Merge pull request #910 from lnls-sirius/fix-killbeam

Fix KillBeam and SOFB
lnls-sirius · Feb 13, 2023 · 17a958f · 17a958f
2 parents 7debfb5 + 9fcc1b1
commit 17a958f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/siriuspy/siriuspy/VERSION b/siriuspy/siriuspy/VERSION
@@ -1 +1 @@
-2.67.0
+2.67.1
diff --git a/siriuspy/siriuspy/devices/rf.py b/siriuspy/siriuspy/devices/rf.py
@@ -1096,7 +1096,7 @@ def set_frequency(self, value, timeout=10, tol=0.05):
 
 class RFKillBeam(ASLLRF):
     """RF Kill Beam Button."""
-    TIMEOUT_WAIT = 5.0  # [s]
+    TIMEOUT_WAIT = 20.0  # [s]
     INCRATE_VALUE = ASLLRF.VoltIncRates.vel_50p0  # [mV/s]
     REFMIN_VALUE = 60  # Minimum Amplitude Reference [mV]
 

diff --git a/siriuspy/siriuspy/sofb/bpms.py b/siriuspy/siriuspy/sofb/bpms.py
@@ -31,6 +31,7 @@ def __init__(self, name, callback=None):
         self._polyx = _PV(pvpref + 'GEN_PolyXArrayCoeff-RB', **opt)
         self._polyy = _PV(pvpref + 'GEN_PolyYArrayCoeff-RB', **opt)
         opt['callback'] = self._set_needs_update
+        opt['auto_monitor'] = True
         self._arraya = _PV(pvpref + 'GEN_AArrayData', **opt)
         self._arrayb = _PV(pvpref + 'GEN_BArrayData', **opt)
         self._arrayc = _PV(pvpref + 'GEN_CArrayData', **opt)
@@ -39,6 +40,7 @@ def __init__(self, name, callback=None):
         self._arrayy = _PV(pvpref + 'GEN_YArrayData', **opt)
         self._arrays = _PV(pvpref + 'GEN_SUMArrayData', **opt)
         opt.pop('callback')
+        opt.pop('auto_monitor')
         self._offsetx = _PV(pvpref + 'PosXOffset-RB', **opt)
         self._offsety = _PV(pvpref + 'PosYOffset-RB', **opt)
         self._config_ok_vals = {

diff --git a/siriuspy/siriuspy/sofb/orbit.py b/siriuspy/siriuspy/sofb/orbit.py
@@ -845,9 +845,9 @@ def _update_multiturn_orbits(self):
                         bpm.mtposy, self.ref_orbs['Y'][i], samp)
                     psum = self._get_pos(bpm.mtsum, 0, samp)
                 else:
-                    posx = self.raw_mtorbs['X'][-1].copy()
-                    posy = self.raw_mtorbs['Y'][-1].copy()
-                    psum = self.raw_mtorbs['Sum'][-1].copy()
+                    posx = self.raw_mtorbs['X'][-1][:, i].copy()
+                    posy = self.raw_mtorbs['Y'][-1][:, i].copy()
+                    psum = self.raw_mtorbs['Sum'][-1][:, i].copy()
                 orbs['X'].append(posx)
                 orbs['Y'].append(posy)
                 orbs['Sum'].append(psum)
@@ -920,9 +920,9 @@ def _update_singlepass_orbits(self):
                         'refy': self.ref_orbs['Y'][i]})
                     orbx, orby, summ = bpm.calc_sp_multiturn_pos(**dic)
                 else:
-                    orbx = self.raw_sporbs['X'][-1].copy()
-                    orby = self.raw_sporbs['Y'][-1].copy()
-                    summ = self.raw_sporbs['Sum'][-1].copy()
+                    orbx = self.raw_sporbs['X'][-1][:, i].copy()
+                    orby = self.raw_sporbs['Y'][-1][:, i].copy()
+                    summ = self.raw_sporbs['Sum'][-1][:, i].copy()
                 orbs['X'].append(orbx)
                 orbs['Y'].append(orby)
                 orbs['Sum'].append(summ)