mx-bluesky 1.5.1__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.1'
-__version_tuple__ = version_tuple = (1, 5, 1)
+__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/fixed_target/i24ssx_Chip_Collect_py3v1.py

@@ -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()

mx_bluesky/common/experiment_plans/change_aperture_then_move_plan.py

@@ -4,6 +4,7 @@ from dodal.devices.aperturescatterguard import ApertureScatterguard, ApertureVal
 from dodal.devices.smargon import Smargon, StubPosition
 
 from mx_bluesky.common.device_setup_plans.manipulate_sample import move_x_y_z
+from mx_bluesky.common.parameters.constants import PlanGroupCheckpointConstants
 from mx_bluesky.common.utils.log import LOGGER
 from mx_bluesky.common.utils.tracing import TRACER
 from mx_bluesky.common.xrc_result import XRayCentreResult
@@ -43,6 +44,7 @@ def change_aperture_then_move_to_xtal(
 def set_aperture_for_bbox_mm(
     aperture_device: ApertureScatterguard,
     bbox_size_mm: list[float] | numpy.ndarray,
+    group=PlanGroupCheckpointConstants.GRID_READY_FOR_DC,
 ):
     """Sets aperture size based on bbox_size.
 
@@ -71,4 +73,6 @@ def set_aperture_for_bbox_mm(
         f"Setting aperture to {new_selected_aperture} based on bounding box size {bbox_size_mm}."
     )
 
-    yield from bps.abs_set(aperture_device.selected_aperture, new_selected_aperture)
+    yield from bps.abs_set(
+        aperture_device.selected_aperture, new_selected_aperture, group=group
+    )

mx_bluesky/common/experiment_plans/common_flyscan_xray_centre_plan.py

@@ -22,7 +22,7 @@ from mx_bluesky.common.experiment_plans.inner_plans.do_fgs import (
     ZOCALO_STAGE_GROUP,
     kickoff_and_complete_gridscan,
 )
-from mx_bluesky.common.experiment_plans.read_hardware import (
+from mx_bluesky.common.experiment_plans.inner_plans.read_hardware import (
     read_hardware_plan,
 )
 from mx_bluesky.common.parameters.constants import (
@@ -55,6 +55,25 @@ class BeamlineSpecificFGSFeatures:
     get_xrc_results_from_zocalo: bool
 
 
+def generic_tidy(xrc_composite: FlyScanEssentialDevices, wait=True) -> MsgGenerator:
+    """Tidy Zocalo and turn off Eiger dev/shm. Ran after the beamline-specific tidy plan"""
+
+    LOGGER.info("Tidying up Zocalo")
+    group = "generic_tidy"
+    # make sure we don't consume any other results
+    yield from bps.unstage(xrc_composite.zocalo, group=group)
+
+    # 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")
+    # 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,  # type: ignore
+        0,
+        group=group,
+    )
+    yield from bps.wait(group)
+
+
 def construct_beamline_specific_FGS_features(
     setup_trigger_plan: Callable[..., MsgGenerator],
     tidy_plan: Callable[..., MsgGenerator],
@@ -71,7 +90,7 @@ def construct_beamline_specific_FGS_features(
         Ran directly before kicking off the gridscan.
 
         tidy_plan (Callable): Tidy up states of devices. Ran at the end of the flyscan, regardless of
-        whether or not it finished successfully.
+        whether or not it finished successfully. Zocalo and Eiger are cleaned up separately
 
         set_flyscan_params_plan (Callable): Set PV's for the relevant Fast Grid Scan dodal device
 
@@ -135,6 +154,10 @@ def common_flyscan_xray_centre(
     There are a few other useful decorators to use with this plan, see: verify_undulator_gap_before_run_decorator, transmission_and_xbpm_feedback_for_collection_decorator
     """
 
+    def _overall_tidy():
+        yield from beamline_specific.tidy_plan()
+        yield from generic_tidy(composite)
+
     def _decorated_flyscan():
         @bpp.set_run_key_decorator(PlanNameConstants.GRIDSCAN_OUTER)
         @bpp.run_decorator(  # attach experiment metadata to the start document
@@ -146,7 +169,7 @@ def common_flyscan_xray_centre(
                 ],
             }
         )
