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

mx_bluesky/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.1.0'
-__version_tuple__ = version_tuple = (1, 1, 0)
+__version__ = version = '1.2.0'
+__version_tuple__ = version_tuple = (1, 2, 0)

mx_bluesky/hyperion/device_setup_plans/utils.py

@@ -3,6 +3,10 @@ from collections.abc import Generator
 from bluesky import plan_stubs as bps
 from bluesky import preprocessors as bpp
 from bluesky.utils import Msg
+from dodal.devices.dcm import DCM
+from dodal.devices.detector import (
+    DetectorParams,
+)
 from dodal.devices.detector.detector_motion import DetectorMotion, ShutterState
 from dodal.devices.eiger import EigerDetector
 
@@ -12,6 +16,13 @@ from mx_bluesky.hyperion.device_setup_plans.position_detector import (
 )
 
 
+def fill_in_energy_if_not_supplied(dcm: DCM, detector_params: DetectorParams):
+    if not detector_params.expected_energy_ev:
+        actual_energy_ev = 1000 * (yield from bps.rd(dcm.energy_in_kev))
+        detector_params.expected_energy_ev = actual_energy_ev
+    return detector_params
+
+
 def start_preparing_data_collection_then_do_plan(
     eiger: EigerDetector,
     detector_motion: DetectorMotion,

mx_bluesky/hyperion/experiment_plans/experiment_registry.py

@@ -7,12 +7,14 @@ import mx_bluesky.hyperion.experiment_plans.flyscan_xray_centre_plan as flyscan_
 import mx_bluesky.hyperion.experiment_plans.rotation_scan_plan as rotation_scan_plan
 from mx_bluesky.hyperion.experiment_plans import (
     grid_detect_then_xray_centre_plan,
+    load_centre_collect_full_plan,
     pin_centre_then_xray_centre_plan,
     robot_load_then_centre_plan,
 )
 from mx_bluesky.hyperion.external_interaction.callbacks.common.callback_util import (
     CallbacksFactory,
     create_gridscan_callbacks,
+    create_load_centre_collect_callbacks,
     create_robot_load_and_centre_callbacks,
     create_rotation_callbacks,
 )
@@ -22,6 +24,7 @@ from mx_bluesky.hyperion.parameters.gridscan import (
     RobotLoadThenCentre,
     ThreeDGridScan,
 )
+from mx_bluesky.hyperion.parameters.load_centre_collect import LoadCentreCollect
 from mx_bluesky.hyperion.parameters.rotation import MultiRotationScan, RotationScan
 
 
@@ -42,6 +45,7 @@ class ExperimentRegistryEntry(TypedDict):
         | MultiRotationScan
         | PinTipCentreThenXrayCentre
         | RobotLoadThenCentre
+        | LoadCentreCollect
     ]
     callbacks_factory: CallbacksFactory
 
@@ -77,6 +81,11 @@ PLAN_REGISTRY: dict[str, ExperimentRegistryEntry] = {
         "param_type": MultiRotationScan,
         "callbacks_factory": create_rotation_callbacks,
     },
+    "load_centre_collect_full_plan": {
+        "setup": load_centre_collect_full_plan.create_devices,
+        "param_type": LoadCentreCollect,
+        "callbacks_factory": create_load_centre_collect_callbacks,
+    },
 }
 
 

mx_bluesky/hyperion/experiment_plans/flyscan_xray_centre_plan.py

@@ -77,6 +77,12 @@ class SmargonSpeedException(Exception):
     pass
 
 
+class CrystalNotFoundException(WarningException):
+    """Raised if grid detection completed normally but no crystal was found."""
+
+    pass
+
+
 @dataclasses.dataclass
 class FlyScanXRayCentreComposite:
     """All devices which are directly or indirectly required by this plan"""
