Fix bugs in OrbIntlk IOC

siriuspy/siriuspy/VERSION

@@ -1 +1 @@
-2.87.0
+2.87.1

siriuspy/siriuspy/orbintlk/csdev.py

@@ -213,6 +213,7 @@ def __init__(self):
         if NR_BPM != len(self.bpm_names):
             raise ValueError('Inconsistent NR_BPM parameter!')
         self.bpm_nicknames = _BPMSearch.get_nicknames(self.bpm_names)
+        self.bpm_idcs = {b: idx for idx, b in enumerate(self.bpm_names)}
 
         # bpm position along the ring
         self.bpm_pos = _BPMSearch.get_positions(self.bpm_names)

siriuspy/siriuspy/orbintlk/main.py

@@ -1358,13 +1358,23 @@ def _callback_bpm_intlk(self, pvname, value, **kws):
         if not value:
             return
         # launch thread to log interlock details
+        bpmname = _PVName(pvname).device_name
         _CAThread(
             target=self._log_bpm_intlk,
-            args=(_PVName(pvname).device_name, ),
+            args=(bpmname, ),
             daemon=True).start()
         # launch thread to send interlock to RF as a backup
         if self._thread_cbbpm and self._thread_cbbpm.is_alive():
             return
+
+        # NOTE: the next lines help to avoid killing beam in case one BPM that
+        # is not enabled raises a false positive interlock signal.
+        idx = self._const.bpm_idcs[bpmname]
+        enbl = self._enable_lists['pos'][idx] or self._enable_lists['ang'][idx]
+        if not enbl:
+            self._update_log(f'WARN:{bpmname} false positive')
+            return
+
         self._thread_cbbpm = _CAThread(
             target=self._do_callback_bpm_intlk, daemon=True)
         self._thread_cbbpm.start()