mx-bluesky 1.4.9__py3-none-any.whl → 1.5.0__py3-none-any.whl

mx_bluesky/hyperion/experiment_plans/hyperion_flyscan_xray_centre_plan.py

@@ -9,7 +9,7 @@ from dodal.devices.fast_grid_scan import (
     set_fast_grid_scan_params,
 )
 
-from mx_bluesky.common.plans.common_flyscan_xray_centre_plan import (
+from mx_bluesky.common.experiment_plans.common_flyscan_xray_centre_plan import (
     construct_beamline_specific_FGS_features,
 )
 from mx_bluesky.common.utils.log import LOGGER
@@ -34,51 +34,50 @@ class SmargonSpeedException(Exception):
 
 
 def construct_hyperion_specific_features(
-    fgs_composite: HyperionFlyScanXRayCentreComposite,
-    parameters: HyperionSpecifiedThreeDGridScan,
+    xrc_composite: HyperionFlyScanXRayCentreComposite,
+    xrc_parameters: HyperionSpecifiedThreeDGridScan,
 ):
     """
     Get all the information needed to do the Hyperion-specific parts of the XRC flyscan.
     """
-
     signals_to_read_pre_flyscan = [
-        fgs_composite.undulator.current_gap,
-        fgs_composite.synchrotron.synchrotron_mode,
-        fgs_composite.s4_slit_gaps.xgap,
-        fgs_composite.s4_slit_gaps.ygap,
-        fgs_composite.smargon.x,
-        fgs_composite.smargon.y,
-        fgs_composite.smargon.z,
-        fgs_composite.dcm.energy_in_kev,
+        xrc_composite.undulator.current_gap,
+        xrc_composite.synchrotron.synchrotron_mode,
+        xrc_composite.s4_slit_gaps.xgap,
+        xrc_composite.s4_slit_gaps.ygap,
+        xrc_composite.smargon.x,
+        xrc_composite.smargon.y,
+        xrc_composite.smargon.z,
+        xrc_composite.dcm.energy_in_kev,
     ]
 
     signals_to_read_during_collection = [
-        fgs_composite.aperture_scatterguard,
-        fgs_composite.attenuator.actual_transmission,
-        fgs_composite.flux.flux_reading,
-        fgs_composite.dcm.energy_in_kev,
-        fgs_composite.eiger.bit_depth,
+        xrc_composite.aperture_scatterguard,
+        xrc_composite.attenuator.actual_transmission,
+        xrc_composite.flux.flux_reading,
+        xrc_composite.dcm.energy_in_kev,
+        xrc_composite.eiger.bit_depth,
     ]
 
-    if parameters.features.use_panda_for_gridscan:
+    if xrc_parameters.features.use_panda_for_gridscan:
         setup_trigger_plan = _panda_triggering_setup
         tidy_plan = _panda_tidy
         set_flyscan_params_plan = partial(
             set_fast_grid_scan_params,
-            fgs_composite.panda_fast_grid_scan,
-            parameters.panda_FGS_params,
+            xrc_composite.panda_fast_grid_scan,
+            xrc_parameters.panda_FGS_params,
         )
-        fgs_motors = fgs_composite.panda_fast_grid_scan
+        fgs_motors = xrc_composite.panda_fast_grid_scan
 
     else:
         setup_trigger_plan = _zebra_triggering_setup
         tidy_plan = partial(_generic_tidy, group="flyscan_zebra_tidy", wait=True)
         set_flyscan_params_plan = partial(
             set_fast_grid_scan_params,
-            fgs_composite.zebra_fast_grid_scan,
-            parameters.FGS_params,
+            xrc_composite.zebra_fast_grid_scan,
+            xrc_parameters.FGS_params,
         )
-        fgs_motors = fgs_composite.zebra_fast_grid_scan
+        fgs_motors = xrc_composite.zebra_fast_grid_scan
     return construct_beamline_specific_FGS_features(
         setup_trigger_plan,
         tidy_plan,
@@ -91,47 +90,47 @@ def construct_hyperion_specific_features(
 
 
 def _generic_tidy(
-    fgs_composite: HyperionFlyScanXRayCentreComposite, group, wait=True
+    xrc_composite: HyperionFlyScanXRayCentreComposite, group, wait=True
 ) -> MsgGenerator:
     LOGGER.info("Tidying up Zebra")
     yield from tidy_up_zebra_after_gridscan(
-        fgs_composite.zebra, fgs_composite.sample_shutter, group=group, wait=wait
+        xrc_composite.zebra, xrc_composite.sample_shutter, group=group, wait=wait
     )
     LOGGER.info("Tidying up Zocalo")
     # make sure we don't consume any other results
-    yield from bps.unstage(fgs_composite.zocalo, group=group, wait=wait)
+    yield from bps.unstage(xrc_composite.zocalo, group=group, wait=wait)
 
     # Turn off dev/shm streaming to avoid filling disk, see https://github.com/DiamondLightSource/hyperion/issues/1395
     LOGGER.info("Turning off Eiger dev/shm streaming")
-    yield from bps.abs_set(fgs_composite.eiger.odin.fan.dev_shm_enable, 0)  # type: ignore # Fix types in ophyd-async (https://github.com/DiamondLightSource/mx-bluesky/issues/855)
+    yield from bps.abs_set(xrc_composite.eiger.odin.fan.dev_shm_enable, 0)  # type: ignore # Fix types in ophyd-async (https://github.com/DiamondLightSource/mx-bluesky/issues/855)
 
 
-def _panda_tidy(fgs_composite: HyperionFlyScanXRayCentreComposite):
+def _panda_tidy(xrc_composite: HyperionFlyScanXRayCentreComposite):
     group = "panda_flyscan_tidy"
     LOGGER.info("Disabling panda blocks")
-    yield from disarm_panda_for_gridscan(fgs_composite.panda, group)
-    yield from _generic_tidy(fgs_composite, group, False)
+    yield from disarm_panda_for_gridscan(xrc_composite.panda, group)
+    yield from _generic_tidy(xrc_composite, group, False)
     yield from bps.wait(group, timeout=10)
-    yield from bps.unstage(fgs_composite.panda)
+    yield from bps.unstage(xrc_composite.panda)
 
 
 def _zebra_triggering_setup(
-    fgs_composite: HyperionFlyScanXRayCentreComposite,
+    xrc_composite: HyperionFlyScanXRayCentreComposite,
     parameters: HyperionSpecifiedThreeDGridScan,
 ) -> MsgGenerator:
     yield from setup_zebra_for_gridscan(
-        fgs_composite.zebra, fgs_composite.sample_shutter, wait=True
+        xrc_composite.zebra, xrc_composite.sample_shutter, wait=True
     )
 
 
 def _panda_triggering_setup(
-    fgs_composite: HyperionFlyScanXRayCentreComposite,
+    xrc_composite: HyperionFlyScanXRayCentreComposite,
     parameters: HyperionSpecifiedThreeDGridScan,
 ) -> MsgGenerator:
     LOGGER.info("Setting up Panda for flyscan")
 
     run_up_distance_mm = yield from bps.rd(
-        fgs_composite.panda_fast_grid_scan.run_up_distance_mm
+        xrc_composite.panda_fast_grid_scan.run_up_distance_mm
     )
 
     # Set the time between x steps pv
@@ -140,7 +139,7 @@ def _panda_triggering_setup(
     time_between_x_steps_ms = (DEADTIME_S + parameters.exposure_time_s) * 1e3
 
     smargon_speed_limit_mm_per_s = yield from bps.rd(
-        fgs_composite.smargon.x.max_velocity
+        xrc_composite.smargon.x.max_velocity
     )
 
     sample_velocity_mm_per_s = (
@@ -161,7 +160,7 @@ def _panda_triggering_setup(
         )
 
     yield from bps.mv(
-        fgs_composite.panda_fast_grid_scan.time_between_x_steps_ms,  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+        xrc_composite.panda_fast_grid_scan.time_between_x_steps_ms,  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
         time_between_x_steps_ms,  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
     )
 
@@ -169,9 +168,9 @@ def _panda_triggering_setup(
     yield from set_panda_directory(directory_provider_root)
 
     yield from setup_panda_for_flyscan(
-        fgs_composite.panda,
+        xrc_composite.panda,
         parameters.panda_FGS_params,
-        fgs_composite.smargon,
+        xrc_composite.smargon,
         parameters.exposure_time_s,
         time_between_x_steps_ms,
         sample_velocity_mm_per_s,
@@ -179,5 +178,5 @@ def _panda_triggering_setup(
 
     LOGGER.info("Setting up Zebra for panda flyscan")
     yield from setup_zebra_for_panda_flyscan(
-        fgs_composite.zebra, fgs_composite.sample_shutter, wait=True
+        xrc_composite.zebra, xrc_composite.sample_shutter, wait=True
     )

mx_bluesky/hyperion/experiment_plans/hyperion_grid_detect_then_xray_centre_plan.py

@@ -0,0 +1,60 @@
+from __future__ import annotations
+
+from blueapi.core import BlueskyContext
+from bluesky.utils import MsgGenerator
+from dodal.plans.preprocessors.verify_undulator_gap import (
+    verify_undulator_gap_before_run_decorator,
+)
+
+from mx_bluesky.common.experiment_plans.common_grid_detect_then_xray_centre_plan import (
+    grid_detect_then_xray_centre,
+)
+from mx_bluesky.common.parameters.constants import OavConstants, PlanNameConstants
+from mx_bluesky.common.preprocessors.preprocessors import (
+    transmission_and_xbpm_feedback_for_collection_decorator,
+)
+from mx_bluesky.common.utils.context import device_composite_from_context
+from mx_bluesky.hyperion.experiment_plans.hyperion_flyscan_xray_centre_plan import (
+    construct_hyperion_specific_features,
+)
+from mx_bluesky.hyperion.parameters.device_composites import (
+    HyperionGridDetectThenXRayCentreComposite,
+)
+from mx_bluesky.hyperion.parameters.gridscan import (
+    GridScanWithEdgeDetect,
+    HyperionSpecifiedThreeDGridScan,
+)
+
+
+def create_devices(
+    context: BlueskyContext,
+) -> HyperionGridDetectThenXRayCentreComposite:
+    return device_composite_from_context(
+        context, HyperionGridDetectThenXRayCentreComposite
+    )
+
+
+def hyperion_grid_detect_then_xray_centre(
+    composite: HyperionGridDetectThenXRayCentreComposite,
+    parameters: GridScanWithEdgeDetect,
+    oav_config: str = OavConstants.OAV_CONFIG_JSON,
+) -> MsgGenerator:
+    """
+    A plan which combines the collection of snapshots from the OAV and the determination
+    of the grid dimensions to use for the following grid scan.
+    """
+
+    @verify_undulator_gap_before_run_decorator(composite)
+    @transmission_and_xbpm_feedback_for_collection_decorator(
+        composite, parameters.transmission_frac, PlanNameConstants.GRIDSCAN_OUTER
+    )
+    def plan_to_perform():
+        yield from grid_detect_then_xray_centre(
+            composite=composite,
+            parameters=parameters,
+            xrc_params_type=HyperionSpecifiedThreeDGridScan,
+            construct_beamline_specific=construct_hyperion_specific_features,
+            oav_config=oav_config,
+        )
+
+    yield from plan_to_perform()

mx_bluesky/hyperion/experiment_plans/pin_centre_then_xray_centre_plan.py

@@ -9,9 +9,18 @@ from dodal.devices.eiger import EigerDetector
 from dodal.devices.oav.oav_parameters import OAVParameters
 
 from mx_bluesky.common.device_setup_plans.manipulate_sample import move_phi_chi_omega
+from mx_bluesky.common.device_setup_plans.utils import (
+    start_preparing_data_collection_then_do_plan,
+)
 from mx_bluesky.common.experiment_plans.change_aperture_then_move_plan import (
     change_aperture_then_move_to_xtal,
 )
+from mx_bluesky.common.experiment_plans.common_grid_detect_then_xray_centre_plan import (
+    detect_grid_and_do_gridscan,
+)
+from mx_bluesky.common.experiment_plans.oav_snapshot_plan import (
+    setup_beamline_for_OAV,
+)
 from mx_bluesky.common.external_interaction.callbacks.xray_centre.ispyb_callback import (
     ispyb_activation_wrapper,
 )
@@ -19,32 +28,33 @@ from mx_bluesky.common.parameters.constants import OavConstants
 from mx_bluesky.common.utils.context import device_composite_from_context
 from mx_bluesky.common.utils.log import LOGGER
 from mx_bluesky.common.xrc_result import XRayCentreEventHandler
-from mx_bluesky.hyperion.device_setup_plans.utils import (
-    start_preparing_data_collection_then_do_plan,
-)
-from mx_bluesky.hyperion.experiment_plans.grid_detect_then_xray_centre_plan import (
-    GridDetectThenXRayCentreComposite,
-    detect_grid_and_do_gridscan,
-)
-from mx_bluesky.hyperion.experiment_plans.oav_snapshot_plan import (
-    setup_beamline_for_OAV,
+from mx_bluesky.hyperion.experiment_plans.hyperion_flyscan_xray_centre_plan import (
+    construct_hyperion_specific_features,
 )
 from mx_bluesky.hyperion.experiment_plans.pin_tip_centring_plan import (
     PinTipCentringComposite,
     pin_tip_centre_plan,
 )
 from mx_bluesky.hyperion.parameters.constants import CONST
+from mx_bluesky.hyperion.parameters.device_composites import (
+    HyperionGridDetectThenXRayCentreComposite,
+)
 from mx_bluesky.hyperion.parameters.gridscan import (
     GridScanWithEdgeDetect,
+    HyperionSpecifiedThreeDGridScan,
     PinTipCentreThenXrayCentre,
 )
 
 
-def create_devices(context: BlueskyContext) -> GridDetectThenXRayCentreComposite:
+def create_devices(
+    context: BlueskyContext,
+) -> HyperionGridDetectThenXRayCentreComposite:
     """
-    GridDetectThenXRayCentreComposite contains all the devices we need, reuse that.
+    HyperionGridDetectThenXRayCentreComposite contains all the devices we need, reuse that.
     """
-    return device_composite_from_context(context, GridDetectThenXRayCentreComposite)
+    return device_composite_from_context(
+        context, HyperionGridDetectThenXRayCentreComposite
+    )
 
 
 def create_parameters_for_grid_detection(
@@ -60,7 +70,7 @@ def create_parameters_for_grid_detection(
 
 
 def pin_centre_then_flyscan_plan(
-    composite: GridDetectThenXRayCentreComposite,
+    composite: HyperionGridDetectThenXRayCentreComposite,
     parameters: PinTipCentreThenXrayCentre,
     oav_config_file: str = OavConstants.OAV_CONFIG_JSON,
 ):
@@ -92,20 +102,21 @@ def pin_centre_then_flyscan_plan(
         )
 
         grid_detect_params = create_parameters_for_grid_detection(parameters)
-
         oav_params = OAVParameters("xrayCentring", oav_config_file)
 
         yield from detect_grid_and_do_gridscan(
             composite,
             grid_detect_params,
             oav_params,
+            HyperionSpecifiedThreeDGridScan,
+            construct_hyperion_specific_features,
         )
 
     yield from ispyb_activation_wrapper(_pin_centre_then_flyscan_plan(), parameters)
 
 
 def pin_tip_centre_then_xray_centre(
-    composite: GridDetectThenXRayCentreComposite,
+    composite: HyperionGridDetectThenXRayCentreComposite,
     parameters: PinTipCentreThenXrayCentre,
     oav_config_file: str = OavConstants.OAV_CONFIG_JSON,
 ) -> MsgGenerator:

mx_bluesky/hyperion/experiment_plans/robot_load_then_centre_plan.py

@@ -35,13 +35,12 @@ from dodal.devices.zocalo import ZocaloResults
 from dodal.log import LOGGER
 from ophyd_async.fastcs.panda import HDFPanda
 
+from mx_bluesky.common.device_setup_plans.utils import (
+    start_preparing_data_collection_then_do_plan,
+)
 from mx_bluesky.common.parameters.constants import OavConstants
 from mx_bluesky.hyperion.device_setup_plans.utils import (
     fill_in_energy_if_not_supplied,
-    start_preparing_data_collection_then_do_plan,
-)
-from mx_bluesky.hyperion.experiment_plans.grid_detect_then_xray_centre_plan import (
-    GridDetectThenXRayCentreComposite,
 )
 from mx_bluesky.hyperion.experiment_plans.pin_centre_then_xray_centre_plan import (
     pin_centre_then_flyscan_plan,
@@ -56,6 +55,9 @@ from mx_bluesky.hyperion.experiment_plans.set_energy_plan import (
     set_energy_plan,
 )
 from mx_bluesky.hyperion.parameters.constants import CONST
+from mx_bluesky.hyperion.parameters.device_composites import (
+    HyperionGridDetectThenXRayCentreComposite,
+)
 from mx_bluesky.hyperion.parameters.robot_load import RobotLoadThenCentre
 
 
@@ -65,7 +67,7 @@ class RobotLoadThenCentreComposite:
     xbpm_feedback: XBPMFeedback
     attenuator: BinaryFilterAttenuator
 
-    # GridDetectThenXRayCentreComposite fields
+    # HyperionGridDetectThenXRayCentreComposite fields
     aperture_scatterguard: ApertureScatterguard
     backlight: Backlight
     detector_motion: DetectorMotion
@@ -110,7 +112,7 @@ def _flyscan_plan_from_robot_load_params(
     oav_config_file: str = OavConstants.OAV_CONFIG_JSON,
 ):
     yield from pin_centre_then_flyscan_plan(
-        cast(GridDetectThenXRayCentreComposite, composite),
+        cast(HyperionGridDetectThenXRayCentreComposite, composite),
         params.pin_centre_then_xray_centre_params,
         oav_config_file,
     )

mx_bluesky/hyperion/experiment_plans/rotation_scan_plan.py

@@ -34,12 +34,20 @@ from mx_bluesky.common.device_setup_plans.manipulate_sample import (
     cleanup_sample_environment,
     setup_sample_environment,
 )
-from mx_bluesky.common.parameters.components import WithSnapshot
-from mx_bluesky.common.plans.read_hardware import (
+from mx_bluesky.common.device_setup_plans.utils import (
+    start_preparing_data_collection_then_do_plan,
+)
+from mx_bluesky.common.experiment_plans.oav_snapshot_plan import (
+    OavSnapshotComposite,
+    oav_snapshot_plan,
+    setup_beamline_for_OAV,
+)
+from mx_bluesky.common.experiment_plans.read_hardware import (
     read_hardware_for_zocalo,
     standard_read_hardware_during_collection,
     standard_read_hardware_pre_collection,
 )
+from mx_bluesky.common.parameters.components import WithSnapshot
 from mx_bluesky.common.preprocessors.preprocessors import (
     transmission_and_xbpm_feedback_for_collection_decorator,
 )
@@ -50,14 +58,6 @@ from mx_bluesky.hyperion.device_setup_plans.setup_zebra import (
     setup_zebra_for_rotation,
     tidy_up_zebra_after_rotation_scan,
 )
-from mx_bluesky.hyperion.device_setup_plans.utils import (
-    start_preparing_data_collection_then_do_plan,
-)
-from mx_bluesky.hyperion.experiment_plans.oav_snapshot_plan import (
-    OavSnapshotComposite,
-    oav_snapshot_plan,
-    setup_beamline_for_OAV,
-)
 from mx_bluesky.hyperion.parameters.constants import CONST
 from mx_bluesky.hyperion.parameters.rotation import (
     RotationScan,
@@ -350,7 +350,7 @@ def _move_and_rotation(
             yield from bps.prepare(
                 composite.aperture_scatterguard,
                 params.selected_aperture,
-                group=CONST.WAIT.ROTATION_READY_FOR_DC,
+                group=CONST.WAIT.PREPARE_APERTURE,
             )
         yield from oav_snapshot_plan(composite, params, oav_params)
     yield from rotation_scan_plan(composite, params, motion_values)

mx_bluesky/hyperion/parameters/constants.py

@@ -19,7 +19,6 @@ TEST_MODE = os.environ.get("HYPERION_TEST_MODE")
 
 @dataclass(frozen=True)
 class I03Constants:
-    BASE_DATA_DIR = "/tmp/dls/i03/data/" if TEST_MODE else "/dls/i03/data/"
     BEAMLINE = "BL03S" if TEST_MODE else "BL03I"
     DETECTOR = EIGER2_X_16M_SIZE
     INSERTION_PREFIX = "SR03S" if TEST_MODE else "SR03I"

mx_bluesky/hyperion/parameters/device_composites.py

@@ -7,19 +7,14 @@ from dodal.devices.aperturescatterguard import (
 from dodal.devices.attenuator.attenuator import BinaryFilterAttenuator
 from dodal.devices.backlight import Backlight
 from dodal.devices.common_dcm import BaseDCM
-from dodal.devices.detector.detector_motion import DetectorMotion
 from dodal.devices.eiger import EigerDetector
 from dodal.devices.fast_grid_scan import (
     PandAFastGridScan,
     ZebraFastGridScan,
 )
 from dodal.devices.flux import Flux
-from dodal.devices.i03 import Beamstop
-from dodal.devices.oav.oav_detector import OAV
-from dodal.devices.oav.pin_image_recognition import PinTipDetection
 from dodal.devices.robot import BartRobot
 from dodal.devices.s4_slit_gaps import S4SlitGaps
-from dodal.devices.smargon import Smargon
 from dodal.devices.synchrotron import Synchrotron
 from dodal.devices.undulator import Undulator
 from dodal.devices.xbpm_feedback import XBPMFeedback
@@ -28,9 +23,12 @@ from dodal.devices.zebra.zebra_controlled_shutter import ZebraShutter
 from dodal.devices.zocalo import ZocaloResults
 from ophyd_async.fastcs.panda import HDFPanda
 
-from mx_bluesky.common.plans.common_flyscan_xray_centre_plan import (
+from mx_bluesky.common.experiment_plans.common_flyscan_xray_centre_plan import (
     FlyScanEssentialDevices,
 )
+from mx_bluesky.common.parameters.device_composites import (
+    GridDetectThenXRayCentreComposite,
+)
 
 
 @pydantic.dataclasses.dataclass(config={"arbitrary_types_allowed": True})
@@ -57,28 +55,8 @@ class HyperionFlyScanXRayCentreComposite(FlyScanEssentialDevices):
 
 
 @pydantic.dataclasses.dataclass(config={"arbitrary_types_allowed": True})
-class GridDetectThenXRayCentreComposite:
+class HyperionGridDetectThenXRayCentreComposite(GridDetectThenXRayCentreComposite):
     """All devices which are directly or indirectly required by this plan"""
 
-    aperture_scatterguard: ApertureScatterguard
-    attenuator: BinaryFilterAttenuator
-    backlight: Backlight
-    beamstop: Beamstop
-    dcm: BaseDCM
-    detector_motion: DetectorMotion
-    eiger: EigerDetector
-    zebra_fast_grid_scan: ZebraFastGridScan
-    flux: Flux
-    oav: OAV
-    pin_tip_detection: PinTipDetection
-    smargon: Smargon
-    synchrotron: Synchrotron
-    s4_slit_gaps: S4SlitGaps
-    undulator: Undulator
-    xbpm_feedback: XBPMFeedback
-    zebra: Zebra
-    zocalo: ZocaloResults
     panda: HDFPanda
     panda_fast_grid_scan: PandAFastGridScan
-    robot: BartRobot
-    sample_shutter: ZebraShutter

mx_bluesky/hyperion/utils/validation.py

@@ -10,7 +10,7 @@ from dodal.beamlines import i03
 from dodal.devices.oav.oav_detector import OAVConfigBeamCentre
 from ophyd_async.testing import set_mock_value
 
-from mx_bluesky.common.plans.read_hardware import (
+from mx_bluesky.common.experiment_plans.read_hardware import (
     standard_read_hardware_during_collection,
 )
 from mx_bluesky.hyperion.experiment_plans.rotation_scan_plan import (

{mx_bluesky-1.4.9.dist-info → mx_bluesky-1.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mx-bluesky
-Version: 1.4.9
+Version: 1.5.0
 Summary: Bluesky tools for MX Beamlines at DLS
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
 License:                                  Apache License
@@ -234,12 +234,12 @@ Requires-Dist: scanspec
 Requires-Dist: scipy
 Requires-Dist: semver
 Requires-Dist: matplotlib
-Requires-Dist: blueapi>=0.5.0
+Requires-Dist: blueapi>=0.11.1
 Requires-Dist: daq-config-server==0.1.1
 Requires-Dist: ophyd>=1.10.5
 Requires-Dist: ophyd-async>=0.10.0a2
 Requires-Dist: bluesky>=1.13.1
-Requires-Dist: dls-dodal==1.48.0
+Requires-Dist: dls-dodal==1.49.0
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: build; extra == "dev"