Skip to content

Commit

Permalink
Merge pull request #746 from lnls-sirius/improve-powersupply
Browse files Browse the repository at this point in the history
DEV.ENH: Add CurrentRef-Mon monitoring to PowerSupply class.
  • Loading branch information
fernandohds564 authored Oct 21, 2021
2 parents 4265c0a + cab16d9 commit 937c059
Showing 1 changed file with 13 additions and 9 deletions.
22 changes: 13 additions & 9 deletions siriuspy/siriuspy/devices/pwrsupply.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class _PSDev(_Device):
'Current-SP', 'Current-RB', 'Current-Mon',
)
_properties_magps = (
'Current-SP', 'Current-RB', 'Current-Mon',
'Current-SP', 'Current-RB', 'Current-Mon', 'CurrentRef-Mon',
'OpMode-Sel', 'OpMode-Sts',
'WfmUpdateAuto-Sel', 'WfmUpdateAuto-Sts',
'CycleType-Sel', 'CycleType-Sts',
Expand Down Expand Up @@ -203,6 +203,11 @@ def current_mon(self):
"""."""
return self['Current-Mon']

@property
def currentref_mon(self):
"""."""
return self['CurrentRef-Mon']

@property
def opmode(self):
"""."""
Expand Down Expand Up @@ -290,7 +295,13 @@ def cycle_offset(self, value):
def cycle_aux_param(self):
"""Meaning of each index is presented below.
for Sine and DampedSine and DampedSquaredSine:
for Sine and Square:
- AuxParams[0] --> initial phase [°]
- AuxParams[1] --> final phase [°]
- AuxParams[2] --> not used
- AuxParams[3] --> not used
for DampedSine and DampedSquaredSine:
- AuxParams[0] --> initial phase [°]
- AuxParams[1] --> final phase [°]
- AuxParams[2] --> damping time [s]
Expand All @@ -301,13 +312,6 @@ def cycle_aux_param(self):
- AuxParams[1] --> plateau time [s]
- AuxParams[2] --> rampdown time [s]
- AuxParams[3] --> not used
for Square:
- AuxParams[0] --> initial phase [°]
- AuxParams[1] --> not used
- AuxParams[2] --> not used
- AuxParams[3] --> not used
"""
return self['CycleAuxParam-RB']

Expand Down

0 comments on commit 937c059

Please sign in to comment.