@@ -190,47 +196,50 @@ def run_gridscan_and_move(
 
     LOGGER.info("Grid scan finished, getting results.")
 
-    with TRACER.start_span("wait_for_zocalo"):
-        yield from bps.trigger_and_read(
-            [fgs_composite.zocalo], name=ZOCALO_READING_PLAN_NAME
-        )
-        LOGGER.info("Zocalo triggered and read, interpreting results.")
-        xray_centre, bbox_size = yield from get_processing_result(fgs_composite.zocalo)
-        LOGGER.info(f"Got xray centre: {xray_centre}, bbox size: {bbox_size}")
-        if xray_centre is not None:
-            xray_centre = parameters.FGS_params.grid_position_to_motor_position(
-                xray_centre
+    try:
+        with TRACER.start_span("wait_for_zocalo"):
+            yield from bps.trigger_and_read(
+                [fgs_composite.zocalo], name=ZOCALO_READING_PLAN_NAME
             )
-        else:
-            xray_centre = initial_xyz
-            LOGGER.warning("No X-ray centre received")
-        if bbox_size is not None:
-            with TRACER.start_span("change_aperture"):
-                yield from set_aperture_for_bbox_size(
-                    fgs_composite.aperture_scatterguard, bbox_size
+            LOGGER.info("Zocalo triggered and read, interpreting results.")
+            xray_centre, bbox_size = yield from get_processing_result(
+                fgs_composite.zocalo
+            )
+            LOGGER.info(f"Got xray centre: {xray_centre}, bbox size: {bbox_size}")
+            if xray_centre is not None:
+                xray_centre = parameters.FGS_params.grid_position_to_motor_position(
+                    xray_centre
                 )
-        else:
-            LOGGER.warning("No bounding box size received")
-
-    # once we have the results, go to the appropriate position
-    LOGGER.info("Moving to centre of mass.")
-    with TRACER.start_span("move_to_result"):
-        x, y, z = xray_centre
-        yield from move_x_y_z(fgs_composite.sample_motors, x, y, z, wait=True)
-
-    if parameters.FGS_params.set_stub_offsets:
-        LOGGER.info("Recentring smargon co-ordinate system to this point.")
-        yield from bps.mv(
-            fgs_composite.sample_motors.stub_offsets, StubPosition.CURRENT_AS_CENTER
-        )
-
-    # 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")
-    yield from bps.abs_set(fgs_composite.eiger.odin.fan.dev_shm_enable, 0)
+            else:
+                LOGGER.warning("No X-ray centre received")
+                raise CrystalNotFoundException()
+            if bbox_size is not None:
+                with TRACER.start_span("change_aperture"):
+                    yield from set_aperture_for_bbox_size(
+                        fgs_composite.aperture_scatterguard, bbox_size
+                    )
+            else:
+                LOGGER.warning("No bounding box size received")
+
+        # once we have the results, go to the appropriate position
+        LOGGER.info("Moving to centre of mass.")
+        with TRACER.start_span("move_to_result"):
+            x, y, z = xray_centre
+            yield from move_x_y_z(fgs_composite.sample_motors, x, y, z, wait=True)
+
+        if parameters.FGS_params.set_stub_offsets:
+            LOGGER.info("Recentring smargon co-ordinate system to this point.")
+            yield from bps.mv(
+                fgs_composite.sample_motors.stub_offsets, StubPosition.CURRENT_AS_CENTER
+            )
+    finally:
+        # 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")
+        yield from bps.abs_set(fgs_composite.eiger.odin.fan.dev_shm_enable, 0)
 
-    # Wait on everything before returning to GDA (particularly apertures), can be removed
-    # when we do not return to GDA here
-    yield from bps.wait()
+        # Wait on everything before returning to GDA (particularly apertures), can be removed
+        # when we do not return to GDA here
+        yield from bps.wait()
 
 
 @bpp.set_run_key_decorator(CONST.PLAN.GRIDSCAN_MAIN)

mx_bluesky/hyperion/experiment_plans/load_centre_collect_full_plan.py

@@ -0,0 +1,46 @@
+import dataclasses
+
+from blueapi.core import BlueskyContext
+from dodal.devices.oav.oav_parameters import OAVParameters
+
+from mx_bluesky.hyperion.experiment_plans.robot_load_then_centre_plan import (
+    RobotLoadThenCentreComposite,
+    robot_load_then_centre,
+)
+from mx_bluesky.hyperion.experiment_plans.rotation_scan_plan import (
+    RotationScanComposite,
+    multi_rotation_scan,
+)
+from mx_bluesky.hyperion.parameters.load_centre_collect import LoadCentreCollect
+from mx_bluesky.hyperion.utils.context import device_composite_from_context
+
+
+@dataclasses.dataclass
+class LoadCentreCollectComposite(RobotLoadThenCentreComposite, RotationScanComposite):
+    """Composite that provides access to the required devices."""
+
+    pass
+
+
+def create_devices(context: BlueskyContext) -> LoadCentreCollectComposite:
+    """Create the necessary devices for the plan."""
+    return device_composite_from_context(context, LoadCentreCollectComposite)
+
+
+def load_centre_collect_full_plan(
+    composite: LoadCentreCollectComposite,
+    params: LoadCentreCollect,
+    oav_params: OAVParameters | None = None,
+):
+    """Attempt a complete data collection experiment, consisting of the following:
+    * Load the sample if necessary
+    * Move to the specified goniometer start angles
+    * Perform optical centring, then X-ray centring
+    * If X-ray centring finds a diffracting centre then move to that centre and
+    * do a collection with the specified parameters.
+    """
+    if not oav_params:
+        oav_params = OAVParameters(context="xrayCentring")
+    yield from robot_load_then_centre(composite, params.robot_load_then_centre)
+
+    yield from multi_rotation_scan(composite, params.multi_rotation_scan, oav_params)

mx_bluesky/hyperion/experiment_plans/robot_load_and_change_energy.py

@@ -0,0 +1,237 @@
+from __future__ import annotations
+
+import dataclasses
+from collections.abc import Generator
+from datetime import datetime
+from pathlib import Path
+from typing import cast
+
+import bluesky.plan_stubs as bps
+import bluesky.preprocessors as bpp
+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.motors import XYZPositioner
+from dodal.devices.oav.oav_detector import OAV
+from dodal.devices.robot import BartRobot, SampleLocation
+from dodal.devices.smargon import Smargon, StubPosition
+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 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
+class RobotLoadAndEnergyChangeComposite:
+    # SetEnergyComposite fields
+    vfm: FocusingMirrorWithStripes
+    vfm_mirror_voltages: VFMMirrorVoltages
+    dcm: DCM
+    undulator_dcm: UndulatorDCM
+    xbpm_feedback: XBPMFeedback
+    attenuator: Attenuator
+
+    # RobotLoad fields
+    robot: BartRobot
+    webcam: Webcam
+    lower_gonio: XYZPositioner
+    thawer: Thawer
+    oav: OAV
+    smargon: Smargon
+    aperture_scatterguard: ApertureScatterguard
+
+
+def create_devices(context: BlueskyContext) -> RobotLoadAndEnergyChangeComposite:
+    from mx_bluesky.hyperion.utils.context import device_composite_from_context
+
+    return device_composite_from_context(context, RobotLoadAndEnergyChangeComposite)
+
+
+def wait_for_smargon_not_disabled(smargon: Smargon, timeout=60):
+    """Waits for the smargon disabled flag to go low. The robot hardware is responsible
+    for setting this to low when it is safe to move. It does this through a physical
+    connection between the robot and the smargon.
+    """
+    LOGGER.info("Waiting for smargon enabled")
+    SLEEP_PER_CHECK = 0.1
+    times_to_check = int(timeout / SLEEP_PER_CHECK)
+    for _ in range(times_to_check):
+        smargon_disabled = yield from bps.rd(smargon.disabled)
+        if not smargon_disabled:
+            LOGGER.info("Smargon now enabled")
+            return
+        yield from bps.sleep(SLEEP_PER_CHECK)
+    raise TimeoutError(
+        "Timed out waiting for smargon to become enabled after robot load"
+    )
+
+
+def take_robot_snapshots(oav: OAV, webcam: Webcam, directory: Path):
+    time_now = datetime.now()
+    snapshot_format = f"{time_now.strftime('%H%M%S')}_{{device}}_after_load"
+    for device in [oav.snapshot, webcam]:
+        yield from bps.abs_set(
+            device.filename, snapshot_format.format(device=device.name)
+        )
+        yield from bps.abs_set(device.directory, str(directory))
+        # Note: should be able to use `wait=True` after https://github.com/bluesky/bluesky/issues/1795
+        yield from bps.trigger(device, group="snapshots")
+        yield from bps.wait("snapshots")
+
+
+def prepare_for_robot_load(
+    aperture_scatterguard: ApertureScatterguard, smargon: Smargon
+):
+    yield from bps.abs_set(
+        aperture_scatterguard,
+        ApertureValue.ROBOT_LOAD,
+        group="prepare_robot_load",
+    )
+
+    yield from bps.mv(smargon.stub_offsets, StubPosition.RESET_TO_ROBOT_LOAD)
+
+    # fmt: off
+    yield from bps.mv(smargon.x, 0,
+                      smargon.y, 0,
+                      smargon.z, 0,
+                      smargon.omega, 0,
+                      smargon.chi, 0,
+                      smargon.phi, 0)
+    # fmt: on
+
+    yield from bps.wait("prepare_robot_load")
+
+
+def do_robot_load(
+    composite: RobotLoadAndEnergyChangeComposite,
+    sample_location: SampleLocation,
+    demand_energy_ev: float | None,
+    thawing_time: float,
+):
+    yield from bps.abs_set(
+        composite.robot,
+        sample_location,
+        group="robot_load",
+    )
+
+    if demand_energy_ev:
+        yield from set_energy_plan(
+            demand_energy_ev / 1000,
+            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"
+    )
+    yield from wait_for_smargon_not_disabled(composite.smargon)
+
+
+def raise_exception_if_moved_out_of_cryojet(exception):
+    yield from bps.null()
+    if isinstance(exception, MoveTooLarge):
+        raise Exception(
+            f"Moving {exception.axis} back to {exception.position} after \
+                        robot load would move it out of the cryojet. The max safe \
+                        distance is {exception.maximum_move}"
+        )
+
+
+def pin_already_loaded(
+    robot: BartRobot, sample_location: SampleLocation
+) -> Generator[Msg, None, bool]:
+    current_puck = yield from bps.rd(robot.current_puck)
+    current_pin = yield from bps.rd(robot.current_pin)
+    return (
+        int(current_puck) == sample_location.puck
+        and int(current_pin) == sample_location.pin
+    )
+
+
+def robot_load_and_snapshots(
+    composite: RobotLoadAndEnergyChangeComposite,
+    location: SampleLocation,
+    snapshot_directory: Path,
+    thawing_time: float,
+    demand_energy_ev: float | None,
+):
+    robot_load_plan = do_robot_load(
+        composite,
+        location,
+        demand_energy_ev,
+        thawing_time,
+    )
+
+    # The lower gonio must be in the correct position for the robot load and we
+    # want to put it back afterwards. Note we don't wait the robot is interlocked
+    # to the lower gonio and the  move is quicker than the robot takes to get to the
+    # load position.
+    yield from bpp.contingency_wrapper(
+        home_and_reset_wrapper(
+            robot_load_plan,
+            composite.lower_gonio,
+            BartRobot.LOAD_TOLERANCE_MM,
+            CONST.HARDWARE.CRYOJET_MARGIN_MM,
+            "lower_gonio",
+            wait_for_all=False,
+        ),
+        except_plan=raise_exception_if_moved_out_of_cryojet,
+    )
+
+    yield from take_robot_snapshots(composite.oav, composite.webcam, snapshot_directory)
+
+    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.webcam)
+    yield from bps.save()
+
+    yield from bps.wait("reset-lower_gonio")
+
+
+def robot_load_and_change_energy_plan(
+    composite: RobotLoadAndEnergyChangeComposite,
+    params: RobotLoadAndEnergyChange,
+):
+    assert params.sample_puck is not None
+    assert params.sample_pin is not None
+
+    sample_location = SampleLocation(params.sample_puck, params.sample_pin)
+
+    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,
+            },
+            "activate_callbacks": [
+                "RobotLoadISPyBCallback",
+            ],
+        },
+    )