-        @bpp.finalize_decorator(lambda: beamline_specific.tidy_plan(composite))
+        @bpp.finalize_decorator(lambda: _overall_tidy())
         def run_gridscan_and_tidy(
             fgs_composite: FlyScanEssentialDevices,
             params: SpecifiedThreeDGridScan,

mx_bluesky/common/experiment_plans/common_grid_detect_then_xray_centre_plan.py

@@ -111,6 +111,7 @@ def grid_detect_then_xray_centre(
     )
 
 
+# This function should be private but is currently called by Hyperion, see https://github.com/DiamondLightSource/mx-bluesky/issues/1148
 def detect_grid_and_do_gridscan(
     composite: GridDetectThenXRayCentreComposite,
     parameters: GridCommon,

mx_bluesky/common/experiment_plans/inner_plans/do_fgs.py

@@ -14,7 +14,9 @@ from dodal.log import LOGGER
 from dodal.plan_stubs.check_topup import check_topup_and_wait_if_necessary
 from scanspec.core import AxesPoints, Axis
 
-from mx_bluesky.common.experiment_plans.read_hardware import read_hardware_for_zocalo
+from mx_bluesky.common.experiment_plans.inner_plans.read_hardware import (
+    read_hardware_for_zocalo,
+)
 from mx_bluesky.common.parameters.constants import (
     PlanNameConstants,
 )

mx_bluesky/common/external_interaction/ispyb/ispyb_store.py

@@ -145,11 +145,17 @@ class StoreInIspyb:
     def append_to_comment(
         self, data_collection_id: int, comment: str, delimiter: str = " "
     ) -> None:
-        with ispyb.open(self.ISPYB_CONFIG_PATH) as conn:
-            assert conn is not None, "Failed to connect to ISPyB!"
-            mx_acquisition: MXAcquisition = conn.mx_acquisition
-            mx_acquisition.update_data_collection_append_comments(
-                data_collection_id, comment, delimiter
+        try:
+            with ispyb.open(self.ISPYB_CONFIG_PATH) as conn:
+                assert conn is not None, "Failed to connect to ISPyB!"
+                mx_acquisition: MXAcquisition = conn.mx_acquisition
+                mx_acquisition.update_data_collection_append_comments(
+                    data_collection_id, comment, delimiter
+                )
+        except ispyb.ReadWriteError as e:
+            ISPYB_ZOCALO_CALLBACK_LOGGER.warning(
+                f"Unable to log comment, comment probably exceeded column length: {comment}",
+                exc_info=e,
             )
 
     def update_data_collection_group_table(
@@ -186,7 +192,6 @@ class StoreInIspyb:
             params["parentid"] = data_collection_group_id
             params["endtime"] = end_time
             params["run_status"] = run_status
-
             mx_acquisition.upsert_data_collection(list(params.values()))
 
     def _store_position_table(

mx_bluesky/common/parameters/constants.py

@@ -11,6 +11,7 @@ from mx_bluesky.definitions import ROOT_DIR
 
 BEAMLINE = get_beamline_name("test")
 TEST_MODE = BEAMLINE == "test"
+ZEBRA_STATUS_TIMEOUT = 30
 
 
 @dataclass(frozen=True)

mx_bluesky/common/parameters/device_composites.py

@@ -11,7 +11,7 @@ from dodal.devices.fast_grid_scan import (
     ZebraFastGridScan,
 )
 from dodal.devices.flux import Flux
-from dodal.devices.i03 import Beamstop
+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

mx_bluesky/common/parameters/gridscan.py

@@ -30,6 +30,7 @@ DETECTOR_SIZE_PER_BEAMLINE = {
     "i02-1": EIGER2_X_9M_SIZE,
     "dev": EIGER2_X_16M_SIZE,
     "i03": EIGER2_X_16M_SIZE,
+    "i04": EIGER2_X_16M_SIZE,
 }
 
 

mx_bluesky/hyperion/__main__.py

@@ -218,7 +218,7 @@ class RunExperiment(Resource):
                 status_and_message = self.runner.start(plan, params, plan_name)
             except Exception as e:
                 status_and_message = make_error_status_and_message(e)
-                LOGGER.error(format_exception(e))
+                LOGGER.error("".join(format_exception(e)))
 
         elif action == Actions.STOP.value:
             status_and_message = self.runner.stop()

mx_bluesky/hyperion/baton_handler.py

@@ -1,18 +1,26 @@
 from collections.abc import Sequence
 
+from blueapi.core import BlueskyContext
 from bluesky import plan_stubs as bps
 from bluesky import preprocessors as bpp
 from dodal.devices.baton import Baton
 
+from mx_bluesky.common.utils.context import find_device_in_context
 from mx_bluesky.common.utils.exceptions import WarningException
+from mx_bluesky.common.utils.log import LOGGER
 from mx_bluesky.hyperion.experiment_plans.load_centre_collect_full_plan import (
     LoadCentreCollectComposite,
+    create_devices,
     load_centre_collect_full,
 )
 from mx_bluesky.hyperion.external_interaction.agamemnon import (
     create_parameters_from_agamemnon,
 )
 from mx_bluesky.hyperion.parameters.load_centre_collect import LoadCentreCollect
+from mx_bluesky.hyperion.utils.context import (
+    clear_all_device_caches,
+    setup_devices,
+)
 
 HYPERION_USER = "Hyperion"
 NO_USER = "None"
@@ -59,7 +67,24 @@ def move_to_default_state():
     yield from bps.null()
 
 
-def run_udc_when_requested(baton: Baton, composite: LoadCentreCollectComposite):
+def initialise_udc(context: BlueskyContext, dev_mode: bool = False):
+    """
+    Perform all initialisation that happens at the start of UDC just after the
+    baton is acquired, but before we execute any plans or move hardware.
+
+    Beamline devices are unloaded and reloaded in order to pick up any new configuration,
+    bluesky context gets new set of devices.
+    """
+    LOGGER.info("Initialising mx-bluesky for UDC start...")
+    clear_all_device_caches(context)
+    setup_devices(context, dev_mode)
+
+
+def _get_baton(context: BlueskyContext) -> Baton:
+    return find_device_in_context(context, "baton", Baton)
+
+
+def run_udc_when_requested(context: BlueskyContext, dev_mode: bool = False):
     """This will wait for the baton to be handed to hyperion and then run through the
     UDC queue from agamemnon until:
       1. There are no more instructions from agamemnon
@@ -69,21 +94,28 @@ def run_udc_when_requested(baton: Baton, composite: LoadCentreCollectComposite):
     In the case of 1. or 2. hyperion will immediately release the baton. In the case of
     3. the baton will be released after the next collection has finished."""
 
+    baton = _get_baton(context)
     yield from wait_for_hyperion_requested(baton)
     yield from bps.abs_set(baton.current_user, HYPERION_USER)
 
-    def default_state_then_collect():
+    def initialise_then_collect():
+        initialise_udc(context, dev_mode)
         yield from move_to_default_state()
-        yield from main_hyperion_loop(baton, composite)
+
+        # re-fetch the baton because the device has been reinstantiated
+        new_baton = _get_baton(context)
+        composite = create_devices(context)
+        yield from main_hyperion_loop(new_baton, composite)
 
     def release_baton():
         # If hyperion has given up the baton itself we need to also release requested
         # user so that hyperion doesn't think we're requested again
+        baton = _get_baton(context)
         requested_user = yield from bps.rd(baton.requested_user)
         if requested_user == HYPERION_USER:
             yield from bps.abs_set(baton.requested_user, NO_USER)
         yield from bps.abs_set(baton.current_user, NO_USER)
 
     yield from bpp.contingency_wrapper(
-        default_state_then_collect(), final_plan=release_baton
+        initialise_then_collect(), final_plan=release_baton
     )

mx_bluesky/hyperion/device_setup_plans/setup_zebra.py

@@ -1,5 +1,4 @@
 import bluesky.plan_stubs as bps
-from bluesky.utils import MsgGenerator
 from dodal.devices.zebra.zebra import (
     ArmDemand,
     EncEnum,
@@ -12,9 +11,11 @@ from dodal.devices.zebra.zebra_controlled_shutter import (
     ZebraShutterControl,
 )
 
+from mx_bluesky.common.parameters.constants import ZEBRA_STATUS_TIMEOUT
 from mx_bluesky.common.utils.log import LOGGER
-
-ZEBRA_STATUS_TIMEOUT = 30
+from mx_bluesky.phase1_zebra.device_setup_plans.setup_zebra import (
+    configure_zebra_and_shutter_for_auto_shutter,
+)
 
 
 def arm_zebra(zebra: Zebra):
@@ -35,47 +36,6 @@ def tidy_up_zebra_after_rotation_scan(
         yield from bps.wait(group, timeout=ZEBRA_STATUS_TIMEOUT)
 
 
-def set_shutter_auto_input(zebra: Zebra, input: int, group="set_shutter_trigger"):
-    """Set the signal that controls the shutter. We use the second input to the
-    Zebra's AND2 gate for this input. ZebraShutter control mode must be in auto for this input to take control
-
-    For more details see the ZebraShutter device."""
-    auto_gate = zebra.mapping.AND_GATE_FOR_AUTO_SHUTTER
-    auto_shutter_control = zebra.logic_gates.and_gates[auto_gate]
-    yield from bps.abs_set(auto_shutter_control.sources[2], input, group)
-
-
-def configure_zebra_and_shutter_for_auto_shutter(
-    zebra: Zebra, zebra_shutter: ZebraShutter, input: int, group="use_automatic_shutter"
-):
-    """Set the shutter to auto mode, and configure the zebra to trigger the shutter on
-    an input source. For the input, use one of the source constants in zebra.py
-
-    When the shutter is in auto/manual, logic in EPICS sets the Zebra's
-    SOFT_IN1 to low/high respectively. The Zebra's AND2 gate should be used to control the shutter while in auto mode.
-    To do this, we need (AND2 = SOFT_IN1 AND input), where input is the zebra signal we want to control the shutter when in auto mode.
-    """
-    # See https://github.com/DiamondLightSource/dodal/issues/813 for better typing here.
-
-    # Set shutter to auto mode
-    yield from bps.abs_set(
-        zebra_shutter.control_mode, ZebraShutterControl.AUTO, group=group
-    )
-
-    auto_gate = zebra.mapping.AND_GATE_FOR_AUTO_SHUTTER
-
-    # Set first input of AND2 gate to SOFT_IN1, which is high when shutter is in auto mode
-    # Note the Zebra should ALWAYS be setup this way. See https://github.com/DiamondLightSource/mx-bluesky/issues/551
-    yield from bps.abs_set(
-        zebra.logic_gates.and_gates[auto_gate].sources[1],
-        zebra.mapping.sources.SOFT_IN1,
-        group=group,
-    )
-
-    # Set the second input of AND2 gate to the requested zebra input source
-    yield from set_shutter_auto_input(zebra, input, group=group)
-
-
 def setup_zebra_for_rotation(
     zebra: Zebra,
     zebra_shutter: ZebraShutter,
@@ -155,55 +115,6 @@ def setup_zebra_for_rotation(
         yield from bps.wait(group, timeout=ZEBRA_STATUS_TIMEOUT)
 
 
-def setup_zebra_for_gridscan(
-    zebra: Zebra,
-    zebra_shutter: ZebraShutter,
-    group="setup_zebra_for_gridscan",
-    wait=True,
-):
-    # Set shutter to automatic and to trigger via motion controller GPIO signal (IN4_TTL)
-    yield from configure_zebra_and_shutter_for_auto_shutter(
-        zebra, zebra_shutter, zebra.mapping.sources.IN4_TTL, group=group
-    )
-
-    yield from bps.abs_set(
-        zebra.output.out_pvs[zebra.mapping.outputs.TTL_DETECTOR],
-        zebra.mapping.sources.IN3_TTL,
-        group=group,
-    )
-    yield from bps.abs_set(
-        zebra.output.out_pvs[zebra.mapping.outputs.TTL_XSPRESS3],
-        zebra.mapping.sources.DISCONNECT,
-        group=group,
-    )
-    yield from bps.abs_set(
-        zebra.output.pulse_1.input, zebra.mapping.sources.DISCONNECT, group=group
-    )
-
-    if wait:
-        yield from bps.wait(group, timeout=ZEBRA_STATUS_TIMEOUT)
-
-
-def tidy_up_zebra_after_gridscan(
-    zebra: Zebra,
-    zebra_shutter: ZebraShutter,
-    group="tidy_up_zebra_after_gridscan",
-    wait=True,
-) -> MsgGenerator:
-    yield from bps.abs_set(
-        zebra.output.out_pvs[zebra.mapping.outputs.TTL_DETECTOR],
-        zebra.mapping.sources.PC_PULSE,
-        group=group,
-    )
-    yield from bps.abs_set(
-        zebra_shutter.control_mode, ZebraShutterControl.MANUAL, group=group
-    )
-    yield from set_shutter_auto_input(zebra, zebra.mapping.sources.PC_GATE, group=group)
-
-    if wait:
-        yield from bps.wait(group, timeout=ZEBRA_STATUS_TIMEOUT)
-
-
 def setup_zebra_for_panda_flyscan(
     zebra: Zebra,
     zebra_shutter: ZebraShutter,

mx_bluesky/hyperion/experiment_plans/hyperion_flyscan_xray_centre_plan.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from collections.abc import Callable
 from functools import partial
 from pathlib import Path
 
@@ -19,14 +20,16 @@ from mx_bluesky.hyperion.device_setup_plans.setup_panda import (
     setup_panda_for_flyscan,
 )
 from mx_bluesky.hyperion.device_setup_plans.setup_zebra import (
-    setup_zebra_for_gridscan,
     setup_zebra_for_panda_flyscan,
-    tidy_up_zebra_after_gridscan,
 )
 from mx_bluesky.hyperion.parameters.device_composites import (
     HyperionFlyScanXRayCentreComposite,
 )
 from mx_bluesky.hyperion.parameters.gridscan import HyperionSpecifiedThreeDGridScan
+from mx_bluesky.phase1_zebra.device_setup_plans.setup_zebra import (
+    setup_zebra_for_gridscan,
+    tidy_up_zebra_after_gridscan,
+)
 
 
 class SmargonSpeedException(Exception):
@@ -59,9 +62,11 @@ def construct_hyperion_specific_features(
         xrc_composite.eiger.bit_depth,
     ]
 
+    setup_trigger_plan: Callable[..., MsgGenerator]
+
     if xrc_parameters.features.use_panda_for_gridscan:
         setup_trigger_plan = _panda_triggering_setup
-        tidy_plan = _panda_tidy
+        tidy_plan = partial(_panda_tidy, xrc_composite)
         set_flyscan_params_plan = partial(
             set_fast_grid_scan_params,
             xrc_composite.panda_fast_grid_scan,
@@ -70,8 +75,14 @@ def construct_hyperion_specific_features(
         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)
+        setup_trigger_plan = setup_zebra_for_gridscan
+        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,
@@ -89,46 +100,17 @@ def construct_hyperion_specific_features(
     )
 
 
-def _generic_tidy(
-    xrc_composite: HyperionFlyScanXRayCentreComposite, group, wait=True
-) -> MsgGenerator:
-    LOGGER.info("Tidying up Zebra")
-    yield from tidy_up_zebra_after_gridscan(
-        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(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")
-    # 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,  # type: ignore
-        0,
-        group=group,
-        wait=wait,
-    )
-
-
 def _panda_tidy(xrc_composite: HyperionFlyScanXRayCentreComposite):
     group = "panda_flyscan_tidy"
     LOGGER.info("Disabling panda blocks")
     yield from disarm_panda_for_gridscan(xrc_composite.panda, group)
-    yield from _generic_tidy(xrc_composite, group, False)
+    yield from tidy_up_zebra_after_gridscan(
+        xrc_composite.zebra, xrc_composite.sample_shutter, group=group, wait=False
+    )
     yield from bps.wait(group, timeout=10)
     yield from bps.unstage(xrc_composite.panda)
 
 
-def _zebra_triggering_setup(
-    xrc_composite: HyperionFlyScanXRayCentreComposite,
-    parameters: HyperionSpecifiedThreeDGridScan,
-) -> MsgGenerator:
-    yield from setup_zebra_for_gridscan(
-        xrc_composite.zebra, xrc_composite.sample_shutter, wait=True
-    )
-
-
 def _panda_triggering_setup(
     xrc_composite: HyperionFlyScanXRayCentreComposite,
     parameters: HyperionSpecifiedThreeDGridScan,

mx_bluesky/hyperion/experiment_plans/rotation_scan_plan.py

@@ -37,16 +37,16 @@ from mx_bluesky.common.device_setup_plans.manipulate_sample import (
 from mx_bluesky.common.device_setup_plans.utils import (
     start_preparing_data_collection_then_do_plan,
 )
+from mx_bluesky.common.experiment_plans.inner_plans.read_hardware import (
+    read_hardware_for_zocalo,
+    standard_read_hardware_during_collection,
+    standard_read_hardware_pre_collection,
+)
 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,

mx_bluesky/hyperion/parameters/constants.py

@@ -35,7 +35,6 @@ class I03Constants:
 
 @dataclass(frozen=True)
 class HyperionConstants:
-    DESCRIPTORS = DocDescriptorNames()
     ZOCALO_ENV = EnvironmentConstants.ZOCALO_ENV
     HARDWARE = HardwareConstants()
     I03 = I03Constants()
@@ -49,7 +48,7 @@ class HyperionConstants:
         if TEST_MODE
         else "https://daq-config.diamond.ac.uk/api"
     )
-    GRAYLOG_PORT = 12232
+    GRAYLOG_PORT = 12232  # Hyperion stream
     PARAMETER_SCHEMA_DIRECTORY = "src/hyperion/parameters/schemas/"
     LOG_FILE_NAME = "hyperion.log"
     DEVICE_SETTINGS_CONSTANTS = DeviceSettingsConstants()

mx_bluesky/hyperion/utils/context.py

@@ -1,5 +1,6 @@
 from blueapi.core import BlueskyContext
-from dodal.utils import get_beamline_based_on_environment_variable
+from dodal.common.beamlines.beamline_utils import clear_devices
+from dodal.utils import collect_factories, get_beamline_based_on_environment_variable
 
 import mx_bluesky.hyperion.experiment_plans as hyperion_plans
 from mx_bluesky.common.utils.log import LOGGER
@@ -9,11 +10,24 @@ def setup_context(dev_mode: bool = False) -> BlueskyContext:
     context = BlueskyContext()
     context.with_plan_module(hyperion_plans)
 
-    context.with_dodal_module(
-        get_beamline_based_on_environment_variable(),
-        mock=dev_mode,
-    )
+    setup_devices(context, dev_mode)
 
     LOGGER.info(f"Plans found in context: {context.plan_functions.keys()}")
 
     return context
+
+
+def clear_all_device_caches(context: BlueskyContext):
+    context.unregister_all_devices()
+    clear_devices()
+
+    for f in collect_factories(get_beamline_based_on_environment_variable()).values():
+        if hasattr(f, "cache_clear"):
+            f.cache_clear()  # type: ignore
+
+
+def setup_devices(context: BlueskyContext, dev_mode: bool):
+    context.with_dodal_module(
+        get_beamline_based_on_environment_variable(),
+        mock=dev_mode,
+    )

mx_bluesky/phase1_zebra/__init__.py

@@ -0,0 +1 @@
+"""The zebra on i03 and i04 (phase1 beamlines) are configured in a specific way which are compatible to the plans in this module"""

mx_bluesky/phase1_zebra/device_setup_plans/setup_zebra.py

@@ -0,0 +1,112 @@
+from typing import Protocol, runtime_checkable
+
+import bluesky.plan_stubs as bps
+from bluesky.utils import MsgGenerator
+from dodal.devices.zebra.zebra import (
+    Zebra,
+)
+from dodal.devices.zebra.zebra_controlled_shutter import (
+    ZebraShutter,
+    ZebraShutterControl,
+)
+
+from mx_bluesky.common.parameters.constants import ZEBRA_STATUS_TIMEOUT
+from mx_bluesky.common.utils.log import LOGGER
+
+
+@runtime_checkable
+class GridscanSetupDevices(Protocol):
+    zebra: Zebra
+    sample_shutter: ZebraShutter
+
+
+def setup_zebra_for_gridscan(
+    composite: GridscanSetupDevices,  # XRC gridscan's generic trigger setup expects a composite rather than individual devices
+    group="setup_zebra_for_gridscan",
+    wait=True,
+) -> MsgGenerator:
+    zebra = composite.zebra
+    # Set shutter to automatic and to trigger via motion controller GPIO signal (IN4_TTL)
+    yield from configure_zebra_and_shutter_for_auto_shutter(
+        zebra, composite.sample_shutter, zebra.mapping.sources.IN4_TTL, group=group
+    )
+
+    yield from bps.abs_set(
+        zebra.output.out_pvs[zebra.mapping.outputs.TTL_DETECTOR],
+        zebra.mapping.sources.IN3_TTL,
+        group=group,
+    )
+    yield from bps.abs_set(
+        zebra.output.out_pvs[zebra.mapping.outputs.TTL_XSPRESS3],
+        zebra.mapping.sources.DISCONNECT,
+        group=group,
+    )
+    yield from bps.abs_set(
+        zebra.output.pulse_1.input, zebra.mapping.sources.DISCONNECT, group=group
+    )
+
+    if wait:
+        yield from bps.wait(group, timeout=ZEBRA_STATUS_TIMEOUT)
+
+
+def set_shutter_auto_input(zebra: Zebra, input: int, group="set_shutter_trigger"):
+    """Set the signal that controls the shutter. We use the second input to the
+    Zebra's AND2 gate for this input. ZebraShutter control mode must be in auto for this input to take control
+
+    For more details see the ZebraShutter device."""
+    auto_gate = zebra.mapping.AND_GATE_FOR_AUTO_SHUTTER
+    auto_shutter_control = zebra.logic_gates.and_gates[auto_gate]
+    yield from bps.abs_set(auto_shutter_control.sources[2], input, group)
+
+
+def configure_zebra_and_shutter_for_auto_shutter(
+    zebra: Zebra, zebra_shutter: ZebraShutter, input: int, group="use_automatic_shutter"
+):
+    """Set the shutter to auto mode, and configure the zebra to trigger the shutter on
+    an input source. For the input, use one of the source constants in zebra.py
+
+    When the shutter is in auto/manual, logic in EPICS sets the Zebra's
+    SOFT_IN1 to low/high respectively. The Zebra's AND2 gate should be used to control the shutter while in auto mode.
+    To do this, we need (AND2 = SOFT_IN1 AND input), where input is the zebra signal we want to control the shutter when in auto mode.
+    """
+    # See https://github.com/DiamondLightSource/dodal/issues/813 for better typing here.
+
+    # Set shutter to auto mode
+    yield from bps.abs_set(
+        zebra_shutter.control_mode, ZebraShutterControl.AUTO, group=group
+    )
+
+    auto_gate = zebra.mapping.AND_GATE_FOR_AUTO_SHUTTER
+
+    # Set first input of AND2 gate to SOFT_IN1, which is high when shutter is in auto mode
+    # Note the Zebra should ALWAYS be setup this way. See https://github.com/DiamondLightSource/mx-bluesky/issues/551
+    yield from bps.abs_set(
+        zebra.logic_gates.and_gates[auto_gate].sources[1],
+        zebra.mapping.sources.SOFT_IN1,
+        group=group,
+    )
+
+    # Set the second input of AND2 gate to the requested zebra input source
+    yield from set_shutter_auto_input(zebra, input, group=group)
+
+
+def tidy_up_zebra_after_gridscan(
+    zebra: Zebra,
+    zebra_shutter: ZebraShutter,
+    group="tidy_up_zebra_after_gridscan",
+    wait=True,
+) -> MsgGenerator:
+    LOGGER.info("Tidying up Zebra")
+
+    yield from bps.abs_set(
+        zebra.output.out_pvs[zebra.mapping.outputs.TTL_DETECTOR],
+        zebra.mapping.sources.PC_PULSE,
+        group=group,
+    )
+    yield from bps.abs_set(
+        zebra_shutter.control_mode, ZebraShutterControl.MANUAL, group=group
+    )
+    yield from set_shutter_auto_input(zebra, zebra.mapping.sources.PC_GATE, group=group)
+
+    if wait:
+        yield from bps.wait(group, timeout=ZEBRA_STATUS_TIMEOUT)

{mx_bluesky-1.5.1.dist-info → mx_bluesky-1.5.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mx-bluesky
-Version: 1.5.1
+Version: 1.5.2
 Summary: Bluesky tools for MX Beamlines at DLS
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
 License:                                  Apache License
@@ -235,12 +235,12 @@ Requires-Dist: scipy
 Requires-Dist: semver
 Requires-Dist: deepdiff
 Requires-Dist: matplotlib
-Requires-Dist: blueapi>=0.11.1
+Requires-Dist: blueapi>=0.15.0
 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.51.0
+Requires-Dist: dls-dodal==1.52.0
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: build; extra == "dev"

{mx_bluesky-1.5.1.dist-info → mx_bluesky-1.5.2.dist-info}/RECORD

@@ -1,6 +1,6 @@
 mx_bluesky/__init__.py,sha256=Ksms_WJF8LTkbm38gEpm1jBpGqcQ8NGvmb2ZJlOE1j8,198
 mx_bluesky/__main__.py,sha256=RVqPnxDisFMIn_aoEi0drlThNHgKTJULnSrotouIKI0,480
-mx_bluesky/_version.py,sha256=FasBapRYrTzegTWgTLGzFg84_c9eAAt8ZkOEeQxlLC4,511
+mx_bluesky/_version.py,sha256=ULxoARbzjBMKCLCwFpnGZ1a36HS9SymijR2WGye0UeQ,511
 mx_bluesky/definitions.py,sha256=ULpEYAUzdQiEbBoTgYTMxfUf3DDDjhYtvDxofs7Qxqw,168
 mx_bluesky/jupyter_example.ipynb,sha256=wpwvPrBvwtRMS5AIFk8F54cIlUoD0o4ji8tKK5cZHA4,1672
 mx_bluesky/beamlines/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -8,10 +8,12 @@ mx_bluesky/beamlines/aithre_lasershaping/__init__.py,sha256=A0dlifkBYPlCiMkTEovT
 mx_bluesky/beamlines/aithre_lasershaping/beamline_safe.py,sha256=-GTu2w7dIKtssZB8vXwE2f1zF-Pg1zC_jwBbB-r2Goo,1233
 mx_bluesky/beamlines/aithre_lasershaping/check_goniometer_performance.py,sha256=AqWAFey_Ih1JcRxVNiZDGFsVg4kvA9LH2p5SJeXfe2I,834
 mx_bluesky/beamlines/aithre_lasershaping/goniometer_controls.py,sha256=1La4vJmQdKp3_Ib1DMgavJBdYLTxp7S7dEr_lqNknV0,1828
-mx_bluesky/beamlines/i04/__init__.py,sha256=jZjAMN5_oOEjQoR3iTrnMFW3ElxlHhQ7pEQZIv21Y4I,129
+mx_bluesky/beamlines/i04/__init__.py,sha256=5ainxns2EcIh7EXqdZJRLI8yYDCBpY1-Dflqn7JDm-c,271
 mx_bluesky/beamlines/i04/redis_to_murko_forwarder.py,sha256=T6K0LOwwGxB05YvS6FV-UU4O2N2GMQdEM2vj9BSow_U,6618
 mx_bluesky/beamlines/i04/thawing_plan.py,sha256=uvm1wfp012GN5yE7TcURSQeDtC9nWnW5X__6UCXazjA,5085
-mx_bluesky/beamlines/i04/callbacks/murko_callback.py,sha256=ZIwkY6gdcmIE-aMBvehN8DVcjGRtb9wwzpgHJNMZ39Q,2125
+mx_bluesky/beamlines/i04/callbacks/murko_callback.py,sha256=C2KoIxwMIWxD46utmq1-69SIc8MspocXJ1sccO1lwAY,4458
+mx_bluesky/beamlines/i04/experiment_plans/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mx_bluesky/beamlines/i04/experiment_plans/i04_grid_detect_then_xray_centre_plan.py,sha256=hWMnQSnmCrlVQgxi4qyqD0WtFt65_rSpSwYB_9bHMXY,9236
 mx_bluesky/beamlines/i23/__init__.py,sha256=7nwQiKBZAXLnvPhCqaI2VC1k4TOzQalOUvwF6SQ3Yd4,95
 mx_bluesky/beamlines/i23/serial.py,sha256=XVbHM8NevnJMFAJD9jkxG-VnPaWX6t_k-wlipRw0pmY,2055
 mx_bluesky/beamlines/i24/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -33,7 +35,7 @@ mx_bluesky/beamlines/i24/serial/extruder/EX-gui-edm/DiamondExtruder-I24-py3v1.ed
 mx_bluesky/beamlines/i24/serial/extruder/EX-gui-edm/microdrop_alignment.edl,sha256=K79vmGAcf9qVEQLXTgr0g4bZDWaJ7nFoK4e0Ex7qAwM,14690
 mx_bluesky/beamlines/i24/serial/fixed_target/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/beamlines/i24/serial/fixed_target/ft_utils.py,sha256=puO1vg0x-TPgv8FbEFg73ohJqbwDpcG50_2cLUTa2FA,1210
-mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Collect_py3v1.py,sha256=d5eG8xllmCf0wJO-tsN2vzALaahMr7igm6ap94hGqrY,25515
+mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Collect_py3v1.py,sha256=aUwzEQAuib9V0AZsnnk34FhJ2IVi4XsPV5D2OnfySHk,25538
 mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Manager_py3v1.py,sha256=fjX_UKOfdA38u-3hhe6t7Y9c6r-HijyWqOi3kLUY3M8,33098
 mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_StartUp_py3v1.py,sha256=Vokr_Gl_lpqcUwG18C2h8TYMmyTx1HmUSDd9zgR9-7M,3275
 mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_moveonclick.py,sha256=QLg4wryENBeFfOYFaIgE9R12r2KvUuKIP9ZY8iyYibY,6582
@@ -76,15 +78,15 @@ mx_bluesky/common/device_setup_plans/setup_panda.py,sha256=OF-ZygZyAyQEUdrAWiIxW
 mx_bluesky/common/device_setup_plans/utils.py,sha256=S_Us1KfLkyaRzWxmqnoVxHj2Suq-Vs0n5fMRygHgrTw,1859
 mx_bluesky/common/device_setup_plans/xbpm_feedback.py,sha256=WsUMdeOZBgbj-bFp7x66aHp2oWffQmjyp61-qmtQAmI,2153
 mx_bluesky/common/experiment_plans/__init__.py,sha256=FMA-4VN1TJCPcyURKF0qPIQ8uo8YBbtHPRdJokVF4MA,129
-mx_bluesky/common/experiment_plans/change_aperture_then_move_plan.py,sha256=IY5pq8ni_LKD4LTZG0bbKrC3fEXAnxiunIkp6Oray_c,2897
-mx_bluesky/common/experiment_plans/common_flyscan_xray_centre_plan.py,sha256=Zus9VDwse1iDJu_920UutWyddEtviJXt2ORYvQKIhqg,12304
-mx_bluesky/common/experiment_plans/common_grid_detect_then_xray_centre_plan.py,sha256=N9LXiKJWCOOJ_AyKJu6jMIKocvOidjTA5JOOG5xWPmw,6921
+mx_bluesky/common/experiment_plans/change_aperture_then_move_plan.py,sha256=407E9rp0yGWWIU1fJrgqK_hC19mVwRK-Und7fMlGNDc,3062
+mx_bluesky/common/experiment_plans/common_flyscan_xray_centre_plan.py,sha256=jLo9nrd8CW85Px7t3I6QlnfD71VhApyVJMfWB6-gJgk,13245
+mx_bluesky/common/experiment_plans/common_grid_detect_then_xray_centre_plan.py,sha256=BxBKc9cn843eoMlmlV7j0tqIG-DRPL6A0n-S6JLyDjg,7057
 mx_bluesky/common/experiment_plans/oav_grid_detection_plan.py,sha256=Djfqfny7Bs-PlpxJUXLDZv-n3uWnk_99YQjAvlvqm8k,6733
 mx_bluesky/common/experiment_plans/oav_snapshot_plan.py,sha256=Zvz8j9ZgK6hIYRTkSjYBr1ARLyMRixOsou_wSuR97U4,3647
-mx_bluesky/common/experiment_plans/read_hardware.py,sha256=Og7Uz8lAB1_Z6puN6ws_2kwOqCvgQMqfmyZPFZMRneY,2351
-mx_bluesky/common/experiment_plans/write_sample_status.py,sha256=pmS4Lsndp90CCIKzD_wssvbzt1qu7rEzfXgxvDwDrQ8,1313
 mx_bluesky/common/experiment_plans/inner_plans/__init__ .py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mx_bluesky/common/experiment_plans/inner_plans/do_fgs.py,sha256=wn2Bi1icVngLQsgHzl6QBGOR5Uw6pZlZSozDlmUv6JM,4786
+mx_bluesky/common/experiment_plans/inner_plans/do_fgs.py,sha256=WjtoyMxpTFSrfFzxxoYKRlRbwRHfEBeEItq82mad0Pw,4807
+mx_bluesky/common/experiment_plans/inner_plans/read_hardware.py,sha256=Og7Uz8lAB1_Z6puN6ws_2kwOqCvgQMqfmyZPFZMRneY,2351
+mx_bluesky/common/experiment_plans/inner_plans/write_sample_status.py,sha256=pmS4Lsndp90CCIKzD_wssvbzt1qu7rEzfXgxvDwDrQ8,1313
 mx_bluesky/common/external_interaction/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/common/external_interaction/config_server.py,sha256=EmvLfOkvoJlnKa0sffAKNICkY26YsQQqY9sYHKmOGzw,2441
 mx_bluesky/common/external_interaction/callbacks/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -105,15 +107,16 @@ mx_bluesky/common/external_interaction/callbacks/xray_centre/nexus_callback.py,s
 mx_bluesky/common/external_interaction/ispyb/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/common/external_interaction/ispyb/data_model.py,sha256=HJZPT_j5EMK7-j-0tdaugiS3kDp44_jzvVoP-xcFCsA,2738
 mx_bluesky/common/external_interaction/ispyb/exp_eye_store.py,sha256=7j7ybxW1CB4WiuaTf4N2ZeeVbNNy7v5aN1KbbcW74wo,6080
-mx_bluesky/common/external_interaction/ispyb/ispyb_store.py,sha256=Q23dZOGN9VfpwN69K4A41merojNhp4VFTEDAe8G9xws,11132
+mx_bluesky/common/external_interaction/ispyb/ispyb_store.py,sha256=PVV8MzpDCaUHNX1LtRhHLVcrmVNZVWwxAw3DxhmjE3Q,11396
 mx_bluesky/common/external_interaction/ispyb/ispyb_utils.py,sha256=5-8wHmY1KvMuRpXUxN5YBCQP3M-Jk-sTcfDm-CC84Mw,732
 mx_bluesky/common/external_interaction/nexus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/common/external_interaction/nexus/nexus_utils.py,sha256=n97KHJJd_C59SOVJHcJ3RbNkvxkoUrF6fIJx3jXBuI0,5580
 mx_bluesky/common/external_interaction/nexus/write_nexus.py,sha256=s8xT05_Fn_s64KbPOnR5cm-AooklMKRj2cXxLstl7e0,4067
+mx_bluesky/common/parameters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/common/parameters/components.py,sha256=LKkFiGWEzU3dPHGG_M9gzNu4XUA-0nc7Q3ceRiWJFTk,8536
-mx_bluesky/common/parameters/constants.py,sha256=Aj5vRZWy2xaKQNLku1posPsgo5tLW_wqRMBJht4fBio,4467
-mx_bluesky/common/parameters/device_composites.py,sha256=aUBH8RozQb-TqNLWXFpjxETSZckPsugcDVwuJTiu8hg,2238
-mx_bluesky/common/parameters/gridscan.py,sha256=XHlXi6zSJoag11hrS4_k44v_NZSIdCS-QBveben2nPw,7034
+mx_bluesky/common/parameters/constants.py,sha256=dEq6rRbifNgX23yIH26ul1KH3_CquMXr7OPPFhuWLpI,4493
+mx_bluesky/common/parameters/device_composites.py,sha256=F_msgzMTzwIYXufkBwRCg47f5-Z4sJlQVbsWnUqjXSw,2253
+mx_bluesky/common/parameters/gridscan.py,sha256=vcSKOBKfAAq1ONTanmzWxm37w48y7WY22Z-xr2ZxqYQ,7064
 mx_bluesky/common/preprocessors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/common/preprocessors/preprocessors.py,sha256=BNpSM7S9gxhVbG39rjH14k89sOmKiII0cqApH3pF_H0,4476
 mx_bluesky/common/protocols/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -125,17 +128,17 @@ mx_bluesky/common/utils/log.py,sha256=CepibF7U5GnN-ICl4bmhbEwqRzWsSFyfNtBDJejK0e
 mx_bluesky/common/utils/tracing.py,sha256=stnBZIvPuKiAm2wVc8lFr3ns7V5C52rUigULi9V-IFs,1171
 mx_bluesky/common/utils/utils.py,sha256=q2uCaK1E8zLVk1BFmj7qlTnQf3JRKjCjyadIVnL1-4M,1180
 mx_bluesky/hyperion/__init__.py,sha256=f4E8wInL1Ll4eeFtAiyKmipOBTPlUtKmVK-m_LOQG4M,35
-mx_bluesky/hyperion/__main__.py,sha256=2TEoxvKU3JaG74rW3VKCf-DQhl6CRl_eZNQ0u5dW6EA,11406
-mx_bluesky/hyperion/baton_handler.py,sha256=AC3Qca5d3KdM5eN2nTqA2HmPkN4ZciOuCxtCKLfK0Uc,3276
+mx_bluesky/hyperion/__main__.py,sha256=zRAkEuHCAcVyQrTHr9myJ37AmW1q9Fez5sd2lxddFSw,11415
+mx_bluesky/hyperion/baton_handler.py,sha256=2xcaDuxNOjuqhFMj9EiD_x3P3K7nt1vj8uA0d1mp-to,4429
 mx_bluesky/hyperion/device_setup_plans/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/hyperion/device_setup_plans/dcm_pitch_roll_mirror_adjuster.py,sha256=iQawC-nIOVSoMMSYl4mleIkVYs-BaKKMTgOWX4efHTg,4723
 mx_bluesky/hyperion/device_setup_plans/setup_panda.py,sha256=96eFp4acQLOthe1PA-S14uv635uGVP71DpP7qy_uo40,8509
-mx_bluesky/hyperion/device_setup_plans/setup_zebra.py,sha256=_PnV4PyrcoN7_CBi-HLWWNMKMKarpFUTcNcXsEx3sZo,9076
+mx_bluesky/hyperion/device_setup_plans/setup_zebra.py,sha256=e3ocVsncImQIrfL6d0UoH5fCl8AR0pM_4AIXSxc8dgQ,5749
 mx_bluesky/hyperion/device_setup_plans/smargon.py,sha256=9znQLGF8Uqif1SZ_H4GyqcnhR3xCI1FIniCaGLRY3zM,758
 mx_bluesky/hyperion/device_setup_plans/utils.py,sha256=96JlzyikMhWN7LzdiMx8URZInXoGR3OjoxYmCIp9tts,425
 mx_bluesky/hyperion/experiment_plans/__init__.py,sha256=dJjwLk0EQP-1hKhbs8aRxTF_LxUXgB7kcgDlaP-tMnk,787
 mx_bluesky/hyperion/experiment_plans/experiment_registry.py,sha256=bGp2c3nKutqHMnDxuqjp6yCF-JKykSzX-IUfxk3oVlM,1701
-mx_bluesky/hyperion/experiment_plans/hyperion_flyscan_xray_centre_plan.py,sha256=MzoJ0ts8eeHWi6lt95toZRVsEJ0I21zJ9Z6iYwr2Lps,6643
+mx_bluesky/hyperion/experiment_plans/hyperion_flyscan_xray_centre_plan.py,sha256=OZq6cYajQEbCXuOFzw2h-YoGju3J0nYzitgFW5mCc9U,5908
 mx_bluesky/hyperion/experiment_plans/hyperion_grid_detect_then_xray_centre_plan.py,sha256=e4w4226ONSGQF2dnXzxOfcJ9i57CZIJrqQ1YCLlaBNo,2153
 mx_bluesky/hyperion/experiment_plans/load_centre_collect_full_plan.py,sha256=G_r8NIHkvRpC8jGYPYZAtG6uVPTwzlH1P2Akd2ykP4o,6877
 mx_bluesky/hyperion/experiment_plans/optimise_attenuation_plan.py,sha256=5ZAH17F5T1YyVgA2ML0NEf4ufrD1G0jPRU0_5pINdTg,16195
@@ -143,7 +146,7 @@ mx_bluesky/hyperion/experiment_plans/pin_centre_then_xray_centre_plan.py,sha256=
 mx_bluesky/hyperion/experiment_plans/pin_tip_centring_plan.py,sha256=FP_tAhq7Txljbxvvr3eEMoapDtXj8siPyWd9qcYevBg,6247
 mx_bluesky/hyperion/experiment_plans/robot_load_and_change_energy.py,sha256=AFQtQ-goN7cbMXiYaxd3-PSDKG2llnMr0dKkYdbCIB4,5942
 mx_bluesky/hyperion/experiment_plans/robot_load_then_centre_plan.py,sha256=II-4v2AOyC7QbCqLZFSq1fT1OjWSg8P5MmSQFzQI0D0,6892
-mx_bluesky/hyperion/experiment_plans/rotation_scan_plan.py,sha256=EzxvClv7Gc3izpBVOQaBskFqdpIl66vIUyjqNtaM3H4,15913
+mx_bluesky/hyperion/experiment_plans/rotation_scan_plan.py,sha256=ymYtfLvB2A4Ux_FV_kIRtY35IFF8OoE4Iv9zSpTpyWI,15925
 mx_bluesky/hyperion/experiment_plans/set_energy_plan.py,sha256=8FAqN-aJgRwZSiCX-hNdeGmaijt0l8owdShVBwNchfE,2643
 mx_bluesky/hyperion/external_interaction/__init__.py,sha256=95DwXDmKsx36RgAL-AtLZl2LQoLPKbzeYdlkkP_4Coc,559
 mx_bluesky/hyperion/external_interaction/agamemnon.py,sha256=y80qaZ43fwUdDBDkRYs7yJH1I8zXVla_7GTnRkXBOnQ,9959
@@ -159,7 +162,7 @@ mx_bluesky/hyperion/external_interaction/callbacks/rotation/nexus_callback.py,sh
 mx_bluesky/hyperion/parameters/__init__.py,sha256=kf2wfcILBUBpT0tJ8-W39BywQUkn67yxl9IVsfrr1LE,115
 mx_bluesky/hyperion/parameters/cli.py,sha256=zciAE1-7Ahx0B8-RNNk25hB40xBMrmrR7cK1GbEDgaM,1177
 mx_bluesky/hyperion/parameters/components.py,sha256=uXxdW6nIE1VZnh4ZXe5O-LOwsx4MbENEWfLGm2ACvsI,313
-mx_bluesky/hyperion/parameters/constants.py,sha256=-_dCUu5uqw1iHqZ2FE_HkLeaWYHGPB-poNNiqpnfEms,1665
+mx_bluesky/hyperion/parameters/constants.py,sha256=_-8nlAGAWDBAFRauk2G9rQjE3raSvES6QzdIUKQDKBM,1645
 mx_bluesky/hyperion/parameters/device_composites.py,sha256=wXr0VH66Qm5xT0WBBy4hmXjONrAxieP3aAFdt0rM6kY,2139
 mx_bluesky/hyperion/parameters/gridscan.py,sha256=snER6auUYTdj31Qa_sjp7zPIpXMo_lwLq7Ugn-YlG6k,3663
 mx_bluesky/hyperion/parameters/load_centre_collect.py,sha256=bT4jXBPKeOTfi3U2lECJ-bbKLkmlCz_MMydqdbCE4xI,4361
@@ -167,10 +170,13 @@ mx_bluesky/hyperion/parameters/robot_load.py,sha256=DSOwIosO629WoXbVFokEjmgqKZz3
 mx_bluesky/hyperion/parameters/rotation.py,sha256=Ws3iic17Btmleatc5PStL_N8iO41kVe2UtZ1I8F2Uz8,7546
 mx_bluesky/hyperion/resources/panda/panda-gridscan.yaml,sha256=mhLBJTSjHCkM9F6mjtqbhNmmrV8qSctbCUfhb0q7pYo,28085
 mx_bluesky/hyperion/utils/__init__.py,sha256=f4E8wInL1Ll4eeFtAiyKmipOBTPlUtKmVK-m_LOQG4M,35
-mx_bluesky/hyperion/utils/context.py,sha256=TXvARIUZNLcz-KY_-xPkQvK-tMe1sV_cjFDh6IqPgfo,568
-mx_bluesky-1.5.1.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-mx_bluesky-1.5.1.dist-info/METADATA,sha256=vM2XcXEYwdurLg9LtfQzf8VBzHRnmrHKKSw1rfH96UE,17392
-mx_bluesky-1.5.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mx_bluesky-1.5.1.dist-info/entry_points.txt,sha256=-hM2jXf6TAwgqnUHaEVx02j7sdB0L_WaeHW_tIRuj6o,600
-mx_bluesky-1.5.1.dist-info/top_level.txt,sha256=S4rrzXIUef58ulf_04wn01XGZ3xeJjXs4LPEJ_xoF-I,11
-mx_bluesky-1.5.1.dist-info/RECORD,,
+mx_bluesky/hyperion/utils/context.py,sha256=yxMYn3YFET6SanFZ4YWXDmZDdp3WkaXhDc3ySxHYpAE,1033
+mx_bluesky/phase1_zebra/__init__.py,sha256=Edhhn2L9MVXnjJhyD5_yKQVUDo7XW98rvuT7dlzIn58,132
+mx_bluesky/phase1_zebra/device_setup_plans/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mx_bluesky/phase1_zebra/device_setup_plans/setup_zebra.py,sha256=zfEnDvh5Rh9cPmg_Q_0EnJOZNIwIGmHeIDiJ9kg9Z4c,4129
+mx_bluesky-1.5.2.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+mx_bluesky-1.5.2.dist-info/METADATA,sha256=Ao71REUS-SrRGSViHIXTrKwF-wP1MRp5e5eG_H6uAoM,17392
+mx_bluesky-1.5.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mx_bluesky-1.5.2.dist-info/entry_points.txt,sha256=-hM2jXf6TAwgqnUHaEVx02j7sdB0L_WaeHW_tIRuj6o,600
+mx_bluesky-1.5.2.dist-info/top_level.txt,sha256=S4rrzXIUef58ulf_04wn01XGZ3xeJjXs4LPEJ_xoF-I,11
+mx_bluesky-1.5.2.dist-info/RECORD,,