mx-bluesky 1.4.7__py3-none-any.whl → 1.4.9__py3-none-any.whl

mx_bluesky/hyperion/parameters/load_centre_collect.py

@@ -12,7 +12,7 @@ from mx_bluesky.hyperion.parameters.components import WithHyperionUDCFeatures
 from mx_bluesky.hyperion.parameters.robot_load import (
     RobotLoadThenCentre,
 )
-from mx_bluesky.hyperion.parameters.rotation import MultiRotationScan
+from mx_bluesky.hyperion.parameters.rotation import RotationScan
 
 T = TypeVar("T", bound=BaseModel)
 
@@ -34,7 +34,7 @@ class LoadCentreCollect(
     pin-tip centre and rotation scan operations."""
 
     robot_load_then_centre: RobotLoadThenCentre
-    multi_rotation_scan: MultiRotationScan
+    multi_rotation_scan: RotationScan
 
     @model_validator(mode="before")
     @classmethod
@@ -42,7 +42,7 @@ class LoadCentreCollect(
         allowed_keys = (
             LoadCentreCollect.model_fields.keys()
             | RobotLoadThenCentre.model_fields.keys()
-            | MultiRotationScan.model_fields.keys()
+            | RotationScan.model_fields.keys()
         )
 
         disallowed_keys = values.keys() - allowed_keys
@@ -74,7 +74,7 @@ class LoadCentreCollect(
             values, values["robot_load_then_centre"], RobotLoadThenCentre
         )
         new_multi_rotation_scan_params = construct_from_values(
-            values, values["multi_rotation_scan"], MultiRotationScan
+            values, values["multi_rotation_scan"], RotationScan
         )
         values["multi_rotation_scan"] = new_multi_rotation_scan_params
         values["robot_load_then_centre"] = new_robot_load_then_centre_params

mx_bluesky/hyperion/parameters/rotation.py

@@ -42,7 +42,8 @@ class RotationScanPerSweep(OptionalGonioAngleStarts, OptionalXyzStarts):
         omega_start_deg: The initial angle of the rotation in degrees (default 0)
         scan_width_deg: The sweep of the rotation in degrees, this must be positive (default 360)
         rotation_direction: Indicates the direction of rotation, if RotationDirection.POSITIVE
-            the final angle is obtained by adding scan_width_deg, otherwise by subtraction (default NEGATIVE)
+            the final angle is obtained by adding scan_width_deg, otherwise by subtraction (default NEGATIVE).
+            See "Hyperion Coordinate Systems" in the documentation.
         nexus_vds_start_img: The frame number of the first frame captured during the rotation
     """
 
@@ -104,7 +105,7 @@ class RotationExperiment(DiffractionExperimentWithSample, WithHyperionUDCFeature
             return aperture_position
 
 
-class RotationScan(WithScan, RotationScanPerSweep, RotationExperiment):
+class SingleRotationScan(WithScan, RotationScanPerSweep, RotationExperiment):
     @property
     def detector_params(self):
         return self._detector_params(self.omega_start_deg)
@@ -129,12 +130,12 @@ class RotationScan(WithScan, RotationScanPerSweep, RotationExperiment):
         return int(self.scan_width_deg / self.rotation_increment_deg)
 
 
-class MultiRotationScan(RotationExperiment, SplitScan):
+class RotationScan(RotationExperiment, SplitScan):
     rotation_scans: Annotated[list[RotationScanPerSweep], Len(min_length=1)]
 
-    def _single_rotation_scan(self, scan: RotationScanPerSweep) -> RotationScan:
+    def _single_rotation_scan(self, scan: RotationScanPerSweep) -> SingleRotationScan:
         # self has everything from RotationExperiment
-        allowed_keys = RotationScan.model_fields.keys()  # type: ignore # mypy doesn't recognise this as a property...
+        allowed_keys = SingleRotationScan.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()
@@ -142,13 +143,13 @@ class MultiRotationScan(RotationExperiment, SplitScan):
             k: v for k, v in (params_dump | scan_dump).items() if k in allowed_keys
         }
         # together they have everything for RotationScan
-        rotation_scan = RotationScan(**rotation_scan_kv_pairs)
+        rotation_scan = SingleRotationScan(**rotation_scan_kv_pairs)
         return rotation_scan
 
     @model_validator(mode="after")
     @classmethod
     def correct_start_vds(cls, values: Any) -> Any:
-        assert isinstance(values, MultiRotationScan)
+        assert isinstance(values, RotationScan)
         start_img = 0.0
         for scan in values.rotation_scans:
             scan.nexus_vds_start_img = int(start_img)
@@ -167,7 +168,7 @@ class MultiRotationScan(RotationExperiment, SplitScan):
         return self
 
     @property
-    def single_rotation_scans(self) -> Iterator[RotationScan]:
+    def single_rotation_scans(self) -> Iterator[SingleRotationScan]:
         for scan in self.rotation_scans:
             yield self._single_rotation_scan(scan)
 
@@ -192,7 +193,3 @@ class MultiRotationScan(RotationExperiment, SplitScan):
             self._num_images_per_scan()[0],
             len(self._num_images_per_scan()),
         )
-
-    @property
-    def ispyb_params(self):  # pyright: ignore
-        raise ValueError("Please get ispyb params from one of the individual scans")

mx_bluesky/hyperion/utils/context.py

@@ -5,13 +5,13 @@ import mx_bluesky.hyperion.experiment_plans as hyperion_plans
 from mx_bluesky.common.utils.log import LOGGER
 
 
-def setup_context(wait_for_connection: bool = True) -> BlueskyContext:
+def setup_context(dev_mode: bool = False) -> BlueskyContext:
     context = BlueskyContext()
     context.with_plan_module(hyperion_plans)
 
     context.with_dodal_module(
         get_beamline_based_on_environment_variable(),
-        wait_for_connection=wait_for_connection,
+        mock=dev_mode,
     )
 
     LOGGER.info(f"Plans found in context: {context.plan_functions.keys()}")

mx_bluesky/hyperion/utils/validation.py

@@ -3,12 +3,11 @@ import json
 import os
 import shutil
 from pathlib import Path
