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

mx_bluesky/hyperion/parameters/rotation.py

@@ -18,12 +18,14 @@ from scanspec.core import Path as ScanPath
 from scanspec.specs import Line
 
 from mx_bluesky.common.parameters.components import (
+    DiffractionExperiment,
     DiffractionExperimentWithSample,
     IspybExperimentType,
     OptionalGonioAngleStarts,
     OptionalXyzStarts,
     RotationAxis,
     SplitScan,
+    WithSample,
     WithScan,
 )
 from mx_bluesky.hyperion.parameters.components import WithHyperionUDCFeatures
@@ -33,7 +35,7 @@ from mx_bluesky.hyperion.parameters.constants import (
 )
 
 
-class RotationScanPerSweep(OptionalGonioAngleStarts, OptionalXyzStarts):
+class RotationScanPerSweep(OptionalGonioAngleStarts, OptionalXyzStarts, WithSample):
     """
     Describes a rotation scan about the specified axis.
 
@@ -54,7 +56,7 @@ class RotationScanPerSweep(OptionalGonioAngleStarts, OptionalXyzStarts):
     nexus_vds_start_img: int = Field(default=0, ge=0)
 
 
-class RotationExperiment(DiffractionExperimentWithSample, WithHyperionUDCFeatures):
+class RotationExperiment(DiffractionExperiment, WithHyperionUDCFeatures):
     shutter_opening_time_s: float = Field(default=CONST.I03.SHUTTER_TIME_S)
     rotation_increment_deg: float = Field(default=0.1, gt=0)
     ispyb_experiment_type: IspybExperimentType = Field(
@@ -105,7 +107,9 @@ class RotationExperiment(DiffractionExperimentWithSample, WithHyperionUDCFeature
             return aperture_position
 
 
-class SingleRotationScan(WithScan, RotationScanPerSweep, RotationExperiment):
+class SingleRotationScan(
+    WithScan, RotationScanPerSweep, RotationExperiment, DiffractionExperimentWithSample
+):
     @property
     def detector_params(self):
         return self._detector_params(self.omega_start_deg)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mx-bluesky
-Version: 1.4.9
+Version: 1.5.1
 Summary: Bluesky tools for MX Beamlines at DLS
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
 License:                                  Apache License
@@ -221,7 +221,7 @@ Requires-Dist: ispyb
 Requires-Dist: jupyterlab
 Requires-Dist: matplotlib
 Requires-Dist: nexgen>=0.11.0
-Requires-Dist: numpy
+Requires-Dist: numpy==2.2.6
 Requires-Dist: opencv-python
 Requires-Dist: opentelemetry-distro
 Requires-Dist: opentelemetry-exporter-otlp
@@ -233,13 +233,14 @@ Requires-Dist: requests
 Requires-Dist: scanspec
 Requires-Dist: scipy
 Requires-Dist: semver
+Requires-Dist: deepdiff
 Requires-Dist: matplotlib
-Requires-Dist: blueapi>=0.5.0
+Requires-Dist: blueapi>=0.11.1
 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.48.0
+Requires-Dist: dls-dodal==1.51.0
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: build; extra == "dev"

{mx_bluesky-1.4.9.dist-info → mx_bluesky-1.5.1.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=_khE0BvLLOXKCyxlHn8gjMAbG__XlngpoNyCPRZBxOQ,511
+mx_bluesky/_version.py,sha256=FasBapRYrTzegTWgTLGzFg84_c9eAAt8ZkOEeQxlLC4,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
@@ -15,8 +15,8 @@ mx_bluesky/beamlines/i04/callbacks/murko_callback.py,sha256=ZIwkY6gdcmIE-aMBvehN
 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=TInCdnrsp4FYLkwTZ8bzNpUrFuLrWzg9ugqwkplvPZg,1473
-mx_bluesky/beamlines/i24/serial/blueapi_config.yaml,sha256=xT-czuatOKpt_a8onssDsVNx2ey-uZMoTJ4s7HPuDEU,261
+mx_bluesky/beamlines/i24/serial/__init__.py,sha256=r8v9V48TMrNxOcwBZ6lzeCCuPulq5rg8m-mwH_KkOnI,1533
+mx_bluesky/beamlines/i24/serial/blueapi_config.yaml,sha256=kQIOqltl-rW-iKgtWlcABQ5E_QdBW_CHt1cnfcBchpg,323
 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
@@ -27,14 +27,14 @@ mx_bluesky/beamlines/i24/serial/set_visit_directory.sh,sha256=heQWMqUHNERQurt2tR
 mx_bluesky/beamlines/i24/serial/start_blueapi.sh,sha256=4iBzQljTLXQiVIF4UO7drc9qUkP7KSRC6Mjh8hcGxpI,608
 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=upg_8uQ-DMzQckjoDSt0VjoxxayfX09WvphCTVGBNM8,19462
+mx_bluesky/beamlines/i24/serial/extruder/i24ssx_Extruder_Collect_py3v2.py,sha256=OddLUvKvKe_Sabl0uTKiAk7yB5qtnhWftZJlvepqRkk,19389
 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=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_Collect_py3v1.py,sha256=d5eG8xllmCf0wJO-tsN2vzALaahMr7igm6ap94hGqrY,25515
+mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Manager_py3v1.py,sha256=fjX_UKOfdA38u-3hhe6t7Y9c6r-HijyWqOi3kLUY3M8,33098
 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
@@ -61,20 +61,30 @@ 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=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_beamline.py,sha256=6OiZep8qrDdE_QdKqdk_BBx2FK-Dd5OUwSQ1DxL4J9U,20951
+mx_bluesky/beamlines/i24/serial/setup_beamline/setup_detector.py,sha256=zooWiRnzzBiZLE3WvHQNH3oARUSaXqEV57Cs3WU5mfI,3169
 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=BtZaTZJGSv_Je2UleDJTsy8HLiuc_C5YP4c46K3UOgo,6609
+mx_bluesky/beamlines/i24/serial/web_gui_plans/general_plans.py,sha256=BN8dSYcMgUwSqaNK4sj_BkIisb-dMHtGMUE5zmRxNm4,8881
 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/xrc_result.py,sha256=tUJ6qkDTTB6H1F71IvVAKtmHCRyHSU_tj9GRzVmnE7w,3219
+mx_bluesky/common/device_setup_plans/manipulate_sample.py,sha256=-5y2AahAU_ZhDQCFQA8Nr-Z3o7mp54pxabqoj4pqhXc,3115
 mx_bluesky/common/device_setup_plans/position_detector.py,sha256=S49ml0KNZ6wXPQqOxNJ2whKTCyRTcKdBXBhyeEyFDQQ,635
+mx_bluesky/common/device_setup_plans/robot_load_unload.py,sha256=UO2fCMk3Yfy1z4SjUd-zwWsc9lYL4LMLKi0jtCUgPso,4419
 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/utils.py,sha256=S_Us1KfLkyaRzWxmqnoVxHj2Suq-Vs0n5fMRygHgrTw,1859
 mx_bluesky/common/device_setup_plans/xbpm_feedback.py,sha256=WsUMdeOZBgbj-bFp7x66aHp2oWffQmjyp61-qmtQAmI,2153
+mx_bluesky/common/experiment_plans/__init__.py,sha256=FMA-4VN1TJCPcyURKF0qPIQ8uo8YBbtHPRdJokVF4MA,129
 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/experiment_plans/common_flyscan_xray_centre_plan.py,sha256=Zus9VDwse1iDJu_920UutWyddEtviJXt2ORYvQKIhqg,12304
+mx_bluesky/common/experiment_plans/common_grid_detect_then_xray_centre_plan.py,sha256=N9LXiKJWCOOJ_AyKJu6jMIKocvOidjTA5JOOG5xWPmw,6921
+mx_bluesky/common/experiment_plans/oav_grid_detection_plan.py,sha256=Djfqfny7Bs-PlpxJUXLDZv-n3uWnk_99YQjAvlvqm8k,6733
+mx_bluesky/common/experiment_plans/oav_snapshot_plan.py,sha256=Zvz8j9ZgK6hIYRTkSjYBr1ARLyMRixOsou_wSuR97U4,3647
+mx_bluesky/common/experiment_plans/read_hardware.py,sha256=Og7Uz8lAB1_Z6puN6ws_2kwOqCvgQMqfmyZPFZMRneY,2351
+mx_bluesky/common/experiment_plans/write_sample_status.py,sha256=pmS4Lsndp90CCIKzD_wssvbzt1qu7rEzfXgxvDwDrQ8,1313
+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=wn2Bi1icVngLQsgHzl6QBGOR5Uw6pZlZSozDlmUv6JM,4786
 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/callbacks/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -94,25 +104,21 @@ mx_bluesky/common/external_interaction/callbacks/xray_centre/ispyb_mapping.py,sh
 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=YMHENdmzzErRc4AxbpgMIGXmULrd6DmiqKfq8rP8fBc,11183
+mx_bluesky/common/external_interaction/ispyb/exp_eye_store.py,sha256=7j7ybxW1CB4WiuaTf4N2ZeeVbNNy7v5aN1KbbcW74wo,6080
+mx_bluesky/common/external_interaction/ispyb/ispyb_store.py,sha256=Q23dZOGN9VfpwN69K4A41merojNhp4VFTEDAe8G9xws,11132
 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=n97KHJJd_C59SOVJHcJ3RbNkvxkoUrF6fIJx3jXBuI0,5580
-mx_bluesky/common/external_interaction/nexus/write_nexus.py,sha256=tIz9PFFSiaUs1olbMtLGHddTLj132rEuFSWBK9rOM6Y,4087
-mx_bluesky/common/parameters/components.py,sha256=z4UD4GZF5dhn-8mMUCfX1nKfXgpricqdAVY6azNfRWM,8284
-mx_bluesky/common/parameters/constants.py,sha256=yB-yV2RH8wBueEp6dAl87_JwssKgU8vxjwNbENjbjZA,4426
+mx_bluesky/common/external_interaction/nexus/write_nexus.py,sha256=s8xT05_Fn_s64KbPOnR5cm-AooklMKRj2cXxLstl7e0,4067
+mx_bluesky/common/parameters/components.py,sha256=LKkFiGWEzU3dPHGG_M9gzNu4XUA-0nc7Q3ceRiWJFTk,8536
+mx_bluesky/common/parameters/constants.py,sha256=Aj5vRZWy2xaKQNLku1posPsgo5tLW_wqRMBJht4fBio,4467
+mx_bluesky/common/parameters/device_composites.py,sha256=aUBH8RozQb-TqNLWXFpjxETSZckPsugcDVwuJTiu8hg,2238
 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/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/__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=aB_26oowu7gvoaWWKpiBEllrvtGG-Hd6HLsE86mQgKI,2153
 mx_bluesky/common/utils/log.py,sha256=CepibF7U5GnN-ICl4bmhbEwqRzWsSFyfNtBDJejK0eo,4325
@@ -126,47 +132,45 @@ mx_bluesky/hyperion/device_setup_plans/dcm_pitch_roll_mirror_adjuster.py,sha256=
 mx_bluesky/hyperion/device_setup_plans/setup_panda.py,sha256=96eFp4acQLOthe1PA-S14uv635uGVP71DpP7qy_uo40,8509
 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/device_setup_plans/utils.py,sha256=96JlzyikMhWN7LzdiMx8URZInXoGR3OjoxYmCIp9tts,425
+mx_bluesky/hyperion/experiment_plans/__init__.py,sha256=dJjwLk0EQP-1hKhbs8aRxTF_LxUXgB7kcgDlaP-tMnk,787
+mx_bluesky/hyperion/experiment_plans/experiment_registry.py,sha256=bGp2c3nKutqHMnDxuqjp6yCF-JKykSzX-IUfxk3oVlM,1701
+mx_bluesky/hyperion/experiment_plans/hyperion_flyscan_xray_centre_plan.py,sha256=MzoJ0ts8eeHWi6lt95toZRVsEJ0I21zJ9Z6iYwr2Lps,6643
+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=G_r8NIHkvRpC8jGYPYZAtG6uVPTwzlH1P2Akd2ykP4o,6877
 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=DCD2oUx6n6VL6JaBQU779opOPxHr-UY0dQrSIW2hWus,5002
+mx_bluesky/hyperion/experiment_plans/pin_centre_then_xray_centre_plan.py,sha256=oErbq4ffTZVNR_LeiSJP8_q4cwdZWB-bdbrO3ZwKg20,5397
 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/robot_load_and_change_energy.py,sha256=AFQtQ-goN7cbMXiYaxd3-PSDKG2llnMr0dKkYdbCIB4,5942
+mx_bluesky/hyperion/experiment_plans/robot_load_then_centre_plan.py,sha256=II-4v2AOyC7QbCqLZFSq1fT1OjWSg8P5MmSQFzQI0D0,6892
+mx_bluesky/hyperion/experiment_plans/rotation_scan_plan.py,sha256=EzxvClv7Gc3izpBVOQaBskFqdpIl66vIUyjqNtaM3H4,15913
 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=Bh6vIg3edjjKmWKZj_IDFYDmGN5pC_FeCCgSFJQiUKc,9984
-mx_bluesky/hyperion/external_interaction/config_server.py,sha256=_nHoHcEXhKSFTszTu57Y5FSCP5Xogmyy8FVwYRraAy4,2146
+mx_bluesky/hyperion/external_interaction/agamemnon.py,sha256=y80qaZ43fwUdDBDkRYs7yJH1I8zXVla_7GTnRkXBOnQ,9959
+mx_bluesky/hyperion/external_interaction/config_server.py,sha256=mVBSrqFCnyW92QN1Jeiljm1QbyYH1IJE5QZwARuHu08,1592
 mx_bluesky/hyperion/external_interaction/callbacks/__init__.py,sha256=1XHaxDljMveu_DYIlk7n963gHffyC6r4C_RhF6HA-N8,283
-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/__main__.py,sha256=QS4XSLH2KEFWINzs1BweIbDO_gxSfp8tEMa6Y83mSRY,6158
+mx_bluesky/hyperion/external_interaction/callbacks/snapshot_callback.py,sha256=ee1ZIJGp8RQakMDYRfflXjSwi-UgxqdZNkZ1azBIDGQ,11705
+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=KJ1lXurzvvy7eS0W3KDXfnsWzbftsjBUxR0SS0rC0Mg,7460
+mx_bluesky/hyperion/external_interaction/callbacks/rotation/ispyb_callback.py,sha256=-0fz1Fw2zm8JXvZWkHTNRPirO2q3Ha0rb3Ug7eJ-xI4,7456
 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=zciAE1-7Ahx0B8-RNNk25hB40xBMrmrR7cK1GbEDgaM,1177
 mx_bluesky/hyperion/parameters/components.py,sha256=uXxdW6nIE1VZnh4ZXe5O-LOwsx4MbENEWfLGm2ACvsI,313
-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/constants.py,sha256=-_dCUu5uqw1iHqZ2FE_HkLeaWYHGPB-poNNiqpnfEms,1665
+mx_bluesky/hyperion/parameters/device_composites.py,sha256=wXr0VH66Qm5xT0WBBy4hmXjONrAxieP3aAFdt0rM6kY,2139
+mx_bluesky/hyperion/parameters/gridscan.py,sha256=snER6auUYTdj31Qa_sjp7zPIpXMo_lwLq7Ugn-YlG6k,3663
+mx_bluesky/hyperion/parameters/load_centre_collect.py,sha256=bT4jXBPKeOTfi3U2lECJ-bbKLkmlCz_MMydqdbCE4xI,4361
 mx_bluesky/hyperion/parameters/robot_load.py,sha256=DSOwIosO629WoXbVFokEjmgqKZz3xzv0feRQHC_ZgpI,1233
-mx_bluesky/hyperion/parameters/rotation.py,sha256=wziJtpx9bgBbNsqwVs8fVZlAOflOEoiRzSvgtmB_1b8,7462
+mx_bluesky/hyperion/parameters/rotation.py,sha256=Ws3iic17Btmleatc5PStL_N8iO41kVe2UtZ1I8F2Uz8,7546
 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=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.5.1.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+mx_bluesky-1.5.1.dist-info/METADATA,sha256=vM2XcXEYwdurLg9LtfQzf8VBzHRnmrHKKSw1rfH96UE,17392
+mx_bluesky-1.5.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mx_bluesky-1.5.1.dist-info/entry_points.txt,sha256=-hM2jXf6TAwgqnUHaEVx02j7sdB0L_WaeHW_tIRuj6o,600
+mx_bluesky-1.5.1.dist-info/top_level.txt,sha256=S4rrzXIUef58ulf_04wn01XGZ3xeJjXs4LPEJ_xoF-I,11
+mx_bluesky-1.5.1.dist-info/RECORD,,

mx_bluesky/hyperion/utils/validation.py

@@ -1,196 +0,0 @@
-import gzip
-import json
-import os
-import shutil
-from pathlib import Path
-
-import bluesky.preprocessors as bpp
-from bluesky.run_engine import RunEngine
-from dodal.beamlines import i03
-from dodal.devices.oav.oav_detector import OAVConfigBeamCentre
-from ophyd_async.testing import set_mock_value
-
-from mx_bluesky.common.plans.read_hardware import (
-    standard_read_hardware_during_collection,
-)
-from mx_bluesky.hyperion.experiment_plans.rotation_scan_plan import (
-    RotationScanComposite,
-)
-from mx_bluesky.hyperion.external_interaction.callbacks.rotation.nexus_callback import (
-    RotationNexusFileCallback,
-)
-from mx_bluesky.hyperion.parameters.constants import CONST
-from mx_bluesky.hyperion.parameters.rotation import RotationScan
-
-DISPLAY_CONFIGURATION = "tests/test_data/test_display.configuration"
-ZOOM_LEVELS_XML = "tests/test_data/test_jCameraManZoomLevels.xml"
-TEST_DATA_DIRECTORY = Path("tests/test_data/nexus_files/rotation")
-TEST_METAFILE = "ins_8_5_meta.h5.gz"
-FAKE_DATAFILE = "../fake_data.h5"
-FILENAME_STUB = "test_rotation_nexus"
-
-
-def test_params(filename_stub, dir):
-    def get_params(filename):
-        with open(filename) as f:
-            return json.loads(f.read())
-
-    params = RotationScan(
-        **get_params(
-            "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.demand_energy_ev = 12700
-    params.storage_directory = str(dir)
-    params.exposure_time_s = 0.004
-    return params
-
-
-def fake_rotation_scan(
-    parameters: RotationScan,
-    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": single_scan_parameters.model_dump_json(),
-            "activate_callbacks": "RotationNexusFileCallback",
-        }
-    )
-    def plan():
-        yield from standard_read_hardware_during_collection(
-            rotation_devices.aperture_scatterguard,
-            rotation_devices.attenuator,
-            rotation_devices.flux,
-            rotation_devices.dcm,
-            rotation_devices.eiger,
-        )
-
-    return plan()
-
-
-def fake_create_rotation_devices():
-    beamstop = i03.beamstop(connect_immediately=True, mock=True)
-    eiger = i03.eiger(connect_immediately=True, mock=True)
-    smargon = i03.smargon(connect_immediately=True, mock=True)
-    zebra = i03.zebra(connect_immediately=True, mock=True)
-    detector_motion = i03.detector_motion(connect_immediately=True, mock=True)
-    backlight = i03.backlight(mock=True)
-    attenuator = i03.attenuator(connect_immediately=True, mock=True)
-    flux = i03.flux(connect_immediately=True, mock=True)
-    undulator = i03.undulator(connect_immediately=True, mock=True)
-    aperture_scatterguard = i03.aperture_scatterguard(
-        connect_immediately=True, mock=True
-    )
-    synchrotron = i03.synchrotron(connect_immediately=True, mock=True)
-    s4_slit_gaps = i03.s4_slit_gaps(connect_immediately=True, mock=True)
-    dcm = i03.dcm(connect_immediately=True, mock=True)
-    robot = i03.robot(connect_immediately=True, mock=True)
-    oav = i03.oav(
-        connect_immediately=True,
-        mock=True,
-        params=OAVConfigBeamCentre(ZOOM_LEVELS_XML, DISPLAY_CONFIGURATION),
-    )
-    xbpm_feedback = i03.xbpm_feedback(connect_immediately=True, mock=True)
-
-    set_mock_value(smargon.omega.max_velocity, 131)
-    set_mock_value(dcm.energy_in_kev.user_readback, 12700)
-
-    return RotationScanComposite(
-        attenuator=attenuator,
-        backlight=backlight,
-        beamstop=beamstop,
-        dcm=dcm,
-        detector_motion=detector_motion,
-        eiger=eiger,
-        flux=flux,
-        smargon=smargon,
-        undulator=undulator,
-        aperture_scatterguard=aperture_scatterguard,
-        synchrotron=synchrotron,
-        s4_slit_gaps=s4_slit_gaps,
-        zebra=zebra,
-        robot=robot,
-        oav=oav,
-        sample_shutter=i03.sample_shutter(connect_immediately=True, mock=True),
-        xbpm_feedback=xbpm_feedback,
-    )
-
-
-def sim_rotation_scan_to_create_nexus(
-    test_params: RotationScan,
-    fake_create_rotation_devices: RotationScanComposite,
-    filename_stub,
-    RE,
-):
-    run_number = test_params.detector_params.run_number
-    nexus_filename = f"{filename_stub}_{run_number}.nxs"
-
-    fake_create_rotation_devices.eiger.bit_depth.sim_put(32)  # type: ignore
-
-    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)
-    return filename_stub, run_number
-
-
-def extract_metafile(input_filename, output_filename):
-    with gzip.open(input_filename) as metafile_fo:
-        with open(output_filename, "wb") as output_fo:
-            output_fo.write(metafile_fo.read())
-
-
-def _generate_fake_nexus(filename, dir=os.getcwd()):
-    RE = RunEngine({})
-    params = test_params(filename, dir)
-    run_number = params.detector_params.run_number
-    filename_stub, run_number = sim_rotation_scan_to_create_nexus(
-        params, fake_create_rotation_devices(), filename, RE
-    )
-    return filename_stub, run_number
-
-
-def generate_test_nexus():
-    filename_stub, run_number = _generate_fake_nexus(FILENAME_STUB)
-    # ugly hack because we get double free error on exit
-    with open("OUTPUT_FILENAME", "x") as f:
-        f.write(f"{filename_stub}_{run_number}.nxs")
-
-    extract_metafile(
-        str(TEST_DATA_DIRECTORY / TEST_METAFILE),
-        f"{FILENAME_STUB}_{run_number}_meta.h5",
-    )
-
-    new_hyp_data = [f"{FILENAME_STUB}_{run_number}_00000{n}.h5" for n in [1, 2, 3, 4]]
-    [shutil.copy(TEST_DATA_DIRECTORY / FAKE_DATAFILE, d) for d in new_hyp_data]
-
-    exit(0)
-
-
-def copy_test_meta_data_files():
-    extract_metafile(
-        str(TEST_DATA_DIRECTORY / TEST_METAFILE),
-        f"{TEST_DATA_DIRECTORY}/ins_8_5_meta.h5",
-    )
-    new_data = [f"{TEST_DATA_DIRECTORY}/ins_8_5_00000{n}.h5" for n in [1, 2, 3, 4]]
-    [shutil.copy(TEST_DATA_DIRECTORY / FAKE_DATAFILE, d) for d in new_data]
-
-
-if __name__ == "__main__":
-    generate_test_nexus()