Remove references to eiger trigger info (#1313)

* Remove references to EigerTriggerInfo

* Set energy explicitly in plan

* Fix test for new ophyd-async version

---------

Co-authored-by: Dominic Oram <[email protected]>

Author: shihab-dls

src/dodal/plans/configure_arm_trigger_and_disarm_detector.py

@@ -3,8 +3,8 @@
 import bluesky.plan_stubs as bps
 from bluesky import preprocessors as bpp
 from bluesky.run_engine import RunEngine
-from ophyd_async.core import DetectorTrigger
-from ophyd_async.fastcs.eiger import EigerDetector, EigerTriggerInfo
+from ophyd_async.core import DetectorTrigger, TriggerInfo
+from ophyd_async.fastcs.eiger import EigerDetector
 
 from dodal.beamlines.i03 import fastcs_eiger
 from dodal.devices.detector import DetectorParams
@@ -15,7 +15,7 @@
 def configure_arm_trigger_and_disarm_detector(
     eiger: EigerDetector,
     detector_params: DetectorParams,
-    trigger_info: EigerTriggerInfo,
+    trigger_info: TriggerInfo,
 ):
     assert detector_params.expected_energy_ev
     start = time.time()
@@ -132,6 +132,9 @@ def set_mx_settings_pvs(
     yield from bps.abs_set(
         eiger.drv.detector.omega_increment, detector_params.omega_increment, group
     )
+    yield from bps.abs_set(
+        eiger.drv.detector.photon_energy, detector_params.expected_energy_ev, group
+    )
 
     if wait:
         yield from bps.wait(group)
@@ -157,9 +160,8 @@ def set_mx_settings_pvs(
                 use_roi_mode=False,
                 det_dist_to_beam_converter_path="/dls_sw/i03/software/daq_configuration/lookup/DetDistToBeamXYConverter.txt",
             ),
-            trigger_info=EigerTriggerInfo(
+            trigger_info=TriggerInfo(
                 number_of_events=1,
-                energy_ev=12800,
                 trigger=DetectorTrigger.INTERNAL,
                 deadtime=0.0001,
             ),

tests/plans/test_configure_arm_trigger_and_disarm_detector.py

@@ -3,9 +3,8 @@
 
 import pytest
 from bluesky.run_engine import RunEngine
-from ophyd_async.core import DetectorTrigger
+from ophyd_async.core import DetectorTrigger, TriggerInfo
 from ophyd_async.fastcs.eiger import EigerDetector as FastEiger
-from ophyd_async.fastcs.eiger import EigerTriggerInfo
 from ophyd_async.testing import callback_on_mock_put, set_mock_value
 
 from dodal.plans.configure_arm_trigger_and_disarm_detector import (
@@ -30,10 +29,9 @@ async def fake_observe_indices_written(timeout: float) -> AsyncGenerator[int, No
 async def test_configure_arm_trigger_and_disarm_detector(
     fake_eiger, eiger_params, RE: RunEngine
 ):
-    trigger_info = EigerTriggerInfo(
+    trigger_info = TriggerInfo(
         # Manual trigger, so setting number of triggers to 1.
         number_of_events=1,
-        energy_ev=eiger_params.expected_energy_ev,
         trigger=DetectorTrigger.INTERNAL,
         deadtime=0.0001,
     )

tests/unit_tests/test_log.py

@@ -249,17 +249,17 @@ async def test_ophyd_async_logger_configured(dodal_logger_for_tests):
     stream_handler: logging.StreamHandler = dodal_logger_for_tests.handlers[0]
     stream_handler.level = logging.DEBUG
     stream_handler.stream.write = MagicMock()
-    test_signal_name = "TEST SIGNAL NAME"
+    test_signal_name = "my_signal"
     test_device_name = "TEST DEVICE NAME"
 
     class _Device(Device):
         def __init__(self, name: str = test_device_name) -> None:
             super().__init__(name)
-            self.test_signal = soft_signal_rw(int, 0, test_signal_name)
+            self.my_signal = soft_signal_rw(int, 0)
 
     device = _Device()
     await device.connect()
-    assert f"[{test_signal_name}]" in stream_handler.stream.write.call_args.args[0]
+    assert f"{test_signal_name}" in stream_handler.stream.write.call_args.args[0]
     device.log.debug("test message")
     assert f"[{test_device_name}]" in stream_handler.stream.write.call_args.args[0]