mx_bluesky/hyperion/experiment_plans/robot_load_then_centre_plan.py

@@ -1,16 +1,10 @@
 from __future__ import annotations
 
 import dataclasses
-from collections.abc import Generator
-from datetime import datetime
-from pathlib import Path
 from typing import cast
 
-import bluesky.plan_stubs as bps
-import bluesky.preprocessors as bpp
 from blueapi.core import BlueskyContext, MsgGenerator
-from bluesky.utils import Msg
-from dodal.devices.aperturescatterguard import ApertureScatterguard, ApertureValue
+from dodal.devices.aperturescatterguard import ApertureScatterguard
 from dodal.devices.attenuator import Attenuator
 from dodal.devices.backlight import Backlight
 from dodal.devices.dcm import DCM
@@ -24,7 +18,7 @@ from dodal.devices.oav.oav_detector import OAV
 from dodal.devices.oav.pin_image_recognition import PinTipDetection
 from dodal.devices.robot import BartRobot, SampleLocation
 from dodal.devices.s4_slit_gaps import S4SlitGaps
-from dodal.devices.smargon import Smargon, StubPosition
+from dodal.devices.smargon import Smargon
 from dodal.devices.synchrotron import Synchrotron
 from dodal.devices.thawer import Thawer
 from dodal.devices.undulator import Undulator
@@ -34,10 +28,11 @@ from dodal.devices.xbpm_feedback import XBPMFeedback
 from dodal.devices.zebra import Zebra
 from dodal.devices.zebra_controlled_shutter import ZebraShutter
 from dodal.devices.zocalo import ZocaloResults
