From 12b1e68f325f3a05fb3e850b24ca5de271d874f6 Mon Sep 17 00:00:00 2001 From: Fernando Date: Mon, 9 Dec 2024 17:52:45 -0300 Subject: [PATCH 1/2] DEV.LLRF.BUG: Fix property definition in LLRF. --- siriuspy/siriuspy/devices/rf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/siriuspy/siriuspy/devices/rf.py b/siriuspy/siriuspy/devices/rf.py index d5a009f03..a06d4935a 100644 --- a/siriuspy/siriuspy/devices/rf.py +++ b/siriuspy/siriuspy/devices/rf.py @@ -629,8 +629,8 @@ class _BaseLLRF(_Device): 'AmpRefMin-RB', 'AmpRefMin-SP', 'PhsRefMin-RB', 'PhsRefMin-SP', 'CondEnbl-Sts', 'CondEnbl-Sel', 'CondDuty-RB', 'CondDuty-SP', 'CondDutyCycle-Mon', 'PhShCav-SP', 'PhShCav-RB', - 'SLPILim-SP', 'SLPILim-RB', 'SLKI-SP', 'SLKI-RB' 'SLKP-SP', 'SLKI-RB' - ) + 'SLPILim-SP', 'SLPILim-RB', 'SLKI-SP', 'SLKI-RB', 'SLKP-SP', 'SLKI-RB', + ) def __init__(self, devname, props2init='all'): """.""" From ad9299b4a31df40c1257ea939dc3750795aa6b39 Mon Sep 17 00:00:00 2001 From: Matheus Date: Fri, 13 Dec 2024 10:17:33 -0300 Subject: [PATCH 2/2] DEV.BPM.BUG: Fix `get_sampling_frequency` method for ADC rate freq. --- siriuspy/siriuspy/devices/bpm.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/siriuspy/siriuspy/devices/bpm.py b/siriuspy/siriuspy/devices/bpm.py index f0111000f..19d61f8d0 100644 --- a/siriuspy/siriuspy/devices/bpm.py +++ b/siriuspy/siriuspy/devices/bpm.py @@ -799,7 +799,9 @@ def get_sampling_frequency( """ acq_rate = self.acq_channel_str if not acq_rate else acq_rate fadc = rf_freq / self.harmonic_number * self.tbt_rate - if acq_rate.lower().startswith('tbt'): + if acq_rate.lower().startswith('adc'): + return fadc + elif acq_rate.lower().startswith('tbt'): return fadc / self.tbt_rate elif acq_rate.lower().startswith('fofb'): return fadc / self.fofb_rate