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

mx_bluesky/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.5.0'
-__version_tuple__ = version_tuple = (1, 5, 0)
+__version__ = version = '1.5.2'
+__version_tuple__ = version_tuple = (1, 5, 2)

mx_bluesky/beamlines/i04/__init__.py

@@ -1,3 +1,6 @@
+from mx_bluesky.beamlines.i04.experiment_plans import (
+    i04_grid_detect_then_xray_centre_plan,
+)
 from mx_bluesky.beamlines.i04.thawing_plan import thaw, thaw_and_stream_to_redis
 
-__all__ = ["thaw", "thaw_and_stream_to_redis"]
+__all__ = ["thaw", "thaw_and_stream_to_redis", "i04_grid_detect_then_xray_centre_plan"]

mx_bluesky/beamlines/i04/callbacks/murko_callback.py

@@ -1,6 +1,7 @@
 import copy
 import json
 from datetime import timedelta
+from typing import TypedDict
 
 from bluesky.callbacks import CallbackBase
 from dodal.log import LOGGER
@@ -8,7 +9,43 @@ from event_model.documents import Event, RunStart, RunStop
 from redis import StrictRedis
 
 
+class OmegaReading(TypedDict):
+    value: float
+    timestamp: float
+
+
+def extrapolate_omega(
+    latest_omega: OmegaReading, previous_omega: OmegaReading, image_timestamp: float
+) -> float:
+    """Extrapolate an image omega from previous omegas.
+
+    There are a number of assumptions in this calculation:
+    * The speed of the smargon is fixed
+    * The timestamps from the two different devices are synchronised and match the data
+      exactly
+
+    These are accepted to be reasonable based on larger errors likely coming from murko
+    itself and that the results ultimately will be averaged out.
+    """
+    omega_per_sec = (latest_omega["value"] - previous_omega["value"]) / (
+        latest_omega["timestamp"] - previous_omega["timestamp"]
+    )
+    time_elapsed = image_timestamp - latest_omega["timestamp"]
+    return latest_omega["value"] + time_elapsed * omega_per_sec
+
+
 class MurkoCallback(CallbackBase):
+    """A callback that triggers murko processing of images.
+
+    It combines metadata readings from e.g the goniometer rotation with the uuid's given
+    to us by an `OAVToRedisForwarder` (which describe the location of images in redis).
+    And writes these as a package to redis. A separate service then forwards this to murko.
+
+    The metadata and image data arrive independently, it is expected that the image data
+    is arriving at a faster rate than gonio metadata and so the value of omega for when
+    the image arrives is extrapolated based on previous omega readings.
+    """
+
     DATA_EXPIRY_DAYS = 7
 
     def __init__(self, redis_host: str, redis_password: str, redis_db: int = 0):
@@ -16,6 +53,7 @@ class MurkoCallback(CallbackBase):
             host=redis_host, password=redis_password, db=redis_db
         )
         self.last_uuid = None
+        self.previous_omegas: list[OmegaReading] = []
 
     def start(self, doc: RunStart) -> RunStart | None:
         self.sample_id = doc.get("sample_id")
@@ -28,14 +66,31 @@ class MurkoCallback(CallbackBase):
             "sample_id": self.sample_id,
         }
         self.last_uuid = None
+        self.previous_omegas = []
         LOGGER.info(f"Starting to stream metadata to murko under {self.sample_id}")
         return doc
 
     def event(self, doc: Event) -> Event:
         if latest_omega := doc["data"].get("smargon-omega"):
-            if self.last_uuid is not None:
+            if len(self.previous_omegas) <= 2 and self.last_uuid:
+                # For the first few images there's not enough data to extrapolate so we
+                # match them one to one
                 self.call_murko(self.last_uuid, latest_omega)
+            self.previous_omegas.append(
+                OmegaReading(
+                    value=latest_omega,
+                    timestamp=doc["timestamps"]["smargon-omega"],
+                )
+            )
         elif (uuid := doc["data"].get("oav_to_redis_forwarder-uuid")) is not None:
+            if len(self.previous_omegas) >= 2:
+                omega = extrapolate_omega(
+                    self.previous_omegas[-1],
+                    self.previous_omegas[-2],
+                    doc["timestamps"]["oav_to_redis_forwarder-uuid"],
+                )
+                LOGGER.info(f"Using extrapolated omega of {omega}")
+                self.call_murko(uuid, omega)
             self.last_uuid = uuid
         return doc
 

