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

mx_bluesky/hyperion/external_interaction/ispyb/exp_eye_store.py

@@ -35,7 +35,7 @@ class ExpeyeInteraction:
 
     def __init__(self) -> None:
         url, token = _get_base_url_and_token()
-        self.base_url = url + "/core"
+        self.base_url = url
         self.auth = BearerAuth(token)
 
     def _send_and_get_response(self, url, data, send_func) -> dict:

mx_bluesky/hyperion/parameters/components.py

@@ -1,12 +1,7 @@
-from __future__ import annotations
+from pydantic import BaseModel, Field
 
-from pydantic import (
-    BaseModel,
-    Field,
-)
+from mx_bluesky.hyperion.external_interaction.config_server import HyperionFeatureFlags
 
-from mx_bluesky.hyperion.external_interaction.config_server import FeatureFlags
 
-
-class WithFeatures(BaseModel):
-    features: FeatureFlags = Field(default=FeatureFlags())
+class WithHyperionFeatures(BaseModel):
+    features: HyperionFeatureFlags = Field(default=HyperionFeatureFlags())

mx_bluesky/hyperion/parameters/constants.py

@@ -27,7 +27,6 @@ class I03Constants:
     OAV_CENTRING_FILE = OavConstants.OAV_CONFIG_JSON
     SHUTTER_TIME_S = 0.06
     USE_PANDA_FOR_GRIDSCAN = False
-    THAWING_TIME = 20
     SET_STUB_OFFSETS = False
 
     # Turns on GPU processing for zocalo and logs a comparison between GPU and CPU-

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,
 )
@@ -15,38 +12,21 @@ from scanspec.core import Path as ScanPath
 from scanspec.specs import Line, Static
 
 from mx_bluesky.common.parameters.components import (
-    DiffractionExperimentWithSample,
-    IspybExperimentType,
-    OptionalGonioAngleStarts,
     SplitScan,
     WithOptionalEnergyChange,
-    WithScan,
-    XyzStarts,
+    WithPandaGridScan,
+)
+from mx_bluesky.common.parameters.gridscan import (
+    GridCommon,
+    SpecifiedGrid,
 )
-from mx_bluesky.common.parameters.constants import GridscanParamConstants
-from mx_bluesky.hyperion.parameters.components import WithFeatures
+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
 
 
-# This will be restructed once Once https://github.com/DiamondLightSource/mx-bluesky/issues/323#issue-2500957290 is further along
-# to handle slightly different parameters between different beamline implementations
-class GridCommon(
-    DiffractionExperimentWithSample,
-    OptionalGonioAngleStarts,
-    WithFeatures,
-):
-    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=GridscanParamConstants.PANDA_RUN_UP_DISTANCE_MM
-    )
-
-    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):
@@ -60,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,
@@ -80,36 +59,13 @@ class GridCommon(
         )
 
 
