mx-bluesky 1.5.16__py3-none-any.whl → 1.6.3__py3-none-any.whl

mx_bluesky/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.5.16'
-__version_tuple__ = version_tuple = (1, 5, 16)
+__version__ = version = '1.6.3'
+__version_tuple__ = version_tuple = (1, 6, 3)
 
 __commit_id__ = commit_id = None

mx_bluesky/beamlines/i02_1/parameters/gridscan.py

@@ -1,4 +1,4 @@
-from dodal.devices.i02_1.fast_grid_scan import ZebraGridScanParamsTwoD
+from dodal.devices.beamlines.i02_1.fast_grid_scan import ZebraGridScanParamsTwoD
 from scanspec.specs import Product
 
 from mx_bluesky.common.parameters.components import SplitScan, WithOptionalEnergyChange

mx_bluesky/beamlines/i04/__init__.py

@@ -2,6 +2,8 @@ from mx_bluesky.beamlines.i04.experiment_plans.i04_grid_detect_then_xray_centre_
     i04_default_grid_detect_and_xray_centre,
 )
 from mx_bluesky.beamlines.i04.oav_centering_plans.oav_imaging import (
+    find_beam_centres,
+    optimise_transmission_with_oav,
     take_oav_image_with_scintillator_in,
 )
 from mx_bluesky.beamlines.i04.thawing_plan import (
@@ -16,4 +18,6 @@ __all__ = [
     "i04_default_grid_detect_and_xray_centre",
     "thaw_and_murko_centre",
     "take_oav_image_with_scintillator_in",
+    "optimise_transmission_with_oav",
+    "find_beam_centres",
 ]

mx_bluesky/beamlines/i04/experiment_plans/i04_grid_detect_then_xray_centre_plan.py

@@ -9,6 +9,8 @@ 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.beamlines.i04.beamsize import Beamsize
+from dodal.devices.beamlines.i04.transfocator import Transfocator
 from dodal.devices.common_dcm import DoubleCrystalMonochromator
 from dodal.devices.detector.detector_motion import DetectorMotion
 from dodal.devices.eiger import EigerDetector
@@ -17,8 +19,6 @@ from dodal.devices.fast_grid_scan import (
     set_fast_grid_scan_params,
 )
 from dodal.devices.flux import Flux
-from dodal.devices.i04.beamsize import Beamsize
-from dodal.devices.i04.transfocator import Transfocator
 from dodal.devices.mx_phase1.beamstop import Beamstop
 from dodal.devices.oav.oav_detector import OAV
 from dodal.devices.oav.pin_image_recognition import PinTipDetection

mx_bluesky/beamlines/i04/oav_centering_plans/oav_imaging.py

@@ -6,8 +6,10 @@ from bluesky.utils import MsgGenerator
 from dodal.common import inject
 from dodal.devices.attenuator.attenuator import BinaryFilterAttenuator
 from dodal.devices.backlight import Backlight
+from dodal.devices.beamlines.i04.beam_centre import CentreEllipseMethod
+from dodal.devices.beamlines.i04.max_pixel import MaxPixel
 from dodal.devices.mx_phase1.beamstop import Beamstop, BeamstopPositions
-from dodal.devices.oav.oav_detector import OAV
+from dodal.devices.oav.oav_detector import OAV, ZoomControllerWithBeamCentres
 from dodal.devices.robot import BartRobot, PinMounted
 from dodal.devices.scintillator import InOut, Scintillator
 from dodal.devices.xbpm_feedback import XBPMFeedback
@@ -19,8 +21,9 @@ from dodal.devices.zebra.zebra_controlled_shutter import (
 from ophyd_async.core import InOut as core_INOUT
 
 from mx_bluesky.common.utils.exceptions import BeamlineStateError
+from mx_bluesky.common.utils.log import LOGGER
 
-initial_wait_group = "Wait for scint to move in"
+OAV_PREPARE_BEAMLINE_FOR_SCINT_WAIT = "Wait for scint to move in"
 
 
 def take_oav_image_with_scintillator_in(
@@ -48,21 +51,36 @@ def take_oav_image_with_scintillator_in(
                     defaults are always correct.
     """
 
+    LOGGER.info("Preparing beamline to take scintillator images...")
     yield from _prepare_beamline_for_scintillator_images(
-        robot, beamstop, backlight, scintillator, xbpm_feedback, initial_wait_group
+        robot,
+        beamstop,
+        backlight,
+        scintillator,
+        xbpm_feedback,
+        shutter,
+        OAV_PREPARE_BEAMLINE_FOR_SCINT_WAIT,
+    )
+    yield from bps.abs_set(
+        attenuator, transmission, group=OAV_PREPARE_BEAMLINE_FOR_SCINT_WAIT
     )
-
-    yield from bps.abs_set(attenuator, transmission, group=initial_wait_group)
 
     if image_name is None:
         image_name = f"{time.time_ns()}ATT{transmission * 100}"
+    LOGGER.info(f"Using image name {image_name}")
+    LOGGER.info("Waiting for prepare beamline plan to complete...")
+    yield from bps.wait(OAV_PREPARE_BEAMLINE_FOR_SCINT_WAIT)
 
-    yield from bps.wait(initial_wait_group)
+    LOGGER.info("Opening shutter...")
 
     yield from bps.abs_set(shutter.control_mode, ZebraShutterControl.MANUAL, wait=True)
     yield from bps.abs_set(shutter, ZebraShutterState.OPEN, wait=True)
 
-    take_and_save_oav_image(file_path=image_path, file_name=image_name, oav=oav)
+    LOGGER.info("Taking image...")
+
+    yield from take_and_save_oav_image(
+        file_path=image_path, file_name=image_name, oav=oav
+    )
 
 
 def _prepare_beamline_for_scintillator_images(
@@ -71,11 +89,13 @@ def _prepare_beamline_for_scintillator_images(
     backlight: Backlight,
     scintillator: Scintillator,
     xbpm_feedback: XBPMFeedback,
+    shutter: ZebraShutter,
     group: str,
 ) -> MsgGenerator:
     """
-    Prepares the beamline for oav image by making sure the pin is NOT mounted and
-    the beam is on (feedback check). Finally, the scintillator is moved in.
+    Prepares the beamline for oav image by making sure the pin is not mounted and
+    the beam is on (feedback check). Finally, the scintillator is moved in and the
+    shutter opened.
     """
     pin_mounted = yield from bps.rd(robot.gonio_pin_sensor)
     if pin_mounted == PinMounted.PIN_MOUNTED:
@@ -90,6 +110,9 @@ def _prepare_beamline_for_scintillator_images(
     yield from bps.abs_set(backlight, core_INOUT.OUT, group=group)
 
     yield from bps.abs_set(scintillator.selected_pos, InOut.IN, group=group)
+    # Not waiting for control mode to be set before opening shutter can result in timeout error
+    yield from bps.abs_set(shutter.control_mode, ZebraShutterControl.MANUAL, wait=True)
+    yield from bps.abs_set(shutter, ZebraShutterState.OPEN, group=group)
 
 
 def take_and_save_oav_image(
@@ -109,7 +132,198 @@ def take_and_save_oav_image(
     if not os.path.exists(full_file_path):
         yield from bps.abs_set(oav.snapshot.filename, file_name, group=group)
         yield from bps.abs_set(oav.snapshot.directory, file_path, group=group)
-        yield from bps.wait(group)
+        yield from bps.wait(group, timeout=60)
         yield from bps.trigger(oav.snapshot, wait=True)
     else:
         raise FileExistsError("OAV image file path already exists")
+
+
+def _max_pixel_at_transmission(
+    max_pixel: MaxPixel,
+    attenuator: BinaryFilterAttenuator,
+    xbpm_feedback: XBPMFeedback,
+    transmission: float,
+):
+    # Potential controls issue on XBPM device means it can mark
+    # itself as stable before it really is
+    yield from bps.trigger(xbpm_feedback, wait=True)
+    yield from bps.mv(attenuator, transmission)
+    yield from bps.trigger(max_pixel, wait=True)
+    return (yield from bps.rd(max_pixel.max_pixel_val))
+
+
+def optimise_transmission_with_oav(
+    upper_bound: float = 100,
+    lower_bound: float = 0,
+    target_brightness_fraction: float = 0.75,
+    min_transmission_change: float = 5,
+    max_iterations: int = 10,
+    max_pixel: MaxPixel = inject("max_pixel"),
+    attenuator: BinaryFilterAttenuator = inject("attenuator"),
+    xbpm_feedback: XBPMFeedback = inject("xbpm_feedback"),
+) -> MsgGenerator:
+    """
+    Plan to find the optimal oav transmission. First the brightest pixel at 100%
+    transmission is taken. A fraction of this (target_brightness_fraction) is taken
+    as the target - as in the optimal transmission will have it's max pixel as the set
+    target. A binary search is used to reach this.
+    Args:
+        upper_bound: Maximum transmission which will be searched. In percent.
+        lower_bound: Minimum transmission which will be searched. In percent.
+        target_brightness_fraction: Fraction of the brightest pixel at 100%
+                    transmission which should be used as the target max pixel brightness.
+        min_transmission_change: If the next search point would require a transmission
+                    change less than this then we stop.
+        max_iterations: Maximum amount of iterations.
+    """
+
+    if upper_bound < lower_bound:
+        raise ValueError(
+            f"Upper bound ({upper_bound}) must be higher than lower bound {lower_bound}"
+        )
+
+    brightest_pixel_at_full_beam = yield from _max_pixel_at_transmission(
+        max_pixel, attenuator, xbpm_feedback, 1
+    )
+
+    if brightest_pixel_at_full_beam == 0:
+        raise ValueError("No beam found at full transmission")
+
+    target_pixel_brightness = brightest_pixel_at_full_beam * target_brightness_fraction
+    LOGGER.info(
+        f"Optimising until max pixel in image has a value of {target_pixel_brightness}"
+    )
+
+    iterations = 0
+
+    while iterations < max_iterations:
+        mid = round((upper_bound + lower_bound) / 2, 2)  # limit to 2 dp
+        LOGGER.info(f"On iteration {iterations}")
+
+        current_transmission = yield from bps.rd(attenuator.actual_transmission)
+        transmission_change_percent = abs(mid - current_transmission * 100)
+        if transmission_change_percent < min_transmission_change:
+            LOGGER.info(
+                f"Next transmission change would be small ({transmission_change_percent}%) so stopping at {current_transmission}"
+            )
+            return
+
+        brightest_pixel = yield from _max_pixel_at_transmission(
+            max_pixel, attenuator, xbpm_feedback, mid / 100
+        )
+
+        LOGGER.info(f"Upper bound is: {upper_bound}, Lower bound is: {lower_bound}")
+        LOGGER.info(
+            f"Testing transmission {mid}, brightest pixel found {brightest_pixel}"
+        )
+
+        if target_pixel_brightness == brightest_pixel:
+            mid = round(mid, 0)
+            LOGGER.info(f"\nOptimal transmission found: {mid}")
+            return
+
+        # condition for too low so want to try higher
+        elif brightest_pixel < target_pixel_brightness:
+            LOGGER.info("Result: Too low \n")
+            lower_bound = mid
+
+        # condition for too high so want to try lower
+        elif brightest_pixel > target_pixel_brightness:
+            LOGGER.info("Result: Too high \n")
+            upper_bound = mid
+        iterations += 1
+    raise StopIteration("Max iterations reached")
+
+
+def _get_all_zoom_levels(
+    zoom_controller: ZoomControllerWithBeamCentres,
+) -> MsgGenerator[tuple[str]]:
+    zoom_levels = []
+    level_signals = [
+        centring_device.level_name
+        for centring_device in zoom_controller.beam_centres.values()
+    ]
+    for signal in level_signals:
+        level_name = yield from bps.rd(signal)
+        if level_name:
+            zoom_levels.append(level_name)
+    return tuple(zoom_levels)
+
+
+def find_beam_centres(
+    zoom_levels_to_centre: tuple[str, ...] | None = None,
+    zoom_levels_to_optimise_transmission: tuple[str, ...] = ("1.0x", "7.5x"),
+    robot: BartRobot = inject("robot"),
+    beamstop: Beamstop = inject("beamstop"),
+    backlight: Backlight = inject("backlight"),
+    scintillator: Scintillator = inject("scintillator"),
+    xbpm_feedback: XBPMFeedback = inject("xbpm_feedback"),
+    max_pixel: MaxPixel = inject("max_pixel"),
+    centre_ellipse: CentreEllipseMethod = inject("beam_centre"),
+    attenuator: BinaryFilterAttenuator = inject("attenuator"),
+    zoom_controller: ZoomControllerWithBeamCentres = inject("zoom_controller"),
+    shutter: ZebraShutter = inject("sample_shutter"),
+) -> MsgGenerator:
+    """
+    Finds beam centres at the zoom levels given by zoom_levels_to_centre, first
+    optimising transmission if the zoom level is in zoom_levels_to_optimise_transmission.
+
+    Note that the previous beam centre values are used to draw an ROI box around the
+    OAV image when finding updated beam centre. If the previous values are very wrong,
+    this plan may fail or give inaccurate results.
+
+    zoom_levels_to_centre: The levels to do centring at, by default runs at all known
+                           zoom levels.
+    zoom_levels_to_optimise_transmission: The levels to optimise transmission at,
+                           defaults to 1x and 7.5x
+    """
+
+    all_zooms = yield from _get_all_zoom_levels(zoom_controller)
+    if zoom_levels_to_centre is None:
+        zoom_levels_to_centre = all_zooms
+
+    for zoom in [*zoom_levels_to_optimise_transmission, *zoom_levels_to_centre]:
+        if zoom not in all_zooms:
+            raise ValueError(f"Unknown zoom ({zoom}). Known zooms are {all_zooms}")
+
+    LOGGER.info("Preparing beamline for images...")
+    yield from _prepare_beamline_for_scintillator_images(
+        robot,
+        beamstop,
+        backlight,
+        scintillator,
+        xbpm_feedback,
+        shutter,
+        OAV_PREPARE_BEAMLINE_FOR_SCINT_WAIT,
+    )
+    LOGGER.info("Waiting for prepare beamline plan to complete...")
+    yield from bps.wait(OAV_PREPARE_BEAMLINE_FOR_SCINT_WAIT)
+
+    for centring_device in zoom_controller.beam_centres.values():
+        zoom_name = yield from bps.rd(centring_device.level_name)
+        if zoom_name in zoom_levels_to_centre:
+            LOGGER.info(f"Moving to zoom level {zoom_name}")
+            yield from bps.abs_set(zoom_controller, zoom_name, wait=True)
+            if zoom_name in zoom_levels_to_optimise_transmission:
+                LOGGER.info(f"Optimising transmission at zoom level {zoom_name}")
+                yield from optimise_transmission_with_oav(
+                    100,
+                    0,
+                    max_pixel=max_pixel,
+                    attenuator=attenuator,
+                    xbpm_feedback=xbpm_feedback,
+                )
+
+            yield from bps.trigger(centre_ellipse, wait=True)
+            centre_x = yield from bps.rd(centre_ellipse.center_x_val)
+            centre_y = yield from bps.rd(centre_ellipse.center_y_val)
+            centre_x = round(centre_x)
+            centre_y = round(centre_y)
+            LOGGER.info(
+                f"Writing centre values ({centre_x}, {centre_y}) to OAV PVs at zoom level {zoom_name}"
+            )
+            yield from bps.mv(
+                centring_device.x_centre, centre_x, centring_device.y_centre, centre_y
+            )
+
+    LOGGER.info("Find beam centre plan completed!")

mx_bluesky/beamlines/i04/redis_to_murko_forwarder.py

@@ -8,8 +8,11 @@ from typing import TypedDict
 
 import numpy as np
 import zmq
-from dodal.devices.i04.constants import RedisConstants
-from dodal.devices.i04.murko_results import RESULTS_COMPLETE_MESSAGE, MurkoResult
+from dodal.devices.beamlines.i04.constants import RedisConstants
+from dodal.devices.beamlines.i04.murko_results import (
+    RESULTS_COMPLETE_MESSAGE,
+    MurkoResult,
+)
 from numpy.typing import NDArray
 from PIL import Image
 from redis import StrictRedis

mx_bluesky/beamlines/i04/thawing_plan.py

@@ -3,8 +3,8 @@ import bluesky.preprocessors as bpp
 from bluesky.preprocessors import contingency_decorator, run_decorator, subs_decorator
 from bluesky.utils import MsgGenerator
 from dodal.common import inject
-from dodal.devices.i04.constants import RedisConstants
-from dodal.devices.i04.murko_results import MurkoResultsDevice
+from dodal.devices.beamlines.i04.constants import RedisConstants
+from dodal.devices.beamlines.i04.murko_results import MurkoResultsDevice
 from dodal.devices.oav.oav_to_redis_forwarder import OAVToRedisForwarder, Source
 from dodal.devices.robot import BartRobot
 from dodal.devices.smargon import Smargon

mx_bluesky/beamlines/i24/jungfrau_commissioning/composites.py

@@ -2,13 +2,13 @@ from __future__ import annotations
 
 import pydantic
 from dodal.devices.attenuator.attenuator import EnumFilterAttenuator
+from dodal.devices.beamlines.i24.aperture import Aperture
+from dodal.devices.beamlines.i24.beamstop import Beamstop
+from dodal.devices.beamlines.i24.commissioning_jungfrau import CommissioningJungfrau
+from dodal.devices.beamlines.i24.dcm import DCM
+from dodal.devices.beamlines.i24.dual_backlight import DualBacklight
+from dodal.devices.beamlines.i24.vgonio import VerticalGoniometer
 from dodal.devices.hutch_shutter import HutchShutter
-from dodal.devices.i24.aperture import Aperture
-from dodal.devices.i24.beamstop import Beamstop
-from dodal.devices.i24.commissioning_jungfrau import CommissioningJungfrau
-from dodal.devices.i24.dcm import DCM
-from dodal.devices.i24.dual_backlight import DualBacklight
-from dodal.devices.i24.vgonio import VerticalGoniometer
 from dodal.devices.motors import YZStage
 from dodal.devices.synchrotron import Synchrotron
 from dodal.devices.xbpm_feedback import XBPMFeedback

mx_bluesky/beamlines/i24/jungfrau_commissioning/experiment_plans/do_darks.py

@@ -2,7 +2,7 @@ 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 dodal.devices.beamlines.i24.commissioning_jungfrau import CommissioningJungfrau
 from ophyd_async.fastcs.jungfrau import (
     AcquisitionType,
     GainMode,

mx_bluesky/beamlines/i24/jungfrau_commissioning/experiment_plans/rotation_scan_plan.py

@@ -4,11 +4,11 @@ import bluesky.plan_stubs as bps
 import bluesky.preprocessors as bpp
 from bluesky.preprocessors import run_decorator
 from bluesky.utils import MsgGenerator
+from dodal.devices.beamlines.i24.aperture import AperturePositions
+from dodal.devices.beamlines.i24.beamstop import BeamstopPositions
+from dodal.devices.beamlines.i24.commissioning_jungfrau import CommissioningJungfrau
+from dodal.devices.beamlines.i24.dual_backlight import BacklightPositions
 from dodal.devices.hutch_shutter import ShutterState
-from dodal.devices.i24.aperture import AperturePositions
-from dodal.devices.i24.beamstop import BeamstopPositions
-from dodal.devices.i24.commissioning_jungfrau import CommissioningJungfrau
-from dodal.devices.i24.dual_backlight import BacklightPositions
 from dodal.devices.zebra.zebra import ArmDemand, I24Axes, Zebra
 from dodal.devices.zebra.zebra_controlled_shutter import ZebraShutter
 from ophyd_async.fastcs.jungfrau import (

mx_bluesky/beamlines/i24/jungfrau_commissioning/plan_stubs/do_external_acquisition.py

@@ -1,6 +1,6 @@
 from bluesky.utils import MsgGenerator
 from dodal.common import inject
-from dodal.devices.i24.commissioning_jungfrau import CommissioningJungfrau
+from dodal.devices.beamlines.i24.commissioning_jungfrau import CommissioningJungfrau
 from ophyd_async.core import (
     WatchableAsyncStatus,
 )

mx_bluesky/beamlines/i24/jungfrau_commissioning/plan_stubs/plan_utils.py

@@ -4,7 +4,7 @@ from typing import cast
 import bluesky.plan_stubs as bps
 from bluesky.utils import MsgGenerator
 from dodal.common.watcher_utils import log_on_percentage_complete
-from dodal.devices.i24.commissioning_jungfrau import CommissioningJungfrau
+from dodal.devices.beamlines.i24.commissioning_jungfrau import CommissioningJungfrau
 from ophyd_async.core import (
     TriggerInfo,
     WatchableAsyncStatus,

mx_bluesky/beamlines/i24/serial/dcid.py

@@ -8,9 +8,9 @@ from functools import lru_cache
 import bluesky.plan_stubs as bps
 import requests
 from bluesky.utils import MsgGenerator
-from dodal.devices.i24.beam_center import DetectorBeamCenter
-from dodal.devices.i24.dcm import DCM
-from dodal.devices.i24.focus_mirrors import FocusMirrorsMode
+from dodal.devices.beamlines.i24.beam_center import DetectorBeamCenter
+from dodal.devices.beamlines.i24.dcm import DCM
+from dodal.devices.beamlines.i24.focus_mirrors import FocusMirrorsMode
 
 from mx_bluesky.beamlines.i24.serial.fixed_target.ft_utils import PumpProbeSetting
 from mx_bluesky.beamlines.i24.serial.log import SSX_LOGGER

mx_bluesky/beamlines/i24/serial/extruder/i24ssx_extruder_collect_py3v2.py

@@ -15,13 +15,13 @@ import bluesky.preprocessors as bpp
 from bluesky.utils import MsgGenerator
 from dodal.common import inject
 from dodal.devices.attenuator.attenuator import ReadOnlyAttenuator
+from dodal.devices.beamlines.i24.aperture import Aperture
+from dodal.devices.beamlines.i24.beam_center import DetectorBeamCenter
+from dodal.devices.beamlines.i24.beamstop import Beamstop
+from dodal.devices.beamlines.i24.dcm import DCM
+from dodal.devices.beamlines.i24.dual_backlight import DualBacklight
+from dodal.devices.beamlines.i24.focus_mirrors import FocusMirrorsMode
 from dodal.devices.hutch_shutter import HutchShutter, ShutterDemand
-from dodal.devices.i24.aperture import Aperture
-from dodal.devices.i24.beam_center import DetectorBeamCenter
-from dodal.devices.i24.beamstop import Beamstop
-from dodal.devices.i24.dcm import DCM
-from dodal.devices.i24.dual_backlight import DualBacklight
-from dodal.devices.i24.focus_mirrors import FocusMirrorsMode
 from dodal.devices.motors import YZStage
 from dodal.devices.zebra.zebra import Zebra
 

mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_chip_collect_py3v1.py

@@ -11,14 +11,14 @@ import bluesky.preprocessors as bpp
 from bluesky.utils import MsgGenerator
 from dodal.common import inject
 from dodal.devices.attenuator.attenuator import ReadOnlyAttenuator
+from dodal.devices.beamlines.i24.aperture import Aperture
+from dodal.devices.beamlines.i24.beam_center import DetectorBeamCenter
+from dodal.devices.beamlines.i24.beamstop import Beamstop
+from dodal.devices.beamlines.i24.dcm import DCM
+from dodal.devices.beamlines.i24.dual_backlight import DualBacklight
+from dodal.devices.beamlines.i24.focus_mirrors import FocusMirrorsMode
+from dodal.devices.beamlines.i24.pmac import PMAC
 from dodal.devices.hutch_shutter import HutchShutter, ShutterDemand
-from dodal.devices.i24.aperture import Aperture
-from dodal.devices.i24.beam_center import DetectorBeamCenter
-from dodal.devices.i24.beamstop import Beamstop
-from dodal.devices.i24.dcm import DCM
-from dodal.devices.i24.dual_backlight import DualBacklight
-from dodal.devices.i24.focus_mirrors import FocusMirrorsMode
-from dodal.devices.i24.pmac import PMAC
 from dodal.devices.motors import YZStage
 from dodal.devices.zebra.zebra import Zebra
 

mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_chip_manager_py3v1.py

@@ -13,9 +13,9 @@ import numpy as np
 from bluesky.utils import MsgGenerator
 from dodal.common import inject
 from dodal.devices.attenuator.attenuator import ReadOnlyAttenuator
-from dodal.devices.i24.beamstop import Beamstop, BeamstopPositions
-from dodal.devices.i24.dual_backlight import BacklightPositions, DualBacklight
-from dodal.devices.i24.pmac import CS_STR, PMAC, EncReset, LaserSettings
+from dodal.devices.beamlines.i24.beamstop import Beamstop, BeamstopPositions
+from dodal.devices.beamlines.i24.dual_backlight import BacklightPositions, DualBacklight
+from dodal.devices.beamlines.i24.pmac import CS_STR, PMAC, EncReset, LaserSettings
 from dodal.devices.motors import YZStage
 
 from mx_bluesky.beamlines.i24.serial.fixed_target.ft_utils import (

mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_moveonclick.py

@@ -9,7 +9,7 @@ import bluesky.plan_stubs as bps
 import cv2 as cv
 from bluesky.run_engine import RunEngine
 from dodal.beamlines import i24
-from dodal.devices.i24.pmac import PMAC
+from dodal.devices.beamlines.i24.pmac import PMAC
 from dodal.devices.oav.oav_detector import OAV
 
 from mx_bluesky.beamlines.i24.serial.fixed_target import (

mx_bluesky/beamlines/i24/serial/setup_beamline/setup_beamline.py

@@ -1,12 +1,12 @@
 from pathlib import Path
 
 import bluesky.plan_stubs as bps
+from dodal.devices.beamlines.i24.aperture import Aperture, AperturePositions
+from dodal.devices.beamlines.i24.beam_center import DetectorBeamCenter
+from dodal.devices.beamlines.i24.beamstop import Beamstop, BeamstopPositions
+from dodal.devices.beamlines.i24.dcm import DCM
+from dodal.devices.beamlines.i24.dual_backlight import BacklightPositions, DualBacklight
 from dodal.devices.detector.det_dim_constants import DetectorSizeConstants
-from dodal.devices.i24.aperture import Aperture, AperturePositions
-from dodal.devices.i24.beam_center import DetectorBeamCenter
-from dodal.devices.i24.beamstop import Beamstop, BeamstopPositions
-from dodal.devices.i24.dcm import DCM
-from dodal.devices.i24.dual_backlight import BacklightPositions, DualBacklight
 from dodal.devices.motors import YZStage
 from dodal.devices.util.lookup_tables import (
     linear_interpolation_lut,

mx_bluesky/beamlines/i24/serial/web_gui_plans/general_plans.py

@@ -8,14 +8,14 @@ from bluesky.utils import MsgGenerator
 from dodal.beamlines import i24
 from dodal.common import inject
 from dodal.devices.attenuator.attenuator import EnumFilterAttenuator
+from dodal.devices.beamlines.i24.aperture import Aperture
+from dodal.devices.beamlines.i24.beam_center import DetectorBeamCenter
+from dodal.devices.beamlines.i24.beamstop import Beamstop
+from dodal.devices.beamlines.i24.dcm import DCM
+from dodal.devices.beamlines.i24.dual_backlight import BacklightPositions, DualBacklight
+from dodal.devices.beamlines.i24.focus_mirrors import FocusMirrorsMode
+from dodal.devices.beamlines.i24.pmac import PMAC
 from dodal.devices.hutch_shutter import HutchShutter
-from dodal.devices.i24.aperture import Aperture
-from dodal.devices.i24.beam_center import DetectorBeamCenter
-from dodal.devices.i24.beamstop import Beamstop
-from dodal.devices.i24.dcm import DCM
-from dodal.devices.i24.dual_backlight import BacklightPositions, DualBacklight
-from dodal.devices.i24.focus_mirrors import FocusMirrorsMode
-from dodal.devices.i24.pmac import PMAC
 from dodal.devices.motors import YZStage
 from dodal.devices.oav.oav_detector import OAVBeamCentreFile
 from dodal.devices.zebra.zebra import Zebra

mx_bluesky/beamlines/i24/serial/web_gui_plans/oav_plans.py

@@ -3,7 +3,7 @@ from enum import Enum
 import bluesky.plan_stubs as bps
 from bluesky.utils import MsgGenerator
 from dodal.common import inject
-from dodal.devices.i24.pmac import PMAC
+from dodal.devices.beamlines.i24.pmac import PMAC
 
 
 class MoveSize(Enum):

mx_bluesky/common/experiment_plans/common_flyscan_xray_centre_plan.py

@@ -210,7 +210,7 @@ def _fetch_xrc_results_from_zocalo(
 
     LOGGER.info("Getting X-ray center Zocalo results...")
 
-    yield from bps.trigger(zocalo_results)
+    yield from bps.trigger(zocalo_results, wait=True)
     LOGGER.info("Zocalo triggered and read, interpreting results.")
     xrc_results = yield from get_full_processing_results(zocalo_results)
     LOGGER.info(f"Got xray centres, top 5: {xrc_results[:5]}")

mx_bluesky/common/experiment_plans/oav_grid_detection_plan.py

@@ -104,7 +104,7 @@ def grid_detection_plan(
     for angle in (yield from optimum_grid_detect_angles(smargon)):
         yield from bps.mv(smargon.omega, angle)
         # need to wait for the OAV image to update
-        # See #673 for improvements
+        # See https://github.com/DiamondLightSource/mx-bluesky/issues/416 for improvements
         yield from bps.sleep(HardwareConstants.OAV_REFRESH_DELAY)
 
         tip_x_px, tip_y_px = yield from catch_exception_and_warn(

mx_bluesky/common/experiment_plans/pin_tip_centring_plan.py

@@ -146,7 +146,7 @@ def pin_tip_centre_plan(
     LOGGER.info(f"Tip offset in pixels: {tip_offset_px}")
 
     # need to wait for the OAV image to update
-    # See #673 for improvements
+    # See https://github.com/DiamondLightSource/mx-bluesky/issues/416 for improvements
     yield from bps.sleep(0.3)
 
     yield from pre_centring_setup_oav(oav, oav_params, pin_tip_setup)
@@ -157,7 +157,7 @@ def pin_tip_centre_plan(
     yield from bps.mvr(gonio.omega, -90)
 
     # need to wait for the OAV image to update
-    # See #673 for improvements
+    # See https://github.com/DiamondLightSource/mx-bluesky/issues/416 for improvements
     yield from bps.sleep(0.3)
     tip = yield from catch_exception_and_warn(
         PinNotFoundError, wait_for_tip_to_be_found, pin_tip_detect

mx_bluesky/hyperion/device_setup_plans/dcm_pitch_roll_mirror_adjuster.py

@@ -1,10 +1,10 @@
 import bluesky.plan_stubs as bps
+from dodal.devices.beamlines.i03.undulator_dcm import UndulatorDCM
 from dodal.devices.focusing_mirror import (
     FocusingMirrorWithStripes,
     MirrorStripe,
     MirrorVoltages,
 )
-from dodal.devices.i03.undulator_dcm import UndulatorDCM
 from dodal.devices.util.adjuster_plans import lookup_table_adjuster
 from dodal.devices.util.lookup_tables import (
     linear_interpolation_lut,

mx_bluesky/hyperion/device_setup_plans/utils.py

@@ -1,8 +1,8 @@
 from bluesky import plan_stubs as bps
+from dodal.devices.beamlines.i03.dcm import DCM
 from dodal.devices.detector import (
     DetectorParams,
 )
-from dodal.devices.i03.dcm import DCM
 
 
 def fill_in_energy_if_not_supplied(dcm: DCM, detector_params: DetectorParams):

mx_bluesky/hyperion/experiment_plans/robot_load_and_change_energy.py

@@ -13,9 +13,9 @@ from bluesky.utils import Msg
 from dodal.devices.aperturescatterguard import ApertureScatterguard
 from dodal.devices.attenuator.attenuator import BinaryFilterAttenuator
 from dodal.devices.backlight import Backlight, InOut
+from dodal.devices.beamlines.i03.dcm import DCM
+from dodal.devices.beamlines.i03.undulator_dcm import UndulatorDCM
 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 XYZStage
 from dodal.devices.oav.oav_detector import OAV
 from dodal.devices.robot import BartRobot, SampleLocation

mx_bluesky/hyperion/experiment_plans/robot_load_then_centre_plan.py

@@ -10,15 +10,15 @@ 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.beamlines.i03 import Beamstop
+from dodal.devices.beamlines.i03.dcm import DCM
+from dodal.devices.beamlines.i03.undulator_dcm import UndulatorDCM
 from dodal.devices.beamsize.beamsize import BeamsizeBase
 from dodal.devices.detector.detector_motion import DetectorMotion
 from dodal.devices.eiger import EigerDetector
 from dodal.devices.fast_grid_scan import PandAFastGridScan, ZebraFastGridScanThreeD
 from dodal.devices.flux import Flux
 from dodal.devices.focusing_mirror import FocusingMirrorWithStripes, MirrorVoltages
-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 XYZStage
 from dodal.devices.oav.oav_detector import OAV
 from dodal.devices.oav.pin_image_recognition import PinTipDetection

mx_bluesky/hyperion/experiment_plans/rotation_scan_plan.py

@@ -6,12 +6,12 @@ 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.beamlines.i03 import Beamstop
+from dodal.devices.beamlines.i03.dcm import DCM
 from dodal.devices.beamsize.beamsize import BeamsizeBase
 from dodal.devices.detector.detector_motion import DetectorMotion
 from dodal.devices.eiger import EigerDetector
 from dodal.devices.flux import Flux
-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

mx_bluesky/hyperion/experiment_plans/set_energy_plan.py

@@ -9,9 +9,9 @@ import bluesky.preprocessors as bpp
 import pydantic
 from bluesky import plan_stubs as bps
 from dodal.devices.attenuator.attenuator import BinaryFilterAttenuator
+from dodal.devices.beamlines.i03.dcm import DCM
+from dodal.devices.beamlines.i03.undulator_dcm import UndulatorDCM
 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 UndulatorInKeV
 from dodal.devices.xbpm_feedback import XBPMFeedback
 

mx_bluesky/hyperion/experiment_plans/udc_default_state.py

@@ -63,12 +63,7 @@ def move_to_udc_default_state(devices: UDCDefaultDevices):
     """Moves beamline to known positions prior to UDC start"""
     yield from _verify_correct_cryostream_selected(devices.cryostream_gantry)
 
-    cryostream_temp = yield from bps.rd(devices.cryostream.temp)
-    cryostream_pressure = yield from bps.rd(devices.cryostream.back_pressure)
-    if cryostream_temp > CONST.HARDWARE.MAX_CRYO_TEMP_K:
-        raise CryoStreamError("Cryostream temperature is too high, not starting UDC")
-    if cryostream_pressure > CONST.HARDWARE.MAX_CRYO_PRESSURE_BAR:
-        raise CryoStreamError("Cryostream back pressure is too high, not starting UDC")
+    yield from _check_cryostream(devices)
 
     yield from _verify_no_sample_present(devices.robot)
 
@@ -150,6 +145,24 @@ def move_to_udc_default_state(devices: UDCDefaultDevices):
     yield from bps.wait(_GROUP_POST_BEAMSTOP_CHECK, timeout=10)
 
 
+def _check_cryostream(devices: UDCDefaultDevices):
+    commissioning_mode = yield from bps.rd(devices.baton.commissioning)
+    cryo_mode = yield from bps.rd(devices.robot.cryomode_rbv)
+    if commissioning_mode and cryo_mode == BartRobot.CRYO_MODE_WARM:
+        LOGGER.warning("Ignoring cryostream status in commissioning mode")
+    else:
+        cryostream_temp = yield from bps.rd(devices.cryostream.temp)
+        cryostream_pressure = yield from bps.rd(devices.cryostream.back_pressure)
+        if cryostream_temp > CONST.HARDWARE.MAX_CRYO_TEMP_K:
+            raise CryoStreamError(
+                "Cryostream temperature is too high, not starting UDC"
+            )
+        if cryostream_pressure > CONST.HARDWARE.MAX_CRYO_PRESSURE_BAR:
+            raise CryoStreamError(
+                "Cryostream back pressure is too high, not starting UDC"
+            )
+
+
 def _verify_correct_cryostream_selected(
     cryostream_gantry: CryoStreamGantry,
 ) -> MsgGenerator:

mx_bluesky/hyperion/parameters/device_composites.py

@@ -6,6 +6,7 @@ from dodal.devices.aperturescatterguard import (
 )
 from dodal.devices.attenuator.attenuator import BinaryFilterAttenuator
 from dodal.devices.backlight import Backlight
+from dodal.devices.beamlines.i03.beamsize import Beamsize
 from dodal.devices.common_dcm import DoubleCrystalMonochromatorWithDSpacing
 from dodal.devices.eiger import EigerDetector
 from dodal.devices.fast_grid_scan import (
@@ -13,7 +14,6 @@ from dodal.devices.fast_grid_scan import (
     ZebraFastGridScanThreeD,
 )
 from dodal.devices.flux import Flux
-from dodal.devices.i03.beamsize import Beamsize
 from dodal.devices.robot import BartRobot
 from dodal.devices.s4_slit_gaps import S4SlitGaps
 from dodal.devices.synchrotron import Synchrotron

{mx_bluesky-1.5.16.dist-info → mx_bluesky-1.6.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mx-bluesky
-Version: 1.5.16
+Version: 1.6.3
 Summary: Bluesky tools for MX Beamlines at DLS
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
 License:                                  Apache License
@@ -242,7 +242,7 @@ Requires-Dist: blueapi>=1.8.0
 Requires-Dist: ophyd>=1.10.5
 Requires-Dist: ophyd-async>=0.14.0
 Requires-Dist: bluesky>=1.14.6
-Requires-Dist: dls-dodal==1.69.0
+Requires-Dist: dls-dodal==2.0.0
 Dynamic: license-file
 
 mx-bluesky

{mx_bluesky-1.5.16.dist-info → mx_bluesky-1.6.3.dist-info}/RECORD

@@ -1,7 +1,7 @@
 mx_bluesky/Getting started.ipynb,sha256=7Jca55mqPkoqC894HHEXjRKMiECuMN_7P4vlmSF2sgw,6513
 mx_bluesky/__init__.py,sha256=Ksms_WJF8LTkbm38gEpm1jBpGqcQ8NGvmb2ZJlOE1j8,198
 mx_bluesky/__main__.py,sha256=RVqPnxDisFMIn_aoEi0drlThNHgKTJULnSrotouIKI0,480
-mx_bluesky/_version.py,sha256=AUhyhQY4Zp0fmRL5GWktY8vZx2VB59787rbe5ydecrY,706
+mx_bluesky/_version.py,sha256=G38fpx_vDfL4EzQpAGJYyrke-spatelcNUUTx7Yh8BM,704
 mx_bluesky/definitions.py,sha256=ULpEYAUzdQiEbBoTgYTMxfUf3DDDjhYtvDxofs7Qxqw,168
 mx_bluesky/jupyter_example.ipynb,sha256=oGYWduEjWrSpciCBe9strBng1Mh_dPZuQt6dOYnrPdU,1860
 mx_bluesky/beamlines/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -17,39 +17,39 @@ mx_bluesky/beamlines/aithre_lasershaping/parameters/__init__.py,sha256=47DEQpj8H
 mx_bluesky/beamlines/aithre_lasershaping/parameters/constants.py,sha256=g9jtMQAPC2htINynpTxRH9W6SbbsK67qqBCJprP01Xk,356
 mx_bluesky/beamlines/aithre_lasershaping/parameters/robot_load_parameters.py,sha256=KTieNHdKMUS6Eev8EuXvSEkJBZN2-Wyt-_KD5W3E6pU,191
 mx_bluesky/beamlines/i02_1/parameters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mx_bluesky/beamlines/i02_1/parameters/gridscan.py,sha256=BxljHUuWDDqu-AV0Hs7UleiKlSYwzJDNOMo0TzSDL5s,1283
-mx_bluesky/beamlines/i04/__init__.py,sha256=LlotTcJ38SA-oj8Ps2dYSoEHaYsYQXNy59ekeDTumjs,554
-mx_bluesky/beamlines/i04/redis_to_murko_forwarder.py,sha256=UVDRV1rz6Iz96KYRfd3X932QZ5_Wl_YL0VU17V45Trc,7505
-mx_bluesky/beamlines/i04/thawing_plan.py,sha256=ccGiH8xvpvbdcycMqKj3xHhSOSksXV1vsvrNbqo4Ho0,10009
+mx_bluesky/beamlines/i02_1/parameters/gridscan.py,sha256=tKkpOJfukSZFEvFIaBkhwfVYzbAaa_0qNiZwW4Wto_A,1293
+mx_bluesky/beamlines/i04/__init__.py,sha256=oqtrB-A5Cpmg3ssr84EcoMyBuU6fdcWwkQ6GSetri3U,676
+mx_bluesky/beamlines/i04/redis_to_murko_forwarder.py,sha256=QeiaGfP_e-opot2f8e8-IKxVJyOL6W03Xi18GDzVlrw,7538
+mx_bluesky/beamlines/i04/thawing_plan.py,sha256=2Mj8LMuiOZUeGy_Ld5GU8Q1_dtNa4NwuYD-AP_EownM,10029
 mx_bluesky/beamlines/i04/callbacks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/beamlines/i04/callbacks/murko_callback.py,sha256=Ocz11OPVO85ATwPUGPWlk89BGkxwfAB0BKmC0iFZJHc,5607
 mx_bluesky/beamlines/i04/experiment_plans/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mx_bluesky/beamlines/i04/experiment_plans/i04_grid_detect_then_xray_centre_plan.py,sha256=aS9HHX8lJlTEmw3vAHnvQdkp5zPf91jpdjoWt9pYB3M,12804
+mx_bluesky/beamlines/i04/experiment_plans/i04_grid_detect_then_xray_centre_plan.py,sha256=2vmbHPFJRxiD4vzA24DTmdCcn8AL1rNj0i7KJnld5Rc,12824
 mx_bluesky/beamlines/i04/external_interaction/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/beamlines/i04/external_interaction/config_server.py,sha256=Zpair6Qw1nBgm-w8eAg0f-4mjHouAnaF2Fu2Pj8zTeU,425
 mx_bluesky/beamlines/i04/oav_centering_plans/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mx_bluesky/beamlines/i04/oav_centering_plans/oav_imaging.py,sha256=kgAD8cnMm1USyzDnZcy8Z31i4Ss1ki9Aym9e6tAzCag,4256
+mx_bluesky/beamlines/i04/oav_centering_plans/oav_imaging.py,sha256=7qdEI6Gf4etD6XV0XPwuJSKfn-y88CzmqT4geTHfJpU,13008
 mx_bluesky/beamlines/i04/parameters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/beamlines/i04/parameters/constants.py,sha256=H17HqwuAT1upmQHGartdIEBImVEuX1nObwbADwT__Kc,750
 mx_bluesky/beamlines/i23/__init__.py,sha256=7nwQiKBZAXLnvPhCqaI2VC1k4TOzQalOUvwF6SQ3Yd4,95
 mx_bluesky/beamlines/i23/serial.py,sha256=XVbHM8NevnJMFAJD9jkxG-VnPaWX6t_k-wlipRw0pmY,2055
 mx_bluesky/beamlines/i24/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/beamlines/i24/jungfrau_commissioning/__init__.py,sha256=5V-ZjCI42faVxg2I5_7Kb440VQzauFWg4oMSgCu-cDU,363
-mx_bluesky/beamlines/i24/jungfrau_commissioning/composites.py,sha256=yFh5f0wZjc4aTG2cPg-43au-OYn-6RYZvQ51yYmk0eA,1296
+mx_bluesky/beamlines/i24/jungfrau_commissioning/composites.py,sha256=NtoEO7OqNsSKM6sACcK7AHYYdlVhaNEjK3RFKPx16X0,1356
 mx_bluesky/beamlines/i24/jungfrau_commissioning/callbacks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/beamlines/i24/jungfrau_commissioning/callbacks/metadata_writer.py,sha256=Yq8F4kBMDlKRqVUBXLM2QzaJSpWclx3HuYnpXWBEhS0,3485
 mx_bluesky/beamlines/i24/jungfrau_commissioning/experiment_plans/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mx_bluesky/beamlines/i24/jungfrau_commissioning/experiment_plans/do_darks.py,sha256=0h_aldh2XGnMho1EPSqgH_w4P2XiwpSOc56NtEzwxOo,4294
-mx_bluesky/beamlines/i24/jungfrau_commissioning/experiment_plans/rotation_scan_plan.py,sha256=s4hw_RtjyHZukZLA8O5Dan7iN0kddGXUcdkRx7hluuo,10686
+mx_bluesky/beamlines/i24/jungfrau_commissioning/experiment_plans/do_darks.py,sha256=NXw6gDCD6UPbRcIDPXsQRiJJ2DMDI5PlEVCnQxIxFMY,4304
+mx_bluesky/beamlines/i24/jungfrau_commissioning/experiment_plans/rotation_scan_plan.py,sha256=8c3ZdDQWvIbIsYMa4E_-nzyZLnKvddOVYn3qPuAoEak,10726
 mx_bluesky/beamlines/i24/jungfrau_commissioning/plan_stubs/__init__.py,sha256=yxc_V5DfWKXtOmuX-U9YEdkn05ZriD9My65lpEYTuRo,115
-mx_bluesky/beamlines/i24/jungfrau_commissioning/plan_stubs/do_external_acquisition.py,sha256=36TuQyWADFZtF8YeUXYuQ1z6MpFMCm66CSP50isccYU,1401
+mx_bluesky/beamlines/i24/jungfrau_commissioning/plan_stubs/do_external_acquisition.py,sha256=gq1lYZaOMuYZ1wx8XieBW-3LbkvwLLjGUufY9VULIW4,1411
 mx_bluesky/beamlines/i24/jungfrau_commissioning/plan_stubs/do_internal_acquisition.py,sha256=J2dSNqRG0q05o_Rxx85KngqyMuEm0Kg84cGqrLW9jE0,1878
-mx_bluesky/beamlines/i24/jungfrau_commissioning/plan_stubs/plan_utils.py,sha256=a36KcAcK44ICcrBe4RtFyQxyWPKB0HWR2CHWc24ff-M,2684
+mx_bluesky/beamlines/i24/jungfrau_commissioning/plan_stubs/plan_utils.py,sha256=7cLRem5mWj0Dm-gnzAvTUM3OFQW3WyFKsNLd4UL-24E,2694
 mx_bluesky/beamlines/i24/parameters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/beamlines/i24/parameters/constants.py,sha256=9O1_QMu4_Y53KBeXFukT42A4WTqtODWzRWytgJEtsgs,290
 mx_bluesky/beamlines/i24/serial/__init__.py,sha256=Wq8i-XNhmBpfXSF3qZfzL9iubJrIzcVtMTH-fRGb3Eo,1619
 mx_bluesky/beamlines/i24/serial/blueapi_config.yaml,sha256=P0saF1bqt4ANU-2mtS_ZHO4NYr_ierUJN-gf6cspic8,350
-mx_bluesky/beamlines/i24/serial/dcid.py,sha256=oiQ6CNTkUzVbxUjaoxoPk4qyQ3Ga7xbFbFnToEkvzLs,13763
+mx_bluesky/beamlines/i24/serial/dcid.py,sha256=RevHXQE9AVKD3ltITptotDXMwhnPn3tUjizT5ocV82E,13793
 mx_bluesky/beamlines/i24/serial/log.py,sha256=a7tC-o3yzWpNvf27suQmn8O1gQec3_2-DbWW-tp8tL4,4800
 mx_bluesky/beamlines/i24/serial/run_extruder.sh,sha256=Dz3XLx0iPFxwo9KnG7oNBZFG19BGrb37O2w-ki_X9s4,1659
 mx_bluesky/beamlines/i24/serial/run_fixed_target.sh,sha256=KnnDP8_i47c4nWAYqugT-j4H6lcujVitIFs7sz5GzDs,1840
@@ -59,16 +59,16 @@ mx_bluesky/beamlines/i24/serial/set_visit_directory.sh,sha256=9W0ooseih2PszePztp
 mx_bluesky/beamlines/i24/serial/start_blueapi.sh,sha256=4iBzQljTLXQiVIF4UO7drc9qUkP7KSRC6Mjh8hcGxpI,608
 mx_bluesky/beamlines/i24/serial/write_nexus.py,sha256=3xNxco-mY17dS-JrWtYAXu-DWLAmEA5TQ8J-IaDgSUM,4748
 mx_bluesky/beamlines/i24/serial/extruder/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mx_bluesky/beamlines/i24/serial/extruder/i24ssx_extruder_collect_py3v2.py,sha256=XzsC7vt-OqBzFp-4sh8FkUDojFCzpMR8pEZf-opUJKc,16493
+mx_bluesky/beamlines/i24/serial/extruder/i24ssx_extruder_collect_py3v2.py,sha256=YBbD1hG5wjfmV3wRASz_oa3bJsHn5ZK0yoTtkeUCjUg,16553
 mx_bluesky/beamlines/i24/serial/extruder/EX-gui-edm/DetStage.edl,sha256=VqK_0EW_7H433nYLvprXvYRW-xWXWMF1dHqrKxQ0UOQ,1959
 mx_bluesky/beamlines/i24/serial/extruder/EX-gui-edm/DiamondExtruder-I24-py3v1.edl,sha256=u0WFI9LwUAjMvhQuV0SRwHLpGKwqmz17D4YNUPfBwG8,31011
 mx_bluesky/beamlines/i24/serial/extruder/EX-gui-edm/microdrop_alignment.edl,sha256=K79vmGAcf9qVEQLXTgr0g4bZDWaJ7nFoK4e0Ex7qAwM,14690
 mx_bluesky/beamlines/i24/serial/fixed_target/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/beamlines/i24/serial/fixed_target/ft_utils.py,sha256=puO1vg0x-TPgv8FbEFg73ohJqbwDpcG50_2cLUTa2FA,1210
-mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_chip_collect_py3v1.py,sha256=UA4HBhaTk0Z-usBfOczlUQF1jiHrFdEcmJ0jc6JmfZA,22504
-mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_chip_manager_py3v1.py,sha256=6DeItKS_gN3OKur39Te9SXu34oVVLjdCIhcVvukE9oo,32671
+mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_chip_collect_py3v1.py,sha256=7eAa6eZxuvjxHtM0ZmcrHaYlT5OjL42lBlABGdkgAjU,22574
+mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_chip_manager_py3v1.py,sha256=XkD7qrv2htki7Bee9MU4QMnscy-3L8SVA_XD9TTpRqY,32701
 mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_chip_startup_py3v1.py,sha256=_nlBI-LDzgNObF_SVJFqC390_ogWFmTJqVPgJA_C_DM,3275
-mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_moveonclick.py,sha256=144wDZTcbXhoVMaNlj20zDezS62iN_kjoMtbLQeXDRU,6825
+mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_moveonclick.py,sha256=kx18_KQMe2WmNeomYfJRcP8Xr2G9StjneJ_QZhLC-yQ,6835
 mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/CustomChip_py3v1.edl,sha256=jZJ37qg5pOdG6-wrYKpi2Xfz6LwSg7D6PrHlaansjFI,10371
 mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/DetStage.edl,sha256=hYymun88ECy_6A4QohsFf1COwE6ln2goDehUPdEJB3Y,1962
 mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/DiamondChipI24-py3v1.edl,sha256=D5jHfyk7caGKz3K5e7_8M0wX3R9wqFp1jiF0QXdGj7s,56112
@@ -93,12 +93,12 @@ mx_bluesky/beamlines/i24/serial/setup_beamline/__init__.py,sha256=c1IO9b78eT78kp
 mx_bluesky/beamlines/i24/serial/setup_beamline/ca.py,sha256=POg4BRnc9h1VwZEDqb-poMevgC8AwJmIi8RCYvZb8hw,1307
 mx_bluesky/beamlines/i24/serial/setup_beamline/pv.py,sha256=kFATZxSRz4yL3ysfzrgDuocHu8vw_q0cuciC21eXBeg,6995
 mx_bluesky/beamlines/i24/serial/setup_beamline/pv_abstract.py,sha256=lGgdUUr13_ncQQuFrNAye460Weo_-ecRyWAGqRUjV6Q,1042
-mx_bluesky/beamlines/i24/serial/setup_beamline/setup_beamline.py,sha256=BNn2FRn7cDvEdB6uNETwpC6_Zv9SalYgNnr3TXCXMmM,8964
+mx_bluesky/beamlines/i24/serial/setup_beamline/setup_beamline.py,sha256=AKrOgg8-gByNzOGpk7HMJwml0b7U5SV3brFPJxWpIO0,9014
 mx_bluesky/beamlines/i24/serial/setup_beamline/setup_detector.py,sha256=AAOfQpqHbMjHN7NVJ96c68lvC_HL1ZwviAE2dr1qbg4,2926
 mx_bluesky/beamlines/i24/serial/setup_beamline/setup_zebra_plans.py,sha256=zJu2kzWHUTdir1ojYmXWCM-cz0IIXcp2kJmCS90PjeQ,17458
 mx_bluesky/beamlines/i24/serial/web_gui_plans/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mx_bluesky/beamlines/i24/serial/web_gui_plans/general_plans.py,sha256=Gck3y6geOeqE3gC7Ne9mK27fYiu7owj1bXEEosSYsm0,11804
-mx_bluesky/beamlines/i24/serial/web_gui_plans/oav_plans.py,sha256=YxbSNsNPo1jcEMbRkHf1x3mQ1m6qQF1bL_J6j5cjvQ4,2054
+mx_bluesky/beamlines/i24/serial/web_gui_plans/general_plans.py,sha256=gNvLeK3h_OOap4Qfw0GIYiclAmNn95abhxC37idM67A,11874
+mx_bluesky/beamlines/i24/serial/web_gui_plans/oav_plans.py,sha256=r4yiIJ-pfqSanYGRQRApqVYrRZQaCEISTtBUjHEHYF8,2064
 mx_bluesky/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/common/xrc_result.py,sha256=tUJ6qkDTTB6H1F71IvVAKtmHCRyHSU_tj9GRzVmnE7w,3219
 mx_bluesky/common/device_setup_plans/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -114,11 +114,11 @@ mx_bluesky/common/device_setup_plans/xbpm_feedback.py,sha256=UZxFgxG_xhc9k1SzKSb
 mx_bluesky/common/experiment_plans/__init__.py,sha256=FMA-4VN1TJCPcyURKF0qPIQ8uo8YBbtHPRdJokVF4MA,129
 mx_bluesky/common/experiment_plans/beamstop_check.py,sha256=W6dcG1vfJP2_GDeAjuQ_tBvnre106Jq_PSJG3pH76PY,9004
 mx_bluesky/common/experiment_plans/change_aperture_then_move_plan.py,sha256=407E9rp0yGWWIU1fJrgqK_hC19mVwRK-Und7fMlGNDc,3062
-mx_bluesky/common/experiment_plans/common_flyscan_xray_centre_plan.py,sha256=SBd5KeDw9OH49-EtaYKD8XRt9xftFHbgKQ_s-cKQFIA,13566
+mx_bluesky/common/experiment_plans/common_flyscan_xray_centre_plan.py,sha256=BB1KHNmoRliyVRpbsWY60w59wyw7aBVkA3q8kqFfKe4,13577
 mx_bluesky/common/experiment_plans/common_grid_detect_then_xray_centre_plan.py,sha256=-QCj6utLqQNbaguoVh5htYhNihfpVUS7oo5zMvIYOfw,7033
-mx_bluesky/common/experiment_plans/oav_grid_detection_plan.py,sha256=SOX6eyPNm7hLJaRJ8esd4DOE2nBjT_2gbmAz1Ozc57g,7154
+mx_bluesky/common/experiment_plans/oav_grid_detection_plan.py,sha256=-PcZ5J6hKKwqN7wbfD3UkChCL0D9qpiu9kdj1xvBjYc,7209
 mx_bluesky/common/experiment_plans/oav_snapshot_plan.py,sha256=3xhEen8Op_lPSB63sAfbsEfq9sWNIbtMv5ssw8xz0R8,3598
-mx_bluesky/common/experiment_plans/pin_tip_centring_plan.py,sha256=DTBdm7zMwrJUkhS_pu2IHAfKMgYnzBZNa-QIuusxCSo,6184
+mx_bluesky/common/experiment_plans/pin_tip_centring_plan.py,sha256=z6g9SMzYMKzaChKnTfMNoHuFt5rnJ5_RigTuuvS5Bg0,6294
 mx_bluesky/common/experiment_plans/inner_plans/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/common/experiment_plans/inner_plans/do_fgs.py,sha256=IMsfA1-4POl5h5X3mczN-Hll-OlGwrp8RaI32TMlyjM,4884
 mx_bluesky/common/experiment_plans/inner_plans/read_hardware.py,sha256=BDW-xmzvMXo8qQXyBl7j5OrL0wBLM00W5xMNPO_YaLk,2588
@@ -179,10 +179,10 @@ mx_bluesky/hyperion/plan_runner_api.py,sha256=aWO3THjNl9U4UUuOC7jNrrb6bLp8zqR3GU
 mx_bluesky/hyperion/runner.py,sha256=YSdHgtAmMitHfooDwicA9mLhav457MGzLijlhFYeDCo,7167
 mx_bluesky/hyperion/blueapi_plans/__init__.py,sha256=VwhB0PE0cnHWa5MafkxKahCSuYTBoc-_o-INE85lVJ8,3557
 mx_bluesky/hyperion/device_setup_plans/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mx_bluesky/hyperion/device_setup_plans/dcm_pitch_roll_mirror_adjuster.py,sha256=MPPpBkNCyx7r64SMb-2Zm8x1z1Rmdq-21Njr-5gqmxQ,5155
+mx_bluesky/hyperion/device_setup_plans/dcm_pitch_roll_mirror_adjuster.py,sha256=_zw32pay4hQvFRdjqY9DjPgAjfhuzgV7n-7EIw5xk3Y,5165
 mx_bluesky/hyperion/device_setup_plans/setup_panda.py,sha256=prhTvpa0HYkBDUonMBux1aammdBdbT9KSTZbfvB_Zns,8507
 mx_bluesky/hyperion/device_setup_plans/setup_zebra.py,sha256=dOfBQMibyH3CjSh_m5RJKsxs2DtaM3jtwEs7lkqQppo,1525
-mx_bluesky/hyperion/device_setup_plans/utils.py,sha256=XlbHaIAnuCyHY5PmutiCf_j9MmFvITcmURA9yXfXD1o,425
+mx_bluesky/hyperion/device_setup_plans/utils.py,sha256=9Qi4qZ5jlJ9WyjNBMXIyoliqO4YPcHJEHR7WKdLdJMA,435
 mx_bluesky/hyperion/experiment_plans/__init__.py,sha256=dJjwLk0EQP-1hKhbs8aRxTF_LxUXgB7kcgDlaP-tMnk,787
 mx_bluesky/hyperion/experiment_plans/experiment_registry.py,sha256=aj6jLkIdVSKin0wkH-HvK0kpZIeCr29Sg8jDH2k5XWY,1713
 mx_bluesky/hyperion/experiment_plans/hyperion_flyscan_xray_centre_plan.py,sha256=0UnoY5b3ZAKOw3Lh4k-xylithj0vOKNCPEi9wKGzuns,5995
@@ -190,11 +190,11 @@ mx_bluesky/hyperion/experiment_plans/hyperion_grid_detect_then_xray_centre_plan.
 mx_bluesky/hyperion/experiment_plans/load_centre_collect_full_plan.py,sha256=6EAasC4E3-bIBFX7Ru7uznTEGQTF76fOCibf3UOm0h4,7956
 mx_bluesky/hyperion/experiment_plans/optimise_attenuation_plan.py,sha256=9M65cboRt5FR0V2sOjjyq6eLXA0L6xnSeXFzLpW67zw,16169
 mx_bluesky/hyperion/experiment_plans/pin_centre_then_xray_centre_plan.py,sha256=KB75HQHNLL6g6Z0C8cINksX4wS285uMbx77FJ7Z2b0c,5816
-mx_bluesky/hyperion/experiment_plans/robot_load_and_change_energy.py,sha256=7sbouZ-86Nr0oiXgxOdqEyFIT4OZj52VcKcjzeGhJbE,5768
-mx_bluesky/hyperion/experiment_plans/robot_load_then_centre_plan.py,sha256=SB_dRsRKFW7hkSXSQR-wcN_h0-5_wvKs_eklBrLLRBA,6998
-mx_bluesky/hyperion/experiment_plans/rotation_scan_plan.py,sha256=-uqn4yH80Hg4W1oeo2TdacqhJP9vORLNf4QaSmrloK0,12021
-mx_bluesky/hyperion/experiment_plans/set_energy_plan.py,sha256=VOTFWt7SO07eQh7pGVXwTbPfVJVoHQ3-34BVZme4Iww,2685
-mx_bluesky/hyperion/experiment_plans/udc_default_state.py,sha256=pzwRQdid3a2TAr_CUFAzSfNNWVlmiACvKCkE6wntn1Q,6582
+mx_bluesky/hyperion/experiment_plans/robot_load_and_change_energy.py,sha256=UsN3MqqVrmnS9BOXMfBpglR_Fg51XeoVaF9VPuiRn7s,5788
+mx_bluesky/hyperion/experiment_plans/robot_load_then_centre_plan.py,sha256=lV0QuDep9sMPG5wQdhJZmvQ43QdWA47HoCZgReEZAfo,7028
+mx_bluesky/hyperion/experiment_plans/rotation_scan_plan.py,sha256=55vEU5CaHcmVHzfS6fmCLsSWxUot5tWZT5T2vIMWp7o,12041
+mx_bluesky/hyperion/experiment_plans/set_energy_plan.py,sha256=pq44835H-uZs1twhoXmmt-nErto9oeTLKzc4K0VkCaI,2705
+mx_bluesky/hyperion/experiment_plans/udc_default_state.py,sha256=gH2Q6ajkXFFnHob-H_yGPCXMWb3HWf6vB45yU3_cRLo,7049
 mx_bluesky/hyperion/external_interaction/__init__.py,sha256=95DwXDmKsx36RgAL-AtLZl2LQoLPKbzeYdlkkP_4Coc,559
 mx_bluesky/hyperion/external_interaction/agamemnon.py,sha256=4vBBynn7RTUUzFXKnoKyuGLsTfg2zaeSJM6bNMwSZm8,11850
 mx_bluesky/hyperion/external_interaction/config_server.py,sha256=4QIcx_3U4PJfPA9UrGEybJJpd6sTejsdhmDXqUoW00o,498
@@ -216,7 +216,7 @@ mx_bluesky/hyperion/parameters/__init__.py,sha256=kf2wfcILBUBpT0tJ8-W39BywQUkn67
 mx_bluesky/hyperion/parameters/cli.py,sha256=9I2t79xTVKwwwgMFqJZL17sbviPJo66NiSdlnaMn7B4,2701
 mx_bluesky/hyperion/parameters/components.py,sha256=dkh7BTRlG1P3QeDG2AoLFaiEIv_IPZxfKd-x9dad4X8,611
 mx_bluesky/hyperion/parameters/constants.py,sha256=PFnonqcihW2J7qonpHZt9ynJR_IJoUvp_5_mgr4NAjg,2509
-mx_bluesky/hyperion/parameters/device_composites.py,sha256=QROUpZJY2YRLNDGhgyn37cibMoMVUcY3N_VNsCFNNiA,2294
+mx_bluesky/hyperion/parameters/device_composites.py,sha256=LDXOxFE4O4fuwwcix2g_deRVB4SEjCUtauI4zNV7w5I,2304
 mx_bluesky/hyperion/parameters/gridscan.py,sha256=dnK2veiDFfW4U02A4MTzODu0TJPZk-hE_dTCQnb3tSU,3916
 mx_bluesky/hyperion/parameters/load_centre_collect.py,sha256=DF3jEbvgNklh1LPhjhuqhwsZtiK0dPuJrkTbaVB-QEk,3734
 mx_bluesky/hyperion/parameters/robot_load.py,sha256=kZRBzsw_nQKCq1FfnAk_dDzHoSgDKKkShcVP9GPv5V8,844
@@ -230,9 +230,9 @@ mx_bluesky/hyperion/utils/__init__.py,sha256=f4E8wInL1Ll4eeFtAiyKmipOBTPlUtKmVK-
 mx_bluesky/hyperion/utils/context.py,sha256=3mXVpWnuHkZz37Fa-VsfbF_RZxIVGERlyGHL0rWxWgE,1237
 mx_bluesky/phase1_zebra/__init__.py,sha256=Edhhn2L9MVXnjJhyD5_yKQVUDo7XW98rvuT7dlzIn58,132
 mx_bluesky/phase1_zebra/device_setup_plans/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mx_bluesky-1.5.16.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-mx_bluesky-1.5.16.dist-info/METADATA,sha256=WPTIbMzuSZw90ldzext2X1m3J7PTc51sO34pk_lSkJM,16362
-mx_bluesky-1.5.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mx_bluesky-1.5.16.dist-info/entry_points.txt,sha256=HgVtwgWoMRn9-X6rxCcSY3Jz_paspJTIlc-t2NFzWpo,409
-mx_bluesky-1.5.16.dist-info/top_level.txt,sha256=S4rrzXIUef58ulf_04wn01XGZ3xeJjXs4LPEJ_xoF-I,11
-mx_bluesky-1.5.16.dist-info/RECORD,,
+mx_bluesky-1.6.3.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+mx_bluesky-1.6.3.dist-info/METADATA,sha256=GRWjp6Hr3H6XhgyRUu0Xzh7V-gRFyBgWr6_cVApLmIY,16360
+mx_bluesky-1.6.3.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+mx_bluesky-1.6.3.dist-info/entry_points.txt,sha256=HgVtwgWoMRn9-X6rxCcSY3Jz_paspJTIlc-t2NFzWpo,409
+mx_bluesky-1.6.3.dist-info/top_level.txt,sha256=S4rrzXIUef58ulf_04wn01XGZ3xeJjXs4LPEJ_xoF-I,11
+mx_bluesky-1.6.3.dist-info/RECORD,,

{mx_bluesky-1.5.16.dist-info → mx_bluesky-1.6.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any