From 9949415e9d70b2780b684addde4b1575722ac91d Mon Sep 17 00:00:00 2001 From: Fernando Date: Wed, 20 Oct 2021 10:53:24 -0300 Subject: [PATCH 1/2] DEV.ENH: Add CurrentRef-Mon monitoring to PowerSupply class. --- siriuspy/siriuspy/devices/pwrsupply.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/siriuspy/siriuspy/devices/pwrsupply.py b/siriuspy/siriuspy/devices/pwrsupply.py index 510914f3a..f2de9403d 100644 --- a/siriuspy/siriuspy/devices/pwrsupply.py +++ b/siriuspy/siriuspy/devices/pwrsupply.py @@ -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', @@ -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): """.""" From cab16d9c6c17927f397cf268a3927292da05a69c Mon Sep 17 00:00:00 2001 From: anacso17 Date: Wed, 20 Oct 2021 11:49:55 -0300 Subject: [PATCH 2/2] DEV.MNT: update PowerSupply.cycle_aux_param docstring --- siriuspy/siriuspy/devices/pwrsupply.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/siriuspy/siriuspy/devices/pwrsupply.py b/siriuspy/siriuspy/devices/pwrsupply.py index f2de9403d..e9013cdb5 100644 --- a/siriuspy/siriuspy/devices/pwrsupply.py +++ b/siriuspy/siriuspy/devices/pwrsupply.py @@ -295,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] @@ -306,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']