FOFB.MNT: update CurrLoopKi PV name.

lnls-sirius · Sep 4, 2024 · 5cd23aa · 5cd23aa
1 parent 69118a5
commit 5cd23aa
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/siriuspy/siriuspy/devices/fofb_acq.py b/siriuspy/siriuspy/devices/fofb_acq.py
@@ -480,7 +480,7 @@ class FOFBPSSysId(_Device):
         'SYSIDPRBSFOFBAccLvl0-SP', 'SYSIDPRBSFOFBAccLvl0-RB',
         'SYSIDPRBSFOFBAccLvl1-SP', 'SYSIDPRBSFOFBAccLvl1-RB',
         'CurrLoopKp-SP', 'CurrLoopKp-RB',
-        'CurrLoopTi-SP', 'CurrLoopTi-RB',
+        'CurrLoopKi-SP', 'CurrLoopKi-RB',
     )
 
     def __init__(self, devname, auto_monitor_mon=True, props2init='all'):
@@ -530,11 +530,11 @@ def currloop_kp(self, value):
     @property
     def currloop_ki(self):
         """Current control loop Ki parameter."""
-        return self['CurrLoopTi-RB']
+        return self['CurrLoopKi-RB']
 
     @currloop_ki.setter
     def currloop_ki(self, value):
-        self['CurrLoopTi-SP'] = value
+        self['CurrLoopKi-SP'] = value
 
 
 class FamFOFBSysId(_FamFOFBAcqBase):

diff --git a/siriuspy/siriuspy/devices/pwrsupply.py b/siriuspy/siriuspy/devices/pwrsupply.py
@@ -48,7 +48,7 @@ class _PSDev(_Device):
         )
     _properties_fc = (
         'AlarmsAmp-Mon', 'OpMode-Sel', 'OpMode-Sts',
-        'CurrLoopKp-RB', 'CurrLoopKp-SP', 'CurrLoopTi-RB', 'CurrLoopTi-SP',
+        'CurrLoopKp-RB', 'CurrLoopKp-SP', 'CurrLoopKi-RB', 'CurrLoopKi-SP',
         'CurrLoopMode-Sts', 'CurrLoopMode-Sel',
         'CurrGain-RB', 'CurrGain-SP', 'CurrOffset-RB', 'CurrOffset-SP',
         'Current-RB', 'Current-SP', 'Current-Mon', 'CurrentRef-Mon',
@@ -928,11 +928,11 @@ def currloop_kp(self, value):
     @property
     def currloop_ki(self):
         """Current control loop Ki parameter."""
-        return self['CurrLoopTi-RB']
+        return self['CurrLoopKi-RB']
 
     @currloop_ki.setter
     def currloop_ki(self, value):
-        self['CurrLoopTi-SP'] = value
+        self['CurrLoopKi-SP'] = value
 
     @property
     def currloop_mode(self):

diff --git a/siriuspy/siriuspy/pwrsupply/csdev.py b/siriuspy/siriuspy/pwrsupply/csdev.py
@@ -1626,8 +1626,8 @@ def _get_ps_FOFB_propty_database():
         # PI control
         'CurrLoopKp-SP': {'type': 'int', 'value': 0},
         'CurrLoopKp-RB': {'type': 'int', 'value': 0},
-        'CurrLoopTi-SP': {'type': 'int', 'value': 0},
-        'CurrLoopTi-RB': {'type': 'int', 'value': 0},
+        'CurrLoopKi-SP': {'type': 'int', 'value': 0},
+        'CurrLoopKi-RB': {'type': 'int', 'value': 0},
         'CurrLoopMode-Sel': {
             'type': 'enum', 'enums': _et.FOFB_CURRLOOPMODES,
             'value': Const.CurrLoopModeFOFB.open_loop_manual,