mx-bluesky 1.2.0__py3-none-any.whl → 1.4.1__py3-none-any.whl

mx_bluesky/hyperion/experiment_plans/robot_load_and_change_energy.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import dataclasses
 from collections.abc import Generator
 from datetime import datetime
 from pathlib import Path
@@ -8,12 +7,13 @@ from typing import cast
 
 import bluesky.plan_stubs as bps
 import bluesky.preprocessors as bpp
+import pydantic
 from blueapi.core import BlueskyContext
 from bluesky.utils import Msg
 from dodal.devices.aperturescatterguard import ApertureScatterguard, ApertureValue
 from dodal.devices.attenuator import Attenuator
 from dodal.devices.dcm import DCM
-from dodal.devices.focusing_mirror import FocusingMirrorWithStripes, VFMMirrorVoltages
+from dodal.devices.focusing_mirror import FocusingMirrorWithStripes, MirrorVoltages
 from dodal.devices.motors import XYZPositioner
 from dodal.devices.oav.oav_detector import OAV
 from dodal.devices.robot import BartRobot, SampleLocation
@@ -22,22 +22,22 @@ from dodal.devices.thawer import Thawer
 from dodal.devices.undulator_dcm import UndulatorDCM
 from dodal.devices.webcam import Webcam
 from dodal.devices.xbpm_feedback import XBPMFeedback
-from dodal.plans.motor_util_plans import MoveTooLarge, home_and_reset_wrapper
+from dodal.plan_stubs.motor_utils import MoveTooLarge, home_and_reset_wrapper
 
+from mx_bluesky.common.parameters.robot_load import RobotLoadAndEnergyChange
 from mx_bluesky.hyperion.experiment_plans.set_energy_plan import (
     SetEnergyComposite,
     set_energy_plan,
 )
 from mx_bluesky.hyperion.log import LOGGER
 from mx_bluesky.hyperion.parameters.constants import CONST
-from mx_bluesky.hyperion.parameters.robot_load import RobotLoadAndEnergyChange
 
 
-@dataclasses.dataclass
+@pydantic.dataclasses.dataclass(config={"arbitrary_types_allowed": True})
 class RobotLoadAndEnergyChangeComposite:
     # SetEnergyComposite fields
     vfm: FocusingMirrorWithStripes
-    vfm_mirror_voltages: VFMMirrorVoltages
+    mirror_voltages: MirrorVoltages
     dcm: DCM
     undulator_dcm: UndulatorDCM
     xbpm_feedback: XBPMFeedback
@@ -100,15 +100,17 @@ def prepare_for_robot_load(
         group="prepare_robot_load",
     )
 
-    yield from bps.mv(smargon.stub_offsets, StubPosition.RESET_TO_ROBOT_LOAD)
+    yield from bps.mv(smargon.stub_offsets, StubPosition.RESET_TO_ROBOT_LOAD)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
 
     # fmt: off
-    yield from bps.mv(smargon.x, 0,
-                      smargon.y, 0,
-                      smargon.z, 0,
-                      smargon.omega, 0,
-                      smargon.chi, 0,
-                      smargon.phi, 0)
+    yield from bps.mv(
+        smargon.x, 0,  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+        smargon.y, 0,  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+        smargon.z, 0,  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+        smargon.omega, 0,  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+        smargon.chi, 0,  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+        smargon.phi, 0  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+    )
     # fmt: on
 
     yield from bps.wait("prepare_robot_load")
@@ -126,16 +128,14 @@ def do_robot_load(
         group="robot_load",
     )
 
-    if demand_energy_ev:
-        yield from set_energy_plan(
-            demand_energy_ev / 1000,
-            cast(SetEnergyComposite, composite),
-        )
+    yield from set_energy_plan(demand_energy_ev, cast(SetEnergyComposite, composite))
 
     yield from bps.wait("robot_load")
 
     yield from bps.abs_set(
-        composite.thawer.thaw_for_time_s, thawing_time, group="thawing_finished"
+        composite.thawer.thaw_for_time_s,  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+        thawing_time,
+        group="thawing_finished",
     )
     yield from wait_for_smargon_not_disabled(composite.smargon)
 
