Merge pull request #748 from lnls-sirius/improve-bpms

Improve device BPM
lnls-sirius · Oct 22, 2021 · 34ecd32 · 34ecd32
2 parents 0ab19f3 + 09b3e3a
commit 34ecd32
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/siriuspy/siriuspy/devices/bpm.py b/siriuspy/siriuspy/devices/bpm.py
@@ -680,6 +680,16 @@ def acq_nrshots(self, val):
         """."""
         self['ACQShots-SP'] = val
 
+    def wait_acq_finish(self, timeout=10):
+        """Wait Acquisition to finish."""
+        vals = {
+            _csbpm.AcqStates.Idle, _csbpm.AcqStates.Error,
+            _csbpm.AcqStates.Aborted, _csbpm.AcqStates.Too_Many_Samples,
+            _csbpm.AcqStates.Too_Few_Samples, _csbpm.AcqStates.No_Memory,
+            _csbpm.AcqStates.Acq_Overflow}
+        return self._wait(
+            'ACQStatus-Sts', vals, timeout=timeout, comp=lambda x, y: x in y)
+
     def cmd_acq_start(self):
         """Command Start Acquisition."""
         self.acq_ctrl = _csbpm.AcqEvents.Start

diff --git a/siriuspy/siriuspy/devices/device.py b/siriuspy/siriuspy/devices/device.py
@@ -155,7 +155,8 @@ def _create_pvs(self, devname):
 
     def _wait(self, propty, value, timeout=_DEF_TIMEOUT, comp='eq'):
         """."""
-        comp = getattr(_opr, comp)
+        if isinstance(comp, str):
+            comp = getattr(_opr, comp)
         ntrials = int(timeout/_TINY_INTERVAL)
         _time.sleep(4*_TINY_INTERVAL)
         for _ in range(ntrials):