mx-bluesky 1.4.9__tar.gz → 1.5.1__tar.gz

{mx_bluesky-1.4.9 → mx_bluesky-1.5.1}/.github/workflows/_container.yml

@@ -30,14 +30,25 @@ jobs:
           DOCKER_BUILD_RECORD_UPLOAD: false
         with:
           context: .
-          file: Dockerfile.release
+          file: Dockerfile.hyperion
+          load: true
+
+      - name: Build and export Dockerfile.blueapi to local cache
+        uses: docker/build-push-action@v6
+        env:
+          DOCKER_BUILD_RECORD_UPLOAD: false
+        with:
+          context: .
+          file: Dockerfile.blueapi
           load: true
 
       - name: Create tags for publishing image
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ghcr.io/${{ github.repository }}
+          images: |
+            ghcr.io/${{ github.repository }}
+            ghcr.io/${{ github.repository }}-blueapi
           tags: |
             type=ref,event=tag
             type=raw,value=latest
@@ -51,7 +62,19 @@ jobs:
         # Docker cache and publish it
         with:
           context: .
-          file: Dockerfile.release
+          file: Dockerfile.hyperion
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+
+      - name: Push Dockerfile.blueapi image to container registry
+        if: github.ref_type == 'tag'
+        uses: docker/build-push-action@v6
+        env:
+          DOCKER_BUILD_RECORD_UPLOAD: false
+        with:
+          context: .
+          file: Dockerfile.blueapi
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

mx_bluesky-1.5.1/Dockerfile.blueapi

@@ -0,0 +1,14 @@
+ # See https://github.com/DiamondLightSource/mx-bluesky/issues/1004
+FROM ghcr.io/diamondlightsource/blueapi:0.10.1
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt update -y && apt upgrade -y
+# Needed for python cv2 dependency
+RUN apt install -y libgl1 libglib2.0-0
+
+RUN /venv/bin/pip install mx-bluesky
+
+# Needed so that Blueapi's setup-scratch stage has permission to modify dependencies installed 
+# in the above pip installation
+RUN mkdir -p /.cache/pip; chmod -R 777 /venv /.cache/pip

