mx-bluesky 1.4.3__py3-none-any.whl → 1.4.5__py3-none-any.whl

mx_bluesky/hyperion/utils/validation.py

@@ -79,27 +79,30 @@ def fake_rotation_scan(
 
 
 def fake_create_rotation_devices():
-    beamstop = i03.beamstop(fake_with_ophyd_sim=True)
-    eiger = i03.eiger(fake_with_ophyd_sim=True)
-    smargon = i03.smargon(fake_with_ophyd_sim=True)
-    zebra = i03.zebra(fake_with_ophyd_sim=True)
-    detector_motion = i03.detector_motion(fake_with_ophyd_sim=True)
-    backlight = i03.backlight(fake_with_ophyd_sim=True)
-    attenuator = i03.attenuator(fake_with_ophyd_sim=True)
-    flux = i03.flux(fake_with_ophyd_sim=True)
-    undulator = i03.undulator(fake_with_ophyd_sim=True)
-    aperture_scatterguard = i03.aperture_scatterguard(fake_with_ophyd_sim=True)
-    synchrotron = i03.synchrotron(fake_with_ophyd_sim=True)
-    s4_slit_gaps = i03.s4_slit_gaps(fake_with_ophyd_sim=True)
-    dcm = i03.dcm(fake_with_ophyd_sim=True)
-    robot = i03.robot(fake_with_ophyd_sim=True)
+    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(
-        fake_with_ophyd_sim=True,
+        connect_immediately=True,
+        mock=True,
         params=OAVConfig(
             zoom_params_file=ZOOM_LEVELS_XML, display_config_file=DISPLAY_CONFIGURATION
         ),
     )
-    xbpm_feedback = i03.xbpm_feedback(fake_with_ophyd_sim=True)
+    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)
@@ -120,7 +123,7 @@ def fake_create_rotation_devices():
         zebra=zebra,
         robot=robot,
         oav=oav,
-        sample_shutter=i03.sample_shutter(fake_with_ophyd_sim=True),
+        sample_shutter=i03.sample_shutter(connect_immediately=True, mock=True),
         xbpm_feedback=xbpm_feedback,
     )
 

