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

mx_bluesky/hyperion/parameters/constants.py

@@ -1,107 +1,21 @@
 import os
-from enum import Enum
 
-from dodal.devices.aperturescatterguard import ApertureValue
 from dodal.devices.detector import EIGER2_X_16M_SIZE
 from pydantic.dataclasses import dataclass
 
-TEST_MODE = os.environ.get("HYPERION_TEST_MODE")
-
-
-@dataclass(frozen=True)
-class SimConstants:
-    BEAMLINE = "BL03S"
-    INSERTION_PREFIX = "SR03S"
-    ZOCALO_ENV = "dev_artemis"
-    # this one is for unit tests
-    ISPYB_CONFIG = "tests/test_data/test_config.cfg"
-    # this one is for system tests
-    DEV_ISPYB_DATABASE_CFG = "/dls_sw/dasc/mariadb/credentials/ispyb-hyperion-dev.cfg"
-
-
-@dataclass(frozen=True)
-class PlanNameConstants:
-    # Robot load subplan
-    ROBOT_LOAD = "robot_load"
-    # Gridscan
-    GRID_DETECT_AND_DO_GRIDSCAN = "grid_detect_and_do_gridscan"
-    GRID_DETECT_INNER = "grid_detect"
-    GRIDSCAN_OUTER = "run_gridscan_move_and_tidy"
-    GRIDSCAN_AND_MOVE = "run_gridscan_and_move"
-    GRIDSCAN_MAIN = "run_gridscan"
-    DO_FGS = "do_fgs"
-    # Rotation scan
-    ROTATION_MULTI = "multi_rotation_wrapper"
-    ROTATION_OUTER = "rotation_scan_with_cleanup"
-    ROTATION_MAIN = "rotation_scan_main"
-
-
-@dataclass(frozen=True)
-class PlanGroupCheckpointConstants:
-    # For places to synchronise / stop and wait in plans, use as bluesky group names
-    GRID_READY_FOR_DC = "grid_ready_for_data_collection"
-    ROTATION_READY_FOR_DC = "rotation_ready_for_data_collection"
-    MOVE_GONIO_TO_START = "move_gonio_to_start"
-    READY_FOR_OAV = "ready_for_oav"
-
-
-@dataclass(frozen=True)
-class DocDescriptorNames:
-    # Robot load event descriptor
-    ROBOT_LOAD = "robot_load"
-    # For callbacks to use
-    OAV_ROTATION_SNAPSHOT_TRIGGERED = "rotation_snapshot_triggered"
-    OAV_GRID_SNAPSHOT_TRIGGERED = "snapshot_to_ispyb"
-    HARDWARE_READ_PRE = "read_hardware_for_callbacks_pre_collection"
-    HARDWARE_READ_DURING = "read_hardware_for_callbacks_during_collection"
-    ZOCALO_HW_READ = "zocalo_read_hardware_plan"
-
-
-@dataclass(frozen=True)
-class HardwareConstants:
-    OAV_REFRESH_DELAY = 0.3
-    PANDA_FGS_RUN_UP_DEFAULT = 0.17
-    CRYOJET_MARGIN_MM = 0.2
-
-
-@dataclass(frozen=True)
-class TriggerConstants:
-    ZOCALO = "trigger_zocalo_on"
-
-
-@dataclass(frozen=True)
-class GridscanParamConstants:
-    WIDTH_UM = 600.0
-    EXPOSURE_TIME_S = 0.004
-    USE_ROI = True
-    BOX_WIDTH_UM = 20.0
-    OMEGA_1 = 0.0
-    OMEGA_2 = 90.0
-
-
-@dataclass(frozen=True)
-class RotationParamConstants:
-    DEFAULT_APERTURE_POSITION = ApertureValue.LARGE
-
+from mx_bluesky.common.parameters.constants import (
+    DocDescriptorNames,
+    EnvironmentConstants,
+    ExperimentParamConstants,
+    HardwareConstants,
+    OavConstants,
+    PlanGroupCheckpointConstants,
+    PlanNameConstants,
+    SimConstants,
+    TriggerConstants,
+)
 