{mx_bluesky-1.4.9 → mx_bluesky-1.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mx-bluesky
-Version: 1.4.9
+Version: 1.5.1
 Summary: Bluesky tools for MX Beamlines at DLS
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
 License:                                  Apache License
@@ -221,7 +221,7 @@ Requires-Dist: ispyb
 Requires-Dist: jupyterlab
 Requires-Dist: matplotlib
 Requires-Dist: nexgen>=0.11.0
-Requires-Dist: numpy
+Requires-Dist: numpy==2.2.6
 Requires-Dist: opencv-python
 Requires-Dist: opentelemetry-distro
 Requires-Dist: opentelemetry-exporter-otlp
@@ -233,13 +233,14 @@ Requires-Dist: requests
 Requires-Dist: scanspec
 Requires-Dist: scipy
 Requires-Dist: semver
+Requires-Dist: deepdiff
 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.51.0
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: build; extra == "dev"

{mx_bluesky-1.4.9 → mx_bluesky-1.5.1}/docs/developer/code-map/grid_detect_xrc.rst

@@ -1,9 +1,9 @@
 Grid Detect Then Xray Centre
 ============================
 
-The aim of this page is to provide a general overview of the Hyperion ``grid_detect_then_xray_centre_plan``.
+The aim of this page is to provide a general overview of the ``grid_detect_then_xray_centre_plan``.
 
-Most of the code for the ``grid_detect_then_xray_centre_plan`` plan is in ``mx-bluesky/hyperion``. Some code is located in ``mx-bluesky/common`` and `dodal <https://github.com/DiamondLightSource/dodal>`_, and plans are increasingly being generalised and moved into ``mx-bluesky/common`` where possible. Therefore, the structure of the codebase is subject to change and this document should be updated accordingly.
+The code for the ``grid_detect_then_xray_centre`` plan is now entirely ``mx-bluesky/common/`` and `dodal <https://github.com/DiamondLightSource/dodal>`_. There is a new Hyperion entry point, ``hyperion_grid_detect_then_xray_centre`` which calls this common plan, setting up Hyperion features for it. There will soon be an i04 entry point that calls the common plan in the same way.
 
 There are then a number of plans that make up the ``grid_detect_then_xray_centre_plan`` plan. Some important ones:
 
@@ -11,7 +11,7 @@ There are then a number of plans that make up the ``grid_detect_then_xray_centre
 * :ref:`flyscan_xray_centre_plan<flyscan>` - Triggers a hardware-based grid scan and moves to the X-ray centre as returned from ``zocalo``.
 * :ref:`grid_detect_then_xray_centre_plan<grid-detect-xrc>` - This top-level plan performs an :ref:`OAV grid detection <grid-detect>` then a :ref:`flyscan x-ray centre <flyscan>`.
 
-The diagram below shows all the plans that make up the ``grid_detect_then_xray_centre_plan``. The colors indicate where these plans can be found.
+The diagram below shows all the plans that make up the ``grid_detect_then_xray_centre_plan``.
 
 .. image:: grid_detect_then_xray_centre.drawio.png
 
@@ -20,21 +20,22 @@ The diagram below shows all the plans that make up the ``grid_detect_then_xray_c
 Grid Detect Then Xray Centre Plan
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-`This plan <https://github.com/DiamondLightSource/mx-bluesky/blob/main/src/mx_bluesky/hyperion/experiment_plans/grid_detect_then_xray_centre_plan.py>`__ does the following, in roughly this order:
+`This plan <https://github.com/DiamondLightSource/mx-bluesky/blob/main/src/mx_bluesky/common/experiment_plans/common_grid_detect_then_xray_centre_plan.py>`__ does the following, in roughly this order:
 
 1. If called standalone, start preparing for data collection.
-2. Perform an :ref:`OAV grid detection <grid-detect>`.
-3. Convert the parameters calculated in step 2 into something we can send to the flyscan X-ray centre.
-4. Move the backlight out, set the aperture to small, and wait for the detector to finish moving.
-5. Perform a :ref:`flyscan X-ray centre <flyscan>`.
-6. Move the sample based on the results of step 5.
+2. Move the beamstop into place if it isn't already.
+3. Perform an :ref:`OAV grid detection <grid-detect>`.
+4. Convert the parameters calculated in step 2 into something we can send to the flyscan X-ray centre.
+5. Move the backlight out, set the aperture to small, and wait for the detector to finish moving.
+6. Perform a :ref:`flyscan X-ray centre <flyscan>`.
+7. Move the sample based on the results of step 5.
 
 .. _grid-detect:
 
 OAV Grid Detection
 ~~~~~~~~~~~~~~~~~~
 
-`This plan <https://github.com/DiamondLightSource/mx-bluesky/blob/main/src/mx_bluesky/hyperion/experiment_plans/oav_grid_detection_plan.py>`__ does the following, in roughly this order:
+`This plan <https://github.com/DiamondLightSource/mx-bluesky/blob/main/src/mx_bluesky/common/experiment_plans/oav_grid_detection_plan.py>`__ does the following, in roughly this order:
 
 1. Move to omega 0.
 2. Calculate the 2D grid size using the edge arrays from the OAV.
@@ -48,7 +49,7 @@ OAV Grid Detection
 Flyscan Xray Centre No Move
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-`This plan <https://github.com/DiamondLightSource/mx-bluesky/blob/main/src/mx_bluesky/hyperion/experiment_plans/flyscan_xray_centre_plan.py>`__ does the following, in roughly this order:
+`This plan <https://github.com/DiamondLightSource/mx-bluesky/blob/main/src/mx_bluesky/common/experiment_plans/common_flyscan_xray_centre_plan.py>`__ does the following, in roughly this order:
 
 1. Move to the desired transmission (and turn off xbpm feedback).
 2. Move to omega 0.

mx_bluesky-1.5.1/docs/developer/general/explanations/containerised_mx_bluesky.rst

@@ -0,0 +1,14 @@
+Containerised mx-bluesky
+========================
+
+There are currently two images associated with this repository which are pushed on release: hyperion, and mx-bluesky-blueapi.
+
+The Hyperion image exists because Hyperion was developed before BlueAPI was production-ready, and so doesn't use BlueAPI to schedule plans. This image is only really relevant for i03, and currently isn't used in production anywhere
+
+The ``mx-bluesky-blueapi`` image exists as a minor extension of BlueAPI's image. BlueAPI's image contains the dependencies of BlueAPI, as well as the dependencies of BlueAPI, which includes dodal. When the BlueAPI service is launched, it will do a ``pip install --no deps`` of the plan repository. For MX, this means ``mx-bluesky`` gets installed without any of its dependencies. For this reason, we have created an ``mx-bluesky-blueapi`` image which installs these extra dependencies. 
+
+This image can be used with BlueAPI's original helmchart, the only change required in the ``values.yaml`` is::
+
+    image:
+        repository: ghcr.io/diamondlightsource/mx-bluesky-blueapi
+        tag: "{desired_version}"

{mx_bluesky-1.4.9 → mx_bluesky-1.5.1}/docs/developer/general/how-to/create-a-release.rst

@@ -10,12 +10,15 @@ Release
 =======
 
 1. Create a new branch from main named pre followed by the release version e.g. pre_v0.1.0. The release versions should look like ``v{major}.{minor}.{patch}``.
-2. On this branch pin the up-to-date version of dodal and the latest release of nexgen if necessary.
-3. Go `here <https://github.com/DiamondLightSource/mx-bluesky/releases/new>`_.
-4. Select Choose a new tag and type the version of the release, then select the branch created in step 1 as the target.
-5. Click on Generate release notes. This will create a starting set of release notes based on PR titles since the last release.
-6. You should now manually go through each line on the release notes and read it from the perspective of a beamline scientist. It should be clear from each what the change means to the beamline and should have links to easily find further info.
-7. Publish the release
+2. On this branch pin the up-to-date version of dodal and the latest release of nexgen if necessary, then push to GitHub.
+3. Make sure the CI is passing for this new pre-release branch.
+4. Go `here <https://github.com/DiamondLightSource/mx-bluesky/releases/new>`_.
+5. Select Choose a new tag and type the version of the release, then select the branch created in step 1 as the target.
+6. Click on Generate release notes. This will create a starting set of release notes based on PR titles since the last release.
+7. You should now manually go through each line on the release notes and read it from the perspective of a beamline scientist. It should be clear from each what the change means to the beamline and should have links to easily find further info.
+8. Publish the release
+
+NOTE FOR USING THE MX-BLUESKY-BLUEAPI IMAGE: If using this image with BlueAPI's helmchart for deployment, the version of dodal which is installed will be the version which is pinned in the BlueAPI, rather than what's in mx-bluesky's pyproject.toml. Before releasing, you should pin BlueAPI to a version which uses a dodal version which is compatible with itself AND mx-bluesky. The deployment will fail if BlueAPI has no version which works with the desired dodal version
 
 ------------------------
 Deciding release numbers

{mx_bluesky-1.4.9 → mx_bluesky-1.5.1}/docs/developer/general/index.rst

@@ -42,6 +42,7 @@ Documentation is split into four categories, and each is also accessible from li
 
             explanations/decisions
             explanations/callback_and_run_logic
+            explanations/containerised_mx_bluesky
 
         +++
 

{mx_bluesky-1.4.9 → mx_bluesky-1.5.1}/pyproject.toml

@@ -24,7 +24,7 @@ dependencies = [
     "jupyterlab",
     "matplotlib",
     "nexgen >= 0.11.0",
-    "numpy",
+    "numpy == 2.2.6",                 # See https://github.com/DiamondLightSource/mx-bluesky/issues/1119
     "opencv-python",                  # Needed for I24 ssx moveonclick. To be changed to headless once this is moved to separate ui.
     "opentelemetry-distro",
     "opentelemetry-exporter-otlp",
@@ -36,17 +36,18 @@ dependencies = [
     "scanspec",
     "scipy",
     "semver",
+    "deepdiff",
     "matplotlib",
     #
     # These dependencies may be issued as pre-release versions and should have a pin constraint
     # as by default pip-install will not upgrade to a pre-release.
     #
-    "blueapi >= 0.5.0",
+    "blueapi >= 0.11.1",
     "daq-config-server == 0.1.1",
     "ophyd >= 1.10.5",
     "ophyd-async >= 0.10.0a2",
     "bluesky >= 1.13.1",
-    "dls-dodal == 1.48.0"
+    "dls-dodal == 1.51.0",
 ]
 
 

{mx_bluesky-1.4.9 → mx_bluesky-1.5.1}/src/mx_bluesky/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.4.9'
-__version_tuple__ = version_tuple = (1, 4, 9)
+__version__ = version = '1.5.1'
+__version_tuple__ = version_tuple = (1, 5, 1)

{mx_bluesky-1.4.9 → mx_bluesky-1.5.1}/src/mx_bluesky/beamlines/i24/serial/__init__.py

@@ -2,7 +2,8 @@ from mx_bluesky.beamlines.i24.serial.web_gui_plans.general_plans import (
     gui_gonio_move_on_click,
     gui_move_backlight,
     gui_move_detector,
-    gui_set_parameters,
+    gui_run_chip_collection,
+    gui_set_zoom_level,
     gui_sleep,
     gui_stage_move_on_click,
 )
@@ -57,6 +58,7 @@ __all__ = [
     "gui_gonio_move_on_click",
     "gui_sleep",
     "gui_move_detector",
-    "gui_set_parameters",
+    "gui_run_chip_collection",
     "gui_move_backlight",
+    "gui_set_zoom_level",
 ]

{mx_bluesky-1.4.9 → mx_bluesky-1.5.1}/src/mx_bluesky/beamlines/i24/serial/blueapi_config.yaml

@@ -8,6 +8,10 @@ env:
     broadcast_status_events: false
 api:
   port: 25565
+  cors:
+    allow_credentials: True
+    origins: 
+      - "*"
 stomp:
   enabled: true
   host: i24-control.diamond.ac.uk

{mx_bluesky-1.4.9 → mx_bluesky-1.5.1}/src/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-1.4.9 → mx_bluesky-1.5.1}/src/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,
@@ -504,7 +504,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 +655,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"),
@@ -684,6 +684,38 @@ def run_fixed_target_plan(
     # DCID instance - do not create yet
     dcid = DCID(emit_errors=False, expt_params=parameters)
 
+    yield from run_plan_in_wrapper(
+        zebra,
+        pmac,
+        aperture,
+        backlight,
+        beamstop,
+        detector_stage,
+        shutter,
+        dcm,
+        mirrors,
+        beam_center_device,
+        parameters,
+        dcid,
+        pilatus_metadata,
+    )
+
+
+def run_plan_in_wrapper(
+    zebra: Zebra,
+    pmac: PMAC,
+    aperture: Aperture,
+    backlight: DualBacklight,
+    beamstop: Beamstop,
+    detector_stage: YZStage,
+    shutter: HutchShutter,
+    dcm: DCM,
+    mirrors: FocusMirrorsMode,
+    beam_center_device: DetectorBeamCenter,
+    parameters: FixedTargetParameters,
+    dcid: DCID,
+    pilatus_metadata: PilatusMetadata,
+) -> MsgGenerator:
     yield from bpp.contingency_wrapper(
         main_fixed_target_plan(
             zebra,

{mx_bluesky-1.4.9 → mx_bluesky-1.5.1}/src/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.
 
@@ -256,6 +256,7 @@ def upload_chip_map_to_geobrick(pmac: PMAC, chip_map: list[int]) -> MsgGenerator
     """
     SSX_LOGGER.info("Uploading Parameters for Oxford Chip to the GeoBrick")
     SSX_LOGGER.info(f"Chipid {ChipType.Oxford}, width {OXFORD_CHIP_WIDTH}")
+    SSX_LOGGER.warning(f"MAP TO UPLOAD: {chip_map}")
     for block in range(1, 65):
         value = 1 if block in chip_map else 0
         pvar = PVAR_TEMPLATE % block
@@ -264,7 +265,7 @@ def upload_chip_map_to_geobrick(pmac: PMAC, chip_map: list[int]) -> MsgGenerator
         yield from bps.abs_set(pmac.pmac_string, pvar_str, wait=True)
         # Wait for PMAC to be done processing PVAR string
         yield from bps.sleep(0.02)
-    SSX_LOGGER.debug("Upload parameters done.")
+    SSX_LOGGER.info("Upload parameters done.")
 
 
 @log_on_entry
@@ -565,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-1.4.9 → mx_bluesky-1.5.1}/src/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-1.4.9 → mx_bluesky-1.5.1}/src/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