Skip to content

Commit

Permalink
RFDEV.ENH: Add phase shifter and loop params
Browse files Browse the repository at this point in the history
  • Loading branch information
murilobalves committed Oct 23, 2024
1 parent 309600b commit 0635b0c
Showing 1 changed file with 61 additions and 15 deletions.
76 changes: 61 additions & 15 deletions siriuspy/siriuspy/devices/rf.py
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,8 @@ class _BaseLLRF(_Device):
'PhsIncRate-RB', 'PhsIncRate-SP',
'AmpRefMin-RB', 'AmpRefMin-SP', 'PhsRefMin-RB', 'PhsRefMin-SP',
'CondEnbl-Sts', 'CondEnbl-Sel', 'CondDuty-RB', 'CondDuty-SP',
'CondDutyCycle-Mon',
'CondDutyCycle-Mon', 'PhShCav-SP', 'PhShCav-RB',
'SLPILim-SP', 'SLPILim-RB', 'SLKI-SP', 'SLKI-RB' 'SLKP-SP', 'SLKI-RB'
)

def __init__(self, devname, props2init='all'):
Expand Down Expand Up @@ -742,6 +743,32 @@ def set_phase(self, value, tol=0.2, timeout=10, wait_mon=False):
pv2wait = 'SLInpPhs-Mon' if wait_mon else 'SLRefPhs-Mon'
return self._wait_float(pv2wait, value, abs_tol=tol, timeout=timeout)

def phase_shift_cav_sp(self):
"""."""
return self['PhShCav-SP']

def phase_shift_cav(self):
"""."""
return self['PhShCav-RB']

@phase_shift_cav
def phase_shift_cav(self, value):
self['PhShCav-SP'] = self._wrap_phase(value)

@property
def phase_refmin_sp(self):
"""."""
return self['PhsRefMin-SP']

@property
def phase_refmin(self):
"""."""
return self['PhsRefMin-RB']

@phase_refmin.setter
def phase_refmin(self, value):
self['PhsRefMin-SP'] = value

@property
def voltage_mon(self):
"""."""
Expand Down Expand Up @@ -805,20 +832,6 @@ def voltage_refmin(self):
def voltage_refmin(self, value):
self['AmpRefMin-SP'] = value

@property
def phase_refmin_sp(self):
"""."""
return self['PhsRefMin-SP']

@property
def phase_refmin(self):
"""."""
return self['PhsRefMin-RB']

@phase_refmin.setter
def phase_refmin(self, value):
self['PhsRefMin-SP'] = value

@property
def conditioning_state(self):
"""."""
Expand Down Expand Up @@ -919,6 +932,39 @@ def cmd_reset_interlock(self, wait=1):
_time.sleep(wait)
self['IntlkReset-Cmd'] = 0

def loop_pi_limit_sp(self):
return self['SLPILim-SP']

@property
def loop_pi_limit(self):
return self['SLPILim-RB']

@loop_pi_limit.setter
def loop_pi_limit(self, value):
self['SLPILim-SP'] = value

def loop_ki_sp(self):
return self['SLKI-SP']

@property
def loop_ki(self):
return self['SLKI-RB']

@loop_ki.setter
def loop_ki(self, value):
self['SLKI-SP'] = value

def loop_kp_sp(self):
return self['SLKP-SP']

@property
def loop_kp(self):
return self['SLKP-RB']

@loop_kp.setter
def loop_kp(self, value):
self['SLKP-SP'] = value


class _BOLLRF(_BaseLLRF):
"""."""
Expand Down

0 comments on commit 0635b0c

Please sign in to comment.