@@ -195,7 +195,7 @@ def robot_load_and_snapshots(
 
     yield from bps.create(name=CONST.DESCRIPTORS.ROBOT_LOAD)
     yield from bps.read(composite.robot.barcode)
-    yield from bps.read(composite.oav.snapshot)
+    yield from bps.read(composite.oav.snapshot)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
     yield from bps.read(composite.webcam)
     yield from bps.save()
 
@@ -214,24 +214,28 @@ def robot_load_and_change_energy_plan(
     yield from prepare_for_robot_load(
         composite.aperture_scatterguard, composite.smargon
     )
-    yield from bpp.run_wrapper(
-        robot_load_and_snapshots(
-            composite,
-            sample_location,
-            params.snapshot_directory,
-            params.thawing_time,
-            params.demand_energy_ev,
-        ),
-        md={
-            "subplan_name": CONST.PLAN.ROBOT_LOAD,
-            "metadata": {
-                "visit": params.visit,
-                "sample_id": params.sample_id,
-                "sample_puck": sample_location.puck,
-                "sample_pin": sample_location.pin,
+
+    yield from bpp.set_run_key_wrapper(
+        bpp.run_wrapper(
+            robot_load_and_snapshots(
+                composite,
+                sample_location,
+                params.snapshot_directory,
+                params.thawing_time,
+                params.demand_energy_ev,
+            ),
+            md={
+                "subplan_name": CONST.PLAN.ROBOT_LOAD,
+                "metadata": {
+                    "visit": params.visit,
+                    "sample_id": params.sample_id,
+                    "sample_puck": sample_location.puck,
+                    "sample_pin": sample_location.pin,
+                },
+                "activate_callbacks": [
+                    "RobotLoadISPyBCallback",
+                ],
             },
-            "activate_callbacks": [
-                "RobotLoadISPyBCallback",
-            ],
-        },
+        ),
+        CONST.PLAN.ROBOT_LOAD_AND_SNAPSHOTS,
     )

mx_bluesky/hyperion/experiment_plans/robot_load_then_centre_plan.py

@@ -1,9 +1,11 @@
 from __future__ import annotations
 
-import dataclasses
 from typing import cast
 
-from blueapi.core import BlueskyContext, MsgGenerator
+import bluesky.preprocessors as bpp
+import pydantic
+from blueapi.core import BlueskyContext
+from bluesky.utils import MsgGenerator
 from dodal.devices.aperturescatterguard import ApertureScatterguard
 from dodal.devices.attenuator import Attenuator
 from dodal.devices.backlight import Backlight
@@ -12,7 +14,7 @@ from dodal.devices.detector.detector_motion import DetectorMotion
 from dodal.devices.eiger import EigerDetector
 from dodal.devices.fast_grid_scan import PandAFastGridScan, ZebraFastGridScan
 from dodal.devices.flux import Flux
-from dodal.devices.focusing_mirror import FocusingMirrorWithStripes, VFMMirrorVoltages
+from dodal.devices.focusing_mirror import FocusingMirrorWithStripes, MirrorVoltages
 from dodal.devices.motors import XYZPositioner
 from dodal.devices.oav.oav_detector import OAV
 from dodal.devices.oav.pin_image_recognition import PinTipDetection
@@ -31,26 +33,37 @@ from dodal.devices.zocalo import ZocaloResults
 from dodal.log import LOGGER
 from ophyd_async.fastcs.panda import HDFPanda
 
+from mx_bluesky.common.parameters.constants import OavConstants
+from mx_bluesky.common.parameters.gridscan import RobotLoadThenCentre
 from mx_bluesky.hyperion.device_setup_plans.utils import (
     fill_in_energy_if_not_supplied,
     start_preparing_data_collection_then_do_plan,
 )
+from mx_bluesky.hyperion.experiment_plans.change_aperture_then_move_plan import (
+    change_aperture_then_move_to_xtal,
+)
+from mx_bluesky.hyperion.experiment_plans.flyscan_xray_centre_plan import (
+    XRayCentreEventHandler,
+)
 from mx_bluesky.hyperion.experiment_plans.grid_detect_then_xray_centre_plan import (
     GridDetectThenXRayCentreComposite,
 )
 from mx_bluesky.hyperion.experiment_plans.pin_centre_then_xray_centre_plan import (
-    pin_centre_then_xray_centre_plan,
+    pin_centre_then_flyscan_plan,
 )
 from mx_bluesky.hyperion.experiment_plans.robot_load_and_change_energy import (
     RobotLoadAndEnergyChangeComposite,
     pin_already_loaded,
     robot_load_and_change_energy_plan,
 )
+from mx_bluesky.hyperion.experiment_plans.set_energy_plan import (
+    SetEnergyComposite,
+    set_energy_plan,
+)
 from mx_bluesky.hyperion.parameters.constants import CONST
-from mx_bluesky.hyperion.parameters.gridscan import RobotLoadThenCentre
 
 
-@dataclasses.dataclass
+@pydantic.dataclasses.dataclass(config={"arbitrary_types_allowed": True})
 class RobotLoadThenCentreComposite:
     # common fields
     xbpm_feedback: XBPMFeedback
@@ -78,7 +91,7 @@ class RobotLoadThenCentreComposite:
 
     # SetEnergyComposite fields
     vfm: FocusingMirrorWithStripes
-    vfm_mirror_voltages: VFMMirrorVoltages
+    mirror_voltages: MirrorVoltages
     dcm: DCM
     undulator_dcm: UndulatorDCM
 
@@ -87,6 +100,10 @@ class RobotLoadThenCentreComposite:
     webcam: Webcam
     lower_gonio: XYZPositioner
 
+    @property
+    def sample_motors(self):
+        return self.smargon
+
 
 def create_devices(context: BlueskyContext) -> RobotLoadThenCentreComposite:
     from mx_bluesky.hyperion.utils.context import device_composite_from_context
@@ -94,32 +111,57 @@ def create_devices(context: BlueskyContext) -> RobotLoadThenCentreComposite:
     return device_composite_from_context(context, RobotLoadThenCentreComposite)
 
 
-def centring_plan_from_robot_load_params(
+def _flyscan_plan_from_robot_load_params(
     composite: RobotLoadThenCentreComposite,
     params: RobotLoadThenCentre,
+    oav_config_file: str = OavConstants.OAV_CONFIG_JSON,
 ):
-    yield from pin_centre_then_xray_centre_plan(
+    yield from pin_centre_then_flyscan_plan(
         cast(GridDetectThenXRayCentreComposite, composite),
         params.pin_centre_then_xray_centre_params(),
     )
 
 
-def robot_load_then_centre_plan(
+def _robot_load_then_flyscan_plan(
     composite: RobotLoadThenCentreComposite,
     params: RobotLoadThenCentre,
+    oav_config_file: str = OavConstants.OAV_CONFIG_JSON,
 ):
     yield from robot_load_and_change_energy_plan(
         cast(RobotLoadAndEnergyChangeComposite, composite),
         params.robot_load_params(),
     )
 
-    yield from centring_plan_from_robot_load_params(composite, params)
+    yield from _flyscan_plan_from_robot_load_params(composite, params, oav_config_file)
 
 
 def robot_load_then_centre(
     composite: RobotLoadThenCentreComposite,
     parameters: RobotLoadThenCentre,
 ) -> MsgGenerator:
+    """Perform pin-tip detection followed by a flyscan to determine centres of interest.
+    Performs a robot load if necessary. Centre on the best diffracting centre.
+    """
+
+    xray_centre_event_handler = XRayCentreEventHandler()
+
+    yield from bpp.subs_wrapper(
+        robot_load_then_xray_centre(composite, parameters), xray_centre_event_handler
+    )
+    flyscan_results = xray_centre_event_handler.xray_centre_results
+    if flyscan_results is not None:
+        yield from change_aperture_then_move_to_xtal(
+            flyscan_results[0], composite.smargon, composite.aperture_scatterguard
+        )
+    # else no chi change, no need to recentre.
+
+
+def robot_load_then_xray_centre(
+    composite: RobotLoadThenCentreComposite,
+    parameters: RobotLoadThenCentre,
+) -> MsgGenerator:
+    """Perform pin-tip detection followed by a flyscan to determine centres of interest.
+    Performs a robot load if necessary."""
     eiger: EigerDetector = composite.eiger
 
     # TODO: get these from one source of truth #254
@@ -135,17 +177,26 @@ def robot_load_then_centre(
     doing_chi_change = parameters.chi_start_deg is not None
 
     if doing_sample_load:
-        plan = robot_load_then_centre_plan(
+        LOGGER.info("Pin not loaded, loading and centring")
+        plan = _robot_load_then_flyscan_plan(
             composite,
             parameters,
         )
-        LOGGER.info("Pin not loaded, loading and centring")
-    elif doing_chi_change:
-        plan = centring_plan_from_robot_load_params(composite, parameters)
-        LOGGER.info("Pin already loaded but chi changed so centring")
     else:
-        LOGGER.info("Pin already loaded and chi not changed so doing nothing")
-        return
+        # Robot load normally sets the energy so we should do this explicitly if no load is
+        # being done
+        demand_energy_ev = parameters.demand_energy_ev
+        LOGGER.info(f"Setting the energy to {demand_energy_ev}eV")
+        yield from set_energy_plan(
+            demand_energy_ev, cast(SetEnergyComposite, composite)
+        )
+
+        if doing_chi_change:
+            plan = _flyscan_plan_from_robot_load_params(composite, parameters)
+            LOGGER.info("Pin already loaded but chi changed so centring")
+        else:
+            LOGGER.info("Pin already loaded and chi not changed so doing nothing")
+            return
 
     detector_params = yield from fill_in_energy_if_not_supplied(
         composite.dcm, parameters.detector_params

mx_bluesky/hyperion/experiment_plans/rotation_scan_plan.py

@@ -4,7 +4,9 @@ import dataclasses
 
 import bluesky.plan_stubs as bps
 import bluesky.preprocessors as bpp
-from blueapi.core import BlueskyContext, MsgGenerator
+import pydantic
+from blueapi.core import BlueskyContext
+from bluesky.utils import MsgGenerator
 from dodal.devices.aperturescatterguard import ApertureScatterguard
 from dodal.devices.attenuator import Attenuator
 from dodal.devices.backlight import Backlight
@@ -22,8 +24,11 @@ from dodal.devices.undulator import Undulator
 from dodal.devices.xbpm_feedback import XBPMFeedback
 from dodal.devices.zebra import RotationDirection, Zebra
 from dodal.devices.zebra_controlled_shutter import ZebraShutter
-from dodal.plans.check_topup import check_topup_and_wait_if_necessary
+from dodal.plan_stubs.check_topup import check_topup_and_wait_if_necessary
 
+from mx_bluesky.common.device_setup_plans.read_hardware_for_setup import (
+    read_hardware_for_zocalo,
+)
 from mx_bluesky.hyperion.device_setup_plans.manipulate_sample import (
     cleanup_sample_environment,
     move_phi_chi_omega,
@@ -32,7 +37,6 @@ from mx_bluesky.hyperion.device_setup_plans.manipulate_sample import (
 )
 from mx_bluesky.hyperion.device_setup_plans.read_hardware_for_setup import (
     read_hardware_during_collection,
-    read_hardware_for_zocalo,
     read_hardware_pre_collection,
 )
 from mx_bluesky.hyperion.device_setup_plans.setup_zebra import (
@@ -60,7 +64,7 @@ from mx_bluesky.hyperion.parameters.rotation import (
 from mx_bluesky.hyperion.utils.context import device_composite_from_context
 
 
-@dataclasses.dataclass
+@pydantic.dataclasses.dataclass(config={"arbitrary_types_allowed": True})
 class RotationScanComposite(OavSnapshotComposite):
     """All devices which are directly or indirectly required by this plan"""
 
@@ -252,7 +256,7 @@ def rotation_scan_plan(
             composite.undulator,
             composite.synchrotron,
             composite.s4_slit_gaps,
-            composite.robot,
+            composite.dcm,
             composite.smargon,
         )
 
@@ -348,7 +352,7 @@ def rotation_scan(
         md={
             "subplan_name": CONST.PLAN.ROTATION_OUTER,
             CONST.TRIGGER.ZOCALO: CONST.PLAN.ROTATION_MAIN,
-            "zocalo_environment": parameters.zocalo_environment,
+            "zocalo_environment": CONST.ZOCALO_ENV,
             "hyperion_parameters": parameters.model_dump_json(),
             "activate_callbacks": [
                 "RotationISPyBCallback",
@@ -379,7 +383,7 @@ def rotation_scan(
             rotation_with_cleanup_and_stage(params),
             group=CONST.WAIT.ROTATION_READY_FOR_DC,
         )
-        yield from bps.unstage(eiger)
+        yield from bps.unstage(eiger)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
 
     yield from rotation_scan_plan_with_stage_and_cleanup(parameters)
 
@@ -407,6 +411,11 @@ def multi_rotation_scan(
         }
     )
     @bpp.stage_decorator([eiger])
+    @transmission_and_xbpm_feedback_for_collection_decorator(
+        composite.xbpm_feedback,
+        composite.attenuator,
+        parameters.transmission_frac,
+    )
     @bpp.finalize_decorator(lambda: _cleanup_plan(composite))
     def _multi_rotation_scan():
         for single_scan in parameters.single_rotation_scans:
@@ -416,6 +425,7 @@ def multi_rotation_scan(
                 md={
                     "subplan_name": CONST.PLAN.ROTATION_OUTER,
                     CONST.TRIGGER.ZOCALO: CONST.PLAN.ROTATION_MAIN,
+                    "zocalo_environment": CONST.ZOCALO_ENV,
                     "hyperion_parameters": single_scan.model_dump_json(),
                 }
             )

mx_bluesky/hyperion/experiment_plans/set_energy_plan.py

@@ -5,12 +5,11 @@
 * reenable feedback
 """
 
-import dataclasses
-
+import pydantic
 from bluesky import plan_stubs as bps
 from dodal.devices.attenuator import Attenuator
 from dodal.devices.dcm import DCM
-from dodal.devices.focusing_mirror import FocusingMirrorWithStripes, VFMMirrorVoltages
+from dodal.devices.focusing_mirror import FocusingMirrorWithStripes, MirrorVoltages
 from dodal.devices.undulator_dcm import UndulatorDCM
 from dodal.devices.xbpm_feedback import XBPMFeedback
 
@@ -24,10 +23,10 @@ DESIRED_TRANSMISSION_FRACTION = 0.1
 UNDULATOR_GROUP = "UNDULATOR_GROUP"
 
 
-@dataclasses.dataclass
+@pydantic.dataclasses.dataclass(config={"arbitrary_types_allowed": True})
 class SetEnergyComposite:
     vfm: FocusingMirrorWithStripes
-    vfm_mirror_voltages: VFMMirrorVoltages
+    mirror_voltages: MirrorVoltages
     dcm: DCM
     undulator_dcm: UndulatorDCM
     xbpm_feedback: XBPMFeedback
@@ -42,19 +41,20 @@ def _set_energy_plan(
     yield from dcm_pitch_roll_mirror_adjuster.adjust_dcm_pitch_roll_vfm_from_lut(
         composite.undulator_dcm,
         composite.vfm,
-        composite.vfm_mirror_voltages,
+        composite.mirror_voltages,
         energy_kev,
     )
     yield from bps.wait(group=UNDULATOR_GROUP)
 
 
 def set_energy_plan(
-    energy_kev,
+    energy_ev: float | None,
     composite: SetEnergyComposite,
 ):
-    yield from transmission_and_xbpm_feedback_for_collection_wrapper(
-        _set_energy_plan(energy_kev, composite),
-        composite.xbpm_feedback,
-        composite.attenuator,
-        DESIRED_TRANSMISSION_FRACTION,
-    )
+    if energy_ev:
+        yield from transmission_and_xbpm_feedback_for_collection_wrapper(
+            _set_energy_plan(energy_ev / 1000, composite),
+            composite.xbpm_feedback,
+            composite.attenuator,
+            DESIRED_TRANSMISSION_FRACTION,
+        )

mx_bluesky/hyperion/external_interaction/callbacks/__init__.py

@@ -4,7 +4,3 @@ execution of an experimental plan.
 
 Callbacks used for the Hyperion fast grid scan are prefixed with 'FGS'.
 """
-
-from .__main__ import main
-
-__all__ = ["main"]

mx_bluesky/hyperion/external_interaction/callbacks/__main__.py

@@ -7,6 +7,7 @@ from bluesky.callbacks.zmq import Proxy, RemoteDispatcher
 from dodal.log import LOGGER as dodal_logger
 from dodal.log import set_up_all_logging_handlers
 
+from mx_bluesky.common.utils.log import _get_logging_dir, tag_filter
 from mx_bluesky.hyperion.external_interaction.callbacks.log_uid_tag_callback import (
     LogUidTaggingCallback,
 )
@@ -19,6 +20,9 @@ from mx_bluesky.hyperion.external_interaction.callbacks.rotation.ispyb_callback
 from mx_bluesky.hyperion.external_interaction.callbacks.rotation.nexus_callback import (
     RotationNexusFileCallback,
 )
+from mx_bluesky.hyperion.external_interaction.callbacks.sample_handling.sample_handling_callback import (
+    SampleHandlingCallback,
+)
 from mx_bluesky.hyperion.external_interaction.callbacks.xray_centre.ispyb_callback import (
     GridscanISPyBCallback,
 )
@@ -31,8 +35,6 @@ from mx_bluesky.hyperion.external_interaction.callbacks.zocalo_callback import (
 from mx_bluesky.hyperion.log import (
     ISPYB_LOGGER,
     NEXUS_LOGGER,
-    _get_logging_dir,
-    tag_filter,
 )
 from mx_bluesky.hyperion.parameters.cli import parse_callback_dev_mode_arg
 from mx_bluesky.hyperion.parameters.constants import CONST
@@ -50,6 +52,7 @@ def setup_callbacks():
         RotationISPyBCallback(emit=zocalo),
         LogUidTaggingCallback(),
         RobotLoadISPyBCallback(),
+        SampleHandlingCallback(),
     ]
 
 

mx_bluesky/hyperion/external_interaction/callbacks/common/abstract_event.py

@@ -0,0 +1,66 @@
+import builtins
+import dataclasses
+import time
+from abc import ABC
+from typing import Literal
+
+from bluesky.protocols import Readable, Reading
+from event_model import DataKey
+
+
+@dataclasses.dataclass(frozen=True)
+class AbstractEvent(Readable, ABC):
+    """An abstract superclass that can be extended to provide lightweight software events
+    for bluesky plans, without having to incur the overhead of creating ophyd-async devices
+    specifically for the purpose.
+
+    The currently supported types for field annotations in the event are ``str``, ``int``, ``float``, ``bool``
+
+    In future array types may be supported.
+
+    Examples:
+        Subclasses should extend this class and decorate with::
+
+            @dataclasses.dataclass(frozen=True)
+
+        To raise an event, simply construct the event and then ``read`` it as you would a device::
+
+            yield from bps.create("MY_EVENT_NAME")
+            my_event = MyEvent(an_int=1)
+            yield from bps.read(my_event)
+            yield from bps.save()
+    """
+
+    def read(self) -> dict[str, Reading]:
+        return {
+            f.name: AbstractEvent._reading_from_value(getattr(self, f.name))
+            for f in dataclasses.fields(self)
+        }
+
+    def describe(self) -> dict[str, DataKey]:
+        return {
+            f.name: DataKey(dtype=AbstractEvent._dtype_of(f.type), shape=[], source="")
+            for f in dataclasses.fields(self)
+        }
+
+    @classmethod
+    def _reading_from_value(cls, value):
+        return Reading(timestamp=time.time(), value=value)
+
+    @classmethod
+    def _dtype_of(cls, t) -> Literal["string", "number", "boolean", "integer"]:
+        match t:
+            case builtins.str:
+                return "string"
+            case builtins.bool:
+                return "boolean"
+            case builtins.int:
+                return "integer"
+            case builtins.float:
+                return "number"
+        # TODO array support
+        raise ValueError(f"Unsupported type for AbstractEvent: {t}")
+
+    @property
+    def name(self) -> str:
+        return type(self).__name__

mx_bluesky/hyperion/external_interaction/callbacks/common/callback_util.py

@@ -11,6 +11,9 @@ from mx_bluesky.hyperion.external_interaction.callbacks.rotation.ispyb_callback
 from mx_bluesky.hyperion.external_interaction.callbacks.rotation.nexus_callback import (
     RotationNexusFileCallback,
 )
+from mx_bluesky.hyperion.external_interaction.callbacks.sample_handling.sample_handling_callback import (
+    SampleHandlingCallback,
+)
 from mx_bluesky.hyperion.external_interaction.callbacks.xray_centre.ispyb_callback import (
     GridscanISPyBCallback,
 )
@@ -53,6 +56,7 @@ def create_load_centre_collect_callbacks() -> (
         RobotLoadISPyBCallback,
         RotationNexusFileCallback,
         RotationISPyBCallback,
+        SampleHandlingCallback,
     ]
 ):
     return (
@@ -61,4 +65,5 @@ def create_load_centre_collect_callbacks() -> (
         RobotLoadISPyBCallback(),
         RotationNexusFileCallback(),
         RotationISPyBCallback(emit=ZocaloCallback()),
+        SampleHandlingCallback(),
     )

mx_bluesky/hyperion/external_interaction/callbacks/common/ispyb_mapping.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from mx_bluesky.common.parameters.components import DiffractionExperimentWithSample
 from mx_bluesky.hyperion.external_interaction.ispyb.data_model import (
     DataCollectionGroupInfo,
     DataCollectionInfo,
@@ -11,7 +12,6 @@ from mx_bluesky.hyperion.external_interaction.ispyb.ispyb_store import (
 from mx_bluesky.hyperion.external_interaction.ispyb.ispyb_utils import (
     get_current_time_string,
 )
-from mx_bluesky.hyperion.parameters.components import DiffractionExperimentWithSample
 
 
 def populate_data_collection_group(params: DiffractionExperimentWithSample):