-@dataclass(frozen=True)
-class DetectorParamConstants:
-    BEAM_XY_LUT_PATH = (
-        "tests/test_data/test_det_dist_converter.txt"
-        if TEST_MODE
-        else "/dls_sw/i03/software/daq_configuration/lookup/DetDistToBeamXYConverter.txt"
-    )
-
-
-@dataclass(frozen=True)
-class ExperimentParamConstants:
-    DETECTOR = DetectorParamConstants()
-    GRIDSCAN = GridscanParamConstants()
-    ROTATION = RotationParamConstants()
-
-
-_test_oav_file = "tests/test_data/test_OAVCentring.json"
-_live_oav_file = "/dls_sw/i03/software/daq_configuration/json/OAVCentring_hyperion.json"
+TEST_MODE = os.environ.get("HYPERION_TEST_MODE")
 
 
 @dataclass(frozen=True)
@@ -110,16 +24,21 @@ class I03Constants:
     BEAMLINE = "BL03S" if TEST_MODE else "BL03I"
     DETECTOR = EIGER2_X_16M_SIZE
     INSERTION_PREFIX = "SR03S" if TEST_MODE else "SR03I"
-    OAV_CENTRING_FILE = _test_oav_file if TEST_MODE else _live_oav_file
+    OAV_CENTRING_FILE = OavConstants.OAV_CONFIG_JSON
     SHUTTER_TIME_S = 0.06
     USE_PANDA_FOR_GRIDSCAN = False
-    USE_GPU_FOR_GRIDSCAN_ANALYSIS = False
-    THAWING_TIME = 20
-    USE_CPU_AND_GPU_ZOCALO = False
+    SET_STUB_OFFSETS = False
+
+    # Turns on GPU processing for zocalo and logs a comparison between GPU and CPU-
+    # processed results. GPU results never used in analysis for now
+    COMPARE_CPU_AND_GPU_ZOCALO = False
 
 
 @dataclass(frozen=True)
 class HyperionConstants:
+    DESCRIPTORS = DocDescriptorNames()
+    TRIGGER = TriggerConstants()
+    ZOCALO_ENV = EnvironmentConstants.ZOCALO_ENV
     HARDWARE = HardwareConstants()
     I03 = I03Constants()
     PARAM = ExperimentParamConstants()
@@ -136,23 +55,7 @@ class HyperionConstants:
     )
     GRAYLOG_PORT = 12232
     PARAMETER_SCHEMA_DIRECTORY = "src/hyperion/parameters/schemas/"
-    ZOCALO_ENV = "dev_artemis" if TEST_MODE else "artemis"
+    LOG_FILE_NAME = "hyperion.log"
 
 
 CONST = HyperionConstants()
-
-
-class Actions(Enum):
-    START = "start"
-    STOP = "stop"
-    SHUTDOWN = "shutdown"
-    STATUS = "status"
-
-
-class Status(Enum):
-    WARN = "Warn"
-    FAILED = "Failed"
-    SUCCESS = "Success"
-    BUSY = "Busy"
-    ABORTING = "Aborting"
-    IDLE = "Idle"

mx_bluesky/hyperion/parameters/gridscan.py

@@ -1,8 +1,5 @@
 from __future__ import annotations
 
-import os
-
-from dodal.devices.aperturescatterguard import ApertureValue
 from dodal.devices.detector import (
     DetectorParams,
 )
@@ -14,36 +11,22 @@ from pydantic import Field, PrivateAttr
 from scanspec.core import Path as ScanPath
 from scanspec.specs import Line, Static
 
