mx-bluesky 1.4.7__py3-none-any.whl → 1.4.9__py3-none-any.whl

mx_bluesky/hyperion/experiment_plans/oav_snapshot_plan.py

@@ -9,8 +9,8 @@ from dodal.devices.oav.oav_detector import OAV
 from dodal.devices.oav.oav_parameters import OAVParameters
 from dodal.devices.smargon import Smargon
 
+from mx_bluesky.common.device_setup_plans.setup_oav import setup_general_oav_params
 from mx_bluesky.common.parameters.components import WithSnapshot
-from mx_bluesky.hyperion.device_setup_plans.setup_oav import setup_general_oav_params
 from mx_bluesky.hyperion.parameters.constants import CONST, DocDescriptorNames
 
 OAV_SNAPSHOT_SETUP_SHOT = "oav_snapshot_setup_shot"
@@ -29,13 +29,16 @@ def setup_beamline_for_OAV(
     backlight: Backlight,
     aperture_scatterguard: ApertureScatterguard,
     group=CONST.WAIT.READY_FOR_OAV,
+    wait=False,
 ):
     max_vel = yield from bps.rd(smargon.omega.max_velocity)
     yield from bps.abs_set(smargon.omega.velocity, max_vel, group=group)
     yield from bps.abs_set(backlight, BacklightPosition.IN, group=group)
     yield from bps.abs_set(
-        aperture_scatterguard, ApertureValue.OUT_OF_BEAM, group=group
+        aperture_scatterguard.selected_aperture, ApertureValue.OUT_OF_BEAM, group=group
     )
+    if wait:
+        yield from bps.wait(group)
 
 
 def oav_snapshot_plan(
@@ -45,9 +48,12 @@ def oav_snapshot_plan(
 ) -> MsgGenerator:
     if not parameters.take_snapshots:
         return
-    yield from _setup_oav(composite, parameters, oav_parameters)
-    for omega in parameters.snapshot_omegas_deg or []:
-        yield from _take_oav_snapshot(composite, omega)
+    if parameters.use_grid_snapshots:
+        yield from _generate_oav_snapshots(composite, parameters)
+    else:
+        yield from _setup_oav(composite, parameters, oav_parameters)
+        for omega in parameters.snapshot_omegas_deg or []:
+            yield from _take_oav_snapshot(composite, omega)
 
 
 def _setup_oav(
@@ -62,12 +68,24 @@ def _setup_oav(
     )
 
 
+def _generate_oav_snapshots(composite: OavSnapshotComposite, params: WithSnapshot):
+    """Generate rotation snapshots from previously captured grid snapshots"""
+    yield from bps.abs_set(
+        composite.oav.snapshot.directory, str(params.snapshot_directory)
+    )
+    for _ in 0, 270:
+        yield from bps.create(DocDescriptorNames.OAV_ROTATION_SNAPSHOT_TRIGGERED)
+        yield from bps.read(composite.oav)
+        yield from bps.read(composite.smargon)
+        yield from bps.save()
+
+
 def _take_oav_snapshot(composite: OavSnapshotComposite, omega: float):
+    """Create new snapshots by triggering the OAV"""
     yield from bps.abs_set(
         composite.smargon.omega, omega, group=OAV_SNAPSHOT_SETUP_SHOT
     )
-    time_now = datetime.now()
-    filename = f"{time_now.strftime('%H%M%S%f')[:8]}_oav_snapshot_{omega:.0f}"
+    filename = _snapshot_filename(omega)
     yield from bps.abs_set(
         composite.oav.snapshot.filename,
         filename,
@@ -78,3 +96,9 @@ def _take_oav_snapshot(composite: OavSnapshotComposite, omega: float):
     yield from bps.create(DocDescriptorNames.OAV_ROTATION_SNAPSHOT_TRIGGERED)
     yield from bps.read(composite.oav)
     yield from bps.save()
+
+
+def _snapshot_filename(omega):
+    time_now = datetime.now()
+    filename = f"{time_now.strftime('%H%M%S%f')[:8]}_oav_snapshot_{omega:.0f}"
+    return filename

mx_bluesky/hyperion/experiment_plans/pin_centre_then_xray_centre_plan.py

@@ -8,6 +8,10 @@ from bluesky.utils import MsgGenerator
 from dodal.devices.eiger import EigerDetector
 from dodal.devices.oav.oav_parameters import OAVParameters
 
+from mx_bluesky.common.device_setup_plans.manipulate_sample import move_phi_chi_omega
+from mx_bluesky.common.experiment_plans.change_aperture_then_move_plan import (
+    change_aperture_then_move_to_xtal,
+)
 from mx_bluesky.common.external_interaction.callbacks.xray_centre.ispyb_callback import (
     ispyb_activation_wrapper,
 )
@@ -15,13 +19,9 @@ from mx_bluesky.common.parameters.constants import OavConstants
 from mx_bluesky.common.utils.context import device_composite_from_context
 from mx_bluesky.common.utils.log import LOGGER
 from mx_bluesky.common.xrc_result import XRayCentreEventHandler
-from mx_bluesky.hyperion.device_setup_plans.manipulate_sample import move_phi_chi_omega
 from mx_bluesky.hyperion.device_setup_plans.utils import (
     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.grid_detect_then_xray_centre_plan import (
     GridDetectThenXRayCentreComposite,
     detect_grid_and_do_gridscan,

mx_bluesky/hyperion/experiment_plans/pin_tip_centring_plan.py

@@ -16,10 +16,10 @@ from dodal.devices.oav.utils import (
 )
 from dodal.devices.smargon import Smargon
 
+from mx_bluesky.common.device_setup_plans.setup_oav import pre_centring_setup_oav
 from mx_bluesky.common.utils.context import device_composite_from_context
 from mx_bluesky.common.utils.exceptions import SampleException, catch_exception_and_warn
 from mx_bluesky.common.utils.log import LOGGER
-from mx_bluesky.hyperion.device_setup_plans.setup_oav import pre_centring_setup_oav
 from mx_bluesky.hyperion.device_setup_plans.smargon import (
     move_smargon_warn_on_out_of_range,
 )

mx_bluesky/hyperion/experiment_plans/robot_load_and_change_energy.py

@@ -12,14 +12,15 @@ from blueapi.core import BlueskyContext
 from bluesky.utils import Msg
 from dodal.devices.aperturescatterguard import ApertureScatterguard, ApertureValue
 from dodal.devices.attenuator.attenuator import BinaryFilterAttenuator
-from dodal.devices.dcm import DCM
+from dodal.devices.backlight import Backlight, BacklightPosition
 from dodal.devices.focusing_mirror import FocusingMirrorWithStripes, MirrorVoltages
+from dodal.devices.i03.dcm import DCM
+from dodal.devices.i03.undulator_dcm import UndulatorDCM
 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.smargon import CombinedMove, 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.plan_stubs.motor_utils import MoveTooLarge, home_and_reset_wrapper
@@ -51,6 +52,7 @@ class RobotLoadAndEnergyChangeComposite:
     oav: OAV
     smargon: Smargon
     aperture_scatterguard: ApertureScatterguard
+    backlight: Backlight
 
 
 def create_devices(context: BlueskyContext) -> RobotLoadAndEnergyChangeComposite:
@@ -95,21 +97,14 @@ def prepare_for_robot_load(
     aperture_scatterguard: ApertureScatterguard, smargon: Smargon
 ):
     yield from bps.abs_set(
-        aperture_scatterguard, ApertureValue.OUT_OF_BEAM, group="prepare_robot_load"
+        aperture_scatterguard.selected_aperture,
+        ApertureValue.OUT_OF_BEAM,
+        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.mv(smargon, CombinedMove(x=0, y=0, z=0, chi=0, phi=0, omega=0))
 
     yield from bps.wait("prepare_robot_load")
 
@@ -166,6 +161,8 @@ def robot_load_and_snapshots(
     thawing_time: float,
     demand_energy_ev: float | None,
 ):
+    yield from bps.abs_set(composite.backlight, BacklightPosition.IN, group="snapshot")
+
     robot_load_plan = do_robot_load(
         composite,
         location,
@@ -189,6 +186,8 @@ def robot_load_and_snapshots(
         except_plan=raise_exception_if_moved_out_of_cryojet,
     )
 
+    yield from bps.wait(group="snapshot")
+
     yield from take_robot_snapshots(composite.oav, composite.webcam, snapshot_directory)
 
     yield from bps.create(name=CONST.DESCRIPTORS.ROBOT_LOAD)

mx_bluesky/hyperion/experiment_plans/robot_load_then_centre_plan.py

@@ -10,13 +10,14 @@ from bluesky.utils import MsgGenerator
 from dodal.devices.aperturescatterguard import ApertureScatterguard
 from dodal.devices.attenuator.attenuator import BinaryFilterAttenuator
 from dodal.devices.backlight import Backlight
-from dodal.devices.dcm import DCM
 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, MirrorVoltages
-from dodal.devices.i03.beamstop import Beamstop
+from dodal.devices.i03 import Beamstop
+from dodal.devices.i03.dcm import DCM
+from dodal.devices.i03.undulator_dcm import UndulatorDCM
 from dodal.devices.motors import XYZPositioner
 from dodal.devices.oav.oav_detector import OAV
 from dodal.devices.oav.pin_image_recognition import PinTipDetection
@@ -26,7 +27,6 @@ from dodal.devices.smargon import Smargon
 from dodal.devices.synchrotron import Synchrotron
 from dodal.devices.thawer import Thawer
 from dodal.devices.undulator import Undulator
-from dodal.devices.undulator_dcm import UndulatorDCM
 from dodal.devices.webcam import Webcam
 from dodal.devices.xbpm_feedback import XBPMFeedback
 from dodal.devices.zebra.zebra import Zebra
@@ -112,6 +112,7 @@ def _flyscan_plan_from_robot_load_params(
     yield from pin_centre_then_flyscan_plan(
         cast(GridDetectThenXRayCentreComposite, composite),
         params.pin_centre_then_xray_centre_params,
+        oav_config_file,
     )
 
 
@@ -131,6 +132,7 @@ def _robot_load_then_flyscan_plan(
 def robot_load_then_xray_centre(
     composite: RobotLoadThenCentreComposite,
     parameters: RobotLoadThenCentre,
+    oav_config_file: str = OavConstants.OAV_CONFIG_JSON,
 ) -> MsgGenerator:
     """Perform pin-tip detection followed by a flyscan to determine centres of interest.
     Performs a robot load if necessary."""
@@ -154,10 +156,7 @@ def robot_load_then_xray_centre(
 
     if doing_sample_load:
         LOGGER.info("Pin not loaded, loading and centring")
-        plan = _robot_load_then_flyscan_plan(
-            composite,
-            parameters,
-        )
+        plan = _robot_load_then_flyscan_plan(composite, parameters, oav_config_file)
     else:
         # Robot load normally sets the energy so we should do this explicitly if no load is
         # being done
@@ -168,7 +167,9 @@ def robot_load_then_xray_centre(
         )
 
         if doing_chi_change:
-            plan = _flyscan_plan_from_robot_load_params(composite, parameters)
+            plan = _flyscan_plan_from_robot_load_params(
+                composite, parameters, oav_config_file
+            )
             LOGGER.info("Pin already loaded but chi changed so centring")
         else:
             LOGGER.info("Pin already loaded and chi not changed so doing nothing")

mx_bluesky/hyperion/experiment_plans/rotation_scan_plan.py

@@ -10,16 +10,16 @@ from bluesky.utils import MsgGenerator
 from dodal.devices.aperturescatterguard import ApertureScatterguard
 from dodal.devices.attenuator.attenuator import BinaryFilterAttenuator
 from dodal.devices.backlight import Backlight
-from dodal.devices.dcm import DCM
 from dodal.devices.detector.detector_motion import DetectorMotion
 from dodal.devices.eiger import EigerDetector
 from dodal.devices.flux import Flux
-from dodal.devices.i03.beamstop import Beamstop
+from dodal.devices.i03 import Beamstop
+from dodal.devices.i03.dcm import DCM
 from dodal.devices.oav.oav_detector import OAV
 from dodal.devices.oav.oav_parameters import OAVParameters
 from dodal.devices.robot import BartRobot
 from dodal.devices.s4_slit_gaps import S4SlitGaps
-from dodal.devices.smargon import Smargon
+from dodal.devices.smargon import CombinedMove, Smargon
 from dodal.devices.synchrotron import Synchrotron
 from dodal.devices.undulator import Undulator
 from dodal.devices.xbpm_feedback import XBPMFeedback
@@ -30,6 +30,10 @@ from dodal.plans.preprocessors.verify_undulator_gap import (
     verify_undulator_gap_before_run_decorator,
 )
 
+from mx_bluesky.common.device_setup_plans.manipulate_sample import (
+    cleanup_sample_environment,
+    setup_sample_environment,
+)
 from mx_bluesky.common.parameters.components import WithSnapshot
 from mx_bluesky.common.plans.read_hardware import (
     read_hardware_for_zocalo,
@@ -41,12 +45,6 @@ from mx_bluesky.common.preprocessors.preprocessors import (
 )
 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.manipulate_sample import (
-    cleanup_sample_environment,
-    move_phi_chi_omega,
-    move_x_y_z,
-    setup_sample_environment,
-)
 from mx_bluesky.hyperion.device_setup_plans.setup_zebra import (
     arm_zebra,
     setup_zebra_for_rotation,
@@ -62,8 +60,8 @@ from mx_bluesky.hyperion.experiment_plans.oav_snapshot_plan import (
 )
 from mx_bluesky.hyperion.parameters.constants import CONST
 from mx_bluesky.hyperion.parameters.rotation import (
-    MultiRotationScan,
     RotationScan,
+    SingleRotationScan,
 )
 
 
@@ -118,7 +116,7 @@ class RotationMotionProfile:
 
 
 def calculate_motion_profile(
-    params: RotationScan,
+    params: SingleRotationScan,
     motor_time_to_speed_s: float,
     max_velocity_deg_s: float,
 ) -> RotationMotionProfile:
@@ -212,7 +210,7 @@ def calculate_motion_profile(
 
 def rotation_scan_plan(
     composite: RotationScanComposite,
-    params: RotationScan,
+    params: SingleRotationScan,
     motion_values: RotationMotionProfile,
 ):
     """A stub plan to collect diffraction images from a sample continuously rotating
@@ -319,7 +317,7 @@ def _cleanup_plan(composite: RotationScanComposite, **kwargs):
 
 def _move_and_rotation(
     composite: RotationScanComposite,
-    params: RotationScan,
+    params: SingleRotationScan,
     oav_params: OAVParameters,
 ):
     motor_time_to_speed = yield from bps.rd(composite.smargon.omega.acceleration_time)
@@ -330,19 +328,18 @@ def _move_and_rotation(
         return num / 1000 if num else num
 
     LOGGER.info("moving to position (if specified)")
-    yield from move_x_y_z(
-        composite.smargon,
-        _div_by_1000_if_not_none(params.x_start_um),
-        _div_by_1000_if_not_none(params.y_start_um),
-        _div_by_1000_if_not_none(params.z_start_um),
-        group=CONST.WAIT.MOVE_GONIO_TO_START,
-    )
-    yield from move_phi_chi_omega(
+    yield from bps.abs_set(
         composite.smargon,
-        params.phi_start_deg,
-        params.chi_start_deg,
+        CombinedMove(
+            x=_div_by_1000_if_not_none(params.x_start_um),
+            y=_div_by_1000_if_not_none(params.y_start_um),
+            z=_div_by_1000_if_not_none(params.z_start_um),
+            phi=params.phi_start_deg,
+            chi=params.chi_start_deg,
+        ),
         group=CONST.WAIT.MOVE_GONIO_TO_START,
     )
+
     if params.take_snapshots:
         yield from bps.wait(CONST.WAIT.MOVE_GONIO_TO_START)
         yield from setup_beamline_for_OAV(
@@ -356,11 +353,7 @@ def _move_and_rotation(
                 group=CONST.WAIT.ROTATION_READY_FOR_DC,
             )
         yield from oav_snapshot_plan(composite, params, oav_params)
-    yield from rotation_scan_plan(
-        composite,
-        params,
-        motion_values,
-    )
+    yield from rotation_scan_plan(composite, params, motion_values)
 
 
 def rotation_scan(
@@ -368,58 +361,24 @@ def rotation_scan(
     parameters: RotationScan,
     oav_params: OAVParameters | None = None,
 ) -> MsgGenerator:
-    parameters.features.update_self_from_server()
-
-    if not oav_params:
-        oav_params = OAVParameters(context="xrayCentring")
-
-    @transmission_and_xbpm_feedback_for_collection_decorator(
-        composite,
-        parameters.transmission_frac,
-    )
-    @verify_undulator_gap_before_run_decorator(composite)
-    @bpp.set_run_key_decorator("rotation_scan")
-    @bpp.run_decorator(  # attach experiment metadata to the start document
+    @bpp.set_run_key_decorator(CONST.PLAN.ROTATION_MULTI_OUTER)
+    @bpp.run_decorator(
         md={
-            "subplan_name": CONST.PLAN.ROTATION_OUTER,
-            "mx_bluesky_parameters": parameters.model_dump_json(),
+            "activate_callbacks": ["BeamDrawingCallback"],
             "with_snapshot": parameters.model_dump_json(
                 include=WithSnapshot.model_fields.keys()  # type: ignore
             ),
-            "activate_callbacks": [
-                "BeamDrawingCallback",
-                "RotationISPyBCallback",
-                "RotationNexusFileCallback",
-            ],
         }
     )
-    def rotation_scan_plan_with_stage_and_cleanup(
-        params: RotationScan,
-    ):
-        eiger: EigerDetector = composite.eiger
-        eiger.set_detector_parameters(params.detector_params)
-
-        @bpp.finalize_decorator(lambda: _cleanup_plan(composite))
-        def rotation_with_cleanup_and_stage(params: RotationScan):
-            yield from _move_and_rotation(composite, params, oav_params)
-
-        LOGGER.info("setting up and staging eiger...")
-        yield from start_preparing_data_collection_then_do_plan(
-            composite.beamstop,
-            eiger,
-            composite.detector_motion,
-            params.detector_distance_mm,
-            rotation_with_cleanup_and_stage(params),
-            group=CONST.WAIT.ROTATION_READY_FOR_DC,
-        )
-        yield from bps.unstage(eiger)
+    def _wrapped_rotation_scan():
+        yield from rotation_scan_internal(composite, parameters, oav_params)
 
-    yield from rotation_scan_plan_with_stage_and_cleanup(parameters)
+    yield from _wrapped_rotation_scan()
 
 
-def multi_rotation_scan(
+def rotation_scan_internal(
     composite: RotationScanComposite,
-    parameters: MultiRotationScan,
+    parameters: RotationScan,
     oav_params: OAVParameters | None = None,
 ) -> MsgGenerator:
     parameters.features.update_self_from_server()
@@ -457,7 +416,7 @@ def multi_rotation_scan(
                 }
             )
             def rotation_scan_core(
-                params: RotationScan,
+                params: SingleRotationScan,
             ):
                 yield from _move_and_rotation(composite, params, oav_params)
 

mx_bluesky/hyperion/experiment_plans/set_energy_plan.py

@@ -9,10 +9,10 @@ import bluesky.preprocessors as bpp
 import pydantic
 from bluesky import plan_stubs as bps
 from dodal.devices.attenuator.attenuator import BinaryFilterAttenuator
-from dodal.devices.dcm import DCM
 from dodal.devices.focusing_mirror import FocusingMirrorWithStripes, MirrorVoltages
+from dodal.devices.i03.dcm import DCM
+from dodal.devices.i03.undulator_dcm import UndulatorDCM
 from dodal.devices.undulator import Undulator
-from dodal.devices.undulator_dcm import UndulatorDCM
 from dodal.devices.xbpm_feedback import XBPMFeedback
 
 from mx_bluesky.common.parameters.constants import PlanNameConstants

mx_bluesky/hyperion/external_interaction/agamemnon.py

@@ -1,6 +1,8 @@
 import dataclasses
 import json
 import re
+import traceback
+from collections.abc import Sequence
 from os import path
 from typing import Any, TypeVar
 
@@ -12,11 +14,6 @@ from pydantic_extra_types.semantic_version import SemanticVersion
 
 from mx_bluesky.common.parameters.components import (
     PARAMETER_VERSION,
-    MxBlueskyParameters,
-    TopNByMaxCountSelection,
-    WithCentreSelection,
-    WithOptionalEnergyChange,
-    WithSample,
     WithVisit,
 )
 from mx_bluesky.common.parameters.constants import (
@@ -24,9 +21,7 @@ from mx_bluesky.common.parameters.constants import (
 )
 from mx_bluesky.common.utils.log import LOGGER
 from mx_bluesky.common.utils.utils import convert_angstrom_to_eV
-from mx_bluesky.hyperion.parameters.components import WithHyperionUDCFeatures
 from mx_bluesky.hyperion.parameters.load_centre_collect import LoadCentreCollect
-from mx_bluesky.hyperion.parameters.robot_load import RobotLoadThenCentre
 
 T = TypeVar("T", bound=WithVisit)
 AGAMEMNON_URL = "http://agamemnon.diamond.ac.uk/"
@@ -36,19 +31,6 @@ MULTIPIN_REGEX = rf"^{MULTIPIN_PREFIX}_(\d+)x(\d+(?:\.\d+)?)\+(\d+(?:\.\d+)?)$"
 MX_GENERAL_ROOT_REGEX = r"^/dls/(?P<beamline>[^/]+)/data/[^/]*/(?P<visit>[^/]+)(?:/|$)"
 
 
-class AgamemnonLoadCentreCollect(
-    MxBlueskyParameters,
-    WithVisit,
-    WithSample,
-    WithCentreSelection,
-    WithHyperionUDCFeatures,
-    WithOptionalEnergyChange,
-):
-    """Experiment parameters to compare against GDA populated LoadCentreCollect."""
-
-    robot_load_then_centre: RobotLoadThenCentre
-
-
 @dataclasses.dataclass
 class PinType:
     expected_number_of_crystals: int
@@ -131,15 +113,6 @@ def get_withvisit_parameters_from_agamemnon(parameters: dict) -> tuple:
     )
 
 
-def get_withsample_parameters_from_agamemnon(parameters: dict) -> dict[str, Any]:
-    assert parameters.get("sample"), "instruction does not have a sample"
-    return {
-        "sample_id": parameters["sample"]["id"],
-        "sample_puck": parameters["sample"]["container"],
-        "sample_pin": parameters["sample"]["position"],
-    }
-
-
 def get_withenergy_parameters_from_agamemnon(parameters: dict) -> dict[str, Any]:
     try:
         first_collection: dict = parameters["collection"][0]
@@ -155,69 +128,94 @@ def get_param_version() -> SemanticVersion:
     return SemanticVersion.validate_from_str(str(PARAMETER_VERSION))
 
 
-def create_robot_load_then_centre_params_from_agamemnon(
-    parameters: dict,
-) -> RobotLoadThenCentre:
-    visit, detector_distance = get_withvisit_parameters_from_agamemnon(parameters)
-    with_sample_params = get_withsample_parameters_from_agamemnon(parameters)
-    with_energy_params = get_withenergy_parameters_from_agamemnon(parameters)
-    visit_directory, file_name = path.split(parameters["prefix"])
-    return RobotLoadThenCentre(
-        parameter_model_version=get_param_version(),
-        storage_directory=visit_directory + "/xraycentring",
-        visit=visit,
-        detector_distance_mm=detector_distance,
-        snapshot_directory=visit_directory + "/snapshots",
-        file_name=file_name,
-        **with_energy_params,
-        **with_sample_params,
-    )
-
-
-def populate_parameters_from_agamemnon(agamemnon_params):
+def populate_parameters_from_agamemnon(agamemnon_params) -> Sequence[LoadCentreCollect]:
     visit, detector_distance = get_withvisit_parameters_from_agamemnon(agamemnon_params)
-    with_sample_params = get_withsample_parameters_from_agamemnon(agamemnon_params)
     with_energy_params = get_withenergy_parameters_from_agamemnon(agamemnon_params)
     pin_type = get_pin_type_from_agamemnon_parameters(agamemnon_params)
-    robot_load_params = create_robot_load_then_centre_params_from_agamemnon(
-        agamemnon_params
-    )
-    return AgamemnonLoadCentreCollect(
-        parameter_model_version=SemanticVersion.validate_from_str(
-            str(PARAMETER_VERSION)
-        ),
-        visit=visit,
-        detector_distance_mm=detector_distance,
-        select_centres=TopNByMaxCountSelection(n=pin_type.expected_number_of_crystals),
-        robot_load_then_centre=robot_load_params,
-        **with_sample_params,
-        **with_energy_params,
-    )
+    collections = agamemnon_params["collection"]
+    visit_directory, file_name = path.split(agamemnon_params["prefix"])
+
+    return [
+        LoadCentreCollect.model_validate(
+            {
+                "parameter_model_version": get_param_version(),
+                "visit": visit,
+                "detector_distance_mm": detector_distance,
+                "sample_id": agamemnon_params["sample"]["id"],
+                "sample_puck": agamemnon_params["sample"]["container"],
+                "sample_pin": agamemnon_params["sample"]["position"],
+                "select_centres": {
+                    "name": "TopNByMaxCount",
+                    "n": pin_type.expected_number_of_crystals,
+                },
+                "robot_load_then_centre": {
+                    "storage_directory": str(visit_directory) + "/xraycentring",
+                    "file_name": file_name,
+                    "tip_offset_um": pin_type.full_width / 2,
+                    "grid_width_um": pin_type.full_width,
+                    "omega_start_deg": 0.0,
+                    "chi_start_deg": collection["chi"],
+                    "transmission_frac": 1.0,
+                    "features": {"use_gpu_results": True},
+                    **with_energy_params,
+                },
+                "multi_rotation_scan": {
+                    "comment": collection["comment"],
+                    "storage_directory": str(visit_directory),
+                    "exposure_time_s": collection["exposure_time"],
+                    "file_name": file_name,
+                    "transmission_frac": collection["transmission"],
+                    "rotation_increment_deg": collection["omega_increment"],
+                    "ispyb_experiment_type": collection["experiment_type"],
+                    "snapshot_omegas_deg": [0.0, 90.0, 180.0, 270.0],
+                    "rotation_scans": [
+                        {
+                            "scan_width_deg": (
+                                collection["number_of_images"]
+                                * collection["omega_increment"]
+                            ),
+                            "omega_start_deg": collection["omega_start"],
+                            "phi_start_deg": collection["phi_start"],
+                            "chi_start_deg": collection["chi"],
+                            "rotation_direction": "Positive",
+                        }
+                    ],
+                    **with_energy_params,
+                },
+            }
+        )
+        for collection in collections
+    ]
 
 
-def create_parameters_from_agamemnon() -> AgamemnonLoadCentreCollect:
+def create_parameters_from_agamemnon() -> Sequence[LoadCentreCollect]:
     beamline_name = get_beamline_name("i03")
     agamemnon_params = get_next_instruction(beamline_name)
-
-    return populate_parameters_from_agamemnon(agamemnon_params)
+    return (
+        populate_parameters_from_agamemnon(agamemnon_params) if agamemnon_params else []
+    )
 
 
-def compare_params(load_centre_collect_params):
+def compare_params(load_centre_collect_params: LoadCentreCollect):
     try:
-        parameters = create_parameters_from_agamemnon()
-
+        lcc_requests = create_parameters_from_agamemnon()
         # Log differences against GDA populated parameters
-        differences = DeepDiff(
-            parameters, load_centre_collect_params, math_epsilon=1e-5
-        )
-        if differences:
-            LOGGER.info(
-                f"Different parameters found when directly reading from Hyperion: {differences}"
+        if not lcc_requests:
+            LOGGER.info("Agamemnon returned no instructions")
+        else:
+            differences = DeepDiff(
+                lcc_requests[0], load_centre_collect_params, math_epsilon=1e-5
             )
-    except (ValueError, KeyError) as e:
-        LOGGER.warning(f"Failed to compare parameters: {e}")
-    except Exception as e:
-        LOGGER.warning(f"Unexpected error occurred. Failed to compare parameters: {e}")
+            if differences:
+                LOGGER.info(
+                    f"Different parameters found when directly reading from Hyperion: {differences}"
+                )
+    except (ValueError, KeyError):
+        LOGGER.warning(f"Failed to compare parameters: {traceback.format_exc()}")
+    except Exception:
+        LOGGER.warning(
+            f"Unexpected error occurred. Failed to compare parameters: {traceback.format_exc()}"
+        )
 
 
 def update_params_from_agamemnon(parameters: T) -> T: