Merge branch 'master' into add-trims-idff

lnls-sirius · Jan 9, 2025 · 974827c · 974827c
2 parents ae03a83 + bdf5baa
commit 974827c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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

diff --git 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'):
         """."""