-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 OAVConfig
+from dodal.devices.oav.oav_detector import OAVConfigBeamCentre
 from ophyd_async.testing import set_mock_value
 
 from mx_bluesky.common.plans.read_hardware import (
@@ -38,16 +37,17 @@ def test_params(filename_stub, dir):
 
     params = RotationScan(
         **get_params(
-            "tests/test_data/parameter_json_files/good_test_rotation_scan_parameters.json"
+            "tests/test_data/parameter_json_files/good_test_one_multi_rotation_scan_parameters.json"
         )
     )
+    for scan_params in params.rotation_scans:
+        scan_params.x_start_um = 0
+        scan_params.y_start_um = 0
+        scan_params.z_start_um = 0
+        scan_params.scan_width_deg = 360
     params.file_name = filename_stub
-    params.scan_width_deg = 360
     params.demand_energy_ev = 12700
     params.storage_directory = str(dir)
-    params.x_start_um = 0
-    params.y_start_um = 0
-    params.z_start_um = 0
     params.exposure_time_s = 0.004
     return params
 
@@ -57,12 +57,14 @@ def fake_rotation_scan(
     subscription: RotationNexusFileCallback,
     rotation_devices: RotationScanComposite,
 ):
+    single_scan_parameters = next(parameters.single_rotation_scans)
+
     @bpp.subs_decorator(subscription)
     @bpp.set_run_key_decorator("rotation_scan_with_cleanup_and_subs")
     @bpp.run_decorator(  # attach experiment metadata to the start document
         md={
             "subplan_name": CONST.PLAN.ROTATION_OUTER,
-            "mx_bluesky_parameters": parameters.model_dump_json(),
+            "mx_bluesky_parameters": single_scan_parameters.model_dump_json(),
             "activate_callbacks": "RotationNexusFileCallback",
         }
     )
@@ -98,9 +100,7 @@ def fake_create_rotation_devices():
     oav = i03.oav(
         connect_immediately=True,
         mock=True,
-        params=OAVConfig(
-            zoom_params_file=ZOOM_LEVELS_XML, display_config_file=DISPLAY_CONFIGURATION
-        ),
+        params=OAVConfigBeamCentre(ZOOM_LEVELS_XML, DISPLAY_CONFIGURATION),
     )
     xbpm_feedback = i03.xbpm_feedback(connect_immediately=True, mock=True)
 
@@ -139,15 +139,11 @@ def sim_rotation_scan_to_create_nexus(
 
     fake_create_rotation_devices.eiger.bit_depth.sim_put(32)  # type: ignore
 
-    with patch(
-        "mx_bluesky.common.external_interaction.nexus.write_nexus.get_start_and_predicted_end_time",
-        return_value=("test_time", "test_time"),
-    ):
-        RE(
-            fake_rotation_scan(
-                test_params, RotationNexusFileCallback(), fake_create_rotation_devices
-            )
+    RE(
+        fake_rotation_scan(
+            test_params, RotationNexusFileCallback(), fake_create_rotation_devices
         )
+    )
 
     nexus_path = Path(test_params.storage_directory) / nexus_filename
     assert os.path.isfile(nexus_path)

{mx_bluesky-1.4.7.dist-info → mx_bluesky-1.4.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mx-bluesky
-Version: 1.4.7
+Version: 1.4.9
 Summary: Bluesky tools for MX Beamlines at DLS
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
 License:                                  Apache License
@@ -220,7 +220,7 @@ Requires-Dist: flask-restful
 Requires-Dist: ispyb
 Requires-Dist: jupyterlab
 Requires-Dist: matplotlib
-Requires-Dist: nexgen
+Requires-Dist: nexgen>=0.11.0
 Requires-Dist: numpy
 Requires-Dist: opencv-python
 Requires-Dist: opentelemetry-distro
@@ -235,11 +235,11 @@ Requires-Dist: scipy
 Requires-Dist: semver
 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.9.0a2
+Requires-Dist: daq-config-server==0.1.1
+Requires-Dist: ophyd>=1.10.5
+Requires-Dist: ophyd-async>=0.10.0a2
 Requires-Dist: bluesky>=1.13.1
-Requires-Dist: dls-dodal==1.44.0
+Requires-Dist: dls-dodal==1.48.0
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: build; extra == "dev"
@@ -257,6 +257,7 @@ 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-timeout; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: ruff; extra == "dev"
 Requires-Dist: sphinx-autobuild; extra == "dev"

{mx_bluesky-1.4.7.dist-info → mx_bluesky-1.4.9.dist-info}/RECORD

@@ -1,79 +1,86 @@
 mx_bluesky/__init__.py,sha256=Ksms_WJF8LTkbm38gEpm1jBpGqcQ8NGvmb2ZJlOE1j8,198
 mx_bluesky/__main__.py,sha256=RVqPnxDisFMIn_aoEi0drlThNHgKTJULnSrotouIKI0,480
-mx_bluesky/_version.py,sha256=s-Eu9jsJQLZM8_9AlFjyCzqOgTZ3BB_7dc7mXsC3CzU,511
+mx_bluesky/_version.py,sha256=_khE0BvLLOXKCyxlHn8gjMAbG__XlngpoNyCPRZBxOQ,511
 mx_bluesky/definitions.py,sha256=ULpEYAUzdQiEbBoTgYTMxfUf3DDDjhYtvDxofs7Qxqw,168
 mx_bluesky/jupyter_example.ipynb,sha256=wpwvPrBvwtRMS5AIFk8F54cIlUoD0o4ji8tKK5cZHA4,1672
 mx_bluesky/beamlines/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mx_bluesky/beamlines/aithre_lasershaping/__init__.py,sha256=MGOtd-CsJYRfCVxbwwvRJSZcsqMU_uV3vsbmBd7pbHk,374
+mx_bluesky/beamlines/aithre_lasershaping/__init__.py,sha256=A0dlifkBYPlCiMkTEovTcNVUCOzH5FhkUGK9y_u8lHo,603
+mx_bluesky/beamlines/aithre_lasershaping/beamline_safe.py,sha256=-GTu2w7dIKtssZB8vXwE2f1zF-Pg1zC_jwBbB-r2Goo,1233
 mx_bluesky/beamlines/aithre_lasershaping/check_goniometer_performance.py,sha256=AqWAFey_Ih1JcRxVNiZDGFsVg4kvA9LH2p5SJeXfe2I,834
-mx_bluesky/beamlines/aithre_lasershaping/goniometer_controls.py,sha256=qYALVNt69e7mpEonTmHH4xY7ByKXi27BvCskkR8KN9I,633
+mx_bluesky/beamlines/aithre_lasershaping/goniometer_controls.py,sha256=1La4vJmQdKp3_Ib1DMgavJBdYLTxp7S7dEr_lqNknV0,1828
 mx_bluesky/beamlines/i04/__init__.py,sha256=jZjAMN5_oOEjQoR3iTrnMFW3ElxlHhQ7pEQZIv21Y4I,129
-mx_bluesky/beamlines/i04/redis_to_murko_forwarder.py,sha256=iYtsjr94TaYjZ0mKvL9kbs6a3ZfojuQHahfHZl1skG8,6593
-mx_bluesky/beamlines/i04/thawing_plan.py,sha256=95V-y9sjdXTRE7J9GU7YNARCqtWBOeYLUZ7K_2fg0b4,4999
+mx_bluesky/beamlines/i04/redis_to_murko_forwarder.py,sha256=T6K0LOwwGxB05YvS6FV-UU4O2N2GMQdEM2vj9BSow_U,6618
+mx_bluesky/beamlines/i04/thawing_plan.py,sha256=uvm1wfp012GN5yE7TcURSQeDtC9nWnW5X__6UCXazjA,5085
 mx_bluesky/beamlines/i04/callbacks/murko_callback.py,sha256=ZIwkY6gdcmIE-aMBvehN8DVcjGRtb9wwzpgHJNMZ39Q,2125
+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/serial/__init__.py,sha256=XnCeh2GahduKp7d9aFgNjm_SMgh6F0E5M2tk0bNFivY,1423
-mx_bluesky/beamlines/i24/serial/blueapi_config.yaml,sha256=gwOfjzZMbcvpVH71CCyHaxr8hgPYCJIWWWfg1zErtmM,245
-mx_bluesky/beamlines/i24/serial/dcid.py,sha256=Y2bL0AGPvBqQ4gbqbxjCMG2UJqqIY1B7YAW0C_UxS7Q,14530
-mx_bluesky/beamlines/i24/serial/log.py,sha256=oK7HHjIeuiWdy1vNZL6p-mU8Y3kzeCAgsifCxhAYqOQ,4799
+mx_bluesky/beamlines/i24/serial/__init__.py,sha256=TInCdnrsp4FYLkwTZ8bzNpUrFuLrWzg9ugqwkplvPZg,1473
+mx_bluesky/beamlines/i24/serial/blueapi_config.yaml,sha256=xT-czuatOKpt_a8onssDsVNx2ey-uZMoTJ4s7HPuDEU,261
+mx_bluesky/beamlines/i24/serial/dcid.py,sha256=ab48UFmZT6Zuv9RNoqOLkmAgmaIr0G6UDjqr_bE0vF8,14564
+mx_bluesky/beamlines/i24/serial/log.py,sha256=76-bKjjxLZEITTcALpvuwCy3KU5pTq0blnVFD9wT5cY,4798
 mx_bluesky/beamlines/i24/serial/run_extruder.sh,sha256=FXYsqdTpVgxB1-QrY4Tg5pl5Ex7PgUoXnuAcr9iDZTE,1078
 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=heQWMqUHNERQurt2tRgU-kve2ov6L6gyNamjLTRpb48,1660
 mx_bluesky/beamlines/i24/serial/start_blueapi.sh,sha256=4iBzQljTLXQiVIF4UO7drc9qUkP7KSRC6Mjh8hcGxpI,608
-mx_bluesky/beamlines/i24/serial/write_nexus.py,sha256=mcW2y0syeIPjdyqDcaEasMrcbAzXFGws05ky2rCUa4c,4030
+mx_bluesky/beamlines/i24/serial/write_nexus.py,sha256=3qSjvH2_0WYPuX8nUaOdsec7kIUSW0xBhCFec2tv3WM,4018
 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=NK_9gzVQqm5JgmEbw-hb7DS9R3v43FPIdEt1eHm1GRY,18884
-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=JsvqKR_NPbnJsWhAeIhCIUFAZ_ZH2CAt8FCOoMrLH7o,31349
+mx_bluesky/beamlines/i24/serial/extruder/i24ssx_Extruder_Collect_py3v2.py,sha256=upg_8uQ-DMzQckjoDSt0VjoxxayfX09WvphCTVGBNM8,19462
+mx_bluesky/beamlines/i24/serial/extruder/EX-gui-edm/DetStage.edl,sha256=Uqw7u7Lqn6SRZxOoo4E7XwEueTI0eXylXpgBL66DXrI,1974
+mx_bluesky/beamlines/i24/serial/extruder/EX-gui-edm/DiamondExtruder-I24-py3v1.edl,sha256=lRFa3LEIqc6Yar2XjCT3T1KKG9cHBW0AK96nsfss0bE,30896
 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=Ncr008eHFlr-xaF7yK7MVc-NhmjQqBgK36udX8pp82Q,26384
-mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Manager_py3v1.py,sha256=aQHcB0vVvbO9jWa3DKjYASl-CWd4gpBKRFK2xMJdZxA,32926
+mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Collect_py3v1.py,sha256=lMGbqiJPcn-V8l3t9_BZi3BBJi3aNNxyrQYFNvapIgs,24878
+mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Manager_py3v1.py,sha256=cuv37pLsyNgf7sAnGiHMt0Ql3bJM6RUZR2esGUZNfR4,33091
 mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_StartUp_py3v1.py,sha256=Vokr_Gl_lpqcUwG18C2h8TYMmyTx1HmUSDd9zgR9-7M,3275
 mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_moveonclick.py,sha256=QLg4wryENBeFfOYFaIgE9R12r2KvUuKIP9ZY8iyYibY,6582
 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=-O_kRA5-m741Mja8OXQlGJWrRu9uBUkTvJ_uqUBjuFY,56616
+mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/DetStage.edl,sha256=EOhu9lhayhfElypEyVuH7VoNEB6rjSIk-9697A7DK1M,1977
+mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/DiamondChipI24-py3v1.edl,sha256=hetE5eKgjdJbcaxaRDAfF_d3oPNMLKXMbVsjCztZs-4,55873
 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=LI6Z5J1ugny0hX3NrfKx0CC3QdfnohokxYwcyPW-6XU,38124
 mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/PMAC_Command.edl,sha256=2KUy2iEcX9AC07zSH3Sp97b5qauGIm8_HjvoQ4pkyCU,1417
 mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/Shutter_Control.edl,sha256=o2PDoIFzeErIUijDbGdfWdrh3wd5GFAqEsDD2at2a4k,1601
 mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/microdrop_alignment.edl,sha256=8TWQTIBnX3OLa1kjsibsCnG5wCVotPYIOHwFam7rJe4,14679
 mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/nudgechip.edl,sha256=IgLLF7gcNoG8Z4t9FTA7_4ggUccNm6-ekK5bb0V4ekY,15711
-mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/pumpprobe-py3v1.edl,sha256=CrCo1nSIzT3OcSy4OXq1vu4lz5OvI4U8-yl-ruQ57m4,22665
-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/fixed_target/FT-gui-edm/pumpprobe-py3v1.edl,sha256=7K_yMC_52x6DVTgamkei1pSGSGp4t7bx3vUmEaQx-4I,22639
+mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/s1l.png,sha256=wDNuKCa_8hUPy4W01vdIrfdZtCyQKT8qVS5AS6kOTmo,9740
+mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/s2l.png,sha256=MrdiCFX7j-ODkfSdzc4NQ_8hj2Gs8i9gQqWyNXvdM5s,10189
 mx_bluesky/beamlines/i24/serial/parameters/__init__.py,sha256=fdXGnTxNRyWV1cqVv8lQmwhUpUWDoz_VIRlo6KGwvS4,615
 mx_bluesky/beamlines/i24/serial/parameters/constants.py,sha256=uJE3K7p1s8rXrgA0vH2JKrTaitH5ZDqLoSp_0ZmSCB4,1815
 mx_bluesky/beamlines/i24/serial/parameters/experiment_parameters.py,sha256=n6nRgycKMp5GuxwNoU30CP9enW7vTtTKHKIcIOH9ABY,4879
-mx_bluesky/beamlines/i24/serial/parameters/utils.py,sha256=VcCEBjC8WSrf85Q20A6dwnsy4IxvjcB4JSlbYKz_CVM,2673
+mx_bluesky/beamlines/i24/serial/parameters/utils.py,sha256=ugRG7Es74NLXwaJtiCq850g-TK4N7u-qjiUdUVnZifg,4076
 mx_bluesky/beamlines/i24/serial/parameters/fixed_target/cs/cs_maker.json,sha256=xT3y7SSWjVTAJ58dzwNnEgBdn10A6T8umR18n5xt508,142
 mx_bluesky/beamlines/i24/serial/parameters/fixed_target/cs/motor_direction.txt,sha256=oIPpcQpqCrKz5dPZ-qQ5gQ2Sdqtj6nsnf66pN8PGU50,199
 mx_bluesky/beamlines/i24/serial/parameters/fixed_target/pvar_files/minichip-oxford.pvar,sha256=SN4deU199dMcA1Bcx1BF6CBMvoSszxJWZC6vt7_5fHc,284
 mx_bluesky/beamlines/i24/serial/parameters/fixed_target/pvar_files/oxford.pvar,sha256=pZbFOEiN_S5yiTEtqdNHmTMtnQY-W2ImXVBYCovPCx0,1842
 mx_bluesky/beamlines/i24/serial/setup_beamline/__init__.py,sha256=UhBdMcPdJMzwV0d8DKOBzvYNd6TDSwcP9GJVqfGa7Jc,261
 mx_bluesky/beamlines/i24/serial/setup_beamline/ca.py,sha256=H2gPmsLheYReFlGPFa5zzWbnyqdWbCmgKiAwcpVoYfk,1516
-mx_bluesky/beamlines/i24/serial/setup_beamline/pv.py,sha256=YSJnx-o562Lh9zYkQfYCPL7cJxcc_7Ypp6XrFodoJqw,15639
-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=Yx99IzxIpm556GXei5IOWCeSSzD4oQK-G0_mvCTYjlI,21251
-mx_bluesky/beamlines/i24/serial/setup_beamline/setup_detector.py,sha256=l8GCfAQYs_sMeFYgBuT10f8WFuJVr8q8CTmONNDBrpY,3171
+mx_bluesky/beamlines/i24/serial/setup_beamline/pv.py,sha256=9Up7ob1UMUG438SKjW7Ffn6OFiurC7Qpl0v19nwDjQQ,15601
+mx_bluesky/beamlines/i24/serial/setup_beamline/pv_abstract.py,sha256=DVimjuvZYJoCaIswuO6YYVDtbLgZp33KQFmnlb9ngDY,1804
+mx_bluesky/beamlines/i24/serial/setup_beamline/setup_beamline.py,sha256=1JU9eEygAX1bYA-pMlLC4dPMnd2KdaMRVtEpEWX-JM8,20982
+mx_bluesky/beamlines/i24/serial/setup_beamline/setup_detector.py,sha256=niJJjPkk1fSDr__Upf-9DbBkoPrFn8Gz_eTPgO0WpE8,3221
 mx_bluesky/beamlines/i24/serial/setup_beamline/setup_zebra_plans.py,sha256=oRNZLA2uxiRM5eheAuRMM5eT0Oxe1YHqg59BHys3sXY,17970
 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=R1VwqqhPAfG0C8DtIu1ymPpWqJBxYdoWSc0lAdqi1Tk,3538
+mx_bluesky/beamlines/i24/serial/web_gui_plans/general_plans.py,sha256=BtZaTZJGSv_Je2UleDJTsy8HLiuc_C5YP4c46K3UOgo,6609
 mx_bluesky/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/common/xrc_result.py,sha256=J1uB9Bujz_Sq_MwvYdWOZL3c6kX09TSaZW3eetRXBpw,2351
+mx_bluesky/common/device_setup_plans/manipulate_sample.py,sha256=6iE47tjD8M-MJiRv6HMfMH5XLTFKNUzrQhB2PQIxrLw,2998
+mx_bluesky/common/device_setup_plans/position_detector.py,sha256=S49ml0KNZ6wXPQqOxNJ2whKTCyRTcKdBXBhyeEyFDQQ,635
+mx_bluesky/common/device_setup_plans/setup_oav.py,sha256=7WLElZZU5mWq9g2WP86p3P81uiSPuj2V4kIkqXlap3o,2692
 mx_bluesky/common/device_setup_plans/setup_panda.py,sha256=OF-ZygZyAyQEUdrAWiIxWZ6QhAsVx4Mm9ngRYB1mzKI,433
 mx_bluesky/common/device_setup_plans/xbpm_feedback.py,sha256=WsUMdeOZBgbj-bFp7x66aHp2oWffQmjyp61-qmtQAmI,2153
+mx_bluesky/common/experiment_plans/change_aperture_then_move_plan.py,sha256=IY5pq8ni_LKD4LTZG0bbKrC3fEXAnxiunIkp6Oray_c,2897
+mx_bluesky/common/experiment_plans/oav_grid_detection_plan.py,sha256=BhwCm-uFQJjgtElfj1Q5DZpKFqRae5iU9Vm7ReX1M4c,6982
 mx_bluesky/common/external_interaction/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/common/external_interaction/config_server.py,sha256=EmvLfOkvoJlnKa0sffAKNICkY26YsQQqY9sYHKmOGzw,2441
-mx_bluesky/common/external_interaction/test_config_server.py,sha256=4wdYsOpXJfc3yNBZvdcjZGSllOHzKBTB8oYFjjSOufU,960
 mx_bluesky/common/external_interaction/callbacks/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/common/external_interaction/callbacks/common/abstract_event.py,sha256=iBj4WNK5ikieZzTePBZ9AEu6ehlnpew1nDK3ONJqibI,2093
 mx_bluesky/common/external_interaction/callbacks/common/grid_detection_callback.py,sha256=JmF5FssUqNPgsnxqrgxB9Pmw5Dd7W6GCPb9Mur8DHCo,4017
-mx_bluesky/common/external_interaction/callbacks/common/ispyb_callback_base.py,sha256=8uvPwDNSk8gBQq0aRd5To0jFSyxeKkFhFbBjy_LBviE,9821
+mx_bluesky/common/external_interaction/callbacks/common/ispyb_callback_base.py,sha256=Bk5dpAUunuNbhor7MfOc7qRKhbIAhRbtfBKzSTUeUnE,9875
 mx_bluesky/common/external_interaction/callbacks/common/ispyb_mapping.py,sha256=bHtnDZfxIR5zzSRiBSehZ51y42wzkEcCJ7rFg93aONA,2578
 mx_bluesky/common/external_interaction/callbacks/common/log_uid_tag_callback.py,sha256=pfZxQfS9SnXep3F2YAPptDX5bjjWvbXtgy5fINfsoTU,626
 mx_bluesky/common/external_interaction/callbacks/common/logging_callback.py,sha256=NHb8Gp86TAk6PRTV3inWrlW-Lj96LmnZda7ZGewlrFA,712
@@ -82,88 +89,84 @@ mx_bluesky/common/external_interaction/callbacks/common/zocalo_callback.py,sha25
 mx_bluesky/common/external_interaction/callbacks/sample_handling/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/common/external_interaction/callbacks/sample_handling/sample_handling_callback.py,sha256=niZ7CG1vqbp0MUjRfchevmLwJMg-puMz4i_HDPQavI0,2880
 mx_bluesky/common/external_interaction/callbacks/xray_centre/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mx_bluesky/common/external_interaction/callbacks/xray_centre/ispyb_callback.py,sha256=7GzE5u1dd5vhl_LS9ud5B7XapofIcf_yicb7vtZT1A0,13938
+mx_bluesky/common/external_interaction/callbacks/xray_centre/ispyb_callback.py,sha256=niNZLRO3iEFIM6PFnS5byl4n9X6GwZR0NRzDmy9IFyQ,12634
 mx_bluesky/common/external_interaction/callbacks/xray_centre/ispyb_mapping.py,sha256=fOYJkqaXEfCdLGQwGhTrzfGOj6Ed3t2wcRgv68DOOHc,1790
 mx_bluesky/common/external_interaction/callbacks/xray_centre/nexus_callback.py,sha256=64ZA2ACcq8mI9tKG1MMTf46PYdb_B-sul8xQGM56_WA,4709
 mx_bluesky/common/external_interaction/ispyb/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/common/external_interaction/ispyb/data_model.py,sha256=HJZPT_j5EMK7-j-0tdaugiS3kDp44_jzvVoP-xcFCsA,2738
 mx_bluesky/common/external_interaction/ispyb/exp_eye_store.py,sha256=Y3nZV5NZ-XnYThettFMhZin4dQb5jAZfT2mGmtLlv74,6076
-mx_bluesky/common/external_interaction/ispyb/ispyb_store.py,sha256=7dQ7BVL_dwQ6UTRivBo9bzvziJeyNFzIIUatSsweres,11070
-mx_bluesky/common/external_interaction/ispyb/ispyb_utils.py,sha256=Kv0JQVaT8z9Qzt6L1NJEx0U7ZYD6NeyBGF1_wGcI1Dc,728
+mx_bluesky/common/external_interaction/ispyb/ispyb_store.py,sha256=YMHENdmzzErRc4AxbpgMIGXmULrd6DmiqKfq8rP8fBc,11183
+mx_bluesky/common/external_interaction/ispyb/ispyb_utils.py,sha256=5-8wHmY1KvMuRpXUxN5YBCQP3M-Jk-sTcfDm-CC84Mw,732
 mx_bluesky/common/external_interaction/nexus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mx_bluesky/common/external_interaction/nexus/nexus_utils.py,sha256=UmBlTi9zvSV_MxcDV74yJ5Y4oIDHDanCtBjX6_SEf94,5589
+mx_bluesky/common/external_interaction/nexus/nexus_utils.py,sha256=n97KHJJd_C59SOVJHcJ3RbNkvxkoUrF6fIJx3jXBuI0,5580
 mx_bluesky/common/external_interaction/nexus/write_nexus.py,sha256=tIz9PFFSiaUs1olbMtLGHddTLj132rEuFSWBK9rOM6Y,4087
-mx_bluesky/common/parameters/components.py,sha256=Ru76EFT2wG4oPeJge6lVwq1vCHYd7T0EFuqp13EoJk4,7299
-mx_bluesky/common/parameters/constants.py,sha256=S3Y4uwOn18skz5y_WTI8naP-rE80CKG03aGZM2IC9js,4684
-mx_bluesky/common/parameters/gridscan.py,sha256=a-jR6EuxEOj9ddRv5NvPQvC5rwPpY3b3_T78d2NvVtI,6993
+mx_bluesky/common/parameters/components.py,sha256=z4UD4GZF5dhn-8mMUCfX1nKfXgpricqdAVY6azNfRWM,8284
+mx_bluesky/common/parameters/constants.py,sha256=yB-yV2RH8wBueEp6dAl87_JwssKgU8vxjwNbENjbjZA,4426
+mx_bluesky/common/parameters/gridscan.py,sha256=XHlXi6zSJoag11hrS4_k44v_NZSIdCS-QBveben2nPw,7034
 mx_bluesky/common/plans/__init__.py,sha256=FMA-4VN1TJCPcyURKF0qPIQ8uo8YBbtHPRdJokVF4MA,129
-mx_bluesky/common/plans/do_fgs.py,sha256=6aFWvQAuDgBfySzKgt567U_aoDYhAxfUhEDpn3wMjSQ,4775
-mx_bluesky/common/plans/read_hardware.py,sha256=s3Mz11wQOnzO4i4BvV6yWzpDvtQtjZnY-clENH7CVQU,2332
+mx_bluesky/common/plans/common_flyscan_xray_centre_plan.py,sha256=83qzhnuLOPZi6EVGMUHtjPNIg92PexHkY2JanesrWGU,12404
+mx_bluesky/common/plans/read_hardware.py,sha256=Og7Uz8lAB1_Z6puN6ws_2kwOqCvgQMqfmyZPFZMRneY,2351
 mx_bluesky/common/plans/write_sample_status.py,sha256=pmS4Lsndp90CCIKzD_wssvbzt1qu7rEzfXgxvDwDrQ8,1313
+mx_bluesky/common/plans/inner_plans/__init__ .py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mx_bluesky/common/plans/inner_plans/do_fgs.py,sha256=6aFWvQAuDgBfySzKgt567U_aoDYhAxfUhEDpn3wMjSQ,4775
 mx_bluesky/common/preprocessors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/common/preprocessors/preprocessors.py,sha256=BNpSM7S9gxhVbG39rjH14k89sOmKiII0cqApH3pF_H0,4476
 mx_bluesky/common/protocols/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/common/protocols/protocols.py,sha256=I-Yd1AFDarfTe14fMgv0VONEJ-9K-5IwDAItNWZPZ90,298
 mx_bluesky/common/utils/context.py,sha256=Fe_YSNv3ZEIZvpdWs-9UqiG6-xEEdCpK6oMYYdCSYT8,2198
 mx_bluesky/common/utils/exceptions.py,sha256=aB_26oowu7gvoaWWKpiBEllrvtGG-Hd6HLsE86mQgKI,2153
-mx_bluesky/common/utils/log.py,sha256=ZgFZu6zSutGD5A0FDp_n9M0rJ6gU1FuZCmD-r5suchY,3913
+mx_bluesky/common/utils/log.py,sha256=CepibF7U5GnN-ICl4bmhbEwqRzWsSFyfNtBDJejK0eo,4325
 mx_bluesky/common/utils/tracing.py,sha256=stnBZIvPuKiAm2wVc8lFr3ns7V5C52rUigULi9V-IFs,1171
 mx_bluesky/common/utils/utils.py,sha256=q2uCaK1E8zLVk1BFmj7qlTnQf3JRKjCjyadIVnL1-4M,1180
 mx_bluesky/hyperion/__init__.py,sha256=f4E8wInL1Ll4eeFtAiyKmipOBTPlUtKmVK-m_LOQG4M,35
-mx_bluesky/hyperion/__main__.py,sha256=3Gl9MGw4SW1Gaoz9ckhwk2Vv5xzDM142OGri1jA8l9E,12009
-mx_bluesky/hyperion/baton_handler.py,sha256=rYAizzWeO-OYlU5N1nE5tX5eZUhw83D7Mh2jC9DvSEU,3238
+mx_bluesky/hyperion/__main__.py,sha256=2TEoxvKU3JaG74rW3VKCf-DQhl6CRl_eZNQ0u5dW6EA,11406
+mx_bluesky/hyperion/baton_handler.py,sha256=AC3Qca5d3KdM5eN2nTqA2HmPkN4ZciOuCxtCKLfK0Uc,3276
 mx_bluesky/hyperion/device_setup_plans/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mx_bluesky/hyperion/device_setup_plans/check_beamstop.py,sha256=PG2AXIB_z7U0glz9MTHkapaokMgrHyYSoKYSIGaRgLE,844
-mx_bluesky/hyperion/device_setup_plans/dcm_pitch_roll_mirror_adjuster.py,sha256=68L4Fd8nvvH_VeQJfOYK_3WLrlKRt09TRsaA9T2uqU0,4703
-mx_bluesky/hyperion/device_setup_plans/manipulate_sample.py,sha256=fuNRH8slknuZ0iNVv2htiuDozc9LzvxUrWuwYQTtLt8,3293
-mx_bluesky/hyperion/device_setup_plans/position_detector.py,sha256=S49ml0KNZ6wXPQqOxNJ2whKTCyRTcKdBXBhyeEyFDQQ,635
-mx_bluesky/hyperion/device_setup_plans/setup_oav.py,sha256=jVbDCSKDXxJXPfr-dR6dQgKLPmh7pzewj8gH9y-psy8,2564
+mx_bluesky/hyperion/device_setup_plans/dcm_pitch_roll_mirror_adjuster.py,sha256=iQawC-nIOVSoMMSYl4mleIkVYs-BaKKMTgOWX4efHTg,4723
 mx_bluesky/hyperion/device_setup_plans/setup_panda.py,sha256=96eFp4acQLOthe1PA-S14uv635uGVP71DpP7qy_uo40,8509
-mx_bluesky/hyperion/device_setup_plans/setup_zebra.py,sha256=q4KRAufuUi-G6xGKYLhmxhLr8EcTu08HMBca5OpigxM,10177
-mx_bluesky/hyperion/device_setup_plans/smargon.py,sha256=Zzej-9uBVTzZuB4lv9QRiHeJKq_3-lnXOhCqZZIZV-o,789
-mx_bluesky/hyperion/device_setup_plans/utils.py,sha256=Hdw_tocY6scVaVc2jlsNG-W4vS0LCbEKF8g5kDRuAeQ,2216
-mx_bluesky/hyperion/experiment_plans/__init__.py,sha256=3fNT6-LpOen_sfYv95FkMiuHiCuVaSOBx7BMBHXkYoE,942
-mx_bluesky/hyperion/experiment_plans/change_aperture_then_move_plan.py,sha256=vWPhmm3p3jmVfkpasFQYZNYCgyyVYx5Xi-8aHn56w0c,3023
-mx_bluesky/hyperion/experiment_plans/experiment_registry.py,sha256=aSpo7pWQ1X_Y0a42TYv8LmJ8DNzvX5u5y0V2549MZCw,2096
-mx_bluesky/hyperion/experiment_plans/flyscan_xray_centre_plan.py,sha256=AuRn-ti0T5XNwHPDYzsiJBbLZutUvYDbiikwwY-ONNs,17278
-mx_bluesky/hyperion/experiment_plans/grid_detect_then_xray_centre_plan.py,sha256=MuYjeY0JVK6lE4w0b45tJthVi9_AkQDWFB0XfEu84Ps,8524
-mx_bluesky/hyperion/experiment_plans/load_centre_collect_full_plan.py,sha256=VSTZZBw6Bo8nh4qEFknXYeKa11oHF0lUjcSIOY2196g,4793
-mx_bluesky/hyperion/experiment_plans/oav_grid_detection_plan.py,sha256=PRwV04KuvefTm4mV4iE-hB3lLb5LAmJshYKfMnLE-k0,6950
-mx_bluesky/hyperion/experiment_plans/oav_snapshot_plan.py,sha256=DAQZzyw8-yNsUpVWlXFFOtoyUVEh8EskmyBgdSTExqU,2748
+mx_bluesky/hyperion/device_setup_plans/setup_zebra.py,sha256=_PnV4PyrcoN7_CBi-HLWWNMKMKarpFUTcNcXsEx3sZo,9076
+mx_bluesky/hyperion/device_setup_plans/smargon.py,sha256=9znQLGF8Uqif1SZ_H4GyqcnhR3xCI1FIniCaGLRY3zM,758
+mx_bluesky/hyperion/device_setup_plans/utils.py,sha256=z5ybrrbkcpoTXpEqufDdNqRi1zgcSyMZzVYdPm6xdmE,2246
+mx_bluesky/hyperion/experiment_plans/__init__.py,sha256=JhJ9c2V1f1gwAVkuVBuvgBu7LKdgbrp9MBkh7JUefAY,760
+mx_bluesky/hyperion/experiment_plans/experiment_registry.py,sha256=b9ROMppIQPxsR7IBMcBOHTVKB_Vrv5QSG7xqCc7_41g,1674
+mx_bluesky/hyperion/experiment_plans/grid_detect_then_xray_centre_plan.py,sha256=o5l4pWCzGH-Z3PBy7Y9N_xMbfS_ZxRsw5t-OLt6ynCI,7994
+mx_bluesky/hyperion/experiment_plans/hyperion_flyscan_xray_centre_plan.py,sha256=5AK0-mY6e8-x6w_Uj41FnS4pvdbLniTdmznAUZPGbpg,6550
+mx_bluesky/hyperion/experiment_plans/load_centre_collect_full_plan.py,sha256=kdp1dWh4g-w9Bob3L7VoiTDAVNkxwrvKvSGcEMzZCBc,6177
+mx_bluesky/hyperion/experiment_plans/oav_snapshot_plan.py,sha256=YU_lwG6rlPtrS0KfUxmJb9fgH8jCfpZQzpaBxFudadk,3595
 mx_bluesky/hyperion/experiment_plans/optimise_attenuation_plan.py,sha256=5ZAH17F5T1YyVgA2ML0NEf4ufrD1G0jPRU0_5pINdTg,16195
-mx_bluesky/hyperion/experiment_plans/pin_centre_then_xray_centre_plan.py,sha256=MT1uuxF6g4BGrdKV3MAYO91VLaiBP7VMGdYtx1wyaJA,5006
-mx_bluesky/hyperion/experiment_plans/pin_tip_centring_plan.py,sha256=AF7B84s0QGUoSKxPvpU0pBW8xt30qg_LN9gWq3nE2J0,6249
-mx_bluesky/hyperion/experiment_plans/robot_load_and_change_energy.py,sha256=vHAm3AdDaTNeDZ3zc-z6pP1bYXl7c5WImsTI5hutofQ,7917
-mx_bluesky/hyperion/experiment_plans/robot_load_then_centre_plan.py,sha256=fwaDoKvFN0gRIAiR1XxD0xqpHIVLAfoX561cEuBFiWk,6731
-mx_bluesky/hyperion/experiment_plans/rotation_scan_plan.py,sha256=y0HnhKRMweFwkt9wpJ4Dd4rMIqugAG_i-b_MShcQ6Dc,17260
-mx_bluesky/hyperion/experiment_plans/set_energy_plan.py,sha256=aYgutFhMQjcB_q02t-TXkWLkBCS8BeBIwqBdMNEHYVE,2635
+mx_bluesky/hyperion/experiment_plans/pin_centre_then_xray_centre_plan.py,sha256=DCD2oUx6n6VL6JaBQU779opOPxHr-UY0dQrSIW2hWus,5002
+mx_bluesky/hyperion/experiment_plans/pin_tip_centring_plan.py,sha256=FP_tAhq7Txljbxvvr3eEMoapDtXj8siPyWd9qcYevBg,6247
+mx_bluesky/hyperion/experiment_plans/robot_load_and_change_energy.py,sha256=imANEAVswFFaMqTISRXSe0BwcUkQ1sIT8O-WnKsxhqM,8082
+mx_bluesky/hyperion/experiment_plans/robot_load_then_centre_plan.py,sha256=I1kdngl_FwJN5GiWA9LYgp13VZ_EjWHsBCy2GmdeP2w,6841
+mx_bluesky/hyperion/experiment_plans/rotation_scan_plan.py,sha256=az_LYhT7cKTM0z_Y8cdu2zMQKJ9m0ege-uARwmyjEqc,15855
+mx_bluesky/hyperion/experiment_plans/set_energy_plan.py,sha256=8FAqN-aJgRwZSiCX-hNdeGmaijt0l8owdShVBwNchfE,2643
 mx_bluesky/hyperion/external_interaction/__init__.py,sha256=95DwXDmKsx36RgAL-AtLZl2LQoLPKbzeYdlkkP_4Coc,559
-mx_bluesky/hyperion/external_interaction/agamemnon.py,sha256=Y7v5MASzZ6pNgSVSfDzc_bl_ErmWQyFhQW6uEfO6YnU,9418
-mx_bluesky/hyperion/external_interaction/config_server.py,sha256=ZI9QCyWLPKzV3stEpXrg7T2IyRb8Y3dd6LWI30tYvqw,1825
+mx_bluesky/hyperion/external_interaction/agamemnon.py,sha256=Bh6vIg3edjjKmWKZj_IDFYDmGN5pC_FeCCgSFJQiUKc,9984
+mx_bluesky/hyperion/external_interaction/config_server.py,sha256=_nHoHcEXhKSFTszTu57Y5FSCP5Xogmyy8FVwYRraAy4,2146
 mx_bluesky/hyperion/external_interaction/callbacks/__init__.py,sha256=1XHaxDljMveu_DYIlk7n963gHffyC6r4C_RhF6HA-N8,283
-mx_bluesky/hyperion/external_interaction/callbacks/__main__.py,sha256=Xvhr_h8-net89376qZbHmonIOP_U6y7N_Aw7-srVScc,6106
-mx_bluesky/hyperion/external_interaction/callbacks/snapshot_callback.py,sha256=zJ13Clnvb4Ef-3qpg5U58tXpPc6oAmbC3hLWdrQhDPQ,4758
+mx_bluesky/hyperion/external_interaction/callbacks/__main__.py,sha256=1Uu4oT-qnJb2LHQinHrLvN0zBTuz0EZ8HEmqfFrAJE4,6155
+mx_bluesky/hyperion/external_interaction/callbacks/snapshot_callback.py,sha256=Yg9i9YNeQLll9KEtic5omAqZohrlQ4DXdhp0fjGNz5U,11581
 mx_bluesky/hyperion/external_interaction/callbacks/robot_load/ispyb_callback.py,sha256=7xSvCd95tXjvmsbFLecI1hEwJj_rm8yGuJJ1Pmg-RKU,4142
 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=eFKpDEJaH6zluhNZZkrWOW0BRIjj-Bs2xiGbun7pnSs,7442
-mx_bluesky/hyperion/external_interaction/callbacks/rotation/ispyb_mapping.py,sha256=yz2Z_P6qH2DGlSXCi36E3Xwv7mVVcvYzqQc0NqwW4DI,716
-mx_bluesky/hyperion/external_interaction/callbacks/rotation/nexus_callback.py,sha256=w86HvDMznS1wBH3mLYJMe2TgX8SghTYR4G6dajho3Pk,4724
+mx_bluesky/hyperion/external_interaction/callbacks/rotation/ispyb_callback.py,sha256=KJ1lXurzvvy7eS0W3KDXfnsWzbftsjBUxR0SS0rC0Mg,7460
+mx_bluesky/hyperion/external_interaction/callbacks/rotation/ispyb_mapping.py,sha256=bba5ZHoOMqvSCUXJIxbx55HGhaoC_Jqhyxxb-ttqt5g,801
+mx_bluesky/hyperion/external_interaction/callbacks/rotation/nexus_callback.py,sha256=QxLjRqoKSmEC9TbTK6mufbWXRcmzLfe9xZclEhUbxIw,4736
 mx_bluesky/hyperion/parameters/__init__.py,sha256=kf2wfcILBUBpT0tJ8-W39BywQUkn67yxl9IVsfrr1LE,115
-mx_bluesky/hyperion/parameters/cli.py,sha256=tw8u-_THJ69_Rn8IzeEWjwfUJO8VsTKKqz9K0iZHls0,1796
+mx_bluesky/hyperion/parameters/cli.py,sha256=zciAE1-7Ahx0B8-RNNk25hB40xBMrmrR7cK1GbEDgaM,1177
 mx_bluesky/hyperion/parameters/components.py,sha256=uXxdW6nIE1VZnh4ZXe5O-LOwsx4MbENEWfLGm2ACvsI,313
-mx_bluesky/hyperion/parameters/constants.py,sha256=9divI1XYUDsGq3HGm2ehq1yGGOD7tUf66xWvhVxEpB0,1982
-mx_bluesky/hyperion/parameters/device_composites.py,sha256=iBm3qNFBG8dmVW4BPAwnhdi-HvpJ-6AuM1ZZceUembE,1645
-mx_bluesky/hyperion/parameters/gridscan.py,sha256=G49cDDRRh9HWVY8N71K6GWjKkHU04hNse0Mhe-1vsSQ,6018
-mx_bluesky/hyperion/parameters/load_centre_collect.py,sha256=khLBCSeafuw0dNrvDTvKv4GrlBo1LXJZ87NTI1A92jw,3693
+mx_bluesky/hyperion/parameters/constants.py,sha256=EbMhqD9VJTTMABqDgZAYcZdJ1M6IGvJerTZI-5lONYU,1891
+mx_bluesky/hyperion/parameters/device_composites.py,sha256=zFN-Pog5jUewBygIFyTvxBXC6jo_Of_C3Qo5UGV5u0I,2802
+mx_bluesky/hyperion/parameters/gridscan.py,sha256=LcKfL8LUrQlEeehxawL_GebUxVyKYCJuJysMp5W0t_s,3799
+mx_bluesky/hyperion/parameters/load_centre_collect.py,sha256=1KsL9pk1iJAmCJIn6R560tkrh4hU2pp7dFKVbVb-zYU,3673
 mx_bluesky/hyperion/parameters/robot_load.py,sha256=DSOwIosO629WoXbVFokEjmgqKZz3xzv0feRQHC_ZgpI,1233
-mx_bluesky/hyperion/parameters/rotation.py,sha256=5OVstRvUMf4X9QqcyTZc5GaYNsaVuU1W3Y36uop38co,7520
+mx_bluesky/hyperion/parameters/rotation.py,sha256=wziJtpx9bgBbNsqwVs8fVZlAOflOEoiRzSvgtmB_1b8,7462
 mx_bluesky/hyperion/resources/panda/panda-gridscan.yaml,sha256=mhLBJTSjHCkM9F6mjtqbhNmmrV8qSctbCUfhb0q7pYo,28085
 mx_bluesky/hyperion/utils/__init__.py,sha256=f4E8wInL1Ll4eeFtAiyKmipOBTPlUtKmVK-m_LOQG4M,35
-mx_bluesky/hyperion/utils/context.py,sha256=JztC2qhd8ChAGYNUltJnuld_r2zYA37J3LiwxRE3dxQ,604
-mx_bluesky/hyperion/utils/validation.py,sha256=a23OeppZcEMWDffbCk8UFlOk26jS9i9IhTWPkQhP28s,6743
-mx_bluesky-1.4.7.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-mx_bluesky-1.4.7.dist-info/METADATA,sha256=h1Y0Q0e_XKcYDaeGkj6wzyspW4TnTd3lf188W2Ja-_g,17304
-mx_bluesky-1.4.7.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-mx_bluesky-1.4.7.dist-info/entry_points.txt,sha256=-hM2jXf6TAwgqnUHaEVx02j7sdB0L_WaeHW_tIRuj6o,600
-mx_bluesky-1.4.7.dist-info/top_level.txt,sha256=S4rrzXIUef58ulf_04wn01XGZ3xeJjXs4LPEJ_xoF-I,11
-mx_bluesky-1.4.7.dist-info/RECORD,,
+mx_bluesky/hyperion/utils/context.py,sha256=TXvARIUZNLcz-KY_-xPkQvK-tMe1sV_cjFDh6IqPgfo,568
+mx_bluesky/hyperion/utils/validation.py,sha256=5rCvANMbgk1OC0X4bTZWoO-nRhBaM0S6sMvoSYdeR1c,6650
+mx_bluesky-1.4.9.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+mx_bluesky-1.4.9.dist-info/METADATA,sha256=RDKjEGQVuHICiWqUDHwvuQc1sfIcasJxeVMGJmWAjhY,17360
+mx_bluesky-1.4.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mx_bluesky-1.4.9.dist-info/entry_points.txt,sha256=-hM2jXf6TAwgqnUHaEVx02j7sdB0L_WaeHW_tIRuj6o,600
+mx_bluesky-1.4.9.dist-info/top_level.txt,sha256=S4rrzXIUef58ulf_04wn01XGZ3xeJjXs4LPEJ_xoF-I,11
+mx_bluesky-1.4.9.dist-info/RECORD,,

{mx_bluesky-1.4.7.dist-info → mx_bluesky-1.4.9.dist-info}/WHEEL

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

mx_bluesky/common/external_interaction/test_config_server.py

@@ -1,38 +0,0 @@
-from functools import cache
-
-import pytest
-
-from mx_bluesky.common.external_interaction.config_server import FeatureFlags
-
-
-class MockConfigServer:
-    def best_effort_get_all_feature_flags(self):
-        return {
-            "feature_a": False,
-            "feature_b": False,
-        }
-
-
-class FakeFeatureFlags(FeatureFlags):
-    @staticmethod
-    @cache
-    def get_config_server() -> MockConfigServer:  # type: ignore
-        return MockConfigServer()
-
-    feature_a: bool = False
-    feature_b: bool = False
-
-
-@pytest.fixture
-def fake_feature_flags():
-    return FakeFeatureFlags(feature_a=False, feature_b=False)
-
-
-def test_valid_overridden_features(fake_feature_flags: FakeFeatureFlags):
-    assert fake_feature_flags.feature_a is False
-    assert fake_feature_flags.feature_b is False
-
-
-def test_invalid_overridden_features():
-    with pytest.raises(ValueError, match="Invalid feature toggle"):
-        FakeFeatureFlags(feature_x=True)  # type: ignore

mx_bluesky/hyperion/device_setup_plans/check_beamstop.py

@@ -1,27 +0,0 @@
-import bluesky.plan_stubs as bps
-from dodal.devices.i03.beamstop import Beamstop, BeamstopPositions
-
-from mx_bluesky.common.utils.log import LOGGER
-
-
-class BeamstopException(Exception):
-    pass
-
-
-def check_beamstop(beamstop: Beamstop):
-    """
-    Check the current position of the beamstop to ensure it is in position for data collection
-    Args:
-        beamstop: The beamstop device
-
-    Raises:
-        BeamstopException: If the beamstop is in any other position than DATA_COLLECTION
-    """
-    current_pos = yield from bps.rd(beamstop.selected_pos)
-    if current_pos != BeamstopPositions.DATA_COLLECTION:
-        LOGGER.info(f"Beamstop check failed: position {current_pos}")
-        raise BeamstopException(
-            f"Beamstop is not DATA_COLLECTION, current state is {current_pos}"
-        )
-
-    LOGGER.info("Beamstop check ok")