Small changes

Author: jacob720

src/dodal/beamlines/i04.py

@@ -1,9 +1,11 @@
 from ophyd_async.core import Reference
+from ophyd_async.fastcs.eiger import EigerDetector as FastCSEiger
 
 from dodal.common.beamlines.beamline_parameters import get_beamline_parameters
 from dodal.common.beamlines.beamline_utils import (
     device_factory,
     device_instantiation,
+    get_path_provider,
 )
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.devices.aperturescatterguard import (
@@ -374,3 +376,16 @@ def scintillator() -> Scintillator:
         Reference(aperture_scatterguard()),
         get_beamline_parameters(),
     )
+
+
+@device_factory()
+def fastcs_eiger() -> FastCSEiger:
+    """Get the i04 FastCS Eiger device, instantiate it if it hasn't already been.
+    If this is called when already instantiated in i04, it will return the existing object.
+    """
+    return FastCSEiger(
+        prefix=PREFIX.beamline_prefix,
+        path_provider=get_path_provider(),
+        drv_suffix="-EA-EIGER-02:",
+        hdf_suffix="-EA-EIGER-01:OD:",
+    )

src/dodal/plans/configure_arm_trigger_and_disarm_detector.py

@@ -42,6 +42,8 @@ def configure_and_arm_detector(
     eiger: EigerDetector,
     detector_params: DetectorParams,
     trigger_info: TriggerInfo,
+    group: str = "arm_detector",
+    wait: bool = False,
 ):
     assert detector_params.expected_energy_ev
     start = time.time()
@@ -68,7 +70,7 @@ def configure_and_arm_detector(
     yield from set_mx_settings_pvs(eiger, detector_params, wait=True)
     LOGGER.info(f"Setting MX PVs: {time.time() - start}s")
     start = time.time()
-    yield from bps.prepare(eiger, trigger_info, wait=True)
+    yield from bps.prepare(eiger, trigger_info, group=group)
     LOGGER.info(f"Preparing Eiger: {time.time() - start}s")