-class GridScanWithEdgeDetect(GridCommon):
-    box_size_um: float = Field(default=CONST.PARAM.GRIDSCAN.BOX_WIDTH_UM)
-
-
-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."""
 
@@ -131,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,
@@ -147,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"
             )
@@ -154,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

@@ -4,10 +4,11 @@ from pydantic import BaseModel, model_validator
 
 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(MxBlueskyParameters, 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(MxBlueskyParameters, 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

@@ -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,7 +120,7 @@ class MultiRotationScan(RotationExperiment, SplitScan):
 
     def _single_rotation_scan(self, scan: RotationScanPerSweep) -> RotationScan:
         # self has everything from RotationExperiment
-        allowed_keys = RotationScan.model_fields.keys()
+        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
         scan_dump = scan.model_dump()
@@ -156,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-1.4.0.dist-info → mx_bluesky-1.4.1a0.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: mx-bluesky
-Version: 1.4.0
+Version: 1.4.1a0
 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
@@ -233,38 +233,39 @@ 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.35.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.1a
 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: 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'
+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
 ===========================

{mx_bluesky-1.4.0.dist-info → mx_bluesky-1.4.1a0.dist-info}/RECORD

@@ -1,38 +1,37 @@
 mx_bluesky/__init__.py,sha256=Ksms_WJF8LTkbm38gEpm1jBpGqcQ8NGvmb2ZJlOE1j8,198
 mx_bluesky/__main__.py,sha256=RVqPnxDisFMIn_aoEi0drlThNHgKTJULnSrotouIKI0,480
-mx_bluesky/_version.py,sha256=R8-T9fmURjcuoxYpHTAjyNAhgJPDtI2jogCjqYYkfCU,411
+mx_bluesky/_version.py,sha256=34pH_Akldt0m_lg2KQfS9vG1Ej5xQNbz8ITZzIE-dgU,413
 mx_bluesky/jupyter_example.ipynb,sha256=wpwvPrBvwtRMS5AIFk8F54cIlUoD0o4ji8tKK5cZHA4,1672
 mx_bluesky/beamlines/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/beamlines/i04/__init__.py,sha256=jZjAMN5_oOEjQoR3iTrnMFW3ElxlHhQ7pEQZIv21Y4I,129
-mx_bluesky/beamlines/i04/thawing_plan.py,sha256=a7FvdQOXH-sU2KeEytMa6ZXHqTwYQq9_wVy0ksb5SpI,5472
+mx_bluesky/beamlines/i04/thawing_plan.py,sha256=YykXHXINBDnQ0wJ577v4XrXwcqlRRgoUSbaNuOKd1bc,5464
 mx_bluesky/beamlines/i04/callbacks/murko_callback.py,sha256=ZIwkY6gdcmIE-aMBvehN8DVcjGRtb9wwzpgHJNMZ39Q,2125
 mx_bluesky/beamlines/i24/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/beamlines/i24/serial/__init__.py,sha256=9MDcY2aHUE1zZZkoNPSGxgYV1NIf5vsCM8jArR8d3fg,1226
 mx_bluesky/beamlines/i24/serial/blueapi_config.yaml,sha256=gwOfjzZMbcvpVH71CCyHaxr8hgPYCJIWWWfg1zErtmM,245
-mx_bluesky/beamlines/i24/serial/dcid.py,sha256=Yv9SkRf1any4WVG6zI3jUxjgzQdBOKdV3XkdKZl8hto,15172
-mx_bluesky/beamlines/i24/serial/log.py,sha256=924k_K0Gl76ayyx1YMkGm3E2XaKWt_WrehpIoQQTj6o,4798
+mx_bluesky/beamlines/i24/serial/dcid.py,sha256=MWhd7t6faGEO94d0kjfKKpRS8sFqC6Dakjh3sQzGtfU,15245
+mx_bluesky/beamlines/i24/serial/log.py,sha256=oK7HHjIeuiWdy1vNZL6p-mU8Y3kzeCAgsifCxhAYqOQ,4799
 mx_bluesky/beamlines/i24/serial/run_extruder.sh,sha256=FXYsqdTpVgxB1-QrY4Tg5pl5Ex7PgUoXnuAcr9iDZTE,1078
-mx_bluesky/beamlines/i24/serial/run_fixed_target.sh,sha256=56OTNYm6LW09xh682P6p_yaNzAgsTuEsuzI3i7mH_a4,1236
+mx_bluesky/beamlines/i24/serial/run_fixed_target.sh,sha256=ZzxcVFoitBRvcqsJaBxjtepgkG-ZCGBW6X9xuV_Y478,1229
 mx_bluesky/beamlines/i24/serial/run_serial.py,sha256=Zrudosavh2HnnBXd2CLtOPs3lyQFxaN8YyO_sradRGs,1511
 mx_bluesky/beamlines/i24/serial/run_ssx.sh,sha256=0Ir5iQQ-xSN_5teHtxzht6G-mJ08mE1gxBS32vkh1eM,714
 mx_bluesky/beamlines/i24/serial/set_visit_directory.sh,sha256=WuN5PUBxTofzuESk1-3gWtTcbPjOx-26JaQSVCsZhZs,1660
 mx_bluesky/beamlines/i24/serial/start_blueapi.sh,sha256=4iBzQljTLXQiVIF4UO7drc9qUkP7KSRC6Mjh8hcGxpI,608
-mx_bluesky/beamlines/i24/serial/write_nexus.py,sha256=qRLGfrerYnlLUdyDxAso5VPI1PlFUh9gSw0bRcp8GiQ,4050
+mx_bluesky/beamlines/i24/serial/write_nexus.py,sha256=7Waw7NE_vGEuWGcX4iVAELBWfXlqDXflAMWYZ_Z_b0U,4097
 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=i0ZYMy9CDXooiJv4bYegaL7-HAXXq_znSvUx4Z_1atc,17280
+mx_bluesky/beamlines/i24/serial/extruder/i24ssx_Extruder_Collect_py3v2.py,sha256=y5lzbBo3qZNQLfhYRbaumn4I9Mu-VATuZ2iv9mnqiA8,17296
 mx_bluesky/beamlines/i24/serial/extruder/EX-gui-edm/DetStage.edl,sha256=9L1CgEdxZD4N3QvM5HLlAlJTcxpzd4ahB2nVJ9jHujw,2013
 mx_bluesky/beamlines/i24/serial/extruder/EX-gui-edm/DiamondExtruder-I24-py3v1.edl,sha256=k7b_91X5VQEmlHI2DrOmuNXTTMLcvlyJICo6F19h61I,31289
 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=cLZBEN-PK_7V6T5mjaHv53xa3rvKBStD4g-GUqCjkOM,1223
-mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Collect_py3v1.py,sha256=J5vVLQLy-TzvEr55H85U8m6i0GTePKxfdoiZsXOlp8o,28312
-mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Manager_py3v1.py,sha256=Si9XFv88pf-rlBytSa9bjZeHsjR25TKjYhayM-vB9wo,35474
-mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Mapping_py3v1.py,sha256=XU0SuMioS4Lb4J1_tL8ojfgqiu-nkvPnAfmLBuQB-oQ,5104
-mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_StartUp_py3v1.py,sha256=akP7uOn9S9CgsOw6uaONZKVsRd1v5VCeC20amRgDblM,10682
-mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_moveonclick.py,sha256=f7cwLsRkIxMB_Qs7t2pXSn4d5feygGiZaaIDUrUMDPg,6412
+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=djhAdeI13e8AsE7db_b5vDljP86aQtikYjgm-g4zmGU,27753
+mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Manager_py3v1.py,sha256=ZlQk9qIHn0bylL-JMQte5WwOfuRvjHL4bQKr_Pl_tac,33512
+mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_StartUp_py3v1.py,sha256=ZmwetrBxEr5qmeGKFDGHrRnPysA8KhcPr1O2rKzfsEs,3756
+mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_moveonclick.py,sha256=qciUnif6yd5KwJ8_XvRgafHJOFnzJIMg5Bwfjp0VOzw,6418
 mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/CustomChip_py3v1.edl,sha256=H9BVU1S3oy8tAVHtKvJvp7YTHA-4X-jtOtiu3jJ7of4,10348
 mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/DetStage.edl,sha256=WBji5SaRQ5e0KFRgrPuv6IgaFxkal1jh7MZW8SqQN88,2016
-mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/DiamondChipI24-py3v1.edl,sha256=VvFYq0LYnXUrGTO-yl90NujzcWPjAwOJk77St8ewsrg,56602
+mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/DiamondChipI24-py3v1.edl,sha256=POeXAEgypdLQNRItPgQt5szz9FioepCmVIqImG9VsUw,56556
 mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/ME14E-GeneralPurpose.edl,sha256=cpKpXfU668mGjIz35jUMTF8KAi0RI7WlVO2AR-EnJ8U,60868
 mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/MappingLite-oxford_py3v1.edl,sha256=CPMPU-imtWeKERXydJn30svgx-s2u6SuuamsFRsstyM,38860
 mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/PMAC_Command.edl,sha256=2KUy2iEcX9AC07zSH3Sp97b5qauGIm8_HjvoQ4pkyCU,1417
@@ -43,7 +42,7 @@ mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/pumpprobe-py3v1.edl,sha2
 mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/short1-laser.png,sha256=wDNuKCa_8hUPy4W01vdIrfdZtCyQKT8qVS5AS6kOTmo,9740
 mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/short2-laser.png,sha256=MrdiCFX7j-ODkfSdzc4NQ_8hj2Gs8i9gQqWyNXvdM5s,10189
 mx_bluesky/beamlines/i24/serial/parameters/__init__.py,sha256=oyY7qXs1dDTzE2DNiPdZIzMoDWfghujygEWCQa7YozA,434
-mx_bluesky/beamlines/i24/serial/parameters/constants.py,sha256=w20hRzHoUGeJJ3hECtALEheEz60rt-Ffi4boiYkhu50,1494
+mx_bluesky/beamlines/i24/serial/parameters/constants.py,sha256=2IrLKY3Yn9zl-UqsgWmg6kuqp4Cr5JV5keb9xCIz-aA,1447
 mx_bluesky/beamlines/i24/serial/parameters/experiment_parameters.py,sha256=UO5t7Pmx-yyXiQSWKmb8mQPbrZ70RCLbHcPRqtdDMaU,2771
 mx_bluesky/beamlines/i24/serial/parameters/utils.py,sha256=IR1ulMWW0PEoF-kddqXtFVm8MoA7oB_MbS0XO7a-k4w,2118
 mx_bluesky/beamlines/i24/serial/parameters/fixed_target/cs/cs_maker.json,sha256=xT3y7SSWjVTAJ58dzwNnEgBdn10A6T8umR18n5xt508,142
@@ -54,19 +53,22 @@ mx_bluesky/beamlines/i24/serial/setup_beamline/__init__.py,sha256=UhBdMcPdJMzwV0
 mx_bluesky/beamlines/i24/serial/setup_beamline/ca.py,sha256=H2gPmsLheYReFlGPFa5zzWbnyqdWbCmgKiAwcpVoYfk,1516
 mx_bluesky/beamlines/i24/serial/setup_beamline/pv.py,sha256=Wen5tTUBggb5Gf4f2yar5Rkn0GbkLRpKu6rbbFb6qPM,15566
 mx_bluesky/beamlines/i24/serial/setup_beamline/pv_abstract.py,sha256=WbD5ghgTG0F3-MR0XYm4nkiKYswVP5a2COYx_k_cngE,1806
-mx_bluesky/beamlines/i24/serial/setup_beamline/setup_beamline.py,sha256=95N3KOJQdyOsyQQDaJduo-ngPqbFNT-TziCIHHolFNg,18422
-mx_bluesky/beamlines/i24/serial/setup_beamline/setup_detector.py,sha256=yO8MWiPpNLQ-H5RTxsfkT5HSOMXV1MhmChVK9pqyW78,3265
-mx_bluesky/beamlines/i24/serial/setup_beamline/setup_zebra_plans.py,sha256=3Js2O3GkLOZd2sZEk3H0maXcNoNa1YHifDFV-X-I-Yk,17159
+mx_bluesky/beamlines/i24/serial/setup_beamline/setup_beamline.py,sha256=nmQDBLWg2ZseuJZHDq_DXezLy8Z_8dSxvYW-cZA_H1k,18720
+mx_bluesky/beamlines/i24/serial/setup_beamline/setup_detector.py,sha256=riBXkgAg3lV6dqoCng_3IF8ZfhwvOHf0zqktJC0rfn0,3241
+mx_bluesky/beamlines/i24/serial/setup_beamline/setup_zebra_plans.py,sha256=_nTQvZmxcKxspeHmKfVcjXkJMtBzB5Qqq7tB0iSlQi4,17241
 mx_bluesky/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/common/device_setup_plans/read_hardware_for_setup.py,sha256=P018shGBEdO0QWBufwITOk3p-sPUCy4P6UIkf6aUuho,583
-mx_bluesky/common/parameters/components.py,sha256=zHyn7K4Ug7Q_Fhr9ph9hbxw2BUQC0CX1qYq3tgt1xHw,6374
-mx_bluesky/common/parameters/constants.py,sha256=k4rnZXYMPCih2IN78ou6Pyb5TFSXSyMJarGaj-ltELU,3581
+mx_bluesky/common/external_interaction/config_server.py,sha256=7CwHr03idK5vAB_9acDgGPe6_1bX3bIelecnmsjC7V0,1937
+mx_bluesky/common/parameters/components.py,sha256=ktEM1MrKRocbRYLleihcUdu4FwfgYbs7WadiI6GJXHY,7216
+mx_bluesky/common/parameters/constants.py,sha256=EFmHaOMOll2gjB0pHrHKSk8VT5WBGHAMb0eadrWgLI8,3783
+mx_bluesky/common/parameters/gridscan.py,sha256=AWGf_Wwx09i7I6DZty5nfzd8U-eUI2PUjlCb5BhM_WI,3232
+mx_bluesky/common/parameters/robot_load.py,sha256=HWkMxCyD6R3qWuBU1jk-Zel2XGotvgAusMpTsVxYUe0,453
 mx_bluesky/common/plans/__init__.py,sha256=FMA-4VN1TJCPcyURKF0qPIQ8uo8YBbtHPRdJokVF4MA,129
-mx_bluesky/common/plans/do_fgs.py,sha256=BQRLTlzG-ep0FNeFeDo_Ex1tMwC0ofTwufBD32DCdtM,5084
-mx_bluesky/common/utils/log.py,sha256=iHnaMzg7b819fI2XYBbbVFtMoUC5_iSAPA_FoWUtK_0,3524
+mx_bluesky/common/plans/do_fgs.py,sha256=xT_o3nFjiB8bUBZld7k1YTlaBoj1eFUBDvWPjpkXYJs,5090
+mx_bluesky/common/utils/log.py,sha256=ZqhcErN71AUXMCJy0865nWVz4FaKq7DFSoxgdXvC0-8,3566
 mx_bluesky/common/utils/tracing.py,sha256=stnBZIvPuKiAm2wVc8lFr3ns7V5C52rUigULi9V-IFs,1171
 mx_bluesky/hyperion/__init__.py,sha256=f4E8wInL1Ll4eeFtAiyKmipOBTPlUtKmVK-m_LOQG4M,35
-mx_bluesky/hyperion/__main__.py,sha256=d6aZRhoZjACSWZKu7Uave2Z7_g0k2RiDJlX6i-aPtCs,13763
+mx_bluesky/hyperion/__main__.py,sha256=HbyWl_ea6CeZhNF2P5sIG1INgi_d0Jdhtx3F9Vr2pTw,13788
 mx_bluesky/hyperion/exceptions.py,sha256=RUKfRG8V4TZY6dQFg1tISbUOG0p3cG-LUJdWkc32_5s,1298
 mx_bluesky/hyperion/log.py,sha256=DkTW9lH-v_F4Tda5D3OhiSYQe-6Nhma2tqHbnr1mPno,416
 mx_bluesky/hyperion/device_setup_plans/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -75,52 +77,55 @@ mx_bluesky/hyperion/device_setup_plans/manipulate_sample.py,sha256=vJdlTs9LILfki
 mx_bluesky/hyperion/device_setup_plans/position_detector.py,sha256=g2gJZFqOF2klH92uKQAMoyXRSD7ehloe9wToIVfV-CM,631
 mx_bluesky/hyperion/device_setup_plans/read_hardware_for_setup.py,sha256=-bf3lRpvIQVsmT3-jRjb5jqaHDD3F3LSENmJVItixhA,2186
 mx_bluesky/hyperion/device_setup_plans/setup_oav.py,sha256=pIXLM3FKpf7wYMEiEAOaGTm504XAt5N7nuuu9kKraBk,2914
-mx_bluesky/hyperion/device_setup_plans/setup_panda.py,sha256=-az-LSOT0NgoBL8hLI7fV_llOfM8fHpba-NxvRBaKFk,7779
-mx_bluesky/hyperion/device_setup_plans/setup_zebra.py,sha256=qsQZ6AmUzsUxt5qj8dQjEphFjw0YfnrnZk-nZElUtxA,9695
+mx_bluesky/hyperion/device_setup_plans/setup_panda.py,sha256=fpKqOiGODj0ltblZwvV3D9qNU8tljw8r9n2g9fKo8_E,7789
+mx_bluesky/hyperion/device_setup_plans/setup_zebra.py,sha256=JnPRRTycWEljEUx51xoJO1VzfP7QcrHHtn6DZ6tSLgc,9696
 mx_bluesky/hyperion/device_setup_plans/smargon.py,sha256=HrHBdd2QZcSg9i3h4Qx7WsREJy3JXUg65AcaHCBd32E,1208
 mx_bluesky/hyperion/device_setup_plans/utils.py,sha256=Ha9vzI6xniaJZZ9HfjpXjx-N23glxfdEoDGzhSAy6hc,1953
 mx_bluesky/hyperion/device_setup_plans/xbpm_feedback.py,sha256=3WfVaNjB6f6XGLiPl3WqTNe4KdXqDHu8NkYufRl0g0Q,3959
-mx_bluesky/hyperion/experiment_plans/__init__.py,sha256=Tq9XXh8-N4obZMizxi5H1laV-toJQ9olu4K05gMFo8E,936
-mx_bluesky/hyperion/experiment_plans/experiment_registry.py,sha256=n7A0yK4ftpwB0GoNop4ZM1jcFvdqEQuq6qLabzprLKo,2995
-mx_bluesky/hyperion/experiment_plans/flyscan_xray_centre_plan.py,sha256=geDjhmaQTFkK8TbEvs34C89Wp2FLqyQ6at0X49E40fQ,17649
-mx_bluesky/hyperion/experiment_plans/grid_detect_then_xray_centre_plan.py,sha256=kf0Jf8ffL3shGo5KFHhjaH3qBPGDMETX0foIjGBNhPQ,7357
-mx_bluesky/hyperion/experiment_plans/load_centre_collect_full_plan.py,sha256=vmqqlZANQB9LAl9QgMNmGU3yB624_gMuM7pJlglPOOc,1711
-mx_bluesky/hyperion/experiment_plans/oav_grid_detection_plan.py,sha256=dF_eeP2uxAao64jAEswnYIk0fzrqQ8hoOQ5CtHJjob0,7594
-mx_bluesky/hyperion/experiment_plans/oav_snapshot_plan.py,sha256=KUe4PKNv-RQsrc4RywgHAFlIxhLbvtRWNZj05E72VbE,3125
-mx_bluesky/hyperion/experiment_plans/optimise_attenuation_plan.py,sha256=JZJW3hOzcxFyCEmsMYWWGwA9tAgGgg85nBKxBxKXeX0,16276
-mx_bluesky/hyperion/experiment_plans/pin_centre_then_xray_centre_plan.py,sha256=53R50CvGXXw2ZNsbvwuNN4iOf8sGEtRRER_g9SSrln0,4168
-mx_bluesky/hyperion/experiment_plans/pin_tip_centring_plan.py,sha256=EQQXGsbOnUY3Qa1Eset3Qs-VeneEDcz_TYo7909Iy5M,6121
-mx_bluesky/hyperion/experiment_plans/robot_load_and_change_energy.py,sha256=zSvzgkC1SYajXah5EiuQGCP8Y1EhDj4iSV_ByK_vtUU,8383
-mx_bluesky/hyperion/experiment_plans/robot_load_then_centre_plan.py,sha256=eNDsdG-4U6IivUIG8rh9EoMfhA3G0JeaHUWBWIw4pdI,5607
-mx_bluesky/hyperion/experiment_plans/rotation_scan_plan.py,sha256=Ra60qFv4ZKTpfnlLHMmR3822rhaEv5YZIlcRalIAUH4,15934
-mx_bluesky/hyperion/experiment_plans/set_energy_plan.py,sha256=woONMgIDA81vabufc_osJ9S9Nq4ckOIrgHNgqMS4F6s,1715
+mx_bluesky/hyperion/experiment_plans/__init__.py,sha256=3ldTMxgz4yKHJH9iF3nw7uueyX2zQ5Z84V0dsCzW5us,1081
+mx_bluesky/hyperion/experiment_plans/change_aperture_then_move_plan.py,sha256=4if5QruC2Q-rd8iInV9oiq0BjzjQW8IzBhXRcjxcAfg,3258
+mx_bluesky/hyperion/experiment_plans/experiment_registry.py,sha256=uZaxI-Tib0caZpydXooWULyMzx1vGiyWk0_rcvprevs,3059
+mx_bluesky/hyperion/experiment_plans/flyscan_xray_centre_plan.py,sha256=X1LdYkwkI99LHWLh897T3gS6YRFJtoY15-u7Q_41GVI,18761
+mx_bluesky/hyperion/experiment_plans/grid_detect_then_xray_centre_plan.py,sha256=oKq7WpCCY_sxkmVSwIr0Cs5ob7U4YpZgD5Q9oueGm7U,8476
+mx_bluesky/hyperion/experiment_plans/load_centre_collect_full_plan.py,sha256=3pWj_IGLhot01OPQGTyLZbeVP_TOOOwqBUwlTcs4qoE,3389
+mx_bluesky/hyperion/experiment_plans/oav_grid_detection_plan.py,sha256=UYFEPzW4QzpiyspMa9GnSjmrQ4qLSb0HllyPJ78ApvI,7642
+mx_bluesky/hyperion/experiment_plans/oav_snapshot_plan.py,sha256=HfStkqGIsCgNyDjUi6rfAVfwg4g4bGxw8366SOsY8Y4,2984
+mx_bluesky/hyperion/experiment_plans/optimise_attenuation_plan.py,sha256=ORE60OyjhbXL1ul-IlMc9XnutNaTpiRGmc0YLegMX4c,16324
+mx_bluesky/hyperion/experiment_plans/pin_centre_then_xray_centre_plan.py,sha256=LR365Xmc8bO-6Sz2ApQIbfaAGvMQLnMQxByXAP9s-kA,5014
+mx_bluesky/hyperion/experiment_plans/pin_tip_centring_plan.py,sha256=Nl07oPJ6YUf7pPpjpEUn5_SAL8TJ_BuchDiBHyJjKPM,6169
+mx_bluesky/hyperion/experiment_plans/robot_load_and_change_energy.py,sha256=flzYUC12jR8vX058o-SAvxkECgSFdFM5Rv3g4JkpyTQ,8366
+mx_bluesky/hyperion/experiment_plans/robot_load_then_centre_plan.py,sha256=1FhXGG8uWkLBEnfR7sD2n9XmGNjCU16kT4565D3kklo,6937
+mx_bluesky/hyperion/experiment_plans/rotation_scan_plan.py,sha256=USK0dExxWXzbQPuoM838j7JRfSAlzYM80N3qm1TAcUo,16576
+mx_bluesky/hyperion/experiment_plans/set_energy_plan.py,sha256=VyTGE5OD0vDi39X_x7BKJCi5vI8qj5hL_HKbWKPoeqI,1762
+mx_bluesky/hyperion/experiment_plans/common/xrc_result.py,sha256=VwNbY9bzXoFUo-VYiQNscmF7l_6TFv1iRCYshHdla7w,1435
 mx_bluesky/hyperion/external_interaction/__init__.py,sha256=95DwXDmKsx36RgAL-AtLZl2LQoLPKbzeYdlkkP_4Coc,559
-mx_bluesky/hyperion/external_interaction/config_server.py,sha256=5tMF2AnXZsV1q_l_2EMde7ja-PKFUba2iJC2YWouI8o,1870
+mx_bluesky/hyperion/external_interaction/config_server.py,sha256=bq_MPCDVcKswRzFbfgJUTErj11TrYaYHyrnkpknVE6M,640
 mx_bluesky/hyperion/external_interaction/exceptions.py,sha256=XBDES13VaW9fhxRZYNvSfLC_Mvg4M4RqMseW_u18Mb8,342
 mx_bluesky/hyperion/external_interaction/callbacks/__init__.py,sha256=njGhxi0Qf06vvDXCpVlQhFAOebf6iVAVm3CjGCjwr1g,331
 mx_bluesky/hyperion/external_interaction/callbacks/__main__.py,sha256=9mn8ysV2mOAv91KuqjVyK15Eb5SSHGQvy5MeqCa4miM,4891
 mx_bluesky/hyperion/external_interaction/callbacks/aperture_change_callback.py,sha256=pWd84QldTGLoxPdyqXZk6_SLhvF7O-CQRsiXqWDQEkg,837
-mx_bluesky/hyperion/external_interaction/callbacks/grid_detection_callback.py,sha256=33IZyPSBsevjcCtqfnBvXqez0BCRF3DhnmJZ93QmGUY,3046
+mx_bluesky/hyperion/external_interaction/callbacks/grid_detection_callback.py,sha256=haWySSo0eHCU28i8bZ_uahg6K7ZVDlMy7X-mAsSP0oY,3090
 mx_bluesky/hyperion/external_interaction/callbacks/ispyb_callback_base.py,sha256=Na00U4d1ZiuV1DlXKkoNOcwo1Bh89ONNgNQWl2H1YM4,9484
 mx_bluesky/hyperion/external_interaction/callbacks/log_uid_tag_callback.py,sha256=pfZxQfS9SnXep3F2YAPptDX5bjjWvbXtgy5fINfsoTU,626
 mx_bluesky/hyperion/external_interaction/callbacks/logging_callback.py,sha256=W5jO7uHvi84FmEwVC_wNk93oc3-SJ8pZq61cYS-qalU,708
 mx_bluesky/hyperion/external_interaction/callbacks/plan_reactive_callback.py,sha256=7UtkXZluAag_Mx_JnESd7ODPSN3WrcNCgN8mquIpxjE,4086
 mx_bluesky/hyperion/external_interaction/callbacks/zocalo_callback.py,sha256=Jwf_jFLnC1lRm-WIlZ6ZozbQyw_SHtXK_5HUA5RT7Fw,3960
 mx_bluesky/hyperion/external_interaction/callbacks/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mx_bluesky/hyperion/external_interaction/callbacks/common/abstract_event.py,sha256=iBj4WNK5ikieZzTePBZ9AEu6ehlnpew1nDK3ONJqibI,2093
 mx_bluesky/hyperion/external_interaction/callbacks/common/callback_util.py,sha256=CjB3SOITmwv9I7pokwN0pmPomDAri7fJrg7Ww2kpXPo,1981
 mx_bluesky/hyperion/external_interaction/callbacks/common/ispyb_mapping.py,sha256=DK6YqioQCwPF4MkVGMf8rtKsC1o7nWmVBdGaJOv2lhQ,2582
 mx_bluesky/hyperion/external_interaction/callbacks/robot_load/ispyb_callback.py,sha256=o1hw3hfUATkGueyw6xiWIypRvQMWiGj4DajTdgpeHvI,3580
 mx_bluesky/hyperion/external_interaction/callbacks/rotation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mx_bluesky/hyperion/external_interaction/callbacks/rotation/ispyb_callback.py,sha256=nhsUMWd3fJVhOXXpwdgeJmRDG3zoZr7A6bdTfU_3fhE,7257
+mx_bluesky/hyperion/external_interaction/callbacks/rotation/ispyb_callback.py,sha256=YBZYH3-yv1h1AhePJATtPTuouYL76QMcmxTI0vSEbGQ,7365
 mx_bluesky/hyperion/external_interaction/callbacks/rotation/ispyb_mapping.py,sha256=gXub8lt04ClC4sU_QGaBW4w3wrH8hJK7Tjy0AY4zf7g,718
-mx_bluesky/hyperion/external_interaction/callbacks/rotation/nexus_callback.py,sha256=tx7G1Q9W3bCLB1h_IaNh1FvOmsE2Oy9LJMLC8NSWgCc,4478
+mx_bluesky/hyperion/external_interaction/callbacks/rotation/nexus_callback.py,sha256=kamsFKVXVtbOfwkeepBzzvJCWgWUcDbYiWP9yhIwevc,4553
 mx_bluesky/hyperion/external_interaction/callbacks/xray_centre/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mx_bluesky/hyperion/external_interaction/callbacks/xray_centre/ispyb_callback.py,sha256=cMgKv1md4KoXWL7mKcqDuPtjGf-y8Jgw88roSuseYa8,11446
+mx_bluesky/hyperion/external_interaction/callbacks/xray_centre/ispyb_callback.py,sha256=UW3RHnBekHb_hl13QAfAbYxdy5OfNxwu3WysTwJMSaI,11556
 mx_bluesky/hyperion/external_interaction/callbacks/xray_centre/ispyb_mapping.py,sha256=8SiT3Yes58HJNro4CatIM1dcnyIvTBt0DNtAGbcEx7g,1818
-mx_bluesky/hyperion/external_interaction/callbacks/xray_centre/nexus_callback.py,sha256=FvO6OcRgQNBm8HEeM6Gc-j2a1yH3OOGUat-GTtfh-gM,4409
+mx_bluesky/hyperion/external_interaction/callbacks/xray_centre/nexus_callback.py,sha256=4I4Dp5CClu1Nwn5fzK-byjaZLivHPyqVSR8UZr0Xzl8,4499
 mx_bluesky/hyperion/external_interaction/ispyb/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/hyperion/external_interaction/ispyb/data_model.py,sha256=7P2Tz3Y9k-vKSGsdk8ppvKg15z1iBGGKbw3RNv_8y-E,2632
-mx_bluesky/hyperion/external_interaction/ispyb/exp_eye_store.py,sha256=ekMaDRkshbC72_hY0VWjaBA5b1vQgUfHoYBW22wEzNw,4487
+mx_bluesky/hyperion/external_interaction/ispyb/exp_eye_store.py,sha256=5JS2pmxSzu7Rt_m53yvRZ8zSoD7NPao7uyPpO-AKOC4,4477
 mx_bluesky/hyperion/external_interaction/ispyb/ispyb_store.py,sha256=cDNUbdZfM491_OwSboW7BX_hSAm2xmIgeY0thPnek2Y,10322
 mx_bluesky/hyperion/external_interaction/ispyb/ispyb_utils.py,sha256=2Vl5qvGoCvbZ-lJFJSSNpTkbE4YfHAhy79jP7Oap6gg,720
 mx_bluesky/hyperion/external_interaction/nexus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -128,19 +133,18 @@ mx_bluesky/hyperion/external_interaction/nexus/nexus_utils.py,sha256=dryKyQS7sxD
 mx_bluesky/hyperion/external_interaction/nexus/write_nexus.py,sha256=77D2yD2VMm4CkGTzI_1OZHQR_byVwVeJ2MCRTfT5vKs,4134
 mx_bluesky/hyperion/parameters/__init__.py,sha256=kf2wfcILBUBpT0tJ8-W39BywQUkn67yxl9IVsfrr1LE,115
 mx_bluesky/hyperion/parameters/cli.py,sha256=FGzvEB76YnQvBydUMPUNHJuqxvEe7Zc627w7gA2KODY,2125
-mx_bluesky/hyperion/parameters/components.py,sha256=bJbp1yCZDsh5VS08vdqitf7clLUhXGYTiHvZSd7RY2Q,260
-mx_bluesky/hyperion/parameters/constants.py,sha256=7WXfunGj_rhHBQ7MbfJFakbBerkE4ZKC3snIcgOkAjM,1832
-mx_bluesky/hyperion/parameters/gridscan.py,sha256=wEqNtt0FNH0x56eodloEerA0C6uLJLw3g7ZdZ5H-Dd4,8528
-mx_bluesky/hyperion/parameters/load_centre_collect.py,sha256=RFX7DlldLV552X7UzCmuVohpW2urum_4Mdw1ucHkIRk,1583
-mx_bluesky/hyperion/parameters/robot_load.py,sha256=Sfr_DqCl6IsaSsJqB0UvIcVObdSy4-Ud8GC-WMxjFAI,435
-mx_bluesky/hyperion/parameters/rotation.py,sha256=Gwt9gXAFOxcQAEd8vleXoCXtkqL5x4dSRKnr8HZWjkw,5804
+mx_bluesky/hyperion/parameters/components.py,sha256=Uy-CZ81YhwJcatMOEZxQJmZD79SwQJbxgPUYxeNw_xQ,243
+mx_bluesky/hyperion/parameters/constants.py,sha256=XVhYFHK8PZ81uNNjifNtzB__jcabNPOd4Cc_oLY8KXs,1810
+mx_bluesky/hyperion/parameters/gridscan.py,sha256=q9N0cCw1B1gBw6hUF1RgBVnX2DT-11W3QBWD-EI9X1A,7006
+mx_bluesky/hyperion/parameters/load_centre_collect.py,sha256=XtMCnH7eIoLy55CDi5U8NjejnedF_vLzkdfV6mffImY,1854
+mx_bluesky/hyperion/parameters/rotation.py,sha256=eO5TAbH3jx0pj1AYMOA4jVf9z_qMuiyuAYX0oQjxKEE,6260
 mx_bluesky/hyperion/resources/panda/panda-gridscan.yaml,sha256=xrhgok-9X2VXdyLEWiYOUEeRCBqhYM6IJFAefnNdgzw,26521
 mx_bluesky/hyperion/utils/context.py,sha256=TYG3e4lu88ssngoNbsR5pfEXI0DveDemLWaBuThtvbI,2710
 mx_bluesky/hyperion/utils/utils.py,sha256=q2uCaK1E8zLVk1BFmj7qlTnQf3JRKjCjyadIVnL1-4M,1180
 mx_bluesky/hyperion/utils/validation.py,sha256=dTG7KmWsLSoR0c1mYuhhNByUT6Yj3_VBAreY9nUdQjQ,6483
-mx_bluesky-1.4.0.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-mx_bluesky-1.4.0.dist-info/METADATA,sha256=22StpSFg9vrZqeWNgIqFtijAWmWaoSdDQT9CpFks4AE,17245
-mx_bluesky-1.4.0.dist-info/WHEEL,sha256=a7TGlA-5DaHMRrarXjVbQagU3Man_dCnGIWMJr5kRWo,91
-mx_bluesky-1.4.0.dist-info/entry_points.txt,sha256=Bt3iHCqzZtHYnnSKoh_qM2k3K4LbK1Uxr0gF8B34F98,528
-mx_bluesky-1.4.0.dist-info/top_level.txt,sha256=S4rrzXIUef58ulf_04wn01XGZ3xeJjXs4LPEJ_xoF-I,11
-mx_bluesky-1.4.0.dist-info/RECORD,,
+mx_bluesky-1.4.1a0.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+mx_bluesky-1.4.1a0.dist-info/METADATA,sha256=AYP1dVZb3smG0MpvnSERST4N8tjEF9i336GCcs63rFA,17275
+mx_bluesky-1.4.1a0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+mx_bluesky-1.4.1a0.dist-info/entry_points.txt,sha256=Bt3iHCqzZtHYnnSKoh_qM2k3K4LbK1Uxr0gF8B34F98,528
+mx_bluesky-1.4.1a0.dist-info/top_level.txt,sha256=S4rrzXIUef58ulf_04wn01XGZ3xeJjXs4LPEJ_xoF-I,11
+mx_bluesky-1.4.1a0.dist-info/RECORD,,

{mx_bluesky-1.4.0.dist-info → mx_bluesky-1.4.1a0.dist-info}/WHEEL

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