Merge branch 'main' into hyperion_1339_fix_panda_pcap

DiamondLightSource · May 13, 2024 · c508ee5 · c508ee5
2 parents 0ab3721 + 050e9a4
commit c508ee5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/src/dodal/devices/eiger.py b/src/dodal/devices/eiger.py
@@ -290,6 +290,8 @@ def set_num_triggers_and_captures(self) -> Status:
 
     def _wait_for_odin_status(self) -> Status:
         self.forward_bit_depth_to_filewriter()
+        await_value(self.odin.meta.active, 1).wait(self.GENERAL_STATUS_TIMEOUT)
+
         status = self.odin.file_writer.capture.set(
             1, timeout=self.GENERAL_STATUS_TIMEOUT
         )

diff --git a/src/dodal/devices/eiger_odin.py b/src/dodal/devices/eiger_odin.py
@@ -27,6 +27,7 @@ class OdinMetaListener(Device):
     # file_name should not be set. Set the filewriter file_name and this will be updated in EPICS
     file_name = Component(EpicsSignalRO, "FileName", string=True)
     stop_writing = Component(EpicsSignal, "Stop")
+    active = Component(EpicsSignalRO, "AcquisitionActive_RBV")
 
 
 class OdinFileWriter(HDF5Plugin_V22):

diff --git a/tests/devices/unit_tests/test_eiger.py b/tests/devices/unit_tests/test_eiger.py
@@ -400,6 +400,7 @@ def test_when_stage_called_then_odin_started_after_stale_params_goes_low(
 
     fake_eiger.stale_params.sim_put(1)  # type: ignore
     fake_eiger.odin.file_writer.capture.sim_put(0)  # type: ignore
+    fake_eiger.odin.meta.active.sim_put(1)  # type: ignore
 
     unwrapped_funcs = [
         lambda: await_value(fake_eiger.stale_params, 0, 60),
@@ -428,6 +429,7 @@ def test_when_stage_called_then_cam_acquired_on_meta_ready(
 
     fake_eiger.odin.file_writer.capture.sim_put(0)  # type: ignore
     fake_eiger.stale_params.sim_put(0)  # type: ignore
+    fake_eiger.odin.meta.active.sim_put(1)  # type: ignore
 
     unwrapped_funcs = [
         fake_eiger._wait_for_odin_status,