mx-bluesky 1.5.9__tar.gz → 1.5.10__tar.gz

{mx_bluesky-1.5.9 → mx_bluesky-1.5.10}/PKG-INFO

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

{mx_bluesky-1.5.9 → mx_bluesky-1.5.10}/pyproject.toml

@@ -44,11 +44,11 @@ dependencies = [
     # as by default pip-install will not upgrade to a pre-release.
     #
     "daq-config-server>=v1.0.0-rc.2",
-    "blueapi >= 0.15.0",
+    "blueapi >= 1.5.0",
     "ophyd >= 1.10.5",
     "ophyd-async >= 0.10.0a2",
-    "bluesky >= 1.13.1",
-    "dls-dodal == 1.62.0",
+    "bluesky >= 1.14.6",
+    "dls-dodal == 1.63.0",
 ]
 
 

{mx_bluesky-1.5.9 → mx_bluesky-1.5.10}/src/mx_bluesky/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.5.9'
-__version_tuple__ = version_tuple = (1, 5, 9)
+__version__ = version = '1.5.10'
+__version_tuple__ = version_tuple = (1, 5, 10)
 
-__commit_id__ = commit_id = 'g65ec4a831'
+__commit_id__ = commit_id = 'g3d41045cd'

{mx_bluesky-1.5.9 → mx_bluesky-1.5.10}/src/mx_bluesky/beamlines/i04/experiment_plans/i04_grid_detect_then_xray_centre_plan.py

@@ -9,7 +9,7 @@ from dodal.common import inject
 from dodal.devices.aperturescatterguard import ApertureScatterguard, ApertureValue
 from dodal.devices.attenuator.attenuator import BinaryFilterAttenuator
 from dodal.devices.backlight import Backlight
