Move read_hardware_for_zocalo to mx_bluesky

src/hyperion/device_setup_plans/read_hardware_for_setup.py

@@ -52,9 +52,3 @@ def read_hardware_during_collection(
  yield from bps.read(dcm.energy_in_kev)
  yield from bps.read(detector.bit_depth)
  yield from bps.save()
-
-
-def read_hardware_for_zocalo(detector: EigerDetector):
- yield from bps.create(name=CONST.DESCRIPTORS.ZOCALO_HW_READ)
- yield from bps.read(detector.odin.file_writer.id)
- yield from bps.save()

src/hyperion/experiment_plans/flyscan_xray_centre_plan.py

@@ -45,13 +45,15 @@
  get_processing_result,
 )
 from dodal.plans.check_topup import check_topup_and_wait_if_necessary
+from mx_bluesky.device_setup_plans.read_hardware_for_setup import (
+ read_hardware_for_zocalo,
+)
 from ophyd_async.panda import HDFPanda
 from scanspec.core import AxesPoints, Axis
 
 from hyperion.device_setup_plans.manipulate_sample import move_x_y_z
 from hyperion.device_setup_plans.read_hardware_for_setup import (
  read_hardware_during_collection,
- read_hardware_for_zocalo,
  read_hardware_pre_collection,
 )
 from hyperion.device_setup_plans.setup_panda import (

src/hyperion/experiment_plans/rotation_scan_plan.py

@@ -21,6 +21,9 @@
 from dodal.devices.undulator import Undulator
 from dodal.devices.zebra import RotationDirection, Zebra
 from dodal.plans.check_topup import check_topup_and_wait_if_necessary
+from mx_bluesky.device_setup_plans.read_hardware_for_setup import (
+ read_hardware_for_zocalo,
+)
 
 from hyperion.device_setup_plans.manipulate_sample import (
  begin_sample_environment_setup,
@@ -31,7 +34,6 @@
 )
 from hyperion.device_setup_plans.read_hardware_for_setup import (
  read_hardware_during_collection,
- read_hardware_for_zocalo,
  read_hardware_pre_collection,
 )
 from hyperion.device_setup_plans.setup_zebra import (

tests/unit_tests/external_interaction/callbacks/test_rotation_callbacks.py

@@ -11,13 +11,15 @@
 from dodal.devices.eiger import EigerDetector
 from dodal.devices.flux import Flux
 from event_model import RunStart
+from mx_bluesky.device_setup_plans.read_hardware_for_setup import (
+ read_hardware_for_zocalo,
+)
 from mx_bluesky.parameters import IspybExperimentType
 from ophyd.sim import make_fake_device
 from ophyd_async.core import DeviceCollector, set_mock_value
 
 from hyperion.device_setup_plans.read_hardware_for_setup import (
  read_hardware_during_collection,
- read_hardware_for_zocalo,
 )
 from hyperion.external_interaction.callbacks.common.callback_util import (
  create_rotation_callbacks,