mx-bluesky 1.5.11__py3-none-any.whl → 1.5.12__py3-none-any.whl

mx_bluesky/hyperion/parameters/robot_load.py

@@ -1,5 +1,3 @@
-from pydantic import Field
-
 from mx_bluesky.common.parameters.components import (
     MxBlueskyParameters,
     WithOptionalEnergyChange,
@@ -7,9 +5,6 @@ from mx_bluesky.common.parameters.components import (
     WithSnapshot,
     WithVisit,
 )
-from mx_bluesky.common.parameters.constants import (
-    HardwareConstants,
-)
 from mx_bluesky.hyperion.parameters.gridscan import (
     GridCommonWithHyperionDetectorParams,
     PinTipCentreThenXrayCentre,
@@ -19,12 +14,10 @@ from mx_bluesky.hyperion.parameters.gridscan import (
 class RobotLoadAndEnergyChange(
     MxBlueskyParameters, WithSample, WithSnapshot, WithOptionalEnergyChange, WithVisit
 ):
-    thawing_time: float = Field(default=HardwareConstants.THAWING_TIME)
+    pass
 
 
 class RobotLoadThenCentre(GridCommonWithHyperionDetectorParams):
-    thawing_time: float = Field(default=HardwareConstants.THAWING_TIME)
-
     @property
     def robot_load_params(self) -> RobotLoadAndEnergyChange:
         my_params = self.model_dump()
@@ -33,5 +26,4 @@ class RobotLoadThenCentre(GridCommonWithHyperionDetectorParams):
     @property
     def pin_centre_then_xray_centre_params(self) -> PinTipCentreThenXrayCentre:
         my_params = self.model_dump()
-        del my_params["thawing_time"]
         return PinTipCentreThenXrayCentre(**my_params)

{mx_bluesky-1.5.11.dist-info → mx_bluesky-1.5.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mx-bluesky
-Version: 1.5.11
+Version: 1.5.12
 Summary: Bluesky tools for MX Beamlines at DLS
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
 License:                                  Apache License
@@ -218,11 +218,10 @@ Requires-Dist: annotated_types
 Requires-Dist: caproto
 Requires-Dist: fastapi[all]
 Requires-Dist: flask-restful
-Requires-Dist: ispyb
 Requires-Dist: jupyterlab
 Requires-Dist: matplotlib
 Requires-Dist: nexgen>=0.11.0
-Requires-Dist: numpy==2.2.6
+Requires-Dist: numpy>=2.3.5
 Requires-Dist: opencv-python
 Requires-Dist: opentelemetry-distro
 Requires-Dist: opentelemetry-exporter-otlp
@@ -240,15 +239,16 @@ Requires-Dist: cachetools
 Requires-Dist: daq-config-server>=v1.0.0-rc.2
 Requires-Dist: blueapi>=1.6.3
 Requires-Dist: ophyd>=1.10.5
-Requires-Dist: ophyd-async>=0.13.5
+Requires-Dist: ophyd-async>=0.14.0
 Requires-Dist: bluesky>=1.14.6
-Requires-Dist: dls-dodal==1.65.0
+Requires-Dist: dls-dodal==1.66.0
 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: ispyb; extra == "dev"
 Requires-Dist: ipython; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: myst-parser; extra == "dev"
@@ -262,6 +262,7 @@ 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: responses; extra == "dev"
 Requires-Dist: ruff; extra == "dev"
 Requires-Dist: sphinx-autobuild; extra == "dev"
 Requires-Dist: sphinx-copybutton; extra == "dev"

{mx_bluesky-1.5.11.dist-info → mx_bluesky-1.5.12.dist-info}/RECORD

@@ -1,6 +1,6 @@
 mx_bluesky/__init__.py,sha256=Ksms_WJF8LTkbm38gEpm1jBpGqcQ8NGvmb2ZJlOE1j8,198
 mx_bluesky/__main__.py,sha256=RVqPnxDisFMIn_aoEi0drlThNHgKTJULnSrotouIKI0,480
-mx_bluesky/_version.py,sha256=KdHW5RAU7WcbqnDx5Cvj4f8FvE8unfe7w8_Owc4xIS4,706
+mx_bluesky/_version.py,sha256=TL6wrn4QI80JHCPVFzYKILNOnoWs_pn-RUeoNFokTsI,706
 mx_bluesky/definitions.py,sha256=ULpEYAUzdQiEbBoTgYTMxfUf3DDDjhYtvDxofs7Qxqw,168
 mx_bluesky/jupyter_example.ipynb,sha256=oxNpKVGRQp28paV6XM5ZQyN4llhH-EpFeHSBXK1JNPU,1696
 mx_bluesky/beamlines/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -8,15 +8,28 @@ mx_bluesky/beamlines/aithre_lasershaping/__init__.py,sha256=rwbS3QJnC3nq-VKddgEa
 mx_bluesky/beamlines/aithre_lasershaping/beamline_safe.py,sha256=E7tNwX9LFPNfBCF1DpNNtWpchPkEvGP0nrrTq4t2s38,1927
 mx_bluesky/beamlines/aithre_lasershaping/check_goniometer_performance.py,sha256=AqWAFey_Ih1JcRxVNiZDGFsVg4kvA9LH2p5SJeXfe2I,834
 mx_bluesky/beamlines/aithre_lasershaping/goniometer_controls.py,sha256=Db95Mgc24wVw_8ghvpfbVOR7-MwgHdJkq4J4Xe7iy_I,1828
+mx_bluesky/beamlines/aithre_lasershaping/pin_tip_centring.py,sha256=-Hoa40YiCio_zALyxlqwmRmwcnF0AI2qpMArdRliFvc,1049
+mx_bluesky/beamlines/aithre_lasershaping/robot_load.py,sha256=_oQCRknaAILmHFf86i2q4SWTfamKlClpFPyavOcLjfA,2571
+mx_bluesky/beamlines/aithre_lasershaping/experiment_plans/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mx_bluesky/beamlines/aithre_lasershaping/experiment_plans/robot_load_plan.py,sha256=Y1FbWwCM5Qy978X2NSd26StWHcg_3M7z-Y35zKFKkRE,6243
+mx_bluesky/beamlines/aithre_lasershaping/parameters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mx_bluesky/beamlines/aithre_lasershaping/parameters/constants.py,sha256=g9jtMQAPC2htINynpTxRH9W6SbbsK67qqBCJprP01Xk,356
+mx_bluesky/beamlines/aithre_lasershaping/parameters/robot_load_parameters.py,sha256=KTieNHdKMUS6Eev8EuXvSEkJBZN2-Wyt-_KD5W3E6pU,191
 mx_bluesky/beamlines/i02_1/parameters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/beamlines/i02_1/parameters/gridscan.py,sha256=BxljHUuWDDqu-AV0Hs7UleiKlSYwzJDNOMo0TzSDL5s,1283
-mx_bluesky/beamlines/i04/__init__.py,sha256=DM5-pkoPb2jill-VmKdhEylsV1jryA92gygCIFSv3Fo,383
-mx_bluesky/beamlines/i04/redis_to_murko_forwarder.py,sha256=LViC4Dql47EXIDnI2hkt9CMtIyF1_e8h0s4GyIAllmA,6656
-mx_bluesky/beamlines/i04/thawing_plan.py,sha256=y7bqcR3vv2VlNdJXcc7dZ1iK8zMZqjoQTQNNe5CoNLg,9761
+mx_bluesky/beamlines/i04/__init__.py,sha256=LlotTcJ38SA-oj8Ps2dYSoEHaYsYQXNy59ekeDTumjs,554
+mx_bluesky/beamlines/i04/redis_to_murko_forwarder.py,sha256=UVDRV1rz6Iz96KYRfd3X932QZ5_Wl_YL0VU17V45Trc,7505
+mx_bluesky/beamlines/i04/thawing_plan.py,sha256=fFePelD3SHjSSduJzaXHQ1r1oTYouGH2IvmsRsxEWJY,10008
 mx_bluesky/beamlines/i04/callbacks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mx_bluesky/beamlines/i04/callbacks/murko_callback.py,sha256=C2KoIxwMIWxD46utmq1-69SIc8MspocXJ1sccO1lwAY,4458
+mx_bluesky/beamlines/i04/callbacks/murko_callback.py,sha256=tmpALQZZreD03TH7mvoaKzTWHrm1l_bIpcg7pv8YCQU,5011
 mx_bluesky/beamlines/i04/experiment_plans/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mx_bluesky/beamlines/i04/experiment_plans/i04_grid_detect_then_xray_centre_plan.py,sha256=DqWsFwMAd0KFOM6cB30R7J1XHqEjhyAzxwJzW0XVESI,10236
+mx_bluesky/beamlines/i04/experiment_plans/i04_grid_detect_then_xray_centre_plan.py,sha256=H46PfTaHL9QRZqDKkIdfVWnt2lCJdUhYca8s_QkT75o,12767
+mx_bluesky/beamlines/i04/external_interaction/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mx_bluesky/beamlines/i04/external_interaction/config_server.py,sha256=Zpair6Qw1nBgm-w8eAg0f-4mjHouAnaF2Fu2Pj8zTeU,425
+mx_bluesky/beamlines/i04/oav_centering_plans/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mx_bluesky/beamlines/i04/oav_centering_plans/oav_imaging.py,sha256=kgAD8cnMm1USyzDnZcy8Z31i4Ss1ki9Aym9e6tAzCag,4256
+mx_bluesky/beamlines/i04/parameters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mx_bluesky/beamlines/i04/parameters/constants.py,sha256=H17HqwuAT1upmQHGartdIEBImVEuX1nObwbADwT__Kc,750
 mx_bluesky/beamlines/i23/__init__.py,sha256=7nwQiKBZAXLnvPhCqaI2VC1k4TOzQalOUvwF6SQ3Yd4,95
 mx_bluesky/beamlines/i23/serial.py,sha256=XVbHM8NevnJMFAJD9jkxG-VnPaWX6t_k-wlipRw0pmY,2055
 mx_bluesky/beamlines/i24/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -28,7 +41,7 @@ mx_bluesky/beamlines/i24/jungfrau_commissioning/plan_stubs/do_internal_acquisiti
 mx_bluesky/beamlines/i24/jungfrau_commissioning/plan_stubs/plan_utils.py,sha256=GW1BCDh4_nIHc8rCugIfumJvo1tIrRsaJj4J0vFjUcQ,2514
 mx_bluesky/beamlines/i24/serial/__init__.py,sha256=Wq8i-XNhmBpfXSF3qZfzL9iubJrIzcVtMTH-fRGb3Eo,1619
 mx_bluesky/beamlines/i24/serial/blueapi_config.yaml,sha256=P0saF1bqt4ANU-2mtS_ZHO4NYr_ierUJN-gf6cspic8,350
-mx_bluesky/beamlines/i24/serial/dcid.py,sha256=xqvxM5wNwR1MuHckaXUnmD0lzUGA6zHlCRBMl3At9iU,13824
+mx_bluesky/beamlines/i24/serial/dcid.py,sha256=oiQ6CNTkUzVbxUjaoxoPk4qyQ3Ga7xbFbFnToEkvzLs,13763
 mx_bluesky/beamlines/i24/serial/log.py,sha256=a7tC-o3yzWpNvf27suQmn8O1gQec3_2-DbWW-tp8tL4,4800
 mx_bluesky/beamlines/i24/serial/run_extruder.sh,sha256=Dz3XLx0iPFxwo9KnG7oNBZFG19BGrb37O2w-ki_X9s4,1659
 mx_bluesky/beamlines/i24/serial/run_fixed_target.sh,sha256=KnnDP8_i47c4nWAYqugT-j4H6lcujVitIFs7sz5GzDs,1840
@@ -38,99 +51,101 @@ mx_bluesky/beamlines/i24/serial/set_visit_directory.sh,sha256=9W0ooseih2PszePztp
 mx_bluesky/beamlines/i24/serial/start_blueapi.sh,sha256=4iBzQljTLXQiVIF4UO7drc9qUkP7KSRC6Mjh8hcGxpI,608
 mx_bluesky/beamlines/i24/serial/write_nexus.py,sha256=3xNxco-mY17dS-JrWtYAXu-DWLAmEA5TQ8J-IaDgSUM,4748
 mx_bluesky/beamlines/i24/serial/extruder/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mx_bluesky/beamlines/i24/serial/extruder/i24ssx_extruder_collect_py3v2.py,sha256=JMV_oCN-UpMMQ-ebo8NYeLMBi05MzthOfXsO6-4g2do,16396
+mx_bluesky/beamlines/i24/serial/extruder/i24ssx_extruder_collect_py3v2.py,sha256=oVkc0WE6z93DQn-lD1GyDnnmdbXgre9dKpU0YczYNEQ,16521
 mx_bluesky/beamlines/i24/serial/extruder/EX-gui-edm/DetStage.edl,sha256=VqK_0EW_7H433nYLvprXvYRW-xWXWMF1dHqrKxQ0UOQ,1959
 mx_bluesky/beamlines/i24/serial/extruder/EX-gui-edm/DiamondExtruder-I24-py3v1.edl,sha256=u0WFI9LwUAjMvhQuV0SRwHLpGKwqmz17D4YNUPfBwG8,31011
 mx_bluesky/beamlines/i24/serial/extruder/EX-gui-edm/microdrop_alignment.edl,sha256=K79vmGAcf9qVEQLXTgr0g4bZDWaJ7nFoK4e0Ex7qAwM,14690
 mx_bluesky/beamlines/i24/serial/fixed_target/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/beamlines/i24/serial/fixed_target/ft_utils.py,sha256=puO1vg0x-TPgv8FbEFg73ohJqbwDpcG50_2cLUTa2FA,1210
-mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_chip_collect_py3v1.py,sha256=tot6k-2TUJegM1XElU9QmblRX9dflHMGtVWyUb4sLvY,22370
-mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_chip_manager_py3v1.py,sha256=z5pFZJt5E4IyntKRBm-frdWXrzh9rZlQ322w4X7Foi8,32489
+mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_chip_collect_py3v1.py,sha256=UA4HBhaTk0Z-usBfOczlUQF1jiHrFdEcmJ0jc6JmfZA,22504
+mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_chip_manager_py3v1.py,sha256=6DeItKS_gN3OKur39Te9SXu34oVVLjdCIhcVvukE9oo,32671
 mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_chip_startup_py3v1.py,sha256=_nlBI-LDzgNObF_SVJFqC390_ogWFmTJqVPgJA_C_DM,3275
 mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_moveonclick.py,sha256=gpfUnUc1XFzdQOn4XvUwE8gAxyjYijN5y1GA_qgwMHg,6813
-mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/CustomChip_py3v1.edl,sha256=gin-vnmzieyNIeyId0vrvXWqH3yG7VZIOaI9kjfyz2M,10371
-mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/DetStage.edl,sha256=3SHQayH1_v4-LYB8ihZRbLW1uGyP4UbtPObizxtcgrQ,1962
-mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/DiamondChipI24-py3v1.edl,sha256=jkfrsWR7W_L-XYyt1SRUbbHj_RE09zKnkZiyUKprBB8,56149
+mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/CustomChip_py3v1.edl,sha256=jZJ37qg5pOdG6-wrYKpi2Xfz6LwSg7D6PrHlaansjFI,10371
+mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/DetStage.edl,sha256=hYymun88ECy_6A4QohsFf1COwE6ln2goDehUPdEJB3Y,1962
+mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/DiamondChipI24-py3v1.edl,sha256=D5jHfyk7caGKz3K5e7_8M0wX3R9wqFp1jiF0QXdGj7s,56112
 mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/ME14E-GeneralPurpose.edl,sha256=PRgDxOo46v_sGh1y0qqMDfPJKPDQnhKZzAUxCpffBF4,60868
-mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/MappingLite-oxford_py3v1.edl,sha256=EMmIFa8WN2DtQv6Pbqw1d-U-9IRrECNHLrE__7nEKwo,38308
-mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/PMAC_Command.edl,sha256=qYlEGAmI_uKQNLDs0G2-WSQI4fby6FPW5WqV1kMZ4bA,1417
+mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/MappingLite-oxford_py3v1.edl,sha256=BNA3fR6fTgi_ovvRFQ4u1A9W_niRVX4x5uIsUEkWLMc,38308
+mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/PMAC_Command.edl,sha256=z7Uc1PtRvnDfvOV07dNJa0JVv5KqeQwH3k0v_94R5WI,1416
 mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/Shutter_Control.edl,sha256=WEOECG2qOaL1C9Y1VObeblm8J-BM9lR2ig_hmkAjheQ,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=dYfGTJOKsiLuefZRKiqR-kJcnr0fGTgOsnHA7wooPQI,15711
-mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/pumpprobe-py3v1.edl,sha256=5i8wl2qWOtuG3L5PFedOnthfahyfdlLTVycMuE00ikc,22800
+mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/pumpprobe-py3v1.edl,sha256=W5eSkWOUD6s-DUQTiHJrgOZzYYiwlPqImzIbsPc0aAI,22800
 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=qotJK7ZHidhJrqtIyNZ1JjiLlZfw9wPeR0W_9-mdQG8,1713
 mx_bluesky/beamlines/i24/serial/parameters/experiment_parameters.py,sha256=B7hWo-TrxJljja72yFAFG3IH2YJ-weScrFL82tlrzFA,4745
-mx_bluesky/beamlines/i24/serial/parameters/utils.py,sha256=Sbl4LhcZpbwBASvPMd0sEpW7HbJ0ZoUxPpRN4mNc4a0,4076
+mx_bluesky/beamlines/i24/serial/parameters/utils.py,sha256=6rqiD53GYADafTde35AKaW_a8-J4fcrXx7iZr8Ank4M,4076
 mx_bluesky/beamlines/i24/serial/parameters/fixed_target/cs/cs_maker.json,sha256=u0Vn1qCS3DEbsCrlvO2CYorLrUcOPhWKQurmKOIHMvQ,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=c1IO9b78eT78kpzsQFvPFVH1J-VTQNkVL8FXXhjoEkc,237
 mx_bluesky/beamlines/i24/serial/setup_beamline/ca.py,sha256=POg4BRnc9h1VwZEDqb-poMevgC8AwJmIi8RCYvZb8hw,1307
-mx_bluesky/beamlines/i24/serial/setup_beamline/pv.py,sha256=cHni3N3zeTRucX7hlCVcWpQjGeFHRro5_ml5vtn4S1c,14056
+mx_bluesky/beamlines/i24/serial/setup_beamline/pv.py,sha256=kFATZxSRz4yL3ysfzrgDuocHu8vw_q0cuciC21eXBeg,6995
 mx_bluesky/beamlines/i24/serial/setup_beamline/pv_abstract.py,sha256=lGgdUUr13_ncQQuFrNAye460Weo_-ecRyWAGqRUjV6Q,1042
-mx_bluesky/beamlines/i24/serial/setup_beamline/setup_beamline.py,sha256=9SNKBWwEO7b0uESX1DtxpvIA27Vd7EzAbjrAKo-kTXg,8875
-mx_bluesky/beamlines/i24/serial/setup_beamline/setup_detector.py,sha256=S6g2OC3KMwcjYkc7ugdw1zwC6hybIbEIUXhwQzpQT2M,2926
+mx_bluesky/beamlines/i24/serial/setup_beamline/setup_beamline.py,sha256=BNn2FRn7cDvEdB6uNETwpC6_Zv9SalYgNnr3TXCXMmM,8964
+mx_bluesky/beamlines/i24/serial/setup_beamline/setup_detector.py,sha256=AAOfQpqHbMjHN7NVJ96c68lvC_HL1ZwviAE2dr1qbg4,2926
 mx_bluesky/beamlines/i24/serial/setup_beamline/setup_zebra_plans.py,sha256=zJu2kzWHUTdir1ojYmXWCM-cz0IIXcp2kJmCS90PjeQ,17458
 mx_bluesky/beamlines/i24/serial/web_gui_plans/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mx_bluesky/beamlines/i24/serial/web_gui_plans/general_plans.py,sha256=AgmLX08dfT9Asd8_lEq5Z0d2o_O0mqGAFm4A3lrqZDs,11820
+mx_bluesky/beamlines/i24/serial/web_gui_plans/general_plans.py,sha256=QvwNYwWuIYZ9cqnrFsib8lr8I1TvedGLLxLcoVzoK5Y,11820
+mx_bluesky/beamlines/i24/serial/web_gui_plans/oav_plans.py,sha256=GTN6T3E_2UAxh1O4s4H44XKaW-gEh1gL6eJ6dD9U9IU,1557
 mx_bluesky/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/common/xrc_result.py,sha256=tUJ6qkDTTB6H1F71IvVAKtmHCRyHSU_tj9GRzVmnE7w,3219
 mx_bluesky/common/device_setup_plans/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mx_bluesky/common/device_setup_plans/manipulate_sample.py,sha256=bKVWiXQnibXEjKjCNvy9PX4kUSh1CsBQCkqO5tUgrOU,3130
+mx_bluesky/common/device_setup_plans/gonio.py,sha256=Hg0OzP7q-NT88s8RQrIDe2n8AI6Ec1wZPzPcvkJfwss,955
+mx_bluesky/common/device_setup_plans/manipulate_sample.py,sha256=8WkkQt3MMy5OKLloHhKhF_EiCsjZ6A2nH6VzPQ6ePuE,3367
 mx_bluesky/common/device_setup_plans/position_detector.py,sha256=S49ml0KNZ6wXPQqOxNJ2whKTCyRTcKdBXBhyeEyFDQQ,635
-mx_bluesky/common/device_setup_plans/robot_load_unload.py,sha256=vbkH9pGu3ZHYrzsMJlEB38eLTP-eSNEbnB6svC_KP2Q,4503
-mx_bluesky/common/device_setup_plans/setup_oav.py,sha256=10lo4c7k-OHI2i5F3OsC318ZXG3N8BtjKMFFSflVFR0,2692
+mx_bluesky/common/device_setup_plans/robot_load_unload.py,sha256=T9_X9B3m2OG6bV_dpAKEe4R1UqvYWTtmO2TraS117zU,4502
+mx_bluesky/common/device_setup_plans/setup_oav.py,sha256=NQZYVQBuqlBPJY5u14dG_9uuBqrjVKE7TrFlPPZRsqk,2967
 mx_bluesky/common/device_setup_plans/setup_panda.py,sha256=OF-ZygZyAyQEUdrAWiIxWZ6QhAsVx4Mm9ngRYB1mzKI,433
-mx_bluesky/common/device_setup_plans/setup_zebra_and_shutter.py,sha256=y83Szce7QxXdpLeGXpgyhceOr1HCE6fs6zmZr77IYAE,10066
+mx_bluesky/common/device_setup_plans/setup_zebra_and_shutter.py,sha256=lYFf0dF9iyiDRJzADCD1JahAL043BiL9evUaeCPaW0g,9826
 mx_bluesky/common/device_setup_plans/utils.py,sha256=S_Us1KfLkyaRzWxmqnoVxHj2Suq-Vs0n5fMRygHgrTw,1859
-mx_bluesky/common/device_setup_plans/xbpm_feedback.py,sha256=EY1CwACPfts4otAjF15uLrMDyRGwmHz2khh8WicK6cY,1873
+mx_bluesky/common/device_setup_plans/xbpm_feedback.py,sha256=UZxFgxG_xhc9k1SzKSbVM7I_X6ndKZ2v4xQpAACsc5Q,2236
 mx_bluesky/common/experiment_plans/__init__.py,sha256=FMA-4VN1TJCPcyURKF0qPIQ8uo8YBbtHPRdJokVF4MA,129
+mx_bluesky/common/experiment_plans/beamstop_check.py,sha256=W6dcG1vfJP2_GDeAjuQ_tBvnre106Jq_PSJG3pH76PY,9004
 mx_bluesky/common/experiment_plans/change_aperture_then_move_plan.py,sha256=407E9rp0yGWWIU1fJrgqK_hC19mVwRK-Und7fMlGNDc,3062
-mx_bluesky/common/experiment_plans/common_flyscan_xray_centre_plan.py,sha256=GXQ7Kiosh4mZ6CU55N23VgsDCeVTjvRbLlkjm-3WKAM,13550
+mx_bluesky/common/experiment_plans/common_flyscan_xray_centre_plan.py,sha256=P96K7lV3Qja5KJdykolO9VOq-daPsoGEJ8oUlYggSYY,13584
 mx_bluesky/common/experiment_plans/common_grid_detect_then_xray_centre_plan.py,sha256=-QCj6utLqQNbaguoVh5htYhNihfpVUS7oo5zMvIYOfw,7033
 mx_bluesky/common/experiment_plans/oav_grid_detection_plan.py,sha256=SOX6eyPNm7hLJaRJ8esd4DOE2nBjT_2gbmAz1Ozc57g,7154
-mx_bluesky/common/experiment_plans/oav_snapshot_plan.py,sha256=0TrrYtFmyc9rJsZ5yu8vzGZZ_J6IICFXqqtFXW1t5s0,3623
+mx_bluesky/common/experiment_plans/oav_snapshot_plan.py,sha256=3xhEen8Op_lPSB63sAfbsEfq9sWNIbtMv5ssw8xz0R8,3598
+mx_bluesky/common/experiment_plans/pin_tip_centring_plan.py,sha256=DTBdm7zMwrJUkhS_pu2IHAfKMgYnzBZNa-QIuusxCSo,6184
 mx_bluesky/common/experiment_plans/inner_plans/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/common/experiment_plans/inner_plans/do_fgs.py,sha256=IMsfA1-4POl5h5X3mczN-Hll-OlGwrp8RaI32TMlyjM,4884
-mx_bluesky/common/experiment_plans/inner_plans/read_hardware.py,sha256=dYXXnyNKH5dqwVLYqR6rWRh2uOSJw9GweIoDeMEY_Jg,2408
-mx_bluesky/common/experiment_plans/inner_plans/udc_default_state.py,sha256=u6ff33_A-XOjvEThBW3h6sJkudX72YajYHypM5kuAUg,3651
+mx_bluesky/common/experiment_plans/inner_plans/read_hardware.py,sha256=tp4A2X-Ti7YEOo-TvnX6sNhrtFLLofcjkGC2MoShB3k,2521
 mx_bluesky/common/experiment_plans/inner_plans/write_sample_status.py,sha256=iRgp49666zSUMDijjqQyHuxj84ID5mbQ2yCRjMD2ZIY,1305
 mx_bluesky/common/external_interaction/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mx_bluesky/common/external_interaction/config_server.py,sha256=QHyIEVUfJpoGvKSbHdubTG898SUvn9IQP9KTAV2nqaA,6547
+mx_bluesky/common/external_interaction/config_server.py,sha256=9kik1dO0n6o3D3_ohIxb4JmrXf5U7lkZV6ovvV-tjpQ,6549
 mx_bluesky/common/external_interaction/alerting/__init__.py,sha256=Di6vVslmB_3v5r7qsGezm7Iln4dA-T60_9USo_8y-P0,264
 mx_bluesky/common/external_interaction/alerting/_service.py,sha256=5GLXKETg8o0d4coIv17hOoAI-rFGldIF2SIVmKW0QUQ,2632
 mx_bluesky/common/external_interaction/alerting/log_based_service.py,sha256=KCTUcuk4lGzTOWaOUcUEXzTo5-vVAdRtMy0a5Kq2fso,2130
 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=hfFJjICMer26TowK5Nq-AEjDe1TAHIgJAvTFhs-o-Zg,4901
-mx_bluesky/common/external_interaction/callbacks/common/ispyb_callback_base.py,sha256=CwguiKfzr3J72jaWJf6j1Ht5T6NTUOYVKNfaTS6S63M,9869
-mx_bluesky/common/external_interaction/callbacks/common/ispyb_mapping.py,sha256=pzDlNEGhXACc5MyO_FAT2PlCYz6r_bnz_S08hXEGjdk,2707
+mx_bluesky/common/external_interaction/callbacks/common/grid_detection_callback.py,sha256=m4b-LDVynkPVzpd3MzdrBQD4CZJwexIkM-_J44dbhD0,5093
+mx_bluesky/common/external_interaction/callbacks/common/ispyb_callback_base.py,sha256=Df7wclsKLmKr97JfOZAA9qBoG9JtWwLnTyl5zS3kyOU,9482
+mx_bluesky/common/external_interaction/callbacks/common/ispyb_mapping.py,sha256=Q5RgYNLSyXvqVTHJsafwc732ODOvOe607U72yRknOj8,2583
 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
 mx_bluesky/common/external_interaction/callbacks/common/plan_reactive_callback.py,sha256=LWV-OoUKCg12TyVQScToPTEUmKh9aywrHU00u4gJqeU,4089
 mx_bluesky/common/external_interaction/callbacks/common/zocalo_callback.py,sha256=4_125UmckEuZE9UhrP3qdF7j2rYkydHvrGm5FQhgKsk,4181
 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=MzmiI4TA3mqFK_p8gfT7HmUTz23fbTrd-2PhJIgQXAI,3866
 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=ONMVOgba090Mg0AJmGSguOjBJ_lSd4vlPFyOoJDdpvs,15446
+mx_bluesky/common/external_interaction/callbacks/xray_centre/ispyb_callback.py,sha256=Vw_dHYzEJxB_qmT7CTQh3OsFi_wfipsOMeTFbN4GHmE,15569
 mx_bluesky/common/external_interaction/callbacks/xray_centre/ispyb_mapping.py,sha256=yElqODhPm2HZlpF7vNOX0SQNjwJ_m8kNMS-c_cp4KUU,1163
 mx_bluesky/common/external_interaction/callbacks/xray_centre/nexus_callback.py,sha256=QCjGzKUKv2jVOLmqd1nEK22TKd42VOCOHF6xbI787hc,4717
 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=nODCetFDL5bUGymTlGcd6VcDRhA6eZQKkCjLvJ6kYYs,6112
-mx_bluesky/common/external_interaction/ispyb/ispyb_store.py,sha256=4AgXpcD_ZZBPgLa8VWkz3lG3YUGV8f-SbjKGTlob6Aw,11372
-mx_bluesky/common/external_interaction/ispyb/ispyb_utils.py,sha256=5-8wHmY1KvMuRpXUxN5YBCQP3M-Jk-sTcfDm-CC84Mw,732
+mx_bluesky/common/external_interaction/ispyb/data_model.py,sha256=4f60-Fl9irQpDgXbaZKja3w53hJF0SPSy5vqeCMvKt4,2920
+mx_bluesky/common/external_interaction/ispyb/exp_eye_store.py,sha256=X5er8xNg69Li0onhu7QXv9OOg1d8JnqpfgNcKcdxcVo,11676
+mx_bluesky/common/external_interaction/ispyb/ispyb_store.py,sha256=sMVCbquk_DJBGxumj5ENjVpUDXBqqQ-mrXnBoR2QLfM,8023
+mx_bluesky/common/external_interaction/ispyb/ispyb_utils.py,sha256=zHZvzL0u6nvaY8CrqoYRDWqmRIczqWq2TwM0lDAO-RI,307
 mx_bluesky/common/external_interaction/nexus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/common/external_interaction/nexus/nexus_utils.py,sha256=EXHKd6Kc6J7CkpWpLkuAgSUk66t6mE-NZJHDEx1eFVA,5580
 mx_bluesky/common/external_interaction/nexus/write_nexus.py,sha256=PAc-vuywgLCo5AoOs-bQNS5i_lM3qSSax4nvwSgyAMY,4067
 mx_bluesky/common/parameters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mx_bluesky/common/parameters/components.py,sha256=wyejnv6DxSOrGzcMVRHZVHnund3pj6cTxTMU5v7JW5Q,8576
-mx_bluesky/common/parameters/constants.py,sha256=zti0DB4rkug4aJ1_vqsRh2FU80t_8Ruza_N4w1xb2xc,5140
-mx_bluesky/common/parameters/device_composites.py,sha256=H-SEn1BNme7ucBRRoo90Qr5YdVX0ooPAQPtrzxB6ZAg,2303
+mx_bluesky/common/parameters/components.py,sha256=v7FHSsvpCLqC97Lama9DjkZxUDnTLt1ljjXd-6Yq00Y,8653
+mx_bluesky/common/parameters/constants.py,sha256=ZkmpyXjrFy1OZlVvXlAUA2ADg-jPwJeZJHFrL7uG_KE,5245
+mx_bluesky/common/parameters/device_composites.py,sha256=gyCcryP6nzgGtEQ6x_oU3mALbk3a7jixxJZogV2AZxc,2397
 mx_bluesky/common/parameters/gridscan.py,sha256=OQkzrDsEKEjTvCI9LhqPe_B2jPNCjRM09AOwgdyECt8,7652
 mx_bluesky/common/preprocessors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/common/preprocessors/preprocessors.py,sha256=BNpSM7S9gxhVbG39rjH14k89sOmKiII0cqApH3pF_H0,4476
@@ -138,13 +153,13 @@ mx_bluesky/common/protocols/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMp
 mx_bluesky/common/protocols/protocols.py,sha256=I-Yd1AFDarfTe14fMgv0VONEJ-9K-5IwDAItNWZPZ90,298
 mx_bluesky/common/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/common/utils/context.py,sha256=Fe_YSNv3ZEIZvpdWs-9UqiG6-xEEdCpK6oMYYdCSYT8,2198
-mx_bluesky/common/utils/exceptions.py,sha256=T4WVpluMByacH7lw8x8QNfq9RCnJ184gPpo3FdXeWQg,2210
-mx_bluesky/common/utils/log.py,sha256=AYizIB0Wix3ZDe4XgTxix7svMWHAi50e5GsQ4vIfr9E,4325
+mx_bluesky/common/utils/exceptions.py,sha256=0ks-xR9URt4h71rJXaqDZhC0TY0WLGvLMU3zRr-BHhg,2499
+mx_bluesky/common/utils/log.py,sha256=8sqkgAY9DbCjZXIqw6ModtmF6l4PKQPePsBhSoE2P6A,4535
 mx_bluesky/common/utils/tracing.py,sha256=OLHP0DHy5sw8werqhSdhgia4Ob_ee-yvPedouQVL2_Y,1176
-mx_bluesky/common/utils/utils.py,sha256=kqrtodPCiqgaUkDC7dfbwqHEe669Pr4T3Ut67Jr3y5c,1180
+mx_bluesky/common/utils/utils.py,sha256=2H6h5DJjI8rRFIOfOXR4TxVpmx0-NYa5oqnBmU9LgdA,3297
 mx_bluesky/hyperion/__init__.py,sha256=f4E8wInL1Ll4eeFtAiyKmipOBTPlUtKmVK-m_LOQG4M,35
-mx_bluesky/hyperion/__main__.py,sha256=sMD-De3ix-JcC-CclmECUiZtmqZ3LkXqiFjw5Car260,7285
-mx_bluesky/hyperion/baton_handler.py,sha256=fJPb0q1TYMpEKjEDI-0u17pHeMVyRVto-GNhbLzLFdo,10205
+mx_bluesky/hyperion/__main__.py,sha256=0S8Izf_u8uuY8In3aLG4GWFCJWewMP3qCfW_xevwXbk,6863
+mx_bluesky/hyperion/baton_handler.py,sha256=qZzHWUay_hyl1XLJfk1zN-Ao5zh5PFJNzXip9O54vmY,10893
 mx_bluesky/hyperion/plan_runner.py,sha256=If2XodutzRDQYu3KQFtLsWLOfxx6x4pMegBgtnqRNDI,2816
 mx_bluesky/hyperion/plan_runner_api.py,sha256=Kq-UyaI6q8eU98odTLBk2RoTiEJ9s7OqYo73k_ep9w4,1296
 mx_bluesky/hyperion/runner.py,sha256=YSdHgtAmMitHfooDwicA9mLhav457MGzLijlhFYeDCo,7167
@@ -152,7 +167,6 @@ mx_bluesky/hyperion/device_setup_plans/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JC
 mx_bluesky/hyperion/device_setup_plans/dcm_pitch_roll_mirror_adjuster.py,sha256=ciNdz_r9XGvghehpejdziL-aMw60oUsIJdVR3yz3nOo,5010
 mx_bluesky/hyperion/device_setup_plans/setup_panda.py,sha256=96eFp4acQLOthe1PA-S14uv635uGVP71DpP7qy_uo40,8509
 mx_bluesky/hyperion/device_setup_plans/setup_zebra.py,sha256=dOfBQMibyH3CjSh_m5RJKsxs2DtaM3jtwEs7lkqQppo,1525
-mx_bluesky/hyperion/device_setup_plans/smargon.py,sha256=YB6wRxrvCIZyvJBABVSazmQsYkhxrxARievu60pHxTU,947
 mx_bluesky/hyperion/device_setup_plans/utils.py,sha256=XlbHaIAnuCyHY5PmutiCf_j9MmFvITcmURA9yXfXD1o,425
 mx_bluesky/hyperion/experiment_plans/__init__.py,sha256=dJjwLk0EQP-1hKhbs8aRxTF_LxUXgB7kcgDlaP-tMnk,787
 mx_bluesky/hyperion/experiment_plans/experiment_registry.py,sha256=L7nMBaGkP3c1Fq80osYmxPEBsEtGzP2AfAYsUu33gKs,1706
@@ -160,15 +174,15 @@ mx_bluesky/hyperion/experiment_plans/hyperion_flyscan_xray_centre_plan.py,sha256
 mx_bluesky/hyperion/experiment_plans/hyperion_grid_detect_then_xray_centre_plan.py,sha256=e4w4226ONSGQF2dnXzxOfcJ9i57CZIJrqQ1YCLlaBNo,2153
 mx_bluesky/hyperion/experiment_plans/load_centre_collect_full_plan.py,sha256=UIt2dRNv2s3gWx0jNiEFDsTQZ_Hqnv2NHC3sw8AJhsg,7949
 mx_bluesky/hyperion/experiment_plans/optimise_attenuation_plan.py,sha256=9M65cboRt5FR0V2sOjjyq6eLXA0L6xnSeXFzLpW67zw,16169
-mx_bluesky/hyperion/experiment_plans/pin_centre_then_xray_centre_plan.py,sha256=X_1s_0PTPJAuYs3HPPAsFofUNnVJuPeaBjVgUZEvmI8,5397
-mx_bluesky/hyperion/experiment_plans/pin_tip_centring_plan.py,sha256=x2vK0ntiSuHFuCdDIeU_6TIEAMCzOx1eNnZVNPGB_sQ,6228
-mx_bluesky/hyperion/experiment_plans/robot_load_and_change_energy.py,sha256=bqG4enP2bZQ6ND0c5XqwDySQTkQRBdK7gvWf61VEnWM,6051
-mx_bluesky/hyperion/experiment_plans/robot_load_then_centre_plan.py,sha256=samWAztWJU9sRo1FtIicWWQZ7TjUwg7Y9y9oqhkcb5o,6904
-mx_bluesky/hyperion/experiment_plans/rotation_scan_plan.py,sha256=HjTqYAvM481JZlxVC-d1s_3O-AHsnYGz84dtZmMKB_U,15974
-mx_bluesky/hyperion/experiment_plans/set_energy_plan.py,sha256=8FAqN-aJgRwZSiCX-hNdeGmaijt0l8owdShVBwNchfE,2643
+mx_bluesky/hyperion/experiment_plans/pin_centre_then_xray_centre_plan.py,sha256=qOZbOT_v2kqEonkVTnU-SHNbPTB6zU4orp2HDLeHeng,5354
+mx_bluesky/hyperion/experiment_plans/robot_load_and_change_energy.py,sha256=jq_bVHgJ-AvB2H0FjmhcY2G5gTSjF0lA1q616uKUxLs,5868
+mx_bluesky/hyperion/experiment_plans/robot_load_then_centre_plan.py,sha256=SB_dRsRKFW7hkSXSQR-wcN_h0-5_wvKs_eklBrLLRBA,6998
+mx_bluesky/hyperion/experiment_plans/rotation_scan_plan.py,sha256=mt2BkEaHcJtfENyiET0pRtUR20hnvxM_zeTvdO5ffoc,16189
+mx_bluesky/hyperion/experiment_plans/set_energy_plan.py,sha256=m0MmiHRS0JlpakyccDbI63kYts_FR_RnUCBZ1J-acJ4,2653
+mx_bluesky/hyperion/experiment_plans/udc_default_state.py,sha256=oyaxD_FHNwx1FUgAYP4h26tuqxE34zm3WefyiRhDJSI,6333
 mx_bluesky/hyperion/external_interaction/__init__.py,sha256=95DwXDmKsx36RgAL-AtLZl2LQoLPKbzeYdlkkP_4Coc,559
-mx_bluesky/hyperion/external_interaction/agamemnon.py,sha256=iOaC2x5Cb7gsh7MC9SpfqFM4SZ5q9TgJDykE9kTW-Fc,12020
-mx_bluesky/hyperion/external_interaction/config_server.py,sha256=Xz1R-vga5xXVIqYjpWGtYI3ad6ATNY3rTxYAfmsC_dE,493
+mx_bluesky/hyperion/external_interaction/agamemnon.py,sha256=Eumu2fXdW_t49ms1CTM0aN2CiagdDXrvmVuim2CyAfU,12034
+mx_bluesky/hyperion/external_interaction/config_server.py,sha256=4QIcx_3U4PJfPA9UrGEybJJpd6sTejsdhmDXqUoW00o,498
 mx_bluesky/hyperion/external_interaction/alerting/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/hyperion/external_interaction/alerting/constants.py,sha256=8wE_MDF8vOqomQ6SBiwZKb1W4NRO_hmrBLVfLVnKdSg,170
 mx_bluesky/hyperion/external_interaction/callbacks/__init__.py,sha256=1XHaxDljMveu_DYIlk7n963gHffyC6r4C_RhF6HA-N8,283
@@ -178,26 +192,26 @@ mx_bluesky/hyperion/external_interaction/callbacks/snapshot_callback.py,sha256=e
 mx_bluesky/hyperion/external_interaction/callbacks/robot_actions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/hyperion/external_interaction/callbacks/robot_actions/ispyb_callback.py,sha256=Ta8w0W_3LI0PGpwxKlQsS7X0B_hsfJoZdzR2K3J0KHo,4467
 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=2uQa8-Tnix57B12CcQ6VL8JqWJu2qmS4Dco1ajdIfi4,8893
-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=-RyzSsZwvqSQHwSWSPF9roGW9LtOgcf9q6dYMJsYUi8,4751
+mx_bluesky/hyperion/external_interaction/callbacks/rotation/ispyb_callback.py,sha256=5Yiva17zELK03gOePiU4cqQo06HHBSUhm9pZfykWBvE,8861
+mx_bluesky/hyperion/external_interaction/callbacks/rotation/ispyb_mapping.py,sha256=jR6OGTYMbIQb6cmxPYxZz86ANfFC0BiGeplknwsx8SI,841
+mx_bluesky/hyperion/external_interaction/callbacks/rotation/nexus_callback.py,sha256=bTyDe6mlZhDbBSipAampfz6ND0qwAntvoizSKFyT8Ts,4658
 mx_bluesky/hyperion/parameters/__init__.py,sha256=kf2wfcILBUBpT0tJ8-W39BywQUkn67yxl9IVsfrr1LE,115
 mx_bluesky/hyperion/parameters/cli.py,sha256=I-NY3Kt3la5HNUB4qRA6NtuxbJSr78yx-sM_cRx_pY4,1514
 mx_bluesky/hyperion/parameters/components.py,sha256=eIUEcFNqcEad21IThSDatoX-NRa9GdfBOwt6ZUwb88U,292
-mx_bluesky/hyperion/parameters/constants.py,sha256=gOVJ7VTmK_mLKaN0175rntRLN7cRiEOzAlSygQWd0Ls,2268
-mx_bluesky/hyperion/parameters/device_composites.py,sha256=B37k4J8qtBetL3s16Fu9jlBkJwjpdz02SQ9LW1TZmBE,2213
+mx_bluesky/hyperion/parameters/constants.py,sha256=VfJmT5TIk5P_f_NC93FmJhQkPmKutP69fKEKQG7e63w,2681
+mx_bluesky/hyperion/parameters/device_composites.py,sha256=okfzsWC0eB60DQ5OVRYgTTM6wRCUlYIia7ieTEzj440,2223
 mx_bluesky/hyperion/parameters/gridscan.py,sha256=dnK2veiDFfW4U02A4MTzODu0TJPZk-hE_dTCQnb3tSU,3916
 mx_bluesky/hyperion/parameters/load_centre_collect.py,sha256=8dlKwb7WmgDeohQ9QsdMWQMMM73EaC2cZ0wKg6vOP60,3727
-mx_bluesky/hyperion/parameters/robot_load.py,sha256=Iktni3r6LFRnlM51hpdpv3QrD6QPhx2rAeyB8Gv6ML4,1124
+mx_bluesky/hyperion/parameters/robot_load.py,sha256=kZRBzsw_nQKCq1FfnAk_dDzHoSgDKKkShcVP9GPv5V8,844
 mx_bluesky/hyperion/parameters/rotation.py,sha256=0QNov3jykC__iIHMxdTq3znBsKLyQGk-vzSVMf7rSyA,7360
 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=VYAu1yxhDBrI98ul7UErotuquF64s1EDHtqPQLRpyvY,1227
 mx_bluesky/phase1_zebra/__init__.py,sha256=Edhhn2L9MVXnjJhyD5_yKQVUDo7XW98rvuT7dlzIn58,132
 mx_bluesky/phase1_zebra/device_setup_plans/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mx_bluesky-1.5.11.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-mx_bluesky-1.5.11.dist-info/METADATA,sha256=mgu9muV03ZOAgN4FCPkACUwgLC8Oy7qz227rBPjgaNg,17482
-mx_bluesky-1.5.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mx_bluesky-1.5.11.dist-info/entry_points.txt,sha256=HgVtwgWoMRn9-X6rxCcSY3Jz_paspJTIlc-t2NFzWpo,409
-mx_bluesky-1.5.11.dist-info/top_level.txt,sha256=S4rrzXIUef58ulf_04wn01XGZ3xeJjXs4LPEJ_xoF-I,11
-mx_bluesky-1.5.11.dist-info/RECORD,,
+mx_bluesky-1.5.12.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+mx_bluesky-1.5.12.dist-info/METADATA,sha256=Yzzq6mi-9l0UJrPx0Xc3KEbA6vlulohk_J31l7gxnQ0,17539
+mx_bluesky-1.5.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mx_bluesky-1.5.12.dist-info/entry_points.txt,sha256=HgVtwgWoMRn9-X6rxCcSY3Jz_paspJTIlc-t2NFzWpo,409
+mx_bluesky-1.5.12.dist-info/top_level.txt,sha256=S4rrzXIUef58ulf_04wn01XGZ3xeJjXs4LPEJ_xoF-I,11
+mx_bluesky-1.5.12.dist-info/RECORD,,

mx_bluesky/common/experiment_plans/inner_plans/udc_default_state.py

@@ -1,86 +0,0 @@
-import bluesky.plan_stubs as bps
-import pydantic
-from bluesky.utils import MsgGenerator
-from dodal.devices.aperturescatterguard import ApertureScatterguard, ApertureValue
-from dodal.devices.collimation_table import CollimationTable
-from dodal.devices.cryostream import CryoStream, CryoStreamGantry, CryoStreamSelection
-from dodal.devices.cryostream import InOut as CryoInOut
-from dodal.devices.fluorescence_detector_motion import (
-    FluorescenceDetector,
-)
-from dodal.devices.fluorescence_detector_motion import InOut as FlouInOut
-from dodal.devices.hutch_shutter import HutchShutter, ShutterDemand
-from dodal.devices.mx_phase1.beamstop import Beamstop, BeamstopPositions
-from dodal.devices.scintillator import InOut as ScinInOut
-from dodal.devices.scintillator import Scintillator
-
-
-@pydantic.dataclasses.dataclass(config={"arbitrary_types_allowed": True})
-class UDCDefaultDevices:
-    cryostream: CryoStream
-    cryostream_gantry: CryoStreamGantry
-    fluorescence_det_motion: FluorescenceDetector
-    beamstop: Beamstop
-    scintillator: Scintillator
-    aperture_scatterguard: ApertureScatterguard
-    collimation_table: CollimationTable
-    hutch_shutter: HutchShutter
-
-
-def move_to_udc_default_state(devices: UDCDefaultDevices):
-    """Moves beamline to known positions prior to UDC start"""
-    yield from _verify_correct_cryostream_selected(devices.cryostream_gantry)
-
-    cryostream_temp = yield from bps.rd(devices.cryostream.temperature_k)
-    cryostream_pressure = yield from bps.rd(devices.cryostream.back_pressure_bar)
-    if cryostream_temp > devices.cryostream.MAX_TEMP_K:
-        raise ValueError("Cryostream temperature is too high, not starting UDC")
-    if cryostream_pressure > devices.cryostream.MAX_PRESSURE_BAR:
-        raise ValueError("Cryostream back pressure is too high, not starting UDC")
-
-    yield from bps.abs_set(
-        devices.hutch_shutter, ShutterDemand.OPEN, group="udc_default"
-    )
-
-    yield from bps.abs_set(devices.scintillator.selected_pos, ScinInOut.OUT, wait=True)
-
-    yield from bps.abs_set(
-        devices.fluorescence_det_motion.pos, FlouInOut.OUT, group="udc_default"
-    )
-
-    yield from bps.abs_set(devices.collimation_table.inboard_y, 0, group="udc_default")
-    yield from bps.abs_set(devices.collimation_table.outboard_y, 0, group="udc_default")
-    yield from bps.abs_set(devices.collimation_table.upstream_y, 0, group="udc_default")
-    yield from bps.abs_set(devices.collimation_table.upstream_x, 0, group="udc_default")
-    yield from bps.abs_set(
-        devices.collimation_table.downstream_x, 0, group="udc_default"
-    )
-
-    yield from bps.abs_set(
-        devices.beamstop.selected_pos,
-        BeamstopPositions.DATA_COLLECTION,
-        group="udc_default",
-    )
-
-    yield from bps.abs_set(
-        devices.aperture_scatterguard.selected_aperture,
-        ApertureValue.SMALL,
-        group="udc_default",
-    )
-
-    yield from bps.abs_set(devices.cryostream.course, CryoInOut.IN, group="udc_default")
-    yield from bps.abs_set(devices.cryostream.fine, CryoInOut.IN, group="udc_default")
-
-    yield from bps.wait("udc_default")
-
-
-def _verify_correct_cryostream_selected(
-    cryostream_gantry: CryoStreamGantry,
-) -> MsgGenerator:
-    cryostream_selection = yield from bps.rd(cryostream_gantry.cryostream_selector)
-    cryostream_selected = yield from bps.rd(cryostream_gantry.cryostream_selected)
-    if cryostream_selection != CryoStreamSelection.CRYOJET or cryostream_selected != 1:
-        raise ValueError(
-            f"Cryostream is not selected for use, control PV selection = {cryostream_selection}, "
-            f"current status {cryostream_selected}"
-        )

mx_bluesky/common/external_interaction/callbacks/common/logging_callback.py

@@ -1,29 +0,0 @@
-import json
-
-from bluesky.callbacks import CallbackBase
-
-from mx_bluesky.common.utils.log import LOGGER
-
-
-class _BestEffortEncoder(json.JSONEncoder):
-    def default(self, o):
-        return repr(o)
-
-
-def format_doc_for_log(doc):
-    return json.dumps(doc, indent=2, cls=_BestEffortEncoder)
-
-
-class VerbosePlanExecutionLoggingCallback(CallbackBase):
-    def start(self, doc):
-        LOGGER.info(f"START: {format_doc_for_log(doc)}")
-
-    def descriptor(self, doc):
-        LOGGER.info(f"DESCRIPTOR: {format_doc_for_log(doc)}")
-
-    def event(self, doc):
-        LOGGER.info(f"EVENT: {format_doc_for_log(doc)}")
-        return doc
-
-    def stop(self, doc):
-        LOGGER.info(f"STOP: {format_doc_for_log(doc)}")