update for changes to dodal

DiamondLightSource · Aug 13, 2024 · ef860fd · ef860fd
1 parent 23f0c76
commit ef860fd
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/setup.cfg b/setup.cfg
@@ -40,7 +40,7 @@ install_requires =
  ophyd-async >= 0.3a5
  bluesky >= 1.13.0a4
  blueapi >= 0.4.3-rc1
- dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@df5be3093ad0fef65e11670eb3b528d562d9798e
+ dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@be6e51593e78613e68292fd4af630d138ffbbb01
 
 [options.entry_points]
 console_scripts =

diff --git a/src/hyperion/device_setup_plans/position_detector.py b/src/hyperion/device_setup_plans/position_detector.py
@@ -13,4 +13,4 @@ def set_detector_z_position(
 
 def set_shutter(detector_motion: DetectorMotion, state: ShutterState, group=None):
  LOGGER.info(f"Setting shutter to {state} ({group})")
- yield from bps.abs_set(detector_motion.shutter, int(state), group=group)
+ yield from bps.abs_set(detector_motion.shutter, state, group=group)
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -312,7 +312,7 @@ def fast_grid_scan():
 
 
 @pytest.fixture
-def detector_motion():
+def detector_motion(RE):
  det = i03.detector_motion(fake_with_ophyd_sim=True)
  with patch_async_motor(det.z):
  yield det

diff --git a/tests/unit_tests/experiment_plans/test_pin_centre_then_xray_centre_plan.py b/tests/unit_tests/experiment_plans/test_pin_centre_then_xray_centre_plan.py
@@ -135,7 +135,7 @@ def add_handlers_to_simulate_detector_motion(msg: Msg):
  assert messages[0].args[0] == 100
  assert messages[0].kwargs["group"] == CONST.WAIT.GRID_READY_FOR_DC
  assert messages[1].obj is simple_beamline.detector_motion.shutter
- assert messages[1].args[0] == 1
+ assert messages[1].args[0] == ShutterState.OPEN
  assert messages[1].kwargs["group"] == CONST.WAIT.GRID_READY_FOR_DC
  messages = assert_message_and_return_remaining(
  messages[2:],