mx-bluesky 1.5.8__py3-none-any.whl → 1.5.10__py3-none-any.whl

mx_bluesky/hyperion/experiment_plans/hyperion_flyscan_xray_centre_plan.py

@@ -10,6 +10,10 @@ from dodal.devices.fast_grid_scan import (
     set_fast_grid_scan_params,
 )
 
+from mx_bluesky.common.device_setup_plans.setup_zebra_and_shutter import (
+    setup_zebra_for_gridscan,
+    tidy_up_zebra_after_gridscan,
+)
 from mx_bluesky.common.experiment_plans.common_flyscan_xray_centre_plan import (
     construct_beamline_specific_FGS_features,
 )
@@ -29,10 +33,6 @@ 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):
@@ -78,7 +78,9 @@ def construct_hyperion_specific_features(
         fgs_motors = xrc_composite.panda_fast_grid_scan
 
     else:
-        setup_trigger_plan = setup_zebra_for_gridscan
+        setup_trigger_plan = partial(
+            setup_zebra_for_gridscan,
+        )
         tidy_plan = partial(
             tidy_up_zebra_after_gridscan,
             xrc_composite.zebra,
@@ -110,8 +112,8 @@ def _panda_tidy(xrc_composite: HyperionFlyScanXRayCentreComposite):
     yield from tidy_up_zebra_after_gridscan(
         xrc_composite.zebra, xrc_composite.sample_shutter, group=group, wait=False
     )
+    yield from bps.unstage(xrc_composite.panda, group=group)
     yield from bps.wait(group, timeout=10)
-    yield from bps.unstage(xrc_composite.panda)
 
 
 def _panda_triggering_setup(
@@ -124,10 +126,9 @@ def _panda_triggering_setup(
         xrc_composite.panda_fast_grid_scan.run_up_distance_mm
     )
 
-    # Set the time between x steps pv
-    DEADTIME_S = 1e-6  # according to https://www.dectris.com/en/detectors/x-ray-detectors/eiger2/eiger2-for-synchrotrons/eiger2-x/
+    DETECTOR_DEADTIME_S = 1e-4  # This value was empirically found to be safer than the documented deadtime in the Eiger manual
 
-    time_between_x_steps_ms = (DEADTIME_S + parameters.exposure_time_s) * 1e3
+    time_between_x_steps_ms = (DETECTOR_DEADTIME_S + parameters.exposure_time_s) * 1e3
 
     smargon_speed_limit_mm_per_s = yield from bps.rd(
         xrc_composite.smargon.x.max_velocity
@@ -146,13 +147,13 @@ def _panda_triggering_setup(
         )
     else:
         LOGGER.info(
-            f"Panda grid scan: Smargon speed set to {smargon_speed_limit_mm_per_s} mm/s"
+            f"Panda grid scan: Smargon speed set to {sample_velocity_mm_per_s} mm/s"
             f" and using a run-up distance of {run_up_distance_mm}"
         )
 
     yield from bps.mv(
-        xrc_composite.panda_fast_grid_scan.time_between_x_steps_ms,  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
-        time_between_x_steps_ms,  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+        xrc_composite.panda_fast_grid_scan.time_between_x_steps_ms,
+        time_between_x_steps_ms,
     )
 
     directory_provider_root = Path(parameters.storage_directory)

mx_bluesky/hyperion/experiment_plans/load_centre_collect_full_plan.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from collections.abc import Generator
+from collections.abc import Generator, Sequence
 
 import bluesky.plan_stubs as bps
 import numpy as np
@@ -99,41 +99,12 @@ def load_centre_collect_full(
             else:
                 raise
 
-        locations_to_collect_um: list[np.ndarray]
-        samples_to_collect: list[int]
-
-        if flyscan_event_handler.xray_centre_results:
-            selection_func = flyscan_result.resolve_selection_fn(
-                parameters.selection_params
-            )
-            hits = selection_func(flyscan_event_handler.xray_centre_results)
-            hits_to_collect = []
-            for hit in hits:
-                if hit.sample_id is None:
-                    LOGGER.warning(
-                        f"Diffracting centre {hit} not collected because no sample id was assigned."
-                    )
-                else:
-                    hits_to_collect.append(hit)
-
-            locations_to_collect_um = [
-                hit.centre_of_mass_mm * 1000 for hit in hits_to_collect
-            ]
-            samples_to_collect = [hit.sample_id for hit in hits_to_collect]
-            LOGGER.info(
-                f"Selected hits {hits_to_collect} using {selection_func}, args={parameters.selection_params}"
+        sample_ids_and_locations = yield from (
+            _samples_and_locations_to_collect(
+                flyscan_event_handler.xray_centre_results, parameters, composite
             )
-        else:
-            # If the xray centring hasn't found a result but has not thrown an error it
-            # means that we do not need to recentre and can collect where we are
-            initial_x_mm = yield from bps.rd(composite.smargon.x.user_readback)
-            initial_y_mm = yield from bps.rd(composite.smargon.y.user_readback)
-            initial_z_mm = yield from bps.rd(composite.smargon.z.user_readback)
-
-            locations_to_collect_um = [
-                np.array([initial_x_mm, initial_y_mm, initial_z_mm]) * 1000
-            ]
-            samples_to_collect = [parameters.sample_id]
+        )
+        sample_ids_and_locations.sort(key=_x_coordinate)
 
         multi_rotation = parameters.multi_rotation_scan
         rotation_template = multi_rotation.rotation_scans.copy()
@@ -144,9 +115,7 @@ def load_centre_collect_full(
 
         generator = rotation_scan_generator(is_alternating)
         next(generator)
-        for location, sample_id in zip(
-            locations_to_collect_um, samples_to_collect, strict=True
-        ):
+        for sample_id, location in sample_ids_and_locations:
             for rot in rotation_template:
                 combination = generator.send((rot, location, sample_id))
                 multi_rotation.rotation_scans.append(combination)
@@ -161,6 +130,51 @@ def load_centre_collect_full(
     yield from plan_with_callback_subs()
 
 
+def _samples_and_locations_to_collect(
+    xrc_results: Sequence[flyscan_result.XRayCentreResult] | None,
+    parameters: LoadCentreCollect,
+    composite: LoadCentreCollectComposite,
+) -> MsgGenerator[list[tuple[int, np.ndarray]]]:
+    if xrc_results:
+        selection_func = flyscan_result.resolve_selection_fn(
+            parameters.selection_params
+        )
+        hits = selection_func(xrc_results)
+        hits_to_collect = []
+        for hit in hits:
+            if hit.sample_id is None:
+                LOGGER.warning(
+                    f"Diffracting centre {hit} not collected because no sample id was assigned."
+                )
+            else:
+                hits_to_collect.append(hit)
+
+        samples_and_locations = [
+            (hit.sample_id, hit.centre_of_mass_mm * 1000) for hit in hits_to_collect
+        ]
+        LOGGER.info(
+            f"Selected hits {hits_to_collect} using {selection_func}, args={parameters.selection_params}"
+        )
+        return samples_and_locations
+    else:
+        # If the xray centring hasn't found a result but has not thrown an error it
+        # means that we do not need to recentre and can collect where we are
+        initial_x_mm = yield from bps.rd(composite.smargon.x.user_readback)
+        initial_y_mm = yield from bps.rd(composite.smargon.y.user_readback)
+        initial_z_mm = yield from bps.rd(composite.smargon.z.user_readback)
+
+        return [
+            (
+                parameters.sample_id,
+                np.array([initial_x_mm, initial_y_mm, initial_z_mm]) * 1000,
+            )
+        ]
+
+
+def _x_coordinate(sample_and_location: tuple[int, np.ndarray]) -> float:
+    return sample_and_location[1][0]  # type: ignore
+
+
 def rotation_scan_generator(
     is_alternating: bool,
 ) -> Generator[

mx_bluesky/hyperion/experiment_plans/pin_tip_centring_plan.py

@@ -9,7 +9,7 @@ from dodal.devices.oav.oav_detector import OAV
 from dodal.devices.oav.oav_parameters import OAV_CONFIG_JSON, OAVParameters
 from dodal.devices.oav.pin_image_recognition import PinTipDetection, Tip
 from dodal.devices.oav.utils import (
-    PinNotFoundException,
+    PinNotFoundError,
     Pixel,
     get_move_required_so_that_beam_is_at_pixel,
     wait_for_tip_to_be_found,
@@ -161,6 +161,6 @@ def pin_tip_centre_plan(
     # See #673 for improvements
     yield from bps.sleep(0.3)
     tip = yield from catch_exception_and_warn(
-        PinNotFoundException, wait_for_tip_to_be_found, pin_tip_detect
+        PinNotFoundError, wait_for_tip_to_be_found, pin_tip_detect
     )
     yield from offset_and_move(tip)

mx_bluesky/hyperion/experiment_plans/rotation_scan_plan.py

@@ -34,6 +34,10 @@ from mx_bluesky.common.device_setup_plans.manipulate_sample import (
     cleanup_sample_environment,
     setup_sample_environment,
 )
+from mx_bluesky.common.device_setup_plans.setup_zebra_and_shutter import (
+    setup_zebra_for_rotation,
+    tidy_up_zebra_after_rotation_scan,
+)
 from mx_bluesky.common.device_setup_plans.utils import (
     start_preparing_data_collection_then_do_plan,
 )
@@ -55,8 +59,6 @@ from mx_bluesky.common.utils.context import device_composite_from_context
 from mx_bluesky.common.utils.log import LOGGER
 from mx_bluesky.hyperion.device_setup_plans.setup_zebra import (
     arm_zebra,
-    setup_zebra_for_rotation,
-    tidy_up_zebra_after_rotation_scan,
 )
 from mx_bluesky.hyperion.parameters.constants import CONST, I03Constants
 from mx_bluesky.hyperion.parameters.rotation import (
@@ -426,7 +428,7 @@ def rotation_scan_internal(
 
             yield from rotation_scan_core(single_scan)
 
-        yield from bps.unstage(eiger)
+        yield from bps.unstage(eiger, wait=True)
 
     LOGGER.info("setting up and staging eiger...")
     yield from start_preparing_data_collection_then_do_plan(

mx_bluesky/hyperion/external_interaction/callbacks/alert_on_container_change.py

@@ -1,5 +1,5 @@
 from dodal.utils import get_beamline_name
-from event_model import Event, EventDescriptor, RunStart
+from event_model import Event, EventDescriptor, RunStart, RunStop
 
 from mx_bluesky.common.external_interaction.alerting import (
     Metadata,
@@ -48,7 +48,16 @@ class AlertOnContainerChange(PlanReactiveCallback):
         return doc
 
     def activity_gated_start(self, doc: RunStart):
-        metadata = doc.get("metadata", {})
-        self._new_container = metadata.get("container")
-        self._sample_id = metadata.get("sample_id")
-        self._visit = metadata.get("visit")
+        if not self._sample_id:
+            ISPYB_ZOCALO_CALLBACK_LOGGER.info("Capturing container info for alerts")
+            metadata = doc.get("metadata", {})
+            self._new_container = metadata.get("container")
+            self._sample_id = metadata.get("sample_id")
+            self._visit = metadata.get("visit")
+
+    def activity_gated_stop(self, doc: RunStop):
+        if not self.active:
+            ISPYB_ZOCALO_CALLBACK_LOGGER.info("Resetting state")
+            self._new_container = None
+            self._sample_id = None
+            self._visit = None

mx_bluesky/hyperion/parameters/device_composites.py

@@ -6,7 +6,7 @@ from dodal.devices.aperturescatterguard import (
 )
 from dodal.devices.attenuator.attenuator import BinaryFilterAttenuator
 from dodal.devices.backlight import Backlight
-from dodal.devices.common_dcm import BaseDCM
+from dodal.devices.common_dcm import DoubleCrystalMonochromatorWithDSpacing
 from dodal.devices.eiger import EigerDetector
 from dodal.devices.fast_grid_scan import (
     PandAFastGridScan,
@@ -37,7 +37,7 @@ class HyperionFlyScanXRayCentreComposite(FlyScanEssentialDevices):
 
     aperture_scatterguard: ApertureScatterguard
     attenuator: BinaryFilterAttenuator
-    dcm: BaseDCM
+    dcm: DoubleCrystalMonochromatorWithDSpacing
     eiger: EigerDetector
     flux: Flux
     s4_slit_gaps: S4SlitGaps

mx_bluesky/hyperion/parameters/rotation.py

@@ -150,14 +150,12 @@ class RotationScan(RotationExperiment, SplitScan):
         return rotation_scan
 
     @model_validator(mode="after")
-    @classmethod
-    def correct_start_vds(cls, values: Any) -> Any:
-        assert isinstance(values, RotationScan)
+    def correct_start_vds(self) -> Any:
         start_img = 0.0
-        for scan in values.rotation_scans:
+        for scan in self.rotation_scans:
             scan.nexus_vds_start_img = int(start_img)
-            start_img += scan.scan_width_deg / values.rotation_increment_deg
-        return values
+            start_img += scan.scan_width_deg / self.rotation_increment_deg
+        return self
 
     @model_validator(mode="after")
     def _check_valid_for_single_arm_multiple_sweep(self) -> Self:

mx_bluesky/hyperion/utils/context.py

@@ -27,7 +27,12 @@ def clear_all_device_caches(context: BlueskyContext):
 
 
 def setup_devices(context: BlueskyContext, dev_mode: bool):
-    context.with_dodal_module(
+    _, exceptions = context.with_dodal_module(
         get_beamline_based_on_environment_variable(),
         mock=dev_mode,
     )
+    if exceptions:
+        raise ExceptionGroup(
+            f"Unable to connect to beamline devices {list(exceptions.keys())}",
+            list(exceptions.values()),
+        )

{mx_bluesky-1.5.8.dist-info → mx_bluesky-1.5.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mx-bluesky
-Version: 1.5.8
+Version: 1.5.10
 Summary: Bluesky tools for MX Beamlines at DLS
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
 License:                                  Apache License
@@ -237,11 +237,11 @@ Requires-Dist: deepdiff
 Requires-Dist: matplotlib
 Requires-Dist: cachetools
 Requires-Dist: daq-config-server>=v1.0.0-rc.2
-Requires-Dist: blueapi>=0.15.0
+Requires-Dist: blueapi>=1.5.0
 Requires-Dist: ophyd>=1.10.5
 Requires-Dist: ophyd-async>=0.10.0a2
-Requires-Dist: bluesky>=1.13.1
-Requires-Dist: dls-dodal==1.61.0
+Requires-Dist: bluesky>=1.14.6
+Requires-Dist: dls-dodal==1.63.0
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: build; extra == "dev"

{mx_bluesky-1.5.8.dist-info → mx_bluesky-1.5.10.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=QlBPCHWJHsKOjOT6a1pMTyQvJ4_hi1jBIVqdqRIdaR0,704
+mx_bluesky/_version.py,sha256=GHx1c9DDnT0tx1ian8L-pn_ij2Y5L7Dx0xAenE6ixKE,706
 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
@@ -13,15 +13,19 @@ mx_bluesky/beamlines/i02_1/parameters/gridscan.py,sha256=P-WBnYSKcFQxMyeziIlWPht
 mx_bluesky/beamlines/i04/__init__.py,sha256=DM5-pkoPb2jill-VmKdhEylsV1jryA92gygCIFSv3Fo,383
 mx_bluesky/beamlines/i04/redis_to_murko_forwarder.py,sha256=LViC4Dql47EXIDnI2hkt9CMtIyF1_e8h0s4GyIAllmA,6656
 mx_bluesky/beamlines/i04/thawing_plan.py,sha256=eSqX3VKHKw_KDGxjpszDifRpdb_RkwQxMKAZlOgl_7c,9759
+mx_bluesky/beamlines/i04/callbacks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=NYbJfC8sksF-H8m1fCmQTWHBLQKzzpIqBJVjihYp4ew,9232
+mx_bluesky/beamlines/i04/experiment_plans/i04_grid_detect_then_xray_centre_plan.py,sha256=Z77NSnds9mFVRnea5z_aySgs7vJxKRvzbpNNit2AeZM,10206
 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
-mx_bluesky/beamlines/i24/jungfrau_commissioning/do_external_acquisition.py,sha256=p5ZOhM3COwiBjolMzHs8HNZGbTiIBjys4iUNQtUMKI0,1573
-mx_bluesky/beamlines/i24/jungfrau_commissioning/do_internal_acquisition.py,sha256=cNj4z3TFv8UgtDJax-v8Di74-gKLsTVKtwbCya-wwcw,1744
-mx_bluesky/beamlines/i24/jungfrau_commissioning/plan_utils.py,sha256=IaOw0pX8os-14EoLTwGTrFsl4PUZdL0ymbvdS7lhTto,2789
+mx_bluesky/beamlines/i24/jungfrau_commissioning/experiment_plans/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mx_bluesky/beamlines/i24/jungfrau_commissioning/experiment_plans/do_darks.py,sha256=la0jGZDHt48nsRAe8Gq6uL5LoQ1WszF4LmSo1tp03S8,2974
+mx_bluesky/beamlines/i24/jungfrau_commissioning/plan_stubs/__init__.py,sha256=yxc_V5DfWKXtOmuX-U9YEdkn05ZriD9My65lpEYTuRo,115
+mx_bluesky/beamlines/i24/jungfrau_commissioning/plan_stubs/do_external_acquisition.py,sha256=DmtGT_zS_bOKjOKCLypWh13sZUF-zp6PPZzky6MkPcc,1675
+mx_bluesky/beamlines/i24/jungfrau_commissioning/plan_stubs/do_internal_acquisition.py,sha256=_wmQExT0A-3k_6B8ghtfpspz9vZ2f6QLwcUZlW8jzE8,1846
+mx_bluesky/beamlines/i24/jungfrau_commissioning/plan_stubs/plan_utils.py,sha256=q3KN2oN9k4IptL0vpjaH3l0NZobekPSsNUIJi736l9w,2514
 mx_bluesky/beamlines/i24/serial/__init__.py,sha256=r8v9V48TMrNxOcwBZ6lzeCCuPulq5rg8m-mwH_KkOnI,1533
 mx_bluesky/beamlines/i24/serial/blueapi_config.yaml,sha256=P0saF1bqt4ANU-2mtS_ZHO4NYr_ierUJN-gf6cspic8,350
 mx_bluesky/beamlines/i24/serial/dcid.py,sha256=7NkpMFF3obTVt0aHBbw5J7DqhOEg-zz5otNjdgDMlFg,13819
@@ -75,22 +79,24 @@ mx_bluesky/beamlines/i24/serial/web_gui_plans/__init__.py,sha256=47DEQpj8HBSa-_T
 mx_bluesky/beamlines/i24/serial/web_gui_plans/general_plans.py,sha256=4Cn7B-ZaNdcBkpsBg3BNLaNW5YZ-YkTSiJ4iJV-k4Y8,8471
 mx_bluesky/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/common/xrc_result.py,sha256=tUJ6qkDTTB6H1F71IvVAKtmHCRyHSU_tj9GRzVmnE7w,3219
-mx_bluesky/common/device_setup_plans/manipulate_sample.py,sha256=bM4D0ezAqCJqclN5-hIVUoN_X55F8Yiv_ap6_ChKCA0,3091
+mx_bluesky/common/device_setup_plans/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mx_bluesky/common/device_setup_plans/manipulate_sample.py,sha256=bKVWiXQnibXEjKjCNvy9PX4kUSh1CsBQCkqO5tUgrOU,3130
 mx_bluesky/common/device_setup_plans/position_detector.py,sha256=S49ml0KNZ6wXPQqOxNJ2whKTCyRTcKdBXBhyeEyFDQQ,635
-mx_bluesky/common/device_setup_plans/robot_load_unload.py,sha256=k3JSKBznJQWfYTlM6QO26BmpK5D3w4GJkvcJHLlujIw,4416
-mx_bluesky/common/device_setup_plans/setup_oav.py,sha256=7WLElZZU5mWq9g2WP86p3P81uiSPuj2V4kIkqXlap3o,2692
+mx_bluesky/common/device_setup_plans/robot_load_unload.py,sha256=vbkH9pGu3ZHYrzsMJlEB38eLTP-eSNEbnB6svC_KP2Q,4503
+mx_bluesky/common/device_setup_plans/setup_oav.py,sha256=10lo4c7k-OHI2i5F3OsC318ZXG3N8BtjKMFFSflVFR0,2692
 mx_bluesky/common/device_setup_plans/setup_panda.py,sha256=OF-ZygZyAyQEUdrAWiIxWZ6QhAsVx4Mm9ngRYB1mzKI,433
+mx_bluesky/common/device_setup_plans/setup_zebra_and_shutter.py,sha256=y83Szce7QxXdpLeGXpgyhceOr1HCE6fs6zmZr77IYAE,10066
 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/device_setup_plans/xbpm_feedback.py,sha256=EY1CwACPfts4otAjF15uLrMDyRGwmHz2khh8WicK6cY,1873
 mx_bluesky/common/experiment_plans/__init__.py,sha256=FMA-4VN1TJCPcyURKF0qPIQ8uo8YBbtHPRdJokVF4MA,129
 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=wf22Xwx79UXg_kKG8cD9IeIP_4gY0-p2aNhrUn37eFI,14213
+mx_bluesky/common/experiment_plans/common_flyscan_xray_centre_plan.py,sha256=2Ieb7156ujAGVuybPUMjJEm_7-Z77NYeIGyjDagi0Nw,13546
 mx_bluesky/common/experiment_plans/common_grid_detect_then_xray_centre_plan.py,sha256=jspOKPc3uxvG-a5-LXs7Yfwy8HTvGXBj4snke9j5gYE,7033
-mx_bluesky/common/experiment_plans/oav_grid_detection_plan.py,sha256=gkRpRb3USUx7xDJk-1GghV-sxPp7wy5clubwhlx1v80,7162
+mx_bluesky/common/experiment_plans/oav_grid_detection_plan.py,sha256=SOX6eyPNm7hLJaRJ8esd4DOE2nBjT_2gbmAz1Ozc57g,7154
 mx_bluesky/common/experiment_plans/oav_snapshot_plan.py,sha256=8TRAvHG2W9bn1xb06bYZTWkfhT2q1EtfyxyiMMKmWcw,3623
-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=J8SF-ejb9PpB_wpL1QuS7_FIB5YxDN70odokc5dSIXY,4717
-mx_bluesky/common/experiment_plans/inner_plans/read_hardware.py,sha256=Og7Uz8lAB1_Z6puN6ws_2kwOqCvgQMqfmyZPFZMRneY,2351
+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=dTO9YuvbSzYaMUTs51x0Vuv9-jZ333jIcP51PS10JRw,4876
+mx_bluesky/common/experiment_plans/inner_plans/read_hardware.py,sha256=jwGgzBPyUN4_FKNe5J8vmuLsvSGmEwk73LGBUu-Jy00,2408
 mx_bluesky/common/experiment_plans/inner_plans/udc_default_state.py,sha256=TnO5hv1I_UWlB1Vz7dCQ-nGj4LLsu9nQgetaK6hc_YM,2704
 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
@@ -102,7 +108,7 @@ mx_bluesky/common/external_interaction/callbacks/common/__init__.py,sha256=47DEQ
 mx_bluesky/common/external_interaction/callbacks/common/abstract_event.py,sha256=iBj4WNK5ikieZzTePBZ9AEu6ehlnpew1nDK3ONJqibI,2093
 mx_bluesky/common/external_interaction/callbacks/common/grid_detection_callback.py,sha256=hfFJjICMer26TowK5Nq-AEjDe1TAHIgJAvTFhs-o-Zg,4901
 mx_bluesky/common/external_interaction/callbacks/common/ispyb_callback_base.py,sha256=--eZl4flvtrKZQz5ZhLO87Z1kDboQevIkujrXCADZEI,9869
-mx_bluesky/common/external_interaction/callbacks/common/ispyb_mapping.py,sha256=bHtnDZfxIR5zzSRiBSehZ51y42wzkEcCJ7rFg93aONA,2578
+mx_bluesky/common/external_interaction/callbacks/common/ispyb_mapping.py,sha256=pzDlNEGhXACc5MyO_FAT2PlCYz6r_bnz_S08hXEGjdk,2707
 mx_bluesky/common/external_interaction/callbacks/common/log_uid_tag_callback.py,sha256=pfZxQfS9SnXep3F2YAPptDX5bjjWvbXtgy5fINfsoTU,626
 mx_bluesky/common/external_interaction/callbacks/common/logging_callback.py,sha256=NHb8Gp86TAk6PRTV3inWrlW-Lj96LmnZda7ZGewlrFA,712
 mx_bluesky/common/external_interaction/callbacks/common/plan_reactive_callback.py,sha256=567fx-ONKTZ7V5y5dk0YthxxDJt0s6dZtqrYA0AkfAk,4088
@@ -110,7 +116,7 @@ mx_bluesky/common/external_interaction/callbacks/common/zocalo_callback.py,sha25
 mx_bluesky/common/external_interaction/callbacks/sample_handling/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/common/external_interaction/callbacks/sample_handling/sample_handling_callback.py,sha256=BfUru03fRYmndjiWHpnqBIWPc5kRIy4PTmG94bz3gLw,3886
 mx_bluesky/common/external_interaction/callbacks/xray_centre/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mx_bluesky/common/external_interaction/callbacks/xray_centre/ispyb_callback.py,sha256=ezC3bbz84NLSPswHeUNVZr1eJEt_X6aPr7sn-IxdI9I,14879
+mx_bluesky/common/external_interaction/callbacks/xray_centre/ispyb_callback.py,sha256=fwPPwOvy1yGC8D5KOlpZitBWtVNzfNjK2yz-ZTT6q9Q,15398
 mx_bluesky/common/external_interaction/callbacks/xray_centre/ispyb_mapping.py,sha256=yElqODhPm2HZlpF7vNOX0SQNjwJ_m8kNMS-c_cp4KUU,1163
 mx_bluesky/common/external_interaction/callbacks/xray_centre/nexus_callback.py,sha256=bxFMkTsMvZZJyp4zeGlZkThgZnQqT6dgflKRpqkT1Vc,4709
 mx_bluesky/common/external_interaction/ispyb/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -124,7 +130,7 @@ mx_bluesky/common/external_interaction/nexus/write_nexus.py,sha256=s8xT05_Fn_s64
 mx_bluesky/common/parameters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/common/parameters/components.py,sha256=wyejnv6DxSOrGzcMVRHZVHnund3pj6cTxTMU5v7JW5Q,8576
 mx_bluesky/common/parameters/constants.py,sha256=iNv55VTv4QPu96z58pbnMiAE1RGsFKsTs4wahrlGihw,5139
-mx_bluesky/common/parameters/device_composites.py,sha256=r9e06CEXcW9wyjthHxhSv41ZlUzaI3xqV1DhmW_iZnw,2265
+mx_bluesky/common/parameters/device_composites.py,sha256=H-SEn1BNme7ucBRRoo90Qr5YdVX0ooPAQPtrzxB6ZAg,2303
 mx_bluesky/common/parameters/gridscan.py,sha256=Y4xZpMhzWN58gnAYKZyVbtN8uW4pBVC68KTGGmYpb2A,7632
 mx_bluesky/common/preprocessors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/common/preprocessors/preprocessors.py,sha256=BNpSM7S9gxhVbG39rjH14k89sOmKiII0cqApH3pF_H0,4476
@@ -145,20 +151,20 @@ mx_bluesky/hyperion/runner.py,sha256=x683wuzL-XO1Ws4N2fpPO__TLhlep0br_-8ubml1qG0
 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=ciNdz_r9XGvghehpejdziL-aMw60oUsIJdVR3yz3nOo,5010
 mx_bluesky/hyperion/device_setup_plans/setup_panda.py,sha256=96eFp4acQLOthe1PA-S14uv635uGVP71DpP7qy_uo40,8509
-mx_bluesky/hyperion/device_setup_plans/setup_zebra.py,sha256=e3ocVsncImQIrfL6d0UoH5fCl8AR0pM_4AIXSxc8dgQ,5749
+mx_bluesky/hyperion/device_setup_plans/setup_zebra.py,sha256=dOfBQMibyH3CjSh_m5RJKsxs2DtaM3jtwEs7lkqQppo,1525
 mx_bluesky/hyperion/device_setup_plans/smargon.py,sha256=eb3TCXg33SW6TlfElh5KjYwCXhELDprj0B27CwYcd9c,967
 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=aaDnO_fWOesB7IUMtedinBaJUdliWZe47wxq9ECFoFY,6036
+mx_bluesky/hyperion/experiment_plans/hyperion_flyscan_xray_centre_plan.py,sha256=CMy6NR0rrLeyS8SU0jN7xOthYcpxxy9n9XXi39s4is0,5910
 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=obUMizdLRGt-uCLnEzwiCGHn8wqHt0OVo1uvVvivWr4,7675
+mx_bluesky/hyperion/experiment_plans/load_centre_collect_full_plan.py,sha256=z-RS1MUf1A9aGkmJLcM9zF3G-c0wyI-MoVVXXGB0-lE,7957
 mx_bluesky/hyperion/experiment_plans/optimise_attenuation_plan.py,sha256=5ZAH17F5T1YyVgA2ML0NEf4ufrD1G0jPRU0_5pINdTg,16195
 mx_bluesky/hyperion/experiment_plans/pin_centre_then_xray_centre_plan.py,sha256=oErbq4ffTZVNR_LeiSJP8_q4cwdZWB-bdbrO3ZwKg20,5397
-mx_bluesky/hyperion/experiment_plans/pin_tip_centring_plan.py,sha256=1g3vs2hSgEYGhwDoqB8VsWTZ4q_Hd37493n_csoLnI8,6248
+mx_bluesky/hyperion/experiment_plans/pin_tip_centring_plan.py,sha256=-5iUaM6f4uaUrKQtcufcE_CLQf--zSJ6noGWHFK-6wI,6240
 mx_bluesky/hyperion/experiment_plans/robot_load_and_change_energy.py,sha256=bqG4enP2bZQ6ND0c5XqwDySQTkQRBdK7gvWf61VEnWM,6051
 mx_bluesky/hyperion/experiment_plans/robot_load_then_centre_plan.py,sha256=samWAztWJU9sRo1FtIicWWQZ7TjUwg7Y9y9oqhkcb5o,6904
-mx_bluesky/hyperion/experiment_plans/rotation_scan_plan.py,sha256=jyJMN9atG99hmYG0i3lgrBK9Jx1SR4QVPFhZgA6Dl8s,15886
+mx_bluesky/hyperion/experiment_plans/rotation_scan_plan.py,sha256=LZv6QbBMNpC54mM8fYX7ZTzSxVP2quxpCNubfb8kuy4,15974
 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=B2Q7NR1VSRoCGg4hlCiZDrh2Fa0s4B4ZIws1H7oBfOk,12020
@@ -167,8 +173,9 @@ mx_bluesky/hyperion/external_interaction/alerting/__init__.py,sha256=47DEQpj8HBS
 mx_bluesky/hyperion/external_interaction/alerting/constants.py,sha256=8wE_MDF8vOqomQ6SBiwZKb1W4NRO_hmrBLVfLVnKdSg,170
 mx_bluesky/hyperion/external_interaction/callbacks/__init__.py,sha256=1XHaxDljMveu_DYIlk7n963gHffyC6r4C_RhF6HA-N8,283
 mx_bluesky/hyperion/external_interaction/callbacks/__main__.py,sha256=6-CqBh3uIi-mu_eWSJQ0hBQhoQaC7m8mSi8cHmyrjK0,6827
-mx_bluesky/hyperion/external_interaction/callbacks/alert_on_container_change.py,sha256=QnA8P8QFDRr1XHyx6Qdd4uJal2GhQVcqSTbkLOEjw-Q,2299
+mx_bluesky/hyperion/external_interaction/callbacks/alert_on_container_change.py,sha256=54RU20RuwKHYwB6DtAc0aWg6hz3TXFhwDzTmSC2XYVE,2689
 mx_bluesky/hyperion/external_interaction/callbacks/snapshot_callback.py,sha256=ee1ZIJGp8RQakMDYRfflXjSwi-UgxqdZNkZ1azBIDGQ,11705
+mx_bluesky/hyperion/external_interaction/callbacks/robot_actions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/hyperion/external_interaction/callbacks/robot_actions/ispyb_callback.py,sha256=Ta8w0W_3LI0PGpwxKlQsS7X0B_hsfJoZdzR2K3J0KHo,4467
 mx_bluesky/hyperion/external_interaction/callbacks/rotation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/hyperion/external_interaction/callbacks/rotation/ispyb_callback.py,sha256=4XW5eTwlPKGLk3MS76QRu5U6DOYAQHBEUBKqaNDnVhs,8885
@@ -178,20 +185,19 @@ mx_bluesky/hyperion/parameters/__init__.py,sha256=kf2wfcILBUBpT0tJ8-W39BywQUkn67
 mx_bluesky/hyperion/parameters/cli.py,sha256=I-NY3Kt3la5HNUB4qRA6NtuxbJSr78yx-sM_cRx_pY4,1514
 mx_bluesky/hyperion/parameters/components.py,sha256=eIUEcFNqcEad21IThSDatoX-NRa9GdfBOwt6ZUwb88U,292
 mx_bluesky/hyperion/parameters/constants.py,sha256=aCACWCp670o9U3AKfON-ntqkxIH-99gWNZvEN1G2rPc,2265
-mx_bluesky/hyperion/parameters/device_composites.py,sha256=g9tdA_vImJ89AltxzGY04fCiIXHG1WKPAnoF6b_veag,2151
+mx_bluesky/hyperion/parameters/device_composites.py,sha256=B37k4J8qtBetL3s16Fu9jlBkJwjpdz02SQ9LW1TZmBE,2213
 mx_bluesky/hyperion/parameters/gridscan.py,sha256=DMldH8UJwvcKTUh26Ntg-qgNAP4h6iCrxjFX_kkcvW0,3904
 mx_bluesky/hyperion/parameters/load_centre_collect.py,sha256=8dlKwb7WmgDeohQ9QsdMWQMMM73EaC2cZ0wKg6vOP60,3727
 mx_bluesky/hyperion/parameters/robot_load.py,sha256=Iktni3r6LFRnlM51hpdpv3QrD6QPhx2rAeyB8Gv6ML4,1124
-mx_bluesky/hyperion/parameters/rotation.py,sha256=OwZFvoswCFn4Y3lB-JVYP_5fvuAZB5yrtKUiCYAzQRQ,7443
+mx_bluesky/hyperion/parameters/rotation.py,sha256=0QNov3jykC__iIHMxdTq3znBsKLyQGk-vzSVMf7rSyA,7360
 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=yxMYn3YFET6SanFZ4YWXDmZDdp3WkaXhDc3ySxHYpAE,1033
+mx_bluesky/hyperion/utils/context.py,sha256=VYAu1yxhDBrI98ul7UErotuquF64s1EDHtqPQLRpyvY,1227
 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.8.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-mx_bluesky-1.5.8.dist-info/METADATA,sha256=Sgd23MlRNkDX8FybwhVs0WYSqmA7Elx1hCMuSps2fJw,17424
-mx_bluesky-1.5.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mx_bluesky-1.5.8.dist-info/entry_points.txt,sha256=HgVtwgWoMRn9-X6rxCcSY3Jz_paspJTIlc-t2NFzWpo,409
-mx_bluesky-1.5.8.dist-info/top_level.txt,sha256=S4rrzXIUef58ulf_04wn01XGZ3xeJjXs4LPEJ_xoF-I,11
-mx_bluesky-1.5.8.dist-info/RECORD,,
+mx_bluesky-1.5.10.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+mx_bluesky-1.5.10.dist-info/METADATA,sha256=D4I5k3VrZ9WGcMFtohiAyJSUuuukebOs3yepLqhXQ14,17424
+mx_bluesky-1.5.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mx_bluesky-1.5.10.dist-info/entry_points.txt,sha256=HgVtwgWoMRn9-X6rxCcSY3Jz_paspJTIlc-t2NFzWpo,409
+mx_bluesky-1.5.10.dist-info/top_level.txt,sha256=S4rrzXIUef58ulf_04wn01XGZ3xeJjXs4LPEJ_xoF-I,11
+mx_bluesky-1.5.10.dist-info/RECORD,,

mx_bluesky/phase1_zebra/device_setup_plans/setup_zebra.py

@@ -1,112 +0,0 @@
-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)