mx_bluesky/beamlines/i04/experiment_plans/i04_grid_detect_then_xray_centre_plan.py

@@ -0,0 +1,259 @@
+from __future__ import annotations
+
+from functools import partial
+
+import bluesky.plan_stubs as bps
+import bluesky.preprocessors as bpp
+from blueapi.core import BlueskyContext
+from bluesky.utils import MsgGenerator
+from dodal.common import inject
+from dodal.devices.aperturescatterguard import ApertureScatterguard
+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 (
+    ZebraFastGridScan,
+    set_fast_grid_scan_params,
+)
+from dodal.devices.flux import Flux
+from dodal.devices.mx_phase1.beamstop 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
+from dodal.devices.zebra.zebra import Zebra
+from dodal.devices.zebra.zebra_controlled_shutter import ZebraShutter
+from dodal.devices.zocalo import ZocaloResults
+from dodal.plans.preprocessors.verify_undulator_gap import (
+    verify_undulator_gap_before_run_decorator,
+)
+
+from mx_bluesky.common.experiment_plans.common_flyscan_xray_centre_plan import (
+    BeamlineSpecificFGSFeatures,
+    construct_beamline_specific_FGS_features,
+)
+from mx_bluesky.common.experiment_plans.common_grid_detect_then_xray_centre_plan import (
+    grid_detect_then_xray_centre,
+)
+from mx_bluesky.common.experiment_plans.oav_snapshot_plan import (
+    setup_beamline_for_OAV,
+)
+from mx_bluesky.common.external_interaction.callbacks.common.zocalo_callback import (
+    ZocaloCallback,
+)
+from mx_bluesky.common.external_interaction.callbacks.xray_centre.ispyb_callback import (
+    GridscanISPyBCallback,
+)
+from mx_bluesky.common.external_interaction.callbacks.xray_centre.nexus_callback import (
+    GridscanNexusFileCallback,
+)
+from mx_bluesky.common.parameters.constants import (
+    EnvironmentConstants,
+    OavConstants,
+    PlanGroupCheckpointConstants,
+    PlanNameConstants,
+)
+from mx_bluesky.common.parameters.device_composites import (
+    GridDetectThenXRayCentreComposite,
+)
+from mx_bluesky.common.parameters.gridscan import GridCommon, SpecifiedThreeDGridScan
+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.phase1_zebra.device_setup_plans.setup_zebra import (
+    setup_zebra_for_gridscan,
+    tidy_up_zebra_after_gridscan,
+)
+
+
+def create_devices(
+    context: BlueskyContext,
+) -> GridDetectThenXRayCentreComposite:
+    return device_composite_from_context(context, GridDetectThenXRayCentreComposite)
+
+
+# See https://github.com/DiamondLightSource/blueapi/issues/506 for using device composites
+def i04_grid_detect_then_xray_centre(
+    parameters: GridCommon,
+    aperture_scatterguard: ApertureScatterguard = inject("aperture_scatterguard"),
+    attenuator: BinaryFilterAttenuator = inject("attenuator"),
+    backlight: Backlight = inject("backlight"),
+    beamstop: Beamstop = inject("beamstop"),
+    dcm: BaseDCM = inject("dcm"),
+    zebra_fast_grid_scan: ZebraFastGridScan = inject("zebra_fast_grid_scan"),
+    flux: Flux = inject("flux"),
+    oav: OAV = inject("oav"),
+    pin_tip_detection: PinTipDetection = inject("pin_tip_detection"),
+    s4_slit_gaps: S4SlitGaps = inject("s4_slit_gaps"),
+    undulator: Undulator = inject("undulator"),
+    xbpm_feedback: XBPMFeedback = inject("xbpm_feedback"),
+    zebra: Zebra = inject("zebra"),
+    robot: BartRobot = inject("robot"),
+    sample_shutter: ZebraShutter = inject("sample_shutter"),
+    eiger: EigerDetector = inject("eiger"),
+    synchrotron: Synchrotron = inject("synchrotron"),
+    zocalo: ZocaloResults = inject("zocalo"),
+    smargon: Smargon = inject("smargon"),
+    detector_motion: DetectorMotion = inject("detector_motion"),
+    oav_config: str = OavConstants.OAV_CONFIG_JSON,
+    udc: bool = False,
+) -> MsgGenerator:
+    """
+    A composite plan which:
+    - Uses the OAV to draw a virtual grid over the sample and to take snapshots of the sample
+    - Scans through the grid to identify the crystal centre
+    - Changes the aperture to match the beam size to the crystal size
+    - Moves the sample to the crystal centre of mass
+
+
+    i04's implementation of this plan is very similar to Hyperion. However, since i04
+    isn't running in a continious Bluesky UDC loop, we take additional steps in beamline
+    tidy-up.
+    """
+
+    composite = GridDetectThenXRayCentreComposite(
+        eiger,
+        synchrotron,
+        zocalo,
+        smargon,
+        aperture_scatterguard,
+        attenuator,
+        backlight,
+        beamstop,
+        dcm,
+        detector_motion,
+        zebra_fast_grid_scan,
+        flux,
+        oav,
+        pin_tip_detection,
+        s4_slit_gaps,
+        undulator,
+        xbpm_feedback,
+        zebra,
+        robot,
+        sample_shutter,
+    )
+
+    def tidy_beamline_if_not_udc():
+        if not udc:
+            yield from get_ready_for_oav_and_close_shutter(
+                composite.smargon,
+                composite.backlight,
+                composite.aperture_scatterguard,
+                composite.detector_motion,
+            )
+
+    @bpp.finalize_decorator(tidy_beamline_if_not_udc)
+    def _inner_grid_detect_then_xrc():
+        # These callbacks let us talk to ISPyB and Nexgen. They aren't included in the common plan because
+        # Hyperion handles its callbacks differently to BlueAPI-managed plans, see
+        # https://github.com/DiamondLightSource/mx-bluesky/issues/1117
+        callbacks = create_gridscan_callbacks()
+
+        @bpp.subs_decorator(callbacks)
+        @verify_undulator_gap_before_run_decorator(composite)
+        @transmission_and_xbpm_feedback_for_collection_decorator(
+            composite, parameters.transmission_frac, PlanNameConstants.GRIDSCAN_OUTER
+        )
+        def grid_detect_then_xray_centre_with_callbacks():
+            yield from grid_detect_then_xray_centre(
+                composite=composite,
+                parameters=parameters,
+                xrc_params_type=SpecifiedThreeDGridScan,
+                construct_beamline_specific=construct_i04_specific_features,
+                oav_config=oav_config,
+            )
+
+        yield from grid_detect_then_xray_centre_with_callbacks()
+
+    yield from _inner_grid_detect_then_xrc()
+
+
+def get_ready_for_oav_and_close_shutter(
+    smargon: Smargon,
+    backlight: Backlight,
+    aperture_scatterguard: ApertureScatterguard,
+    detector_motion: DetectorMotion,
+):
+    yield from bps.wait(PlanGroupCheckpointConstants.GRID_READY_FOR_DC)
+    group = "get_ready_for_oav_and_close_shutter"
+    yield from setup_beamline_for_OAV(
+        smargon, backlight, aperture_scatterguard, group=group
+    )
+    yield from bps.abs_set(
+        detector_motion.shutter,
+        0,
+        group=group,
+    )
+    yield from bps.wait(group)
+
+
+def create_gridscan_callbacks() -> tuple[
+    GridscanNexusFileCallback, GridscanISPyBCallback
+]:
+    return (
+        GridscanNexusFileCallback(param_type=SpecifiedThreeDGridScan),
+        GridscanISPyBCallback(
+            param_type=GridCommon,
+            emit=ZocaloCallback(
+                PlanNameConstants.DO_FGS, EnvironmentConstants.ZOCALO_ENV
+            ),
+        ),
+    )
+
+
+def construct_i04_specific_features(
+    xrc_composite: GridDetectThenXRayCentreComposite,
+    xrc_parameters: SpecifiedThreeDGridScan,
+) -> BeamlineSpecificFGSFeatures:
+    """
+    Get all the information needed to do the i04 XRC flyscan.
+    """
+    signals_to_read_pre_flyscan = [
+        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 = [
+        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,
+    ]
+
+    tidy_plan = partial(
+        tidy_up_zebra_after_gridscan,
+        xrc_composite.zebra,
+        xrc_composite.sample_shutter,
+        group="flyscan_zebra_tidy",
+        wait=True,
+    )
+    set_flyscan_params_plan = partial(
+        set_fast_grid_scan_params,
+        xrc_composite.zebra_fast_grid_scan,
+        xrc_parameters.FGS_params,
+    )
+    fgs_motors = xrc_composite.zebra_fast_grid_scan
+    return construct_beamline_specific_FGS_features(
+        setup_zebra_for_gridscan,
+        tidy_plan,
+        set_flyscan_params_plan,
+        fgs_motors,
+        signals_to_read_pre_flyscan,
+        signals_to_read_during_collection,
+        get_xrc_results_from_zocalo=True,
+    )

mx_bluesky/beamlines/i24/serial/extruder/i24ssx_Extruder_Collect_py3v2.py

@@ -23,8 +23,8 @@ from dodal.devices.i24.beamstop import Beamstop
 from dodal.devices.i24.dcm import DCM
 from dodal.devices.i24.dual_backlight import DualBacklight
 from dodal.devices.i24.focus_mirrors import FocusMirrorsMode
-from dodal.devices.i24.i24_detector_motion import DetectorMotion
 from dodal.devices.i24.pilatus_metadata import PilatusMetadata
+from dodal.devices.motors import YZStage
 from dodal.devices.zebra.zebra import Zebra
 
 from mx_bluesky.beamlines.i24.serial.dcid import (
@@ -70,7 +70,7 @@ def flush_print(text):
 
 @log_on_entry
 def initialise_extruder(
-    detector_stage: DetectorMotion = inject("detector_motion"),
+    detector_stage: YZStage = inject("detector_motion"),
 ) -> MsgGenerator:
     SSX_LOGGER.info("Initialise Parameters for extruder data collection on I24.")
 
@@ -98,7 +98,7 @@ def initialise_extruder(
 def laser_check(
     mode: str,
     zebra: Zebra = inject("zebra"),
-    detector_stage: DetectorMotion = inject("detector_motion"),
+    detector_stage: YZStage = inject("detector_motion"),
 ) -> MsgGenerator:
     """Plan to open the shutter and check the laser beam from the viewer by pressing \
         'Laser On' and 'Laser Off' buttons on the edm.
@@ -138,7 +138,7 @@ def laser_check(
 
 @log_on_entry
 def enter_hutch(
-    detector_stage: DetectorMotion = inject("detector_motion"),
+    detector_stage: YZStage = inject("detector_motion"),
 ) -> MsgGenerator:
     """Move the detector stage before entering hutch."""
     yield from bps.mv(detector_stage.z, SAFE_DET_Z)
@@ -146,12 +146,12 @@ def enter_hutch(
 
 
 @log_on_entry
-def read_parameters(detector_stage: DetectorMotion, attenuator: ReadOnlyAttenuator):
+def read_parameters(detector_stage: YZStage, attenuator: ReadOnlyAttenuator):
     """ Read the parameters from user input and create the parameter model for an \
         extruder collection.
 
     Args:
-        detector_stage (DetectorMotion): The detector stage device.
+        detector_stage (YZStage): The detector stage device.
         attenuator (ReadOnlyAttenuator): A read-only attenuator device to get the \
             transmission value.
 
@@ -208,7 +208,7 @@ def main_extruder_plan(
     aperture: Aperture,
     backlight: DualBacklight,
     beamstop: Beamstop,
-    detector_stage: DetectorMotion,
+    detector_stage: YZStage,
     shutter: HutchShutter,
     dcm: DCM,
     mirrors: FocusMirrorsMode,
@@ -500,7 +500,7 @@ def run_extruder_plan(
     aperture: Aperture = inject("aperture"),
     backlight: DualBacklight = inject("backlight"),
     beamstop: Beamstop = inject("beamstop"),
-    detector_stage: DetectorMotion = inject("detector_motion"),
+    detector_stage: YZStage = inject("detector_motion"),
     shutter: HutchShutter = inject("shutter"),
     dcm: DCM = inject("dcm"),
     mirrors: FocusMirrorsMode = inject("focus_mirrors"),

mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Collect_py3v1.py

@@ -18,9 +18,9 @@ from dodal.devices.i24.beamstop import Beamstop
 from dodal.devices.i24.dcm import DCM
 from dodal.devices.i24.dual_backlight import DualBacklight
 from dodal.devices.i24.focus_mirrors import FocusMirrorsMode
-from dodal.devices.i24.i24_detector_motion import DetectorMotion
 from dodal.devices.i24.pilatus_metadata import PilatusMetadata
 from dodal.devices.i24.pmac import PMAC
+from dodal.devices.motors import YZStage
 from dodal.devices.zebra.zebra import Zebra
 
 from mx_bluesky.beamlines.i24.serial.dcid import (
@@ -269,7 +269,7 @@ def start_i24(
     aperture: Aperture,
     backlight: DualBacklight,
     beamstop: Beamstop,
-    detector_stage: DetectorMotion,
+    detector_stage: YZStage,
     shutter: HutchShutter,
     parameters: FixedTargetParameters,
     dcm: DCM,
@@ -490,7 +490,9 @@ def run_aborted_plan(pmac: PMAC, dcid: DCID, exception: Exception):
         either by pressing the Abort button or because of a timeout, and to reset the \
         P variable.
     """
-    SSX_LOGGER.warning(f"Data Collection Aborted: {format_exception(exception)}")
+    SSX_LOGGER.warning(
+        f"Data Collection Aborted: {''.join(format_exception(exception))}"
+    )
     yield from bps.trigger(pmac.abort_program, wait=True)
 
     end_time = datetime.now()
@@ -504,7 +506,7 @@ def main_fixed_target_plan(
     aperture: Aperture,
     backlight: DualBacklight,
     beamstop: Beamstop,
-    detector_stage: DetectorMotion,
+    detector_stage: YZStage,
     shutter: HutchShutter,
     dcm: DCM,
     mirrors: FocusMirrorsMode,
@@ -655,7 +657,7 @@ def run_fixed_target_plan(
     aperture: Aperture = inject("aperture"),
     backlight: DualBacklight = inject("backlight"),
     beamstop: Beamstop = inject("beamstop"),
-    detector_stage: DetectorMotion = inject("detector_motion"),
+    detector_stage: YZStage = inject("detector_motion"),
     shutter: HutchShutter = inject("shutter"),
     dcm: DCM = inject("dcm"),
     mirrors: FocusMirrorsMode = inject("focus_mirrors"),
@@ -707,7 +709,7 @@ def run_plan_in_wrapper(
     aperture: Aperture,
     backlight: DualBacklight,
     beamstop: Beamstop,
-    detector_stage: DetectorMotion,
+    detector_stage: YZStage,
     shutter: HutchShutter,
     dcm: DCM,
     mirrors: FocusMirrorsMode,

mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Manager_py3v1.py

@@ -16,8 +16,8 @@ from dodal.common import inject
 from dodal.devices.attenuator.attenuator import ReadOnlyAttenuator
 from dodal.devices.i24.beamstop import Beamstop, BeamstopPositions
 from dodal.devices.i24.dual_backlight import BacklightPositions, DualBacklight
-from dodal.devices.i24.i24_detector_motion import DetectorMotion
 from dodal.devices.i24.pmac import PMAC, EncReset, LaserSettings
+from dodal.devices.motors import YZStage
 
 from mx_bluesky.beamlines.i24.serial.fixed_target.ft_utils import (
     ChipType,
@@ -121,14 +121,14 @@ def _is_checker_pattern() -> bool:
 
 @log_on_entry
 def read_parameters(
-    detector_stage: DetectorMotion,
+    detector_stage: YZStage,
     attenuator: ReadOnlyAttenuator,
 ) -> MsgGenerator:
     """ Read the parameters from user input and create the parameter model for a fixed \
         target collection.
 
     Args:
-        detector_stage (DetectorMotion): The detector stage device.
+        detector_stage (YZStage): The detector stage device.
         attenuator (ReadOnlyAttenuator): A read-only attenuator device to get the \
             transmission value.
 
@@ -566,7 +566,7 @@ def moveto_preset(
     pmac: PMAC = inject("pmac"),
     beamstop: Beamstop = inject("beamstop"),
     backlight: DualBacklight = inject("backlight"),
-    det_stage: DetectorMotion = inject("detector_motion"),
+    det_stage: YZStage = inject("detector_motion"),
 ) -> MsgGenerator:
     # Non Chip Specific Move
     if place == "zero":

mx_bluesky/beamlines/i24/serial/setup_beamline/setup_beamline.py

@@ -7,7 +7,7 @@ from dodal.devices.i24.beam_center import DetectorBeamCenter
 from dodal.devices.i24.beamstop import Beamstop, BeamstopPositions
 from dodal.devices.i24.dcm import DCM
 from dodal.devices.i24.dual_backlight import BacklightPositions, DualBacklight
-from dodal.devices.i24.i24_detector_motion import DetectorMotion
+from dodal.devices.motors import YZStage
 from dodal.devices.util.lookup_tables import (
     linear_interpolation_lut,
     parse_lookup_table,
@@ -69,7 +69,7 @@ def setup_beamline_for_collection_plan(
 
 
 def move_detector_stage_to_position_plan(
-    detector_stage: DetectorMotion,
+    detector_stage: YZStage,
     detector_distance: float,
 ):
     SSX_LOGGER.debug("Setup beamline: moving detector stage.")

mx_bluesky/beamlines/i24/serial/setup_beamline/setup_detector.py

@@ -8,7 +8,7 @@ from enum import IntEnum
 import bluesky.plan_stubs as bps
 from bluesky.utils import Msg, MsgGenerator
 from dodal.common import inject
-from dodal.devices.i24.i24_detector_motion import DetectorMotion
+from dodal.devices.motors import YZStage
 
 from mx_bluesky.beamlines.i24.serial.log import SSX_LOGGER
 from mx_bluesky.beamlines.i24.serial.parameters import SSXType
@@ -38,9 +38,9 @@ class UnknownDetectorType(Exception):
     pass
 
 
-def get_detector_type(detector_stage: DetectorMotion) -> Generator[Msg, None, Detector]:
+def get_detector_type(detector_stage: YZStage) -> Generator[Msg, None, Detector]:
     det_y = yield from bps.rd(detector_stage.y)
-    # DetectorMotion should also be used for this.
+    # YZStage should also be used for this.
     # This should be part of https://github.com/DiamondLightSource/mx_bluesky/issues/51
     if float(det_y) < Eiger.det_y_threshold:
         SSX_LOGGER.info("Eiger detector in use.")
@@ -53,7 +53,7 @@ def get_detector_type(detector_stage: DetectorMotion) -> Generator[Msg, None, De
         raise UnknownDetectorType("Detector not found.")
 
 
-def _move_detector_stage(detector_stage: DetectorMotion, target: float) -> MsgGenerator:
+def _move_detector_stage(detector_stage: YZStage, target: float) -> MsgGenerator:
     SSX_LOGGER.info(f"Moving detector stage to target position: {target}.")
     yield from bps.mv(detector_stage.y, target)
 
@@ -82,7 +82,7 @@ def _get_requested_detector(det_type_pv: str) -> str:
 
 
 def setup_detector_stage(
-    expt_type: SSXType, detector_stage: DetectorMotion = inject("detector_motion")
+    expt_type: SSXType, detector_stage: YZStage = inject("detector_motion")
 ) -> MsgGenerator:
     # Grab the correct PV depending on experiment
     # Its value is set with MUX on edm screen

mx_bluesky/beamlines/i24/serial/web_gui_plans/general_plans.py

@@ -13,9 +13,9 @@ from dodal.devices.i24.beamstop import Beamstop
 from dodal.devices.i24.dcm import DCM
 from dodal.devices.i24.dual_backlight import BacklightPositions, DualBacklight
 from dodal.devices.i24.focus_mirrors import FocusMirrorsMode
-from dodal.devices.i24.i24_detector_motion import DetectorMotion
 from dodal.devices.i24.pilatus_metadata import PilatusMetadata
 from dodal.devices.i24.pmac import PMAC
+from dodal.devices.motors import YZStage
 from dodal.devices.oav.oav_detector import OAVBeamCentreFile
 from dodal.devices.zebra.zebra import Zebra
 
@@ -104,7 +104,7 @@ def gui_sleep(sec: int) -> MsgGenerator:
 @bpp.run_decorator()
 def gui_move_detector(
     det: Literal["eiger", "pilatus"],
-    detector_stage: DetectorMotion = inject("detector_motion"),
+    detector_stage: YZStage = inject("detector_motion"),
 ) -> MsgGenerator:
     det_y_target = Eiger.det_y_target if det == "eiger" else Pilatus.det_y_target
     yield from _move_detector_stage(detector_stage, det_y_target)
@@ -134,7 +134,7 @@ def gui_run_chip_collection(
     aperture: Aperture = inject("aperture"),
     backlight: DualBacklight = inject("backlight"),
     beamstop: Beamstop = inject("beamstop"),
-    detector_stage: DetectorMotion = inject("detector_motion"),
+    detector_stage: YZStage = inject("detector_motion"),
     shutter: HutchShutter = inject("shutter"),
     dcm: DCM = inject("dcm"),
     mirrors: FocusMirrorsMode = inject("focus_mirrors"),