-from dodal.plans.motor_util_plans import MoveTooLarge, home_and_reset_wrapper
+from dodal.log import LOGGER
 from ophyd_async.fastcs.panda import HDFPanda
 
 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.grid_detect_then_xray_centre_plan import (
@@ -46,12 +41,11 @@ from mx_bluesky.hyperion.experiment_plans.grid_detect_then_xray_centre_plan impo
 from mx_bluesky.hyperion.experiment_plans.pin_centre_then_xray_centre_plan import (
     pin_centre_then_xray_centre_plan,
 )
-from mx_bluesky.hyperion.experiment_plans.set_energy_plan import (
-    SetEnergyComposite,
-    read_energy,
-    set_energy_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.log import LOGGER
 from mx_bluesky.hyperion.parameters.constants import CONST
 from mx_bluesky.hyperion.parameters.gridscan import RobotLoadThenCentre
 
@@ -100,144 +94,6 @@ def create_devices(context: BlueskyContext) -> RobotLoadThenCentreComposite:
     return device_composite_from_context(context, RobotLoadThenCentreComposite)
 
 
-def wait_for_smargon_not_disabled(smargon: Smargon, timeout=60):
-    """Waits for the smargon disabled flag to go low. The robot hardware is responsible
-    for setting this to low when it is safe to move. It does this through a physical
-    connection between the robot and the smargon.
-    """
-    LOGGER.info("Waiting for smargon enabled")
-    SLEEP_PER_CHECK = 0.1
-    times_to_check = int(timeout / SLEEP_PER_CHECK)
-    for _ in range(times_to_check):
-        smargon_disabled = yield from bps.rd(smargon.disabled)
-        if not smargon_disabled:
-            LOGGER.info("Smargon now enabled")
-            return
-        yield from bps.sleep(SLEEP_PER_CHECK)
-    raise TimeoutError(
-        "Timed out waiting for smargon to become enabled after robot load"
-    )
-
-
-def take_robot_snapshots(oav: OAV, webcam: Webcam, directory: Path):
-    time_now = datetime.now()
-    snapshot_format = f"{time_now.strftime('%H%M%S')}_{{device}}_after_load"
-    for device in [oav.snapshot, webcam]:
-        yield from bps.abs_set(
-            device.filename, snapshot_format.format(device=device.name)
-        )
-        yield from bps.abs_set(device.directory, str(directory))
-        # Note: should be able to use `wait=True` after https://github.com/bluesky/bluesky/issues/1795
-        yield from bps.trigger(device, group="snapshots")
-        yield from bps.wait("snapshots")
-
-
-def prepare_for_robot_load(composite: RobotLoadThenCentreComposite):
-    yield from bps.abs_set(
-        composite.aperture_scatterguard,
-        ApertureValue.ROBOT_LOAD,
-        group="prepare_robot_load",
-    )
-
-    yield from bps.mv(composite.smargon.stub_offsets, StubPosition.RESET_TO_ROBOT_LOAD)
-
-    # fmt: off
-    yield from bps.mv(composite.smargon.x, 0,
-                      composite.smargon.y, 0,
-                      composite.smargon.z, 0,
-                      composite.smargon.omega, 0,
-                      composite.smargon.chi, 0,
-                      composite.smargon.phi, 0)
-    # fmt: on
-
-    yield from bps.wait("prepare_robot_load")
-
-
-def do_robot_load(
-    composite: RobotLoadThenCentreComposite,
-    sample_location: SampleLocation,
-    demand_energy_ev: float | None,
-    thawing_time: float,
-):
-    yield from bps.abs_set(
-        composite.robot,
-        sample_location,
-        group="robot_load",
-    )
-
-    if demand_energy_ev:
-        yield from set_energy_plan(
-            demand_energy_ev / 1000,
-            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"
-    )
-    yield from wait_for_smargon_not_disabled(composite.smargon)
-
-
-def raise_exception_if_moved_out_of_cryojet(exception):
-    yield from bps.null()
-    if isinstance(exception, MoveTooLarge):
-        raise Exception(
-            f"Moving {exception.axis} back to {exception.position} after \
-                        robot load would move it out of the cryojet. The max safe \
-                        distance is {exception.maximum_move}"
-        )
-
-
-def _pin_already_loaded(
-    robot: BartRobot, pin_to_load: int, puck_to_load: int
-) -> Generator[Msg, None, bool]:
-    current_puck = yield from bps.rd(robot.current_puck)
-    current_pin = yield from bps.rd(robot.current_pin)
-    return int(current_puck) == puck_to_load and int(current_pin) == pin_to_load
-
-
-def robot_load_and_snapshots(
-    composite: RobotLoadThenCentreComposite,
-    params: RobotLoadThenCentre,
-    location: SampleLocation,
-):
-    robot_load_plan = do_robot_load(
-        composite,
-        location,
-        params.demand_energy_ev,
-        params.thawing_time,
-    )
-
-    # The lower gonio must be in the correct position for the robot load and we
-    # want to put it back afterwards. Note we don't wait the robot is interlocked
-    # to the lower gonio and the  move is quicker than the robot takes to get to the
-    # load position.
-    yield from bpp.contingency_wrapper(
-        home_and_reset_wrapper(
-            robot_load_plan,
-            composite.lower_gonio,
-            BartRobot.LOAD_TOLERANCE_MM,
-            CONST.HARDWARE.CRYOJET_MARGIN_MM,
-            "lower_gonio",
-            wait_for_all=False,
-        ),
-        except_plan=raise_exception_if_moved_out_of_cryojet,
-    )
-
-    yield from take_robot_snapshots(
-        composite.oav, composite.webcam, params.snapshot_directory
-    )
-
-    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.webcam)
-    yield from bps.save()
-
-    yield from bps.wait("reset-lower_gonio")
-
-
 def centring_plan_from_robot_load_params(
     composite: RobotLoadThenCentreComposite,
     params: RobotLoadThenCentre,
@@ -251,23 +107,10 @@ def centring_plan_from_robot_load_params(
 def robot_load_then_centre_plan(
     composite: RobotLoadThenCentreComposite,
     params: RobotLoadThenCentre,
-    sample_location: SampleLocation,
 ):
-    yield from prepare_for_robot_load(composite)
-    yield from bpp.run_wrapper(
-        robot_load_and_snapshots(composite, params, sample_location),
-        md={
-            "subplan_name": CONST.PLAN.ROBOT_LOAD,
-            "metadata": {
-                "visit_path": str(params.visit_directory),
-                "sample_id": params.sample_id,
-                "sample_puck": params.sample_puck,
-                "sample_pin": params.sample_pin,
-            },
-            "activate_callbacks": [
-                "RobotLoadISPyBCallback",
-            ],
-        },
+    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)
@@ -283,10 +126,10 @@ def robot_load_then_centre(
     assert parameters.sample_puck is not None
     assert parameters.sample_pin is not None
 
+    sample_location = SampleLocation(parameters.sample_puck, parameters.sample_pin)
+
     doing_sample_load = not (
-        yield from _pin_already_loaded(
-            composite.robot, parameters.sample_pin, parameters.sample_puck
-        )
+        yield from pin_already_loaded(composite.robot, sample_location)
     )
 
     doing_chi_change = parameters.chi_start_deg is not None
@@ -295,7 +138,6 @@ def robot_load_then_centre(
         plan = robot_load_then_centre_plan(
             composite,
             parameters,
-            SampleLocation(parameters.sample_puck, parameters.sample_pin),
         )
         LOGGER.info("Pin not loaded, loading and centring")
     elif doing_chi_change:
@@ -305,12 +147,10 @@ def robot_load_then_centre(
         LOGGER.info("Pin already loaded and chi not changed so doing nothing")
         return
 
-    detector_params = parameters.detector_params
-    if not detector_params.expected_energy_ev:
-        actual_energy_ev = 1000 * (
-            yield from read_energy(cast(SetEnergyComposite, composite))
-        )
-        detector_params.expected_energy_ev = actual_energy_ev
+    detector_params = yield from fill_in_energy_if_not_supplied(
+        composite.dcm, parameters.detector_params
+    )
+
     eiger.set_detector_parameters(detector_params)
 
     yield from start_preparing_data_collection_then_do_plan(

mx_bluesky/hyperion/experiment_plans/set_energy_plan.py

@@ -6,11 +6,8 @@
 """
 
 import dataclasses
-from collections.abc import Generator
-from typing import Any
 
 from bluesky import plan_stubs as bps
-from bluesky.utils import Msg
 from dodal.devices.attenuator import Attenuator
 from dodal.devices.dcm import DCM
 from dodal.devices.focusing_mirror import FocusingMirrorWithStripes, VFMMirrorVoltages
@@ -51,11 +48,6 @@ def _set_energy_plan(
     yield from bps.wait(group=UNDULATOR_GROUP)
 
 
-def read_energy(composite: SetEnergyComposite) -> Generator[Msg, Any, float]:
-    """Obtain the energy in kev"""
-    return (yield from bps.rd(composite.dcm.energy_in_kev))  # type: ignore
-
-
 def set_energy_plan(
     energy_kev,
     composite: SetEnergyComposite,

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

@@ -44,3 +44,21 @@ def create_rotation_callbacks() -> (
     tuple[RotationNexusFileCallback, RotationISPyBCallback]
 ):
     return (RotationNexusFileCallback(), RotationISPyBCallback(emit=ZocaloCallback()))
+
+
+def create_load_centre_collect_callbacks() -> (
+    tuple[
+        GridscanNexusFileCallback,
+        GridscanISPyBCallback,
+        RobotLoadISPyBCallback,
+        RotationNexusFileCallback,
+        RotationISPyBCallback,
+    ]
+):
+    return (
+        GridscanNexusFileCallback(),
+        GridscanISPyBCallback(emit=ZocaloCallback()),
+        RobotLoadISPyBCallback(),
+        RotationNexusFileCallback(),
+        RotationISPyBCallback(emit=ZocaloCallback()),
+    )

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

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-import re
-
 from mx_bluesky.hyperion.external_interaction.ispyb.data_model import (
     DataCollectionGroupInfo,
     DataCollectionInfo,
@@ -11,7 +9,6 @@ from mx_bluesky.hyperion.external_interaction.ispyb.ispyb_store import (
     I03_EIGER_DETECTOR,
 )
 from mx_bluesky.hyperion.external_interaction.ispyb.ispyb_utils import (
-    VISIT_PATH_REGEX,
     get_current_time_string,
 )
 from mx_bluesky.hyperion.parameters.components import DiffractionExperimentWithSample
@@ -63,8 +60,3 @@ def get_proposal_and_session_from_visit_string(visit_string: str) -> tuple[str,
     visit_parts = visit_string.split("-")
     assert len(visit_parts) == 2, f"Unexpected visit string {visit_string}"
     return visit_parts[0], int(visit_parts[1])
-
-
-def get_visit_string_from_path(path: str | None) -> str | None:
-    match = re.search(VISIT_PATH_REGEX, path) if path else None
-    return str(match.group(1)) if match else None

mx_bluesky/hyperion/external_interaction/callbacks/ispyb_callback_base.py

@@ -110,9 +110,9 @@ class BaseISPyBCallback(PlanReactiveCallback):
             slitgap_vertical=doc["data"]["s4_slit_gaps_ygap"],
         )
         hwscan_position_info = DataCollectionPositionInfo(
-            pos_x=doc["data"]["smargon-x"],
-            pos_y=doc["data"]["smargon-y"],
-            pos_z=doc["data"]["smargon-z"],
+            pos_x=float(doc["data"]["smargon-x"]),
+            pos_y=float(doc["data"]["smargon-y"]),
+            pos_z=float(doc["data"]["smargon-z"]),
         )
         scan_data_infos = self.populate_info_for_update(
             hwscan_data_collection_info, hwscan_position_info, self.params

mx_bluesky/hyperion/external_interaction/callbacks/robot_load/ispyb_callback.py

@@ -6,7 +6,6 @@ from event_model.documents import EventDescriptor
 
 from mx_bluesky.hyperion.external_interaction.callbacks.common.ispyb_mapping import (
     get_proposal_and_session_from_visit_string,
-    get_visit_string_from_path,
 )
 from mx_bluesky.hyperion.external_interaction.callbacks.plan_reactive_callback import (
     PlanReactiveCallback,
@@ -37,10 +36,9 @@ class RobotLoadISPyBCallback(PlanReactiveCallback):
             ISPYB_LOGGER.debug(f"ISPyB robot load callback received: {doc}")
             self.run_uid = doc.get("uid")
             assert isinstance(metadata := doc.get("metadata"), dict)
-            assert isinstance(
-                visit := get_visit_string_from_path(metadata["visit_path"]), str
+            proposal, session = get_proposal_and_session_from_visit_string(
+                metadata["visit"]
             )
-            proposal, session = get_proposal_and_session_from_visit_string(visit)
             self.action_id = self.expeye.start_load(
                 proposal,
                 session,

mx_bluesky/hyperion/external_interaction/ispyb/ispyb_utils.py

@@ -9,8 +9,6 @@ from ispyb.sp.core import Core
 
 from mx_bluesky.hyperion.parameters.constants import CONST
 
-VISIT_PATH_REGEX = r".+/([a-zA-Z]{2}\d{4,5}-\d{1,3})(/?$)"
-
 
 def get_ispyb_config():
     return os.environ.get("ISPYB_CONFIG_PATH", CONST.SIM.ISPYB_CONFIG)

mx_bluesky/hyperion/parameters/components.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import datetime
 import json
 from abc import abstractmethod
 from collections.abc import Sequence
@@ -142,24 +141,32 @@ class WithSnapshot(BaseModel):
         return bool(self.snapshot_omegas_deg)
 
 
-class DiffractionExperiment(HyperionParameters, WithSnapshot):
-    """For all experiments which use beam"""
+class WithOptionalEnergyChange(BaseModel):
+    demand_energy_ev: float | None = Field(default=None, gt=0)
 
+
+class WithVisit(BaseModel):
     visit: str = Field(min_length=1)
-    file_name: str
-    exposure_time_s: float = Field(gt=0)
-    comment: str = Field(default="")
+    zocalo_environment: str = Field(default=CONST.ZOCALO_ENV)
     beamline: str = Field(default=CONST.I03.BEAMLINE, pattern=r"BL\d{2}[BIJS]")
-    insertion_prefix: str = Field(
-        default=CONST.I03.INSERTION_PREFIX, pattern=r"SR\d{2}[BIJS]"
-    )
     det_dist_to_beam_converter_path: str = Field(
         default=CONST.PARAM.DETECTOR.BEAM_XY_LUT_PATH
     )
-    zocalo_environment: str = Field(default=CONST.ZOCALO_ENV)
-    trigger_mode: TriggerMode = Field(default=TriggerMode.FREE_RUN)
+    insertion_prefix: str = Field(
+        default=CONST.I03.INSERTION_PREFIX, pattern=r"SR\d{2}[BIJS]"
+    )
     detector_distance_mm: float | None = Field(default=None, gt=0)
-    demand_energy_ev: float | None = Field(default=None, gt=0)
+
+
+class DiffractionExperiment(
+    HyperionParameters, WithSnapshot, WithOptionalEnergyChange, WithVisit
+):
+    """For all experiments which use beam"""
+
+    file_name: str
+    exposure_time_s: float = Field(gt=0)
+    comment: str = Field(default="")
+    trigger_mode: TriggerMode = Field(default=TriggerMode.FREE_RUN)
     run_number: int | None = Field(default=None, ge=0)
     selected_aperture: ApertureValue | None = Field(default=None)
     transmission_frac: float = Field(default=0.1)
@@ -177,12 +184,6 @@ class DiffractionExperiment(HyperionParameters, WithSnapshot):
         )
         return values
 
-    @property
-    def visit_directory(self) -> Path:
-        return (
-            Path(CONST.I03.BASE_DATA_DIR) / str(datetime.date.today().year) / self.visit
-        )
-
     @property
     def num_images(self) -> int:
         return 0

mx_bluesky/hyperion/parameters/gridscan.py

@@ -20,10 +20,12 @@ from mx_bluesky.hyperion.parameters.components import (
     OptionalGonioAngleStarts,
     SplitScan,
     WithOavCentring,
+    WithOptionalEnergyChange,
     WithScan,
     XyzStarts,
 )
 from mx_bluesky.hyperion.parameters.constants import CONST, I03Constants
+from mx_bluesky.hyperion.parameters.robot_load import RobotLoadAndEnergyChange
 
 
 class GridCommon(
@@ -85,6 +87,10 @@ class PinTipCentreThenXrayCentre(GridCommon):
 class RobotLoadThenCentre(GridCommon):
     thawing_time: float = Field(default=CONST.I03.THAWING_TIME)
 
+    def robot_load_params(self):
+        my_params = self.model_dump()
+        return RobotLoadAndEnergyChange(**my_params)
+
     def pin_centre_then_xray_centre_params(self):
         my_params = self.model_dump()
         del my_params["thawing_time"]
@@ -99,11 +105,10 @@ class SpecifiedGridScan(GridCommon, XyzStarts, WithScan):
     ...
 
 
-class ThreeDGridScan(SpecifiedGridScan, SplitScan):
+class ThreeDGridScan(SpecifiedGridScan, SplitScan, WithOptionalEnergyChange):
     """Parameters representing a so-called 3D grid scan, which consists of doing a
     gridscan in X and Y, followed by one in X and Z."""
 
-    demand_energy_ev: float | None = Field(default=None)
     grid1_omega_deg: float = Field(default=CONST.PARAM.GRIDSCAN.OMEGA_1)  # type: ignore
     grid2_omega_deg: float = Field(default=CONST.PARAM.GRIDSCAN.OMEGA_2)
     x_step_size_um: float = Field(default=CONST.PARAM.GRIDSCAN.BOX_WIDTH_UM)

mx_bluesky/hyperion/parameters/load_centre_collect.py

@@ -0,0 +1,50 @@
+from typing import TypeVar
+
+from pydantic import BaseModel, model_validator
+
+from mx_bluesky.hyperion.parameters.components import (
+    HyperionParameters,
+    WithSample,
+    WithVisit,
+)
+from mx_bluesky.hyperion.parameters.gridscan import (
+    RobotLoadThenCentre,
+)
+from mx_bluesky.hyperion.parameters.rotation import MultiRotationScan
+
+T = TypeVar("T", bound=BaseModel)
+
+
+def construct_from_values(parent_context: dict, key: str, t: type[T]) -> T:
+    values = dict(parent_context)
+    values |= values[key]
+    return t(**values)
+
+
+class LoadCentreCollect(HyperionParameters, WithVisit, WithSample):
+    """Experiment parameters to perform the combined robot load,
+    pin-tip centre and rotation scan operations."""
+
+    robot_load_then_centre: RobotLoadThenCentre
+    multi_rotation_scan: MultiRotationScan
+
+    @model_validator(mode="before")
+    @classmethod
+    def validate_model(cls, values):
+        allowed_keys = (
+            LoadCentreCollect.model_fields.keys()
+            | RobotLoadThenCentre.model_fields.keys()
+            | MultiRotationScan.model_fields.keys()
+        )
+        disallowed_keys = values.keys() - allowed_keys
+        assert (
+            disallowed_keys == set()
+        ), f"Unexpected fields found in LoadCentreCollect {disallowed_keys}"
+
+        values["robot_load_then_centre"] = construct_from_values(
+            values, "robot_load_then_centre", RobotLoadThenCentre
+        )
+        values["multi_rotation_scan"] = construct_from_values(
+            values, "multi_rotation_scan", MultiRotationScan
+        )
+        return values

mx_bluesky/hyperion/parameters/robot_load.py

@@ -0,0 +1,16 @@
+from pydantic import Field
+
+from mx_bluesky.hyperion.parameters.components import (
+    HyperionParameters,
+    WithOptionalEnergyChange,
+    WithSample,
+    WithSnapshot,
+    WithVisit,
+)
+from mx_bluesky.hyperion.parameters.constants import CONST
+
+
+class RobotLoadAndEnergyChange(
+    HyperionParameters, WithSample, WithSnapshot, WithOptionalEnergyChange, WithVisit
+):
+    thawing_time: float = Field(default=CONST.I03.THAWING_TIME)

{mx_bluesky-1.1.0.dist-info → mx_bluesky-1.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mx-bluesky
-Version: 1.1.0
+Version: 1.2.0
 Summary: Bluesky tools for MX Beamlines at DLS
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
 License: Apache License
@@ -237,7 +237,7 @@ Requires-Dist: daq-config-server >=0.1.1
 Requires-Dist: ophyd ==1.9.0
 Requires-Dist: ophyd-async >=0.3a5
 Requires-Dist: bluesky >=1.13.0a4
-Requires-Dist: dls-dodal ==1.32.0
+Requires-Dist: dls-dodal ==1.33.0
 Provides-Extra: dev
 Requires-Dist: black ; extra == 'dev'
 Requires-Dist: build ; extra == 'dev'

{mx_bluesky-1.1.0.dist-info → mx_bluesky-1.2.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 mx_bluesky/__init__.py,sha256=twUymKa_5teVCbYPgxRDu87WyQhJa8nMRb8HLTCFJZ8,115
 mx_bluesky/__main__.py,sha256=bmFrxcsN8zGadkDLRnE3qV3-iXJcEWVPp5GNx2rsTJ0,383
-mx_bluesky/_version.py,sha256=CqDGE4B1ZqZ-56mxeOFcXRTmlxrdOh4ayrjbcPjziE4,411
+mx_bluesky/_version.py,sha256=zMnMemknXglcJs59xkicNzeEJTVgYd1omSfLWj76yWw,411
 mx_bluesky/example.py,sha256=_zBoGrKAI1ReOvBz51F9PDorKWQufrb0_ydmoqJ2UAA,478
 mx_bluesky/jupyter_example.ipynb,sha256=wpwvPrBvwtRMS5AIFk8F54cIlUoD0o4ji8tKK5cZHA4,1672
 mx_bluesky/beamlines/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -72,20 +72,22 @@ mx_bluesky/hyperion/device_setup_plans/setup_oav.py,sha256=LkhhcAyiNiTpeHCzW7vbz
 mx_bluesky/hyperion/device_setup_plans/setup_panda.py,sha256=ZnH2hTMR-Q35D0Gu00cwr-aobIRrfRxoQKW3A0j3fk4,7783
 mx_bluesky/hyperion/device_setup_plans/setup_zebra.py,sha256=rzzxU1d3ahe5tIk0h2TULvabKlY57OhrtO4mM8oKyuc,8049
 mx_bluesky/hyperion/device_setup_plans/smargon.py,sha256=sSqrURldwwqPvbS-y7y-9Y1LM6Rq3AO0JgA9cHCPais,788
-mx_bluesky/hyperion/device_setup_plans/utils.py,sha256=Im_9MYCzIv5A9wAVjD5PeIRRqhn3UHZrrmnUgFSX2Eo,1430
+mx_bluesky/hyperion/device_setup_plans/utils.py,sha256=5xuz4SFYfAA14pvYycvw3zQiwUq2_gscn3LiTdKRz8M,1813
 mx_bluesky/hyperion/device_setup_plans/xbpm_feedback.py,sha256=tx9Sl3LMw4r9ls8J8TGf6COz__ISgLjJaEpInzlmnP8,3679
 mx_bluesky/hyperion/experiment_plans/__init__.py,sha256=Tq9XXh8-N4obZMizxi5H1laV-toJQ9olu4K05gMFo8E,936
-mx_bluesky/hyperion/experiment_plans/experiment_registry.py,sha256=bYQtPAVlsS3f4vM57MXIhr_ltTJoMFpn1ZQYtsZ_jvo,2592
-mx_bluesky/hyperion/experiment_plans/flyscan_xray_centre_plan.py,sha256=Dhw5BYh4MU2oby344JGya1qsFSXvipDaxhQcBoqxSCM,18973
+mx_bluesky/hyperion/experiment_plans/experiment_registry.py,sha256=n7A0yK4ftpwB0GoNop4ZM1jcFvdqEQuq6qLabzprLKo,2995
+mx_bluesky/hyperion/experiment_plans/flyscan_xray_centre_plan.py,sha256=mGxz_6rMR3_z9hihP-e_DDtWzMulxdJrgIU2qoWGNEc,19321
 mx_bluesky/hyperion/experiment_plans/grid_detect_then_xray_centre_plan.py,sha256=C03cKIQLyDAeGnI05tW6Z2kzItTIfHL_wlXqd0X8TcM,7186
+mx_bluesky/hyperion/experiment_plans/load_centre_collect_full_plan.py,sha256=vmqqlZANQB9LAl9QgMNmGU3yB624_gMuM7pJlglPOOc,1711
 mx_bluesky/hyperion/experiment_plans/oav_grid_detection_plan.py,sha256=lzkC1mZCuXW_GmGhgWeTjKGTgAP1uqNWlcEpY5_dOgc,6943
 mx_bluesky/hyperion/experiment_plans/oav_snapshot_plan.py,sha256=7OcQ3nm7m-xLdPkct41-HrrQKrs9q_U8qOy80QqhnFg,2821
 mx_bluesky/hyperion/experiment_plans/optimise_attenuation_plan.py,sha256=JZJW3hOzcxFyCEmsMYWWGwA9tAgGgg85nBKxBxKXeX0,16276
 mx_bluesky/hyperion/experiment_plans/pin_centre_then_xray_centre_plan.py,sha256=vV9UOubh2v6clL4LHFSQhqVBGcKPaNVWqK2rDrdPcQI,4146
 mx_bluesky/hyperion/experiment_plans/pin_tip_centring_plan.py,sha256=YcGGckesXe_5NhaIEd0SFOPbtTYkpDKLSi3g7_2d52o,5969
-mx_bluesky/hyperion/experiment_plans/robot_load_then_centre_plan.py,sha256=PKQf5hdaiXWXNL53MYc0289RuDEc0eyBzdCxEWP0m34,10988
+mx_bluesky/hyperion/experiment_plans/robot_load_and_change_energy.py,sha256=jogvdhNYIb5B2dZihPX3EgL_o3iFUYMTNumNWZNRHRI,7802
+mx_bluesky/hyperion/experiment_plans/robot_load_then_centre_plan.py,sha256=lIGqj_ugGUfiS-1eTbO_5Q6MRfhA5QgINbUvY9JMhjI,5422
 mx_bluesky/hyperion/experiment_plans/rotation_scan_plan.py,sha256=iYsLw3nlIlpdccK1EeWH1S7nN1JoINvVxNRfZG52DE4,15802
-mx_bluesky/hyperion/experiment_plans/set_energy_plan.py,sha256=Q5mlujyR0odDkf2BRurFiWhSfEHJtIPqW904EjUOxLA,2011
+mx_bluesky/hyperion/experiment_plans/set_energy_plan.py,sha256=sBCwDxtBb-XzWPIYeIOqjKSeeOmdLzDvDihONA_Qcwg,1729
 mx_bluesky/hyperion/external_interaction/__init__.py,sha256=95DwXDmKsx36RgAL-AtLZl2LQoLPKbzeYdlkkP_4Coc,559
 mx_bluesky/hyperion/external_interaction/config_server.py,sha256=hA5r4v071gkV91F9YPwTVQGLPq3iMb1pjcBEE14Uxh4,1077
 mx_bluesky/hyperion/external_interaction/exceptions.py,sha256=XBDES13VaW9fhxRZYNvSfLC_Mvg4M4RqMseW_u18Mb8,342
@@ -93,15 +95,15 @@ mx_bluesky/hyperion/external_interaction/callbacks/__init__.py,sha256=njGhxi0Qf0
 mx_bluesky/hyperion/external_interaction/callbacks/__main__.py,sha256=Ke_3nKJXOnPu06rq3r9oULoTqgfwfbQYQgt5GDEidYE,4860
 mx_bluesky/hyperion/external_interaction/callbacks/aperture_change_callback.py,sha256=pWd84QldTGLoxPdyqXZk6_SLhvF7O-CQRsiXqWDQEkg,837
 mx_bluesky/hyperion/external_interaction/callbacks/grid_detection_callback.py,sha256=tWtbpdq3dcTpoVpuDIeSAf-naziky38wgMeW6S1Dh7c,2914
-mx_bluesky/hyperion/external_interaction/callbacks/ispyb_callback_base.py,sha256=SQ9FDrQ02BN3YYDU3kNBvZ28louPBMaRVipEb6OQId8,8854
+mx_bluesky/hyperion/external_interaction/callbacks/ispyb_callback_base.py,sha256=ynztJNtM-Njs_kTIFI6aM1YzcX7TK3c_7p4gge2QUCg,8875
 mx_bluesky/hyperion/external_interaction/callbacks/log_uid_tag_callback.py,sha256=MnpHKTwBbI5_xDtm5VK1cSObrfkWBuWP0_OXnU1qQCA,622
 mx_bluesky/hyperion/external_interaction/callbacks/logging_callback.py,sha256=W5jO7uHvi84FmEwVC_wNk93oc3-SJ8pZq61cYS-qalU,708
 mx_bluesky/hyperion/external_interaction/callbacks/plan_reactive_callback.py,sha256=7UtkXZluAag_Mx_JnESd7ODPSN3WrcNCgN8mquIpxjE,4086
 mx_bluesky/hyperion/external_interaction/callbacks/zocalo_callback.py,sha256=Jwf_jFLnC1lRm-WIlZ6ZozbQyw_SHtXK_5HUA5RT7Fw,3960
 mx_bluesky/hyperion/external_interaction/callbacks/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mx_bluesky/hyperion/external_interaction/callbacks/common/callback_util.py,sha256=Db3ZfUPaOFv53umd8b8kVIHOb4Pxugw2hmBGA75yB08,1512
-mx_bluesky/hyperion/external_interaction/callbacks/common/ispyb_mapping.py,sha256=8cgmMDGTNuD8Y-bNWytzBRv8Kjy8lrVO4Mq0dnEtUFE,2797
-mx_bluesky/hyperion/external_interaction/callbacks/robot_load/ispyb_callback.py,sha256=PGM3fFwM0iCOiEiAlSMSkr79TD-M6lSXOocvoA4LsX0,3696
+mx_bluesky/hyperion/external_interaction/callbacks/common/callback_util.py,sha256=CjB3SOITmwv9I7pokwN0pmPomDAri7fJrg7Ww2kpXPo,1981
+mx_bluesky/hyperion/external_interaction/callbacks/common/ispyb_mapping.py,sha256=g7g_YmW3ZqFSN_uIXV-gONoMWS_mrQUdv51vJ2UOe0s,2584
+mx_bluesky/hyperion/external_interaction/callbacks/robot_load/ispyb_callback.py,sha256=R60oJdMwx8l0qqfRoyNrcj7Qg0fL0VU9IDm0YzR8xi0,3580
 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=tYc5B1UN8K_69rRBhx1KjpLv_r6htRJxjG05sAIFKvg,7220
 mx_bluesky/hyperion/external_interaction/callbacks/rotation/ispyb_mapping.py,sha256=gXub8lt04ClC4sU_QGaBW4w3wrH8hJK7Tjy0AY4zf7g,718
@@ -114,23 +116,25 @@ mx_bluesky/hyperion/external_interaction/ispyb/__init__.py,sha256=47DEQpj8HBSa-_
 mx_bluesky/hyperion/external_interaction/ispyb/data_model.py,sha256=7P2Tz3Y9k-vKSGsdk8ppvKg15z1iBGGKbw3RNv_8y-E,2632
 mx_bluesky/hyperion/external_interaction/ispyb/exp_eye_store.py,sha256=ekMaDRkshbC72_hY0VWjaBA5b1vQgUfHoYBW22wEzNw,4487
 mx_bluesky/hyperion/external_interaction/ispyb/ispyb_store.py,sha256=K71lAHoqMBh-ayqFdfafIwRd8AIqnyj6LR6rzk00nl8,10318
-mx_bluesky/hyperion/external_interaction/ispyb/ispyb_utils.py,sha256=WbfYhECi44bgaR0ciF8ME8T-leQ8WoczqiNpGGLRzOU,780
+mx_bluesky/hyperion/external_interaction/ispyb/ispyb_utils.py,sha256=2Vl5qvGoCvbZ-lJFJSSNpTkbE4YfHAhy79jP7Oap6gg,720
 mx_bluesky/hyperion/external_interaction/nexus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/hyperion/external_interaction/nexus/nexus_utils.py,sha256=dVeKUc92TQcO1rpssqTsufwzlIdlHUu2e6zWm4mUYqs,5131
 mx_bluesky/hyperion/external_interaction/nexus/write_nexus.py,sha256=L67UUdauzbXqsf2GJveGT6NP5YxbSzvcD0RjK5zrErI,4136
 mx_bluesky/hyperion/parameters/__init__.py,sha256=kf2wfcILBUBpT0tJ8-W39BywQUkn67yxl9IVsfrr1LE,115
 mx_bluesky/hyperion/parameters/cli.py,sha256=FGzvEB76YnQvBydUMPUNHJuqxvEe7Zc627w7gA2KODY,2125
-mx_bluesky/hyperion/parameters/components.py,sha256=5na3ka5xhPLrQcgVGbkIhZLFPtkEGAA3iPjagC5jqpw,7239
+mx_bluesky/hyperion/parameters/components.py,sha256=ayIH6QLX15Qeebbz5W66kXUpLpH70JuwdF2E3YyjEmE,7171
 mx_bluesky/hyperion/parameters/constants.py,sha256=U21htONRj9Tvr7nyRbnrSyW6SRAADIkS0wLU0A3gvUQ,4458
-mx_bluesky/hyperion/parameters/gridscan.py,sha256=iWKxMPI2piEzC5Hsr2uBzBq7tSndzTpgxPQX9vGPOAw,8107
+mx_bluesky/hyperion/parameters/gridscan.py,sha256=eTBsjMmzRpS5BacbDmRhH4uncLS96EKrMgKQ1u4Chpg,8310
+mx_bluesky/hyperion/parameters/load_centre_collect.py,sha256=Q0TpVoAZeqPvRBayWPacU3wOWdawmlqhB7361xRKVvc,1583
+mx_bluesky/hyperion/parameters/robot_load.py,sha256=nWiFrakYIn55Y9FDM10TN3Leq5TsAVFpDfY59FU3pIw,435
 mx_bluesky/hyperion/parameters/rotation.py,sha256=HP25ZPlM0U7rRsUxUQFvBPs5pI5NWE2PHSlCg3fI_2Y,5602
 mx_bluesky/hyperion/resources/panda/panda-gridscan.yaml,sha256=xrhgok-9X2VXdyLEWiYOUEeRCBqhYM6IJFAefnNdgzw,26521
 mx_bluesky/hyperion/utils/context.py,sha256=TYG3e4lu88ssngoNbsR5pfEXI0DveDemLWaBuThtvbI,2710
 mx_bluesky/hyperion/utils/utils.py,sha256=GoxupsUcAhGg0TmK_KMgGSB2rDDSd8tV5zGGLOfiAKk,731
 mx_bluesky/hyperion/utils/validation.py,sha256=Cw8TDODble039-lqnSUmFu01p9jdgf-bchcTkByRxok,6569
-mx_bluesky-1.1.0.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-mx_bluesky-1.1.0.dist-info/METADATA,sha256=jHAAxwbqoobEvOQmiiceJoRVKYTFZDyjPoJwrWGv92g,17163
-mx_bluesky-1.1.0.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-mx_bluesky-1.1.0.dist-info/entry_points.txt,sha256=Bt3iHCqzZtHYnnSKoh_qM2k3K4LbK1Uxr0gF8B34F98,528
-mx_bluesky-1.1.0.dist-info/top_level.txt,sha256=S4rrzXIUef58ulf_04wn01XGZ3xeJjXs4LPEJ_xoF-I,11
-mx_bluesky-1.1.0.dist-info/RECORD,,
+mx_bluesky-1.2.0.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+mx_bluesky-1.2.0.dist-info/METADATA,sha256=6yz0owOp839jruq_KMLvJ2WlDWnlHZ1pgz7mLenyKKI,17163
+mx_bluesky-1.2.0.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+mx_bluesky-1.2.0.dist-info/entry_points.txt,sha256=Bt3iHCqzZtHYnnSKoh_qM2k3K4LbK1Uxr0gF8B34F98,528
+mx_bluesky-1.2.0.dist-info/top_level.txt,sha256=S4rrzXIUef58ulf_04wn01XGZ3xeJjXs4LPEJ_xoF-I,11
+mx_bluesky-1.2.0.dist-info/RECORD,,