-from mx_bluesky.hyperion.parameters.components import (
-    DiffractionExperimentWithSample,
-    IspybExperimentType,
-    OptionalGonioAngleStarts,
+from mx_bluesky.common.parameters.components import (
     SplitScan,
-    WithOavCentring,
     WithOptionalEnergyChange,
-    WithScan,
-    XyzStarts,
+    WithPandaGridScan,
+)
+from mx_bluesky.common.parameters.gridscan import (
+    GridCommon,
+    SpecifiedGrid,
 )
+from mx_bluesky.hyperion.parameters.components import WithHyperionFeatures
 from mx_bluesky.hyperion.parameters.constants import CONST, I03Constants
-from mx_bluesky.hyperion.parameters.robot_load import RobotLoadAndEnergyChange
 
 
-class GridCommon(
-    DiffractionExperimentWithSample, OptionalGonioAngleStarts, WithOavCentring
-):
-    grid_width_um: float = Field(default=CONST.PARAM.GRIDSCAN.WIDTH_UM)
-    exposure_time_s: float = Field(default=CONST.PARAM.GRIDSCAN.EXPOSURE_TIME_S)
-    use_roi_mode: bool = Field(default=CONST.PARAM.GRIDSCAN.USE_ROI)
-    panda_runup_distance_mm: float = Field(
-        default=CONST.HARDWARE.PANDA_FGS_RUN_UP_DEFAULT
-    )
-    use_panda: bool = Field(default=CONST.I03.USE_PANDA_FOR_GRIDSCAN)
-    use_gpu: bool = Field(default=CONST.I03.USE_GPU_FOR_GRIDSCAN_ANALYSIS)
-    use_cpu_and_gpu_zocalo: bool = Field(default=CONST.I03.USE_CPU_AND_GPU_ZOCALO)
-    ispyb_experiment_type: IspybExperimentType = Field(
-        default=IspybExperimentType.GRIDSCAN_3D
-    )
-    selected_aperture: ApertureValue | None = Field(default=ApertureValue.SMALL)
+class HyperionGridCommon(GridCommon, WithHyperionFeatures):
+    # This class only exists so that we can properly select enable_dev_shm. Remove in
+    # https://github.com/DiamondLightSource/hyperion/issues/1395"""
 
     @property
     def detector_params(self):
@@ -57,7 +40,6 @@ class GridCommon(
         assert (
             self.detector_distance_mm is not None
         ), "Detector distance must be filled before generating DetectorParams"
-        os.makedirs(self.storage_directory, exist_ok=True)
         return DetectorParams(
             detector_size_constants=I03Constants.DETECTOR,
             expected_energy_ev=self.demand_energy_ev,
@@ -72,40 +54,18 @@ class GridCommon(
             use_roi_mode=self.use_roi_mode,
             det_dist_to_beam_converter_path=self.det_dist_to_beam_converter_path,
             trigger_mode=self.trigger_mode,
-            enable_dev_shm=self.use_gpu,
+            enable_dev_shm=self.features.compare_cpu_and_gpu_zocalo,
             **optional_args,
         )
 
 
-class GridScanWithEdgeDetect(GridCommon): ...
-
-
-class PinTipCentreThenXrayCentre(GridCommon):
-    tip_offset_um: float = 0
-
-
-class RobotLoadThenCentre(GridCommon):
-    thawing_time: float = Field(default=CONST.I03.THAWING_TIME)
-
-    def robot_load_params(self):
-        my_params = self.model_dump()
-        return RobotLoadAndEnergyChange(**my_params)
-
-    def pin_centre_then_xray_centre_params(self):
-        my_params = self.model_dump()
-        del my_params["thawing_time"]
-        return PinTipCentreThenXrayCentre(**my_params)
-
-
-class SpecifiedGridScan(GridCommon, XyzStarts, WithScan):
-    """A specified grid scan is one which has defined values for the start position,
-    grid and box sizes, etc., as opposed to parameters for a plan which will create
-    those parameters at some point (e.g. through optical pin detection)."""
-
-    ...
-
-
-class ThreeDGridScan(SpecifiedGridScan, SplitScan, WithOptionalEnergyChange):
+class HyperionThreeDGridScan(
+    HyperionGridCommon,
+    SpecifiedGrid,
+    SplitScan,
+    WithOptionalEnergyChange,
+    WithPandaGridScan,
+):
     """Parameters representing a so-called 3D grid scan, which consists of doing a
     gridscan in X and Y, followed by one in X and Z."""
 
@@ -127,14 +87,14 @@ class ThreeDGridScan(SpecifiedGridScan, SplitScan, WithOptionalEnergyChange):
             x_steps=self.x_steps,
             y_steps=self.y_steps,
             z_steps=self.z_steps,
-            x_step_size=self.x_step_size_um,
-            y_step_size=self.y_step_size_um,
-            z_step_size=self.z_step_size_um,
-            x_start=self.x_start_um,
-            y1_start=self.y_start_um,
-            z1_start=self.z_start_um,
-            y2_start=self.y2_start_um,
-            z2_start=self.z2_start_um,
+            x_step_size_mm=self.x_step_size_um / 1000,
+            y_step_size_mm=self.y_step_size_um / 1000,
+            z_step_size_mm=self.z_step_size_um / 1000,
+            x_start_mm=self.x_start_um / 1000,
+            y1_start_mm=self.y_start_um / 1000,
+            z1_start_mm=self.z_start_um / 1000,
+            y2_start_mm=self.y2_start_um / 1000,
+            z2_start_mm=self.z2_start_um / 1000,
             set_stub_offsets=self.features.set_stub_offsets,
             dwell_time_ms=self.exposure_time_s * 1000,
             transmission_fraction=self.transmission_frac,
@@ -143,6 +103,7 @@ class ThreeDGridScan(SpecifiedGridScan, SplitScan, WithOptionalEnergyChange):
     @property
     def panda_FGS_params(self) -> PandAGridScanParams:
         if self.y_steps % 2 and self.z_steps > 0:
+            # See https://github.com/DiamondLightSource/hyperion/issues/1118 for explanation
             raise OddYStepsException(
                 "The number of Y steps must be even for a PandA gridscan"
             )
@@ -150,14 +111,14 @@ class ThreeDGridScan(SpecifiedGridScan, SplitScan, WithOptionalEnergyChange):
             x_steps=self.x_steps,
             y_steps=self.y_steps,
             z_steps=self.z_steps,
-            x_step_size=self.x_step_size_um,
-            y_step_size=self.y_step_size_um,
-            z_step_size=self.z_step_size_um,
-            x_start=self.x_start_um,
-            y1_start=self.y_start_um,
-            z1_start=self.z_start_um,
-            y2_start=self.y2_start_um,
-            z2_start=self.z2_start_um,
+            x_step_size_mm=self.x_step_size_um / 1000,
+            y_step_size_mm=self.y_step_size_um / 1000,
+            z_step_size_mm=self.z_step_size_um / 1000,
+            x_start_mm=self.x_start_um / 1000,
+            y1_start_mm=self.y_start_um / 1000,
+            z1_start_mm=self.z_start_um / 1000,
+            y2_start_mm=self.y2_start_um / 1000,
+            z2_start_mm=self.z2_start_um / 1000,
             set_stub_offsets=self.features.set_stub_offsets,
             run_up_distance_mm=self.panda_runup_distance_mm,
             transmission_fraction=self.transmission_frac,

mx_bluesky/hyperion/parameters/load_centre_collect.py

@@ -2,12 +2,13 @@ from typing import TypeVar
 
 from pydantic import BaseModel, model_validator
 
-from mx_bluesky.hyperion.parameters.components import (
-    HyperionParameters,
+from mx_bluesky.common.parameters.components import (
+    MxBlueskyParameters,
+    WithCentreSelection,
     WithSample,
     WithVisit,
 )
-from mx_bluesky.hyperion.parameters.gridscan import (
+from mx_bluesky.common.parameters.gridscan import (
     RobotLoadThenCentre,
 )
 from mx_bluesky.hyperion.parameters.rotation import MultiRotationScan
@@ -15,13 +16,15 @@ from mx_bluesky.hyperion.parameters.rotation import MultiRotationScan
 T = TypeVar("T", bound=BaseModel)
 
 
-def construct_from_values(parent_context: dict, key: str, t: type[T]) -> T:
-    values = dict(parent_context)
-    values |= values[key]
+def construct_from_values(parent_context: dict, child_dict: dict, t: type[T]) -> T:
+    values = {k: v for k, v in parent_context.items() if not isinstance(v, dict)}
+    values |= child_dict
     return t(**values)
 
 
-class LoadCentreCollect(HyperionParameters, WithVisit, WithSample):
+class LoadCentreCollect(
+    MxBlueskyParameters, WithVisit, WithSample, WithCentreSelection
+):
     """Experiment parameters to perform the combined robot load,
     pin-tip centre and rotation scan operations."""
 
@@ -41,10 +44,12 @@ class LoadCentreCollect(HyperionParameters, WithVisit, WithSample):
             disallowed_keys == set()
         ), f"Unexpected fields found in LoadCentreCollect {disallowed_keys}"
 
-        values["robot_load_then_centre"] = construct_from_values(
-            values, "robot_load_then_centre", RobotLoadThenCentre
+        new_robot_load_then_centre_params = construct_from_values(
+            values, values["robot_load_then_centre"], RobotLoadThenCentre
         )
-        values["multi_rotation_scan"] = construct_from_values(
-            values, "multi_rotation_scan", MultiRotationScan
+        new_multi_rotation_scan_params = construct_from_values(
+            values, values["multi_rotation_scan"], MultiRotationScan
         )
+        values["multi_rotation_scan"] = new_multi_rotation_scan_params
+        values["robot_load_then_centre"] = new_robot_load_then_centre_params
         return values

mx_bluesky/hyperion/parameters/rotation.py

@@ -17,7 +17,7 @@ from scanspec.core import AxesPoints
 from scanspec.core import Path as ScanPath
 from scanspec.specs import Line
 
-from mx_bluesky.hyperion.parameters.components import (
+from mx_bluesky.common.parameters.components import (
     DiffractionExperimentWithSample,
     IspybExperimentType,
     OptionalGonioAngleStarts,
@@ -47,7 +47,9 @@ class RotationExperiment(DiffractionExperimentWithSample):
         default=IspybExperimentType.ROTATION
     )
 
-    def _detector_params(self, omega_start_deg: float):
+    def _detector_params_impl(
+        self, omega_start_deg: float, num_images_per_trigger: int, num_triggers: int
+    ) -> DetectorParams:
         self.det_dist_to_beam_converter_path = (
             self.det_dist_to_beam_converter_path
             or CONST.PARAM.DETECTOR.BEAM_XY_LUT_PATH
@@ -66,13 +68,16 @@ class RotationExperiment(DiffractionExperimentWithSample):
             detector_distance=self.detector_distance_mm,
             omega_start=omega_start_deg,
             omega_increment=self.rotation_increment_deg,
-            num_images_per_trigger=self.num_images,
-            num_triggers=1,
+            num_images_per_trigger=num_images_per_trigger,
+            num_triggers=num_triggers,
             use_roi_mode=False,
             det_dist_to_beam_converter_path=self.det_dist_to_beam_converter_path,
             **optional_args,
         )
 
+    def _detector_params(self, omega_start_deg: float) -> DetectorParams:
+        return self._detector_params_impl(omega_start_deg, self.num_images, 1)
+
     @field_validator("selected_aperture")
     @classmethod
     def _set_default_aperture_position(cls, aperture_position: ApertureValue | None):
@@ -115,12 +120,16 @@ class MultiRotationScan(RotationExperiment, SplitScan):
 
     def _single_rotation_scan(self, scan: RotationScanPerSweep) -> RotationScan:
         # self has everything from RotationExperiment
-        params = self.model_dump()
-        del params["rotation_scans"]
+        allowed_keys = RotationScan.model_fields.keys()  # type: ignore # mypy doesn't recognise this as a property...
+        params_dump = self.model_dump()
         # provided `scan` has everything from RotationScanPerSweep
-        params.update(scan.model_dump())
+        scan_dump = scan.model_dump()
+        rotation_scan_kv_pairs = {
+            k: v for k, v in (params_dump | scan_dump).items() if k in allowed_keys
+        }
         # together they have everything for RotationScan
-        return RotationScan(**params)
+        rotation_scan = RotationScan(**rotation_scan_kv_pairs)
+        return rotation_scan
 
     @model_validator(mode="after")
     @classmethod
@@ -152,8 +161,12 @@ class MultiRotationScan(RotationExperiment, SplitScan):
         return list(accumulate([0, *self._num_images_per_scan()]))
 
     @property
-    def detector_params(self):
-        return self._detector_params(self.rotation_scans[0].omega_start_deg)
+    def detector_params(self) -> DetectorParams:
+        return self._detector_params_impl(
+            self.rotation_scans[0].omega_start_deg,
+            self._num_images_per_scan()[0],
+            len(self._num_images_per_scan()),
+        )
 
     @property
     def ispyb_params(self):  # pyright: ignore

mx_bluesky/hyperion/utils/utils.py

@@ -1,3 +1,6 @@
+import math
+from math import asin
+
 from scanspec.core import AxesPoints, Axis
 from scipy.constants import physical_constants
 
@@ -23,3 +26,17 @@ def convert_angstrom_to_eV(wavelength: float) -> float:
 def number_of_frames_from_scan_spec(scan_points: AxesPoints[Axis]):
     ax = list(scan_points.keys())[0]
     return len(scan_points[ax])
+
+
+def energy_to_bragg_angle(energy_kev: float, d_a: float) -> float:
+    """Compute the bragg angle given the energy in kev.
+
+    Args:
+        energy_kev:  The energy in keV
+        d_a:         The lattice spacing in Angstroms
+    Returns:
+        The bragg angle in degrees
+    """
+    wavelength_a = convert_eV_to_angstrom(energy_kev * 1000)
+    d = d_a
+    return asin(wavelength_a / (2 * d)) * 180 / math.pi

mx_bluesky/hyperion/utils/validation.py

@@ -8,7 +8,7 @@ from unittest.mock import patch
 import bluesky.preprocessors as bpp
 from bluesky.run_engine import RunEngine
 from dodal.beamlines import i03
-from dodal.devices.oav.oav_parameters import OAVConfigParams
+from dodal.devices.oav.oav_parameters import OAVConfig
 from ophyd_async.core import set_mock_value
 
 from mx_bluesky.hyperion.device_setup_plans.read_hardware_for_setup import (
@@ -23,8 +23,8 @@ from mx_bluesky.hyperion.external_interaction.callbacks.rotation.nexus_callback
 from mx_bluesky.hyperion.parameters.constants import CONST
 from mx_bluesky.hyperion.parameters.rotation import RotationScan
 
-DISPLAY_CONFIGURATION = "tests/devices/unit_tests/test_display.configuration"
-ZOOM_LEVELS_XML = "tests/devices/unit_tests/test_jCameraManZoomLevels.xml"
+DISPLAY_CONFIGURATION = "tests/test_data/test_display.configuration"
+ZOOM_LEVELS_XML = "tests/test_data/test_jCameraManZoomLevels.xml"
 TEST_DATA_DIRECTORY = Path("tests/test_data/nexus_files/rotation")
 TEST_METAFILE = "ins_8_5_meta.h5.gz"
 FAKE_DATAFILE = "../fake_data.h5"
@@ -94,15 +94,14 @@ def fake_create_rotation_devices():
     robot = i03.robot(fake_with_ophyd_sim=True)
     oav = i03.oav(
         fake_with_ophyd_sim=True,
-        params=OAVConfigParams(
-            zoom_params_file=ZOOM_LEVELS_XML, display_config=DISPLAY_CONFIGURATION
+        params=OAVConfig(
+            zoom_params_file=ZOOM_LEVELS_XML, display_config_file=DISPLAY_CONFIGURATION
         ),
     )
     xbpm_feedback = i03.xbpm_feedback(fake_with_ophyd_sim=True)
 
     set_mock_value(smargon.omega.max_velocity, 131)
     set_mock_value(dcm.energy_in_kev.user_readback, 12700)
-    oav.zoom_controller.fvst.sim_put("1.0x")  # type: ignore
 
     return RotationScanComposite(
         attenuator=attenuator,

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

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: mx-bluesky
-Version: 1.2.0
+Version: 1.4.1
 Summary: Bluesky tools for MX Beamlines at DLS
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
-License: Apache License
+License:                                  Apache License
                                    Version 2.0, January 2004
                                 http://www.apache.org/licenses/
         
@@ -213,7 +213,7 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.11
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: annotated-types
+Requires-Dist: annotated_types
 Requires-Dist: caproto
 Requires-Dist: fastapi[all]
 Requires-Dist: flask-restful
@@ -226,43 +226,46 @@ Requires-Dist: opencv-python
 Requires-Dist: opentelemetry-distro
 Requires-Dist: opentelemetry-exporter-otlp
 Requires-Dist: pydantic
+Requires-Dist: pydantic-extra-types
 Requires-Dist: pyepics
 Requires-Dist: pyzmq
 Requires-Dist: requests
 Requires-Dist: scanspec
 Requires-Dist: scipy
 Requires-Dist: semver
-Requires-Dist: blueapi >=0.5.0
-Requires-Dist: daq-config-server >=0.1.1
-Requires-Dist: ophyd ==1.9.0
-Requires-Dist: ophyd-async >=0.3a5
-Requires-Dist: bluesky >=1.13.0a4
-Requires-Dist: dls-dodal ==1.33.0
+Requires-Dist: matplotlib
+Requires-Dist: blueapi>=0.5.0
+Requires-Dist: daq-config-server>=0.1.1
+Requires-Dist: ophyd==1.9.0
+Requires-Dist: ophyd-async>=0.8a5
+Requires-Dist: bluesky>=1.13.0a4
+Requires-Dist: dls-dodal==1.36.2
 Provides-Extra: dev
-Requires-Dist: black ; extra == 'dev'
-Requires-Dist: build ; extra == 'dev'
-Requires-Dist: diff-cover ; extra == 'dev'
-Requires-Dist: GitPython ; extra == 'dev'
-Requires-Dist: ipython ; extra == 'dev'
-Requires-Dist: mypy ; extra == 'dev'
-Requires-Dist: myst-parser ; extra == 'dev'
-Requires-Dist: pipdeptree ; extra == 'dev'
-Requires-Dist: pre-commit ; extra == 'dev'
-Requires-Dist: pydata-sphinx-theme >=0.12 ; extra == 'dev'
-Requires-Dist: pyright ; extra == 'dev'
-Requires-Dist: pytest-asyncio ; extra == 'dev'
-Requires-Dist: pytest-cov ; extra == 'dev'
-Requires-Dist: pytest-random-order ; extra == 'dev'
-Requires-Dist: pytest ; extra == 'dev'
-Requires-Dist: ruff ; extra == 'dev'
-Requires-Dist: sphinx-autobuild ; extra == 'dev'
-Requires-Dist: sphinx-copybutton ; extra == 'dev'
-Requires-Dist: sphinxcontrib-plantuml ; extra == 'dev'
-Requires-Dist: sphinx-design ; extra == 'dev'
-Requires-Dist: tox-direct ; extra == 'dev'
-Requires-Dist: tox ; extra == 'dev'
-Requires-Dist: types-mock ; extra == 'dev'
-Requires-Dist: types-requests ; extra == 'dev'
+Requires-Dist: black; extra == "dev"
+Requires-Dist: build; extra == "dev"
+Requires-Dist: diff-cover; extra == "dev"
+Requires-Dist: GitPython; extra == "dev"
+Requires-Dist: import-linter; extra == "dev"
+Requires-Dist: ipython; extra == "dev"
+Requires-Dist: mypy; extra == "dev"
+Requires-Dist: myst-parser; extra == "dev"
+Requires-Dist: pipdeptree; extra == "dev"
+Requires-Dist: pre-commit; extra == "dev"
+Requires-Dist: pydata-sphinx-theme>=0.12; extra == "dev"
+Requires-Dist: pyright; extra == "dev"
+Requires-Dist: pytest-asyncio; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
+Requires-Dist: pytest-random-order; extra == "dev"
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: ruff; extra == "dev"
+Requires-Dist: sphinx-autobuild; extra == "dev"
+Requires-Dist: sphinx-copybutton; extra == "dev"
+Requires-Dist: sphinxcontrib-plantuml; extra == "dev"
+Requires-Dist: sphinx-design; extra == "dev"
+Requires-Dist: tox-direct; extra == "dev"
+Requires-Dist: tox; extra == "dev"
+Requires-Dist: types-mock; extra == "dev"
+Requires-Dist: types-requests; extra == "dev"
 
 mx-bluesky
 ===========================