-from dodal.devices.common_dcm import BaseDCM
+from dodal.devices.common_dcm import DoubleCrystalMonochromator
 from dodal.devices.detector.detector_motion import DetectorMotion
 from dodal.devices.eiger import EigerDetector
 from dodal.devices.fast_grid_scan import (
@@ -97,7 +97,7 @@ def i04_grid_detect_then_xray_centre(
     attenuator: BinaryFilterAttenuator = inject("attenuator"),
     backlight: Backlight = inject("backlight"),
     beamstop: Beamstop = inject("beamstop"),
-    dcm: BaseDCM = inject("dcm"),
+    dcm: DoubleCrystalMonochromator = inject("dcm"),
     zebra_fast_grid_scan: ZebraFastGridScanThreeD = inject("zebra_fast_grid_scan"),
     flux: Flux = inject("flux"),
     oav: OAV = inject("oav"),

mx_bluesky-1.5.10/src/mx_bluesky/beamlines/i24/jungfrau_commissioning/experiment_plans/do_darks.py

@@ -0,0 +1,78 @@
+import bluesky.preprocessors as bpp
+from bluesky import plan_stubs as bps
+from bluesky.utils import MsgGenerator
+from dodal.common import inject
+from dodal.devices.i24.commissioning_jungfrau import CommissioningJungfrau
+from ophyd_async.core import WatchableAsyncStatus
+from ophyd_async.fastcs.jungfrau import (
+    AcquisitionType,
+    GainMode,
+    create_jungfrau_pedestal_triggering_info,
+)
+from pydantic import PositiveInt
+
+from mx_bluesky.beamlines.i24.jungfrau_commissioning.plan_stubs.plan_utils import (
+    fly_jungfrau,
+    override_file_path,
+)
+from mx_bluesky.common.utils.log import LOGGER
+
+PEDESTAL_DARKS_RUN = "PEDESTAL DARKS RUN"
+
+
+def do_pedestal_darks(
+    exp_time_s: float = 0.001,
+    pedestal_frames: PositiveInt = 20,
+    pedestal_loops: PositiveInt = 200,
+    jungfrau: CommissioningJungfrau = inject("jungfrau"),
+    path_of_output_file: str | None = None,
+) -> MsgGenerator[WatchableAsyncStatus]:
+    """Acquire darks in pedestal mode, using dynamic gain mode. This calibrates the offsets
+    for the jungfrau, and must be performed before acquiring real data in dynamic gain mode.
+
+    When Bluesky triggers the detector in pedestal mode, with pedestal frames F and pedestal loops L,
+    the acquisition is managed at the driver level to:
+    1. Acquire F-1 frames in dynamic gain mode
+    2. Acquire 1 frame in ForceSwitchG1 gain mode
+    3. Repeat steps 1-2 L times
+    4. Do the first three steps a second time, except use ForceSwitchG2 instead of ForceSwitchG1
+    during step 2.
+
+    Args:
+        exp_time_s: Length of detector exposure for each frame.
+        pedestal_frames: Number of frames acquired per pedestal loop.
+        pedestal_loops: Number of times to acquire a set of pedestal_frames
+        jungfrau: Jungfrau device
+        path_of_output_file: Absolute path of the detector file output, including file name. If None, then use the PathProvider
+            set during Jungfrau device instantiation
+    """
+
+    @bpp.set_run_key_decorator(PEDESTAL_DARKS_RUN)
+    @bpp.run_decorator(md={"subplan_name": PEDESTAL_DARKS_RUN})
+    @bpp.stage_decorator([jungfrau])
+    def _do_decorated_plan():
+        if path_of_output_file:
+            override_file_path(jungfrau, path_of_output_file)
+
+        trigger_info = create_jungfrau_pedestal_triggering_info(
+            exp_time_s, pedestal_frames, pedestal_loops
+        )
+        LOGGER.info(
+            "Jungfrau will be triggered in pedestal mode and in dynamic gain mode"
+        )
+        yield from bps.mv(
+            jungfrau.drv.acquisition_type,
+            AcquisitionType.PEDESTAL,
+            jungfrau.drv.gain_mode,
+            GainMode.DYNAMIC,
+        )
+        return (
+            yield from fly_jungfrau(
+                jungfrau,
+                trigger_info,
+                wait=True,
+                log_on_percentage_prefix="Jungfrau pedestal dynamic gain mode darks triggers recieved",
+            )
+        )
+
+    return (yield from _do_decorated_plan())

mx_bluesky-1.5.10/src/mx_bluesky/beamlines/i24/jungfrau_commissioning/plan_stubs/__init__.py

@@ -0,0 +1 @@
+"""Jungfrau plan stubs should be used as part of Jungfrau experiment plans, and should not be run in isolation."""

{mx_bluesky-1.5.9/src/mx_bluesky/beamlines/i24/jungfrau_commissioning → mx_bluesky-1.5.10/src/mx_bluesky/beamlines/i24/jungfrau_commissioning/plan_stubs}/do_external_acquisition.py

@@ -9,7 +9,7 @@ from ophyd_async.fastcs.jungfrau import (
 )
 from pydantic import PositiveInt
 
-from mx_bluesky.beamlines.i24.jungfrau_commissioning.plan_utils import (
+from mx_bluesky.beamlines.i24.jungfrau_commissioning.plan_stubs.plan_utils import (
     fly_jungfrau,
     override_file_path,
 )
@@ -18,14 +18,15 @@ from mx_bluesky.beamlines.i24.jungfrau_commissioning.plan_utils import (
 def do_external_acquisition(
     exp_time_s: float,
     total_triggers: PositiveInt = 1,
-    output_file_name: str | None = None,
+    output_file_path: str | None = None,
     wait: bool = False,
     jungfrau: CommissioningJungfrau = inject("commissioning_jungfrau"),
 ) -> MsgGenerator[WatchableAsyncStatus]:
     """
     Kickoff external triggering on the Jungfrau, and optionally wait for completion.
 
-    Must be used within an open Bluesky run.
+    Any plan using this stub MUST stage the Jungfrau with the stage_decorator and open a run,
+    ideally using the run_decorator.
 
     Args:
         exp_time_s: Length of detector exposure for each frame.
@@ -36,9 +37,9 @@ def do_external_acquisition(
         wait: Optionally block until data collection is complete.
     """
 
-    if output_file_name:
-        override_file_path(jungfrau, output_file_name)
+    if output_file_path:
+        override_file_path(jungfrau, output_file_path)
 
     trigger_info = create_jungfrau_external_triggering_info(total_triggers, exp_time_s)
-    status = yield from fly_jungfrau(jungfrau, trigger_info, wait)
+    status = yield from fly_jungfrau(jungfrau, trigger_info, wait=wait)
     return status

{mx_bluesky-1.5.9/src/mx_bluesky/beamlines/i24/jungfrau_commissioning → mx_bluesky-1.5.10/src/mx_bluesky/beamlines/i24/jungfrau_commissioning/plan_stubs}/do_internal_acquisition.py

@@ -9,7 +9,7 @@ from ophyd_async.fastcs.jungfrau import (
 )
 from pydantic import PositiveInt
 
-from mx_bluesky.beamlines.i24.jungfrau_commissioning.plan_utils import (
+from mx_bluesky.beamlines.i24.jungfrau_commissioning.plan_stubs.plan_utils import (
     fly_jungfrau,
     override_file_path,
 )
@@ -26,7 +26,8 @@ def do_internal_acquisition(
     Kickoff internal triggering on the Jungfrau, and optionally wait for completion. Frames
     per trigger will trigger as rapidly as possible according to the Jungfrau deadtime.
 
-    Must be used within an open Bluesky run.
+    Any plan using this stub MUST stage the Jungfrau with the stage_decorator and open a run,
+    ideally using the run_decorator.
 
     Args:
         exp_time_s: Length of detector exposure for each frame.
@@ -42,5 +43,5 @@ def do_internal_acquisition(
         override_file_path(jungfrau, path_of_output_file)
 
     trigger_info = create_jungfrau_internal_triggering_info(total_frames, exp_time_s)
-    status = yield from fly_jungfrau(jungfrau, trigger_info, wait)
+    status = yield from fly_jungfrau(jungfrau, trigger_info, wait=wait)
     return status

{mx_bluesky-1.5.9/src/mx_bluesky/beamlines/i24/jungfrau_commissioning → mx_bluesky-1.5.10/src/mx_bluesky/beamlines/i24/jungfrau_commissioning/plan_stubs}/plan_utils.py

@@ -2,7 +2,6 @@ from pathlib import PurePath
 from typing import cast
 
 import bluesky.plan_stubs as bps
-import bluesky.preprocessors as bpp
 from bluesky.utils import MsgGenerator
 from dodal.common.watcher_utils import log_on_percentage_complete
 from dodal.devices.i24.commissioning_jungfrau import CommissioningJungfrau
@@ -19,44 +18,38 @@ JF_COMPLETE_GROUP = "JF complete"
 
 
 def fly_jungfrau(
-    jungfrau: CommissioningJungfrau, trigger_info: TriggerInfo, wait: bool = False
+    jungfrau: CommissioningJungfrau,
+    trigger_info: TriggerInfo,
+    wait: bool = False,
+    log_on_percentage_prefix="Jungfrau data collection triggers recieved",
 ) -> MsgGenerator[WatchableAsyncStatus]:
     """Stage, prepare, and kickoff Jungfrau with a configured TriggerInfo. Optionally wait
     for completion.
 
-    Note that this plan doesn't include unstaging of the Jungfrau, and a run must be open
-    before this plan is called.
+    Any plan using this stub MUST stage the Jungfrau with the stage_decorator and open a run,
+    ideally using the run_decorator.
 
     Args:
     jungfrau: Jungfrau device.
-    trigger_info: TriggerInfo which should be acquired using jungfrau util functions create_jungfrau_internal_triggering_info
-        or create_jungfrau_external_triggering_info.
+    trigger_info: TriggerInfo which should be acquired using jungfrau util functions.
     wait: Optionally block until data collection is complete.
+    log_on_percentage_prefix: String that will be appended to the "percentage completion" logging message.
     """
 
-    @bpp.contingency_decorator(
-        except_plan=lambda _: (yield from bps.unstage(jungfrau, wait=True))
-    )
-    def _fly_with_unstage_contingency():
-        yield from bps.stage(jungfrau)
-        LOGGER.info("Setting up detector...")
-        yield from bps.prepare(jungfrau, trigger_info, wait=True)
-        LOGGER.info("Detector prepared. Starting acquisition")
-        yield from bps.kickoff(jungfrau, wait=True)
-        LOGGER.info("Waiting for acquisition to complete...")
-        status = yield from bps.complete(jungfrau, group=JF_COMPLETE_GROUP)
-
-        # StandardDetector.complete converts regular status to watchable status,
-        # but bluesky plan stubs can't see this currently
-        status = cast(WatchableAsyncStatus, status)
-        log_on_percentage_complete(
-            status, "Jungfrau data collection triggers recieved", 10
-        )
-        if wait:
-            yield from bps.wait(JF_COMPLETE_GROUP)
-        return status
+    LOGGER.info("Preparing detector...")
+    yield from bps.prepare(jungfrau, trigger_info, wait=True)
+    LOGGER.info("Detector prepared. Starting acquisition")
+    yield from bps.kickoff(jungfrau, wait=True)
+    LOGGER.info("Waiting for acquisition to complete...")
+    status = yield from bps.complete(jungfrau, group=JF_COMPLETE_GROUP)
 
-    return (yield from _fly_with_unstage_contingency())
+    # StandardDetector.complete converts regular status to watchable status,
+    # but bluesky plan stubs can't see this currently
+    status = cast(WatchableAsyncStatus, status)
+    log_on_percentage_complete(status, log_on_percentage_prefix, 10)
+    if wait:
+        yield from bps.wait(JF_COMPLETE_GROUP)
+    return status
 
 
 def override_file_path(jungfrau: CommissioningJungfrau, path_of_output_file: str):

{mx_bluesky-1.5.9 → mx_bluesky-1.5.10}/src/mx_bluesky/common/device_setup_plans/robot_load_unload.py

@@ -7,7 +7,7 @@ from dodal.devices.aperturescatterguard import ApertureScatterguard, ApertureVal
 from dodal.devices.motors import XYZStage
 from dodal.devices.robot import BartRobot
 from dodal.devices.smargon import CombinedMove, Smargon, StubPosition
-from dodal.plan_stubs.motor_utils import MoveTooLarge, home_and_reset_wrapper
+from dodal.plan_stubs.motor_utils import MoveTooLargeError, home_and_reset_wrapper
 
 from mx_bluesky.common.parameters.constants import (
     DocDescriptorNames,
@@ -39,7 +39,7 @@ def wait_for_smargon_not_disabled(smargon: Smargon, timeout=60):
 
 def _raise_exception_if_moved_out_of_cryojet(exception):
     yield from bps.null()
-    if isinstance(exception, MoveTooLarge):
+    if isinstance(exception, MoveTooLargeError):
         raise Exception(
             f"Moving {exception.axis} back to {exception.position} after \
                         robot load would move it out of the cryojet. The max safe \

{mx_bluesky-1.5.9 → mx_bluesky-1.5.10}/src/mx_bluesky/common/device_setup_plans/setup_oav.py

@@ -1,7 +1,7 @@
 from functools import partial
 
 import bluesky.plan_stubs as bps
-from dodal.devices.areadetector.plugins.CAM import ColorMode
+from dodal.devices.areadetector.plugins.cam import ColorMode
 from dodal.devices.oav.oav_detector import OAV
 from dodal.devices.oav.oav_parameters import OAVParameters
 from dodal.devices.oav.pin_image_recognition import PinTipDetection

{mx_bluesky-1.5.9 → mx_bluesky-1.5.10}/src/mx_bluesky/common/device_setup_plans/xbpm_feedback.py

@@ -16,7 +16,7 @@ def unpause_xbpm_feedback_and_set_transmission_to_1(
                                       the beam in position
         attenuator (BinaryFilterAttenuator): The attenuator used to set transmission
     """
-    yield from bps.mv(xbpm_feedback.pause_feedback, Pause.RUN, attenuator, 1.0)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+    yield from bps.mv(xbpm_feedback.pause_feedback, Pause.RUN, attenuator, 1.0)
 
 
 def check_and_pause_feedback(
@@ -35,11 +35,11 @@ def check_and_pause_feedback(
                                                turning XBPM feedback off.
 
     """
-    yield from bps.mv(attenuator, 1.0)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+    yield from bps.mv(attenuator, 1.0)
     LOGGER.info("Waiting for XBPM feedback to be stable")
     yield from bps.trigger(xbpm_feedback, wait=True)
     LOGGER.info(
         f"XPBM feedback in position, pausing and setting transmission to {desired_transmission_fraction}"
     )
-    yield from bps.mv(xbpm_feedback.pause_feedback, Pause.PAUSE)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
-    yield from bps.mv(attenuator, desired_transmission_fraction)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+    yield from bps.mv(xbpm_feedback.pause_feedback, Pause.PAUSE)
+    yield from bps.mv(attenuator, desired_transmission_fraction)

{mx_bluesky-1.5.9 → mx_bluesky-1.5.10}/src/mx_bluesky/common/experiment_plans/common_flyscan_xray_centre_plan.py

@@ -13,7 +13,7 @@ from dodal.common.beamlines.commissioning_mode import read_commissioning_mode
 from dodal.devices.fast_grid_scan import (
     FastGridScanCommon,
     FastGridScanThreeD,
-    GridScanInvalidException,
+    GridScanInvalidError,
 )
 from dodal.devices.zocalo import ZocaloResults
 from dodal.devices.zocalo.zocalo_results import (
@@ -275,14 +275,14 @@ def run_gridscan(
     try:
         yield from beamline_specific.set_flyscan_params_plan()
     except FailedStatus as e:
-        if isinstance(e.__cause__, GridScanInvalidException):
+        if isinstance(e.__cause__, GridScanInvalidError):
             raise SampleException(
                 "Scan invalid - gridscan not valid for detected pin position"
             ) from e
 
     LOGGER.info("Waiting for arming to finish")
     yield from bps.wait(PlanGroupCheckpointConstants.GRID_READY_FOR_DC)
-    yield from bps.stage(fgs_composite.eiger)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+    yield from bps.stage(fgs_composite.eiger, wait=True)
 
     yield from kickoff_and_complete_gridscan(
         beamline_specific.fgs_motors,

{mx_bluesky-1.5.9 → mx_bluesky-1.5.10}/src/mx_bluesky/common/experiment_plans/inner_plans/do_fgs.py

@@ -103,7 +103,7 @@ def kickoff_and_complete_gridscan(
     )
     @bpp.contingency_decorator(
         except_plan=lambda e: (yield from bps.stop(detector)),  # type: ignore # Fix types in ophyd-async (https://github.com/DiamondLightSource/mx-bluesky/issues/855)
-        else_plan=lambda: (yield from bps.unstage(detector)),
+        else_plan=lambda: (yield from bps.unstage(detector, wait=True)),
     )
     def _decorated_do_fgs():
         yield from _wait_for_zocalo_to_stage_then_do_fgs(

{mx_bluesky-1.5.9 → mx_bluesky-1.5.10}/src/mx_bluesky/common/experiment_plans/inner_plans/read_hardware.py

@@ -4,7 +4,7 @@ import bluesky.plan_stubs as bps
 from bluesky.protocols import Readable
 from dodal.devices.aperturescatterguard import ApertureScatterguard
 from dodal.devices.attenuator.attenuator import BinaryFilterAttenuator
-from dodal.devices.common_dcm import BaseDCM
+from dodal.devices.common_dcm import DoubleCrystalMonochromator
 from dodal.devices.eiger import EigerDetector
 from dodal.devices.flux import Flux
 from dodal.devices.s4_slit_gaps import S4SlitGaps
@@ -43,7 +43,7 @@ def standard_read_hardware_pre_collection(
     undulator: Undulator,
     synchrotron: Synchrotron,
     s4_slit_gaps: S4SlitGaps,
-    dcm: BaseDCM,
+    dcm: DoubleCrystalMonochromator,
     smargon: Smargon,
 ):
     LOGGER.info("Reading status of beamline for callbacks, pre collection.")
@@ -63,7 +63,7 @@ def standard_read_hardware_during_collection(
     aperture_scatterguard: ApertureScatterguard,
     attenuator: BinaryFilterAttenuator,
     flux: Flux,
-    dcm: BaseDCM,
+    dcm: DoubleCrystalMonochromator,
     detector: EigerDetector,
 ):
     signals_to_read_during_collection = [

{mx_bluesky-1.5.9 → mx_bluesky-1.5.10}/src/mx_bluesky/common/experiment_plans/oav_grid_detection_plan.py

@@ -10,7 +10,7 @@ from bluesky.utils import MsgGenerator
 from dodal.devices.oav.oav_detector import OAV
 from dodal.devices.oav.pin_image_recognition import PinTipDetection
 from dodal.devices.oav.pin_image_recognition.utils import NONE_VALUE
-from dodal.devices.oav.utils import PinNotFoundException, wait_for_tip_to_be_found
+from dodal.devices.oav.utils import PinNotFoundError, wait_for_tip_to_be_found
 from dodal.devices.smargon import Smargon
 
 from mx_bluesky.common.device_setup_plans.setup_oav import (
@@ -108,7 +108,7 @@ def grid_detection_plan(
         yield from bps.sleep(HardwareConstants.OAV_REFRESH_DELAY)
 
         tip_x_px, tip_y_px = yield from catch_exception_and_warn(
-            PinNotFoundException, wait_for_tip_to_be_found, pin_tip_detection
+            PinNotFoundError, wait_for_tip_to_be_found, pin_tip_detection
         )
 
         LOGGER.info(f"Tip is at x,y: {tip_x_px},{tip_y_px}")

{mx_bluesky-1.5.9 → mx_bluesky-1.5.10}/src/mx_bluesky/common/parameters/device_composites.py

@@ -4,7 +4,7 @@ from dodal.devices.aperturescatterguard import (
 )
 from dodal.devices.attenuator.attenuator import BinaryFilterAttenuator
 from dodal.devices.backlight import Backlight
-from dodal.devices.common_dcm import BaseDCM
+from dodal.devices.common_dcm import DoubleCrystalMonochromator
 from dodal.devices.detector.detector_motion import DetectorMotion
 from dodal.devices.eiger import EigerDetector
 from dodal.devices.fast_grid_scan import (
@@ -51,7 +51,7 @@ class GridDetectThenXRayCentreComposite(FlyScanEssentialDevices):
     attenuator: BinaryFilterAttenuator
     backlight: Backlight
     beamstop: Beamstop
-    dcm: BaseDCM
+    dcm: DoubleCrystalMonochromator
     detector_motion: DetectorMotion
     zebra_fast_grid_scan: ZebraFastGridScanThreeD
     flux: Flux

{mx_bluesky-1.5.9 → mx_bluesky-1.5.10}/src/mx_bluesky/hyperion/experiment_plans/hyperion_flyscan_xray_centre_plan.py

@@ -112,8 +112,8 @@ def _panda_tidy(xrc_composite: HyperionFlyScanXRayCentreComposite):
     yield from tidy_up_zebra_after_gridscan(
         xrc_composite.zebra, xrc_composite.sample_shutter, group=group, wait=False
     )
+    yield from bps.unstage(xrc_composite.panda, group=group)
     yield from bps.wait(group, timeout=10)
-    yield from bps.unstage(xrc_composite.panda)
 
 
 def _panda_triggering_setup(
@@ -126,10 +126,9 @@ def _panda_triggering_setup(
         xrc_composite.panda_fast_grid_scan.run_up_distance_mm
     )
 
-    # Set the time between x steps pv
-    DEADTIME_S = 1e-6  # according to https://www.dectris.com/en/detectors/x-ray-detectors/eiger2/eiger2-for-synchrotrons/eiger2-x/
+    DETECTOR_DEADTIME_S = 1e-4  # This value was empirically found to be safer than the documented deadtime in the Eiger manual
 
-    time_between_x_steps_ms = (DEADTIME_S + parameters.exposure_time_s) * 1e3
+    time_between_x_steps_ms = (DETECTOR_DEADTIME_S + parameters.exposure_time_s) * 1e3
 
     smargon_speed_limit_mm_per_s = yield from bps.rd(
         xrc_composite.smargon.x.max_velocity
@@ -148,13 +147,13 @@ def _panda_triggering_setup(
         )
     else:
         LOGGER.info(
-            f"Panda grid scan: Smargon speed set to {smargon_speed_limit_mm_per_s} mm/s"
+            f"Panda grid scan: Smargon speed set to {sample_velocity_mm_per_s} mm/s"
             f" and using a run-up distance of {run_up_distance_mm}"
         )
 
     yield from bps.mv(
-        xrc_composite.panda_fast_grid_scan.time_between_x_steps_ms,  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
-        time_between_x_steps_ms,  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+        xrc_composite.panda_fast_grid_scan.time_between_x_steps_ms,
+        time_between_x_steps_ms,
     )
 
     directory_provider_root = Path(parameters.storage_directory)

{mx_bluesky-1.5.9 → mx_bluesky-1.5.10}/src/mx_bluesky/hyperion/experiment_plans/load_centre_collect_full_plan.py

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

{mx_bluesky-1.5.9 → mx_bluesky-1.5.10}/src/mx_bluesky/hyperion/experiment_plans/pin_tip_centring_plan.py

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

{mx_bluesky-1.5.9 → mx_bluesky-1.5.10}/src/mx_bluesky/hyperion/experiment_plans/rotation_scan_plan.py

@@ -428,7 +428,7 @@ def rotation_scan_internal(
 
             yield from rotation_scan_core(single_scan)
 
-        yield from bps.unstage(eiger)
+        yield from bps.unstage(eiger, wait=True)
 
     LOGGER.info("setting up and staging eiger...")
     yield from start_preparing_data_collection_then_do_plan(

{mx_bluesky-1.5.9 → mx_bluesky-1.5.10}/src/mx_bluesky/hyperion/parameters/device_composites.py

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