mx-bluesky 1.4.1a0__py3-none-any.whl → 1.4.3__py3-none-any.whl

mx_bluesky/hyperion/experiment_plans/optimise_attenuation_plan.py

@@ -5,11 +5,11 @@ import bluesky.preprocessors as bpp
 import numpy as np
 import pydantic
 from blueapi.core import BlueskyContext
-from dodal.devices.attenuator import Attenuator
+from dodal.devices.attenuator.attenuator import BinaryFilterAttenuator
 from dodal.devices.xspress3.xspress3 import Xspress3
-from dodal.devices.zebra_controlled_shutter import ZebraShutter, ZebraShutterState
+from dodal.devices.zebra.zebra_controlled_shutter import ZebraShutter, ZebraShutterState
 
-from mx_bluesky.hyperion.log import LOGGER
+from mx_bluesky.common.utils.log import LOGGER
 from mx_bluesky.hyperion.utils.context import device_composite_from_context
 
 
@@ -26,7 +26,7 @@ class Direction(Enum):
 class OptimizeAttenuationComposite:
     """All devices which are directly or indirectly required by this plan"""
 
-    attenuator: Attenuator
+    attenuator: BinaryFilterAttenuator
     sample_shutter: ZebraShutter
     xspress3mini: Xspress3
 
@@ -197,11 +197,7 @@ def deadtime_optimisation(
     cycles to complete.
 
     Args:
-        attenuator: (Attenuator) Ophyd device
-
-        xspress3mini: (Xspress3Mini) Ophyd device
-
-        sample_shutter: (ZebraShutter) Ophyd_async device for the fast shutter
+        composite: (OptimizeAttenuationComposite) Devices required to optimise attenuation
 
         transmission: (float)
         The initial transmission value to use for the optimising
@@ -302,11 +298,7 @@ def total_counts_optimisation(
     defined by the lower and upper limit. To protect the sample, the transmission has a maximum value of 10%.
 
     Args:
-        attenuator: (Attenuator) Ophyd device
-
-        xspress3mini: (Xspress3Mini) Ophyd device
-
-        sample_shutter: (ZebraShutter) Ophyd_async device for the fast shutter
+        composite: (OptimizeAttenuationComposite) Devices required to optimise attenuation
 
         transmission: (float)
         The initial transmission value to use for the optimising

mx_bluesky/hyperion/experiment_plans/pin_centre_then_xray_centre_plan.py

@@ -8,11 +8,11 @@ from bluesky.utils import MsgGenerator
 from dodal.devices.eiger import EigerDetector
 from dodal.devices.oav.oav_parameters import OAVParameters
 
-from mx_bluesky.common.parameters.constants import OavConstants
-from mx_bluesky.common.parameters.gridscan import (
-    GridScanWithEdgeDetect,
-    PinTipCentreThenXrayCentre,
+from mx_bluesky.common.external_interaction.callbacks.xray_centre.ispyb_callback import (
+    ispyb_activation_wrapper,
 )
+from mx_bluesky.common.parameters.constants import OavConstants
+from mx_bluesky.common.utils.log import LOGGER
 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,
@@ -34,11 +34,11 @@ from mx_bluesky.hyperion.experiment_plans.pin_tip_centring_plan import (
     PinTipCentringComposite,
     pin_tip_centre_plan,
 )
-from mx_bluesky.hyperion.external_interaction.callbacks.xray_centre.ispyb_callback import (
-    ispyb_activation_wrapper,
-)
-from mx_bluesky.hyperion.log import LOGGER
 from mx_bluesky.hyperion.parameters.constants import CONST
+from mx_bluesky.hyperion.parameters.gridscan import (
+    GridScanWithEdgeDetect,
+    PinTipCentreThenXrayCentre,
+)
 from mx_bluesky.hyperion.utils.context import device_composite_from_context
 
 
@@ -121,6 +121,7 @@ def pin_tip_centre_then_xray_centre(
     @bpp.subs_decorator(flyscan_event_handler)
     def pin_centre_flyscan_then_fetch_results() -> MsgGenerator:
         yield from start_preparing_data_collection_then_do_plan(
+            composite.beamstop,
             eiger,
             composite.detector_motion,
             parameters.detector_params.detector_distance,
@@ -130,9 +131,9 @@ def pin_tip_centre_then_xray_centre(
 
     yield from pin_centre_flyscan_then_fetch_results()
     flyscan_results = flyscan_event_handler.xray_centre_results
-    assert (
-        flyscan_results
-    ), "Flyscan result event not received or no crystal found and exception not raised"
+    assert flyscan_results, (
+        "Flyscan result event not received or no crystal found and exception not raised"
+    )
     yield from change_aperture_then_move_to_xtal(
         flyscan_results[0], composite.smargon, composite.aperture_scatterguard
     )

mx_bluesky/hyperion/experiment_plans/pin_tip_centring_plan.py

@@ -15,12 +15,12 @@ from dodal.devices.oav.utils import (
 )
 from dodal.devices.smargon import Smargon
 
+from mx_bluesky.common.utils.exceptions import SampleException
+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,
 )
-from mx_bluesky.hyperion.exceptions import WarningException
-from mx_bluesky.hyperion.log import LOGGER
 from mx_bluesky.hyperion.parameters.constants import CONST
 from mx_bluesky.hyperion.utils.context import device_composite_from_context
 
@@ -68,7 +68,7 @@ def move_pin_into_view(
         max_steps (int, optional): The number of steps to search with. Defaults to 2.
 
     Raises:
-        WarningException: Error if the pin tip is never found
+        SampleException: Error if the pin tip is never found
 
     Returns:
         Tuple[int, int]: The location of the pin tip in pixels
@@ -105,7 +105,7 @@ def move_pin_into_view(
     tip_xy_px = yield from trigger_and_return_pin_tip(pin_tip_device)
 
     if not pin_tip_valid(tip_xy_px):
-        raise WarningException(
+        raise SampleException(
             "Pin tip centring failed - pin too long/short/bent and out of range"
         )
     else:

mx_bluesky/hyperion/experiment_plans/robot_load_and_change_energy.py

@@ -10,8 +10,8 @@ import bluesky.preprocessors as bpp
 import pydantic
 from blueapi.core import BlueskyContext
 from bluesky.utils import Msg
-from dodal.devices.aperturescatterguard import ApertureScatterguard
-from dodal.devices.attenuator import Attenuator
+from dodal.devices.aperturescatterguard import ApertureScatterguard, ApertureValue
+from dodal.devices.attenuator.attenuator import BinaryFilterAttenuator
 from dodal.devices.dcm import DCM
 from dodal.devices.focusing_mirror import FocusingMirrorWithStripes, MirrorVoltages
 from dodal.devices.motors import XYZPositioner
@@ -24,13 +24,13 @@ 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
 
-from mx_bluesky.common.parameters.robot_load import RobotLoadAndEnergyChange
+from mx_bluesky.common.utils.log import LOGGER
 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
 
 
 @pydantic.dataclasses.dataclass(config={"arbitrary_types_allowed": True})
@@ -41,7 +41,7 @@ class RobotLoadAndEnergyChangeComposite:
     dcm: DCM
     undulator_dcm: UndulatorDCM
     xbpm_feedback: XBPMFeedback
-    attenuator: Attenuator
+    attenuator: BinaryFilterAttenuator
 
     # RobotLoad fields
     robot: BartRobot
@@ -94,7 +94,11 @@ def take_robot_snapshots(oav: OAV, webcam: Webcam, directory: Path):
 def prepare_for_robot_load(
     aperture_scatterguard: ApertureScatterguard, smargon: Smargon
 ):
-    yield from bps.trigger(aperture_scatterguard.move_out, group="prepare_robot_load")
+    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)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
 
@@ -118,17 +122,18 @@ def do_robot_load(
     demand_energy_ev: float | None,
     thawing_time: float,
 ):
+    error_code = yield from bps.rd(composite.robot.error_code)
+    # Reset robot if light curtains were tripped
+    if error_code == 40:
+        yield from bps.trigger(composite.robot.reset, wait=True)
+
     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 set_energy_plan(demand_energy_ev, cast(SetEnergyComposite, composite))
 
     yield from bps.wait("robot_load")
 
@@ -214,24 +219,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,13 +1,15 @@
 from __future__ import annotations
 
+from math import isclose
 from typing import cast
 
 import bluesky.preprocessors as bpp
 import pydantic
 from blueapi.core import BlueskyContext
+from bluesky import plan_stubs as bps
 from bluesky.utils import MsgGenerator
 from dodal.devices.aperturescatterguard import ApertureScatterguard
-from dodal.devices.attenuator import Attenuator
+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
@@ -15,6 +17,7 @@ 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.motors import XYZPositioner
 from dodal.devices.oav.oav_detector import OAV
 from dodal.devices.oav.pin_image_recognition import PinTipDetection
@@ -27,14 +30,13 @@ 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 import Zebra
-from dodal.devices.zebra_controlled_shutter import ZebraShutter
+from dodal.devices.zebra.zebra import Zebra
+from dodal.devices.zebra.zebra_controlled_shutter import ZebraShutter
 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,
@@ -56,14 +58,19 @@ from mx_bluesky.hyperion.experiment_plans.robot_load_and_change_energy import (
     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.robot_load import RobotLoadThenCentre
 
 
 @pydantic.dataclasses.dataclass(config={"arbitrary_types_allowed": True})
 class RobotLoadThenCentreComposite:
     # common fields
     xbpm_feedback: XBPMFeedback
-    attenuator: Attenuator
+    attenuator: BinaryFilterAttenuator
 
     # GridDetectThenXRayCentreComposite fields
     aperture_scatterguard: ApertureScatterguard
@@ -95,10 +102,7 @@ class RobotLoadThenCentreComposite:
     robot: BartRobot
     webcam: Webcam
     lower_gonio: XYZPositioner
-
-    @property
-    def sample_motors(self):
-        return self.smargon
+    beamstop: Beamstop
 
 
 def create_devices(context: BlueskyContext) -> RobotLoadThenCentreComposite:
@@ -114,7 +118,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(),
+        params.pin_centre_then_xray_centre_params,
     )
 
 
@@ -125,7 +129,7 @@ def _robot_load_then_flyscan_plan(
 ):
     yield from robot_load_and_change_energy_plan(
         cast(RobotLoadAndEnergyChangeComposite, composite),
-        params.robot_load_params(),
+        params.robot_load_params,
     )
 
     yield from _flyscan_plan_from_robot_load_params(composite, params, oav_config_file)
@@ -170,20 +174,33 @@ def robot_load_then_xray_centre(
         yield from pin_already_loaded(composite.robot, sample_location)
     )
 
-    doing_chi_change = parameters.chi_start_deg is not None
+    current_chi = yield from bps.rd(composite.smargon.chi)
+    LOGGER.info(f"Read back current smargon chi of {current_chi} degrees.")
+    doing_chi_change = parameters.chi_start_deg is not None and not isclose(
+        current_chi, parameters.chi_start_deg, abs_tol=0.001
+    )
 
     if doing_sample_load:
+        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 = _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
+        # 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
@@ -192,6 +209,7 @@ def robot_load_then_xray_centre(
     eiger.set_detector_parameters(detector_params)
 
     yield from start_preparing_data_collection_then_do_plan(
+        composite.beamstop,
         eiger,
         composite.detector_motion,
         parameters.detector_distance_mm,

mx_bluesky/hyperion/experiment_plans/rotation_scan_plan.py

@@ -8,12 +8,13 @@ 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.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.oav.oav_detector import OAV
 from dodal.devices.oav.oav_parameters import OAVParameters
 from dodal.devices.robot import BartRobot
@@ -22,13 +23,14 @@ from dodal.devices.smargon import Smargon
 from dodal.devices.synchrotron import Synchrotron
 from dodal.devices.undulator import Undulator
 from dodal.devices.xbpm_feedback import XBPMFeedback
-from dodal.devices.zebra import RotationDirection, Zebra
-from dodal.devices.zebra_controlled_shutter import ZebraShutter
+from dodal.devices.zebra.zebra import RotationDirection, Zebra
+from dodal.devices.zebra.zebra_controlled_shutter import ZebraShutter
 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.common.utils.log import LOGGER
 from mx_bluesky.hyperion.device_setup_plans.manipulate_sample import (
     cleanup_sample_environment,
     move_phi_chi_omega,
@@ -55,7 +57,6 @@ from mx_bluesky.hyperion.experiment_plans.oav_snapshot_plan import (
     oav_snapshot_plan,
     setup_beamline_for_OAV,
 )
-from mx_bluesky.hyperion.log import LOGGER
 from mx_bluesky.hyperion.parameters.constants import CONST
 from mx_bluesky.hyperion.parameters.rotation import (
     MultiRotationScan,
@@ -69,8 +70,9 @@ class RotationScanComposite(OavSnapshotComposite):
     """All devices which are directly or indirectly required by this plan"""
 
     aperture_scatterguard: ApertureScatterguard
-    attenuator: Attenuator
+    attenuator: BinaryFilterAttenuator
     backlight: Backlight
+    beamstop: Beamstop
     dcm: DCM
     detector_motion: DetectorMotion
     eiger: EigerDetector
@@ -126,13 +128,26 @@ def calculate_motion_profile(
     See https://github.com/DiamondLightSource/hyperion/wiki/rotation-scan-geometry
     for a simple pictorial explanation."""
 
-    direction = params.rotation_direction.multiplier
+    assert params.rotation_increment_deg > 0
+
+    direction = params.rotation_direction
+    start_scan_deg = params.omega_start_deg
+
+    if params.features.omega_flip:
+        # If omega_flip is True then the motor omega axis is inverted with respect to the
+        # hyperion coordinate system.
+        start_scan_deg = -start_scan_deg
+        direction = (
+            direction.POSITIVE
+            if direction == direction.NEGATIVE
+            else direction.NEGATIVE
+        )
+
     num_images = params.num_images
     shutter_time_s = params.shutter_opening_time_s
     image_width_deg = params.rotation_increment_deg
     exposure_time_s = params.exposure_time_s
     motor_time_to_speed_s *= ACCELERATION_MARGIN
-    start_scan_deg = params.omega_start_deg
 
     LOGGER.info("Calculating rotation scan motion profile:")
     LOGGER.info(
@@ -153,9 +168,9 @@ def calculate_motion_profile(
         f"{acceleration_offset_deg=} = {motor_time_to_speed_s=} * {speed_for_rotation_deg_s=}"
     )
 
-    start_motion_deg = start_scan_deg - (acceleration_offset_deg * direction)
+    start_motion_deg = start_scan_deg - (acceleration_offset_deg * direction.multiplier)
     LOGGER.info(
-        f"{start_motion_deg=} = {start_scan_deg=} - ({acceleration_offset_deg=} * {direction=})"
+        f"{start_motion_deg=} = {start_scan_deg=} - ({acceleration_offset_deg=} * {direction.multiplier=})"
     )
 
     shutter_opening_deg = speed_for_rotation_deg_s * shutter_time_s
@@ -173,7 +188,7 @@ def calculate_motion_profile(
 
     distance_to_move_deg = (
         scan_width_deg + shutter_opening_deg + acceleration_offset_deg * 2
-    ) * direction
+    ) * direction.multiplier
     LOGGER.info(
         f"{distance_to_move_deg=} = ({scan_width_deg=} + {shutter_opening_deg=} + {acceleration_offset_deg=} * 2) * {direction=})"
     )
@@ -183,7 +198,7 @@ def calculate_motion_profile(
         start_motion_deg=start_motion_deg,
         scan_width_deg=scan_width_deg,
         shutter_time_s=shutter_time_s,
-        direction=params.rotation_direction,
+        direction=direction,
         speed_for_rotation_deg_s=speed_for_rotation_deg_s,
         acceleration_offset_deg=acceleration_offset_deg,
         shutter_opening_deg=shutter_opening_deg,
@@ -331,13 +346,6 @@ def _move_and_rotation(
         yield from setup_beamline_for_OAV(
             composite.smargon, composite.backlight, composite.aperture_scatterguard
         )
-        yield from bps.wait(group=CONST.WAIT.READY_FOR_OAV)
-        if params.selected_aperture:
-            yield from bps.abs_set(
-                composite.aperture_scatterguard.aperture_outside_beam,
-                params.selected_aperture,
-                group=CONST.WAIT.ROTATION_READY_FOR_DC,
-            )
         yield from oav_snapshot_plan(composite, params, oav_params)
     yield from rotation_scan_plan(
         composite,
@@ -351,6 +359,8 @@ 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")
 
@@ -360,7 +370,7 @@ def rotation_scan(
             "subplan_name": CONST.PLAN.ROTATION_OUTER,
             CONST.TRIGGER.ZOCALO: CONST.PLAN.ROTATION_MAIN,
             "zocalo_environment": CONST.ZOCALO_ENV,
-            "hyperion_parameters": parameters.model_dump_json(),
+            "mx_bluesky_parameters": parameters.model_dump_json(),
             "activate_callbacks": [
                 "RotationISPyBCallback",
                 "RotationNexusFileCallback",
@@ -384,6 +394,7 @@ def rotation_scan(
 
         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,
@@ -400,6 +411,7 @@ def multi_rotation_scan(
     parameters: MultiRotationScan,
     oav_params: OAVParameters | None = None,
 ) -> MsgGenerator:
+    parameters.features.update_self_from_server()
     if not oav_params:
         oav_params = OAVParameters(context="xrayCentring")
     eiger: EigerDetector = composite.eiger
@@ -432,8 +444,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_parameters": single_scan.model_dump_json(),
                 }
             )
             def rotation_scan_core(
@@ -445,6 +456,7 @@ def multi_rotation_scan(
 
     LOGGER.info("setting up and staging eiger...")
     yield from start_preparing_data_collection_then_do_plan(
+        composite.beamstop,
         eiger,
         composite.detector_motion,
         parameters.detector_distance_mm,

mx_bluesky/hyperion/experiment_plans/set_energy_plan.py

@@ -7,7 +7,7 @@
 
 import pydantic
 from bluesky import plan_stubs as bps
-from dodal.devices.attenuator import Attenuator
+from dodal.devices.attenuator.attenuator import BinaryFilterAttenuator
 from dodal.devices.dcm import DCM
 from dodal.devices.focusing_mirror import FocusingMirrorWithStripes, MirrorVoltages
 from dodal.devices.undulator_dcm import UndulatorDCM
@@ -30,7 +30,7 @@ class SetEnergyComposite:
     dcm: DCM
     undulator_dcm: UndulatorDCM
     xbpm_feedback: XBPMFeedback
-    attenuator: Attenuator
+    attenuator: BinaryFilterAttenuator
 
 
 def _set_energy_plan(
@@ -48,12 +48,13 @@ def _set_energy_plan(
 
 
 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"]