{mx_bluesky-1.4.3.dist-info → mx_bluesky-1.4.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mx-bluesky
-Version: 1.4.3
+Version: 1.4.5
 Summary: Bluesky tools for MX Beamlines at DLS
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
 License:                                  Apache License
@@ -237,9 +237,9 @@ Requires-Dist: matplotlib
 Requires-Dist: blueapi>=0.5.0
 Requires-Dist: daq-config-server>=0.1.1
 Requires-Dist: ophyd==1.9.0
-Requires-Dist: ophyd-async>=0.8a5
+Requires-Dist: ophyd-async>=0.9.0a2
 Requires-Dist: bluesky>=1.13
-Requires-Dist: dls-dodal==1.38.0
+Requires-Dist: dls-dodal==1.40.0
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: build; extra == "dev"

{mx_bluesky-1.4.3.dist-info → mx_bluesky-1.4.5.dist-info}/RECORD

@@ -1,6 +1,7 @@
 mx_bluesky/__init__.py,sha256=Ksms_WJF8LTkbm38gEpm1jBpGqcQ8NGvmb2ZJlOE1j8,198
 mx_bluesky/__main__.py,sha256=RVqPnxDisFMIn_aoEi0drlThNHgKTJULnSrotouIKI0,480
-mx_bluesky/_version.py,sha256=cUUlK35wR7qLNaS4SMOrkRP_HG0nSHq0YEIezhPHr3c,411
+mx_bluesky/_version.py,sha256=HhvBOPJ1g3k0gtuZ-SLO8_784kPPejMh80IxITX8Cvc,411
+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/i04/__init__.py,sha256=jZjAMN5_oOEjQoR3iTrnMFW3ElxlHhQ7pEQZIv21Y4I,129
@@ -29,7 +30,7 @@ mx_bluesky/beamlines/i24/serial/fixed_target/ft_utils.py,sha256=puO1vg0x-TPgv8Fb
 mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Collect_py3v1.py,sha256=NgeorAKdXxYDFEkcy4jAq2CFNdqDT--TWSul4bsGkw4,26154
 mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Manager_py3v1.py,sha256=DbdkQkZFkhGDzi_Xcu1YB2LqHzsQyf-RubphIDbQe4k,33196
 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=qciUnif6yd5KwJ8_XvRgafHJOFnzJIMg5Bwfjp0VOzw,6418
+mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_moveonclick.py,sha256=0stnY1NJj2O8h-0dD_hg8phdPcBex2kY3LZdnyUMLg4,6466
 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
@@ -54,11 +55,12 @@ 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=aYgIKeBck2wliQyLq-uukuPiyN7WTkNutLAM6ys3WuM,15623
 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=25kO1JXPl3OVSUf1G4RdcM6ZXbfduskEaDIbZN2xIE8,20595
+mx_bluesky/beamlines/i24/serial/setup_beamline/setup_beamline.py,sha256=S5m6QI6zQcOeGH1JmHzF5-3JuwTikaBcTOCe7qDqwaM,20643
 mx_bluesky/beamlines/i24/serial/setup_beamline/setup_detector.py,sha256=riBXkgAg3lV6dqoCng_3IF8ZfhwvOHf0zqktJC0rfn0,3241
 mx_bluesky/beamlines/i24/serial/setup_beamline/setup_zebra_plans.py,sha256=2e0pWs_ZrGDzp-tnfSE9XdurFH1K9rvh_1-bNY3U0yA,18078
 mx_bluesky/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/common/device_setup_plans/read_hardware_for_setup.py,sha256=P018shGBEdO0QWBufwITOk3p-sPUCy4P6UIkf6aUuho,583
+mx_bluesky/common/device_setup_plans/setup_panda.py,sha256=OF-ZygZyAyQEUdrAWiIxWZ6QhAsVx4Mm9ngRYB1mzKI,433
 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
@@ -71,9 +73,9 @@ mx_bluesky/common/external_interaction/callbacks/common/ispyb_mapping.py,sha256=
 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=7UtkXZluAag_Mx_JnESd7ODPSN3WrcNCgN8mquIpxjE,4086
-mx_bluesky/common/external_interaction/callbacks/common/zocalo_callback.py,sha256=fF17sDt58h3ZbgxQr5P4jzLM1149iEDw8XsF2yiOd6Q,4085
+mx_bluesky/common/external_interaction/callbacks/common/zocalo_callback.py,sha256=RubHJ6wjImsweISHZCG1rI2xcN-49HxmVcwDIaLR6Lc,3728
 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=sHtc45hKAmxjZRlm4jKwqqoo1AiwgueO74p99Qv7vRU,11835
+mx_bluesky/common/external_interaction/callbacks/xray_centre/ispyb_callback.py,sha256=-56cvCr0KyXTYqTjb-Ghg_D_XfqqTBEBvCM27p1WeqI,12072
 mx_bluesky/common/external_interaction/callbacks/xray_centre/ispyb_mapping.py,sha256=dQicTEZ0qvUTkcRnegc4eHBTdQ0EaxdewJCvaZKlftw,1818
 mx_bluesky/common/external_interaction/callbacks/xray_centre/nexus_callback.py,sha256=g9ovYSnb6-bB4RqG1KKuzpAArK-d80DPYTKZ6rDzQOQ,4687
 mx_bluesky/common/external_interaction/ispyb/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -84,17 +86,17 @@ mx_bluesky/common/external_interaction/ispyb/ispyb_utils.py,sha256=Kv0JQVaT8z9Qz
 mx_bluesky/common/external_interaction/nexus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/common/external_interaction/nexus/nexus_utils.py,sha256=CCKQeDBEmXZvCwBy1-o5hQ6CDdwsnuAwlIK_uq0I26Y,5587
 mx_bluesky/common/external_interaction/nexus/write_nexus.py,sha256=tIz9PFFSiaUs1olbMtLGHddTLj132rEuFSWBK9rOM6Y,4087
-mx_bluesky/common/parameters/components.py,sha256=xbk5IPQfuhd5CW9XcwdUvhogkaTGHwj9YLphlXMBSKY,7337
-mx_bluesky/common/parameters/constants.py,sha256=lO8N8XSwE9-lr4r-Q-N7dGd11pZDAQRZHlotqPi8T70,4045
-mx_bluesky/common/parameters/gridscan.py,sha256=FQgrC8INTZ_XI6M-8q77lOig6Y7O0-sLCX2EyLSpOLQ,5462
+mx_bluesky/common/parameters/components.py,sha256=Ru76EFT2wG4oPeJge6lVwq1vCHYd7T0EFuqp13EoJk4,7299
+mx_bluesky/common/parameters/constants.py,sha256=gAp7G9gCNiF_6yZOjDXgE5lJKkWO5quFKpVCww3t00A,4655
+mx_bluesky/common/parameters/gridscan.py,sha256=pm0SAVfRs15XEUCvSTY3wu-JG5cx8yyaPuZxobudO1I,5556
 mx_bluesky/common/plans/__init__.py,sha256=FMA-4VN1TJCPcyURKF0qPIQ8uo8YBbtHPRdJokVF4MA,129
-mx_bluesky/common/plans/do_fgs.py,sha256=mCQ6cPwU5PbFtvZr1lDJafjXKQkG2eKEo0pydqp3P0M,5095
-mx_bluesky/common/utils/exceptions.py,sha256=xz82au833TDI1wMu738l81kBFlXBTVB4-360N-05e84,2063
+mx_bluesky/common/plans/do_fgs.py,sha256=oPCV6uXPPRX-oM-jxODi1-x0jMK3ayw328DDLqy-ekc,4807
+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/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=-bzpCpTYXCIY8ZLNsXtNd9zLpQEF-Q8WMUvyNOHQP0k,13780
+mx_bluesky/hyperion/__main__.py,sha256=BAvJfLQRlx3G6pSR35IXymR0va6ZAPGHiDcXZjAL4pw,12158
 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
@@ -102,33 +104,31 @@ mx_bluesky/hyperion/device_setup_plans/manipulate_sample.py,sha256=fuNRH8slknuZ0
 mx_bluesky/hyperion/device_setup_plans/position_detector.py,sha256=S49ml0KNZ6wXPQqOxNJ2whKTCyRTcKdBXBhyeEyFDQQ,635
 mx_bluesky/hyperion/device_setup_plans/read_hardware_for_setup.py,sha256=kcnUmbQAyNZvixXtQDW40m3pORJgvSo0q1OHM-uO-iM,2225
 mx_bluesky/hyperion/device_setup_plans/setup_oav.py,sha256=pIXLM3FKpf7wYMEiEAOaGTm504XAt5N7nuuu9kKraBk,2914
-mx_bluesky/hyperion/device_setup_plans/setup_panda.py,sha256=bfFQG4PNE9hhjYgUykB-Ps5K1VzDQAK0YwRYC6BpkT8,8292
+mx_bluesky/hyperion/device_setup_plans/setup_panda.py,sha256=GPa42uf4P8B41s_K2mjZfOT0SdaNTjABsoQK3wrz5pc,8383
 mx_bluesky/hyperion/device_setup_plans/setup_zebra.py,sha256=-aHDVgyX1oHOV_nwC3AetIvZ2VnpZcCJI4V5n3Xzj70,10317
 mx_bluesky/hyperion/device_setup_plans/smargon.py,sha256=Tsl-wsExNopwCAEUtUgZyDUos4uhOwJ9SJ2WJRawflg,1209
 mx_bluesky/hyperion/device_setup_plans/utils.py,sha256=CAsJXGmL_Gq6HsvPJ8mdQ7r2lAHf2SF72-LEqHr4-JM,2146
-mx_bluesky/hyperion/device_setup_plans/xbpm_feedback.py,sha256=JgOqnPnG-zXrek1w_M_oEQPc1IET3nHeeeVDZhPXIAk,4058
+mx_bluesky/hyperion/device_setup_plans/xbpm_feedback.py,sha256=-hlO_SdlMcZ2Eabe9S1FNoMvMy2kgHTM93Ep0IiYySY,4567
 mx_bluesky/hyperion/experiment_plans/__init__.py,sha256=3ldTMxgz4yKHJH9iF3nw7uueyX2zQ5Z84V0dsCzW5us,1081
 mx_bluesky/hyperion/experiment_plans/change_aperture_then_move_plan.py,sha256=U-KOA8o5DLeViIVsFkYhUvDmzxUBMXFqXWzzcdljdd4,3690
-mx_bluesky/hyperion/experiment_plans/experiment_registry.py,sha256=Y8MKAxsJ_hax_5Q4UzkN0SAPuXaRgMlSCPu8OZxgjNE,3090
-mx_bluesky/hyperion/experiment_plans/flyscan_xray_centre_plan.py,sha256=ngz3HzwA8_eZK_ovy2xplem_iwV1ifFQbpjFi2eyTuk,19120
-mx_bluesky/hyperion/experiment_plans/grid_detect_then_xray_centre_plan.py,sha256=jlrSEtCkeYLQ1Sf32Gby0fdJyETyU1l4uhMOMMfA148,8218
-mx_bluesky/hyperion/experiment_plans/load_centre_collect_full_plan.py,sha256=Yn3lOcy6pLO-GSoBMU5QzqiMzyBTG7LIDPF8DppiKUM,4117
+mx_bluesky/hyperion/experiment_plans/experiment_registry.py,sha256=25uwWsMnJrwKYPgbAQpJ119lmCK_GdbYHcsf_7LSdR8,2376
+mx_bluesky/hyperion/experiment_plans/flyscan_xray_centre_plan.py,sha256=CyqOruGGf1Vv1SB_GXUdwYdsUxzwwr9K2TIh_9OYsLw,19196
+mx_bluesky/hyperion/experiment_plans/grid_detect_then_xray_centre_plan.py,sha256=5hzMqsT3-qBMK7Mu5D-MRZ1HAdRDPNIOW6PdIqcYEK0,8517
+mx_bluesky/hyperion/experiment_plans/load_centre_collect_full_plan.py,sha256=-PhQCaX5qoID4-osESna81iNJQPagIMFfbJ_cUwaWxY,4610
 mx_bluesky/hyperion/experiment_plans/oav_grid_detection_plan.py,sha256=IP8usGFtY7XCdxZ2RZ63EkYWYjZPpYykjhmF1u27L9g,7652
-mx_bluesky/hyperion/experiment_plans/oav_snapshot_plan.py,sha256=TfhZjnc_j6sqM7eeAkVNc8KG0O2L-CDjO0xoZWGeCA4,3126
+mx_bluesky/hyperion/experiment_plans/oav_snapshot_plan.py,sha256=NHm9GnZZaUSU3VqYSnZvGqYk2PPKp8fDY4dNfTELTCA,3031
 mx_bluesky/hyperion/experiment_plans/optimise_attenuation_plan.py,sha256=l-bZdKLCd3dyPJP5RUHSm82lGosPX9kI1vJ2FDVPU8o,16197
 mx_bluesky/hyperion/experiment_plans/pin_centre_then_xray_centre_plan.py,sha256=u6Cc5DU4XYJxmYNdvMw9cWIMWf3ayCt4GUNBnIJfC68,5050
 mx_bluesky/hyperion/experiment_plans/pin_tip_centring_plan.py,sha256=UsZ07G8ac4SXyv9LfH7L9BSnRuO7E1tl_M15meDR5d4,6174
-mx_bluesky/hyperion/experiment_plans/robot_load_and_change_energy.py,sha256=kHymdtXkxm4b6KNEBTG7pNThTg70OQYG8AkCyymmCNs,8768
+mx_bluesky/hyperion/experiment_plans/robot_load_and_change_energy.py,sha256=9XZsV87WNSPd4EgMm6nWjef-MvHP0uF1TuAuMo3yOwk,8549
 mx_bluesky/hyperion/experiment_plans/robot_load_then_centre_plan.py,sha256=NoaNddQZ_XV6hOdAFLRNqrmppKxLTjhDXZHx3Lajcmo,7787
-mx_bluesky/hyperion/experiment_plans/rotation_scan_plan.py,sha256=JA-6dmB7uhRi7OwgP0GspXiNZK2oo_HmHv4MKoaDLIg,16891
-mx_bluesky/hyperion/experiment_plans/set_energy_plan.py,sha256=m46cVAkGHPQg7gXoTKJB3AGe4nAF-RL24yHLCWmz9S0,1858
+mx_bluesky/hyperion/experiment_plans/rotation_scan_plan.py,sha256=_mgzeGyiQM1UfYEyW2nv8uZUa6eTccCuPGxuISBqBuA,17109
+mx_bluesky/hyperion/experiment_plans/set_energy_plan.py,sha256=D-4p4eMK_jGqAvAZICMkhyieBn7YIZTQZLg_7of9gwc,1938
 mx_bluesky/hyperion/experiment_plans/common/xrc_result.py,sha256=dZRv4chwnLvg9Z96hFHwcPO-h0L3OgoganYLQptGHoI,1806
 mx_bluesky/hyperion/external_interaction/__init__.py,sha256=95DwXDmKsx36RgAL-AtLZl2LQoLPKbzeYdlkkP_4Coc,559
-mx_bluesky/hyperion/external_interaction/config_server.py,sha256=LWKWxJIEo9QliggwAU8LWVzPQTHXx5bc0KI07Ve6eGE,1311
+mx_bluesky/hyperion/external_interaction/config_server.py,sha256=JE9koBfT-yaS82XEOKb7CMyZcNG3S5TXiSYwFWjU4VU,1825
 mx_bluesky/hyperion/external_interaction/callbacks/__init__.py,sha256=1XHaxDljMveu_DYIlk7n963gHffyC6r4C_RhF6HA-N8,283
-mx_bluesky/hyperion/external_interaction/callbacks/__main__.py,sha256=E3sECBq67EMwc3Q_BE8QSKB8wBp812M7GLTwE7NDsgU,5368
-mx_bluesky/hyperion/external_interaction/callbacks/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mx_bluesky/hyperion/external_interaction/callbacks/common/callback_util.py,sha256=OZ19hLtgc20qJFqG9opWLctMFFWWZcciHu5smS3xgXQ,2639
+mx_bluesky/hyperion/external_interaction/callbacks/__main__.py,sha256=6u-jcwGbZmPY994iu30mnnpoVUMN-fE0CRxsgxhdceI,5849
 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=XtVjUdipYNqgooovgjvQeSKLlodzOgs7_kjb3wNBh9s,7465
@@ -137,19 +137,19 @@ mx_bluesky/hyperion/external_interaction/callbacks/rotation/nexus_callback.py,sh
 mx_bluesky/hyperion/external_interaction/callbacks/sample_handling/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/hyperion/external_interaction/callbacks/sample_handling/sample_handling_callback.py,sha256=IyWawfc0arWXYIzq5CuRwagqlJ36yMA1riM5dw0r9Ig,2117
 mx_bluesky/hyperion/parameters/__init__.py,sha256=kf2wfcILBUBpT0tJ8-W39BywQUkn67yxl9IVsfrr1LE,115
-mx_bluesky/hyperion/parameters/cli.py,sha256=FGzvEB76YnQvBydUMPUNHJuqxvEe7Zc627w7gA2KODY,2125
+mx_bluesky/hyperion/parameters/cli.py,sha256=tw8u-_THJ69_Rn8IzeEWjwfUJO8VsTKKqz9K0iZHls0,1796
 mx_bluesky/hyperion/parameters/components.py,sha256=uXxdW6nIE1VZnh4ZXe5O-LOwsx4MbENEWfLGm2ACvsI,313
-mx_bluesky/hyperion/parameters/constants.py,sha256=RVrA1m39HdW5Sm1SR5Sm41YeSPG7GWcfhEomzcBnDhk,1832
-mx_bluesky/hyperion/parameters/gridscan.py,sha256=BTDFKOy0n_lHLTBsFGlgLqCzPvZdt9F85cJDg5IRkKg,6092
+mx_bluesky/hyperion/parameters/constants.py,sha256=9divI1XYUDsGq3HGm2ehq1yGGOD7tUf66xWvhVxEpB0,1982
+mx_bluesky/hyperion/parameters/gridscan.py,sha256=kj4olzsOOcZCBHf5bQUU47VtkkS2QTpy5LrFBQHXF_E,6014
 mx_bluesky/hyperion/parameters/load_centre_collect.py,sha256=khLBCSeafuw0dNrvDTvKv4GrlBo1LXJZ87NTI1A92jw,3693
 mx_bluesky/hyperion/parameters/robot_load.py,sha256=DSOwIosO629WoXbVFokEjmgqKZz3xzv0feRQHC_ZgpI,1233
 mx_bluesky/hyperion/parameters/rotation.py,sha256=270m55MCYBFEK2LM5DjVqhnMJC1JupMMX-O4UulBSMc,7518
-mx_bluesky/hyperion/resources/panda/panda-gridscan.yaml,sha256=xrhgok-9X2VXdyLEWiYOUEeRCBqhYM6IJFAefnNdgzw,26521
+mx_bluesky/hyperion/resources/panda/panda-gridscan.yaml,sha256=mhLBJTSjHCkM9F6mjtqbhNmmrV8qSctbCUfhb0q7pYo,28085
 mx_bluesky/hyperion/utils/context.py,sha256=vy8D9Ygzdpu6k4teespzc_GL7MLb3AtK5vZkAZkT9UE,2714
-mx_bluesky/hyperion/utils/validation.py,sha256=kBxqr-Ue_iv4zGpU3rfNdG0UACXgbQdHAVZssryEqDI,6567
-mx_bluesky-1.4.3.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-mx_bluesky-1.4.3.dist-info/METADATA,sha256=koPaf0l5CIOp-WwXKPrCZKAjT9twvrmq4bPGtFFHfUU,17262
-mx_bluesky-1.4.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-mx_bluesky-1.4.3.dist-info/entry_points.txt,sha256=Bt3iHCqzZtHYnnSKoh_qM2k3K4LbK1Uxr0gF8B34F98,528
-mx_bluesky-1.4.3.dist-info/top_level.txt,sha256=S4rrzXIUef58ulf_04wn01XGZ3xeJjXs4LPEJ_xoF-I,11
-mx_bluesky-1.4.3.dist-info/RECORD,,
+mx_bluesky/hyperion/utils/validation.py,sha256=xeaGnQu-JezRaKK1Zxp1T4dg54UrMvrA7x-8CwZiaGM,6750
+mx_bluesky-1.4.5.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+mx_bluesky-1.4.5.dist-info/METADATA,sha256=_heM89dewd3Jy-0I3f-1u0dENriISc5_M6ok5k9cxAc,17264
+mx_bluesky-1.4.5.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+mx_bluesky-1.4.5.dist-info/entry_points.txt,sha256=Bt3iHCqzZtHYnnSKoh_qM2k3K4LbK1Uxr0gF8B34F98,528
+mx_bluesky-1.4.5.dist-info/top_level.txt,sha256=S4rrzXIUef58ulf_04wn01XGZ3xeJjXs4LPEJ_xoF-I,11
+mx_bluesky-1.4.5.dist-info/RECORD,,

mx_bluesky/hyperion/external_interaction/callbacks/common/callback_util.py

@@ -1,80 +0,0 @@
-from collections.abc import Callable
-
-from bluesky.callbacks import CallbackBase
-
-from mx_bluesky.common.external_interaction.callbacks.common.zocalo_callback import (
-    ZocaloCallback,
-)
-from mx_bluesky.common.external_interaction.callbacks.xray_centre.ispyb_callback import (
-    GridscanISPyBCallback,
-)
-from mx_bluesky.common.external_interaction.callbacks.xray_centre.nexus_callback import (
-    GridscanNexusFileCallback,
-)
-from mx_bluesky.hyperion.external_interaction.callbacks.robot_load.ispyb_callback import (
-    RobotLoadISPyBCallback,
-)
-from mx_bluesky.hyperion.external_interaction.callbacks.rotation.ispyb_callback import (
-    RotationISPyBCallback,
-)
-from mx_bluesky.hyperion.external_interaction.callbacks.rotation.nexus_callback import (
-    RotationNexusFileCallback,
-)
-from mx_bluesky.hyperion.external_interaction.callbacks.sample_handling.sample_handling_callback import (
-    SampleHandlingCallback,
-)
-from mx_bluesky.hyperion.parameters.gridscan import (
-    GridCommonWithHyperionDetectorParams,
-    HyperionSpecifiedThreeDGridScan,
-)
-
-CallbacksFactory = Callable[[], tuple[CallbackBase, ...]]
-
-
-def create_robot_load_and_centre_callbacks() -> tuple[
-    GridscanNexusFileCallback, GridscanISPyBCallback, RobotLoadISPyBCallback
-]:
-    return (
-        GridscanNexusFileCallback(param_type=HyperionSpecifiedThreeDGridScan),
-        GridscanISPyBCallback(
-            param_type=GridCommonWithHyperionDetectorParams, emit=ZocaloCallback()
-        ),
-        RobotLoadISPyBCallback(),
-    )
-
-
-def create_gridscan_callbacks() -> tuple[
-    GridscanNexusFileCallback, GridscanISPyBCallback
-]:
-    return (
-        GridscanNexusFileCallback(param_type=HyperionSpecifiedThreeDGridScan),
-        GridscanISPyBCallback(
-            param_type=GridCommonWithHyperionDetectorParams, emit=ZocaloCallback()
-        ),
-    )
-
-
-def create_rotation_callbacks() -> tuple[
-    RotationNexusFileCallback, RotationISPyBCallback
-]:
-    return (RotationNexusFileCallback(), RotationISPyBCallback(emit=ZocaloCallback()))
-
-
-def create_load_centre_collect_callbacks() -> tuple[
-    GridscanNexusFileCallback,
-    GridscanISPyBCallback,
-    RobotLoadISPyBCallback,
-    RotationNexusFileCallback,
-    RotationISPyBCallback,
-    SampleHandlingCallback,
-]:
-    return (
-        GridscanNexusFileCallback(param_type=HyperionSpecifiedThreeDGridScan),
-        GridscanISPyBCallback(
-            param_type=GridCommonWithHyperionDetectorParams, emit=ZocaloCallback()
-        ),
-        RobotLoadISPyBCallback(),
-        RotationNexusFileCallback(),
-        RotationISPyBCallback(emit=ZocaloCallback()),
-        SampleHandlingCallback(),
-    )