Update hyperion to move just the aperture_scatterguard axes required

setup.cfg

@@ -41,7 +41,7 @@ install_requires =
     bluesky >= 1.13.0a4
     blueapi >= 0.4.3-rc1
     mx-bluesky @ git+https://github.com/DiamondLightSource/mx-bluesky.git
-    dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git
+    dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@5d7ed608fa66d8937c62662633a309f1b345834d
 
 [options.entry_points]
 console_scripts =

src/hyperion/device_setup_plans/manipulate_sample.py

@@ -2,6 +2,7 @@
 
 import bluesky.plan_stubs as bps
 from dodal.devices.aperturescatterguard import (
+    ApertureInOut,
     AperturePositionGDANames,
     ApertureScatterguard,
 )
@@ -61,7 +62,7 @@ def move_aperture_if_required(
         LOGGER.info(f"Setting aperture position to {aperture_position}")
         yield from bps.abs_set(
             aperture_scatterguard,
-            aperture_position,
+            (ApertureInOut.IN, aperture_position),
             group=group,
         )
 

src/hyperion/experiment_plans/flyscan_xray_centre_plan.py

@@ -12,6 +12,7 @@
 from attr import dataclass
 from blueapi.core import BlueskyContext, MsgGenerator
 from dodal.devices.aperturescatterguard import (
+    ApertureInOut,
     AperturePosition,
     ApertureScatterguard,
 )
@@ -383,7 +384,9 @@ def set_aperture_for_bbox_size(
         }
     )
     def set_aperture():
-        yield from bps.abs_set(aperture_device, new_selected_aperture)
+        yield from bps.abs_set(
+            aperture_device, (ApertureInOut.IN, new_selected_aperture)
+        )
 
     yield from set_aperture()
 

src/hyperion/experiment_plans/oav_snapshot_plan.py

@@ -3,7 +3,10 @@
 
 from blueapi.core import MsgGenerator
 from bluesky import plan_stubs as bps
-from dodal.devices.aperturescatterguard import AperturePosition, ApertureScatterguard
+from dodal.devices.aperturescatterguard import (
+    ApertureInOut,
+    ApertureScatterguard,
+)
 from dodal.devices.backlight import Backlight, BacklightPosition
 from dodal.devices.oav.oav_detector import OAV
 from dodal.devices.oav.oav_parameters import OAVParameters
@@ -41,7 +44,7 @@ def setup_oav_snapshot_plan(
     )
     yield from bps.abs_set(
         composite.aperture_scatterguard,
-        AperturePosition.ROBOT_LOAD,
+        (ApertureInOut.OUT, None),
         group=OAV_SNAPSHOT_SETUP_GROUP,
     )
 

src/hyperion/experiment_plans/robot_load_then_centre_plan.py

@@ -8,7 +8,7 @@
 import bluesky.plan_stubs as bps
 import bluesky.preprocessors as bpp
 from blueapi.core import BlueskyContext, MsgGenerator
-from dodal.devices.aperturescatterguard import AperturePosition, ApertureScatterguard
+from dodal.devices.aperturescatterguard import ApertureInOut, ApertureScatterguard
 from dodal.devices.attenuator import Attenuator
 from dodal.devices.backlight import Backlight
 from dodal.devices.dcm import DCM
@@ -130,7 +130,7 @@ def take_robot_snapshots(oav: OAV, webcam: Webcam, directory: Path):
 def prepare_for_robot_load(composite: RobotLoadThenCentreComposite):
     yield from bps.abs_set(
         composite.aperture_scatterguard,
-        AperturePosition.ROBOT_LOAD,
+        (ApertureInOut.OUT, None),
         group="prepare_robot_load",
     )
 

tests/unit_tests/device_setup_plans/test_manipulate_sample.py

@@ -2,6 +2,7 @@
 
 from bluesky.run_engine import RunEngine
 from dodal.devices.aperturescatterguard import (
+    ApertureInOut,
     AperturePosition,
     AperturePositionGDANames,
     ApertureScatterguard,
@@ -19,9 +20,7 @@ async def test_move_aperture_goes_to_correct_position(
                 aperture_scatterguard, AperturePositionGDANames.LARGE_APERTURE
             )
         )
-        mock_set.assert_called_once_with(
-            AperturePosition.LARGE,
-        )
+        mock_set.assert_called_once_with((ApertureInOut.IN, AperturePosition.LARGE))
 
 
 async def test_move_aperture_does_nothing_when_none_selected(

tests/unit_tests/experiment_plans/test_grid_detect_then_xray_centre_plan.py

@@ -7,7 +7,7 @@
 from bluesky.run_engine import RunEngine
 from bluesky.simulators import RunEngineSimulator, assert_message_and_return_remaining
 from dodal.beamlines import i03
-from dodal.devices.aperturescatterguard import AperturePosition
+from dodal.devices.aperturescatterguard import ApertureInOut, AperturePosition
 from dodal.devices.backlight import BacklightPosition
 from dodal.devices.eiger import EigerDetector
 from dodal.devices.oav.oav_detector import OAVConfigParams
@@ -150,7 +150,9 @@ async def test_detect_grid_and_do_gridscan(
         )
 
         # Check aperture was changed to SMALL
-        mock_aperture_scatterguard.assert_called_once_with(AperturePosition.SMALL)
+        mock_aperture_scatterguard.assert_called_once_with(
+            (ApertureInOut.IN, AperturePosition.SMALL)
+        )
 
         # Check we called out to underlying fast grid scan plan
         mock_flyscan_xray_centre_plan.assert_called_once_with(ANY, ANY)

tests/unit_tests/experiment_plans/test_rotation_scan_plan.py

@@ -7,7 +7,11 @@
 import pytest
 from bluesky.run_engine import RunEngine
 from bluesky.simulators import RunEngineSimulator, assert_message_and_return_remaining
-from dodal.devices.aperturescatterguard import AperturePosition, ApertureScatterguard
+from dodal.devices.aperturescatterguard import (
+    ApertureInOut,
+    AperturePosition,
+    ApertureScatterguard,
+)
 from dodal.devices.backlight import BacklightPosition
 from dodal.devices.oav.oav_parameters import OAVParameters
 from dodal.devices.smargon import Smargon
@@ -422,7 +426,7 @@ def test_rotation_scan_moves_aperture_in_backlight_out_after_snapshots_before_ro
         msgs,
         lambda msg: msg.command == "set"
         and msg.obj.name == "aperture_scatterguard"
-        and msg.args[0] == AperturePosition.SMALL
+        and msg.args[0] == (ApertureInOut.IN, AperturePosition.SMALL)
         and msg.kwargs["group"] == "setup_senv",
     )
     msgs = assert_message_and_return_remaining(
@@ -509,7 +513,7 @@ def test_rotation_snapshot_setup_called_to_move_backlight_in_aperture_out_before
         msgs,
         lambda msg: msg.command == "set"
         and msg.obj.name == "aperture_scatterguard"
-        and msg.args[0] == AperturePosition.ROBOT_LOAD
+        and msg.args[0] == (ApertureInOut.OUT, None)
         and msg.kwargs["group"] == OAV_SNAPSHOT_SETUP_GROUP,
     )
     msgs = assert_message_and_return_remaining(

tests/unit_tests/experiment_plans/test_wait_for_robot_load_then_centre.py

@@ -6,7 +6,7 @@
 from bluesky.run_engine import RunEngine
 from bluesky.simulators import RunEngineSimulator, assert_message_and_return_remaining
 from bluesky.utils import Msg
-from dodal.devices.aperturescatterguard import AperturePosition
+from dodal.devices.aperturescatterguard import ApertureInOut
 from dodal.devices.oav.oav_detector import OAV
 from dodal.devices.smargon import StubPosition
 from dodal.devices.webcam import Webcam
@@ -286,7 +286,7 @@ async def test_when_prepare_for_robot_load_called_then_moves_as_expected(
     assert await smargon.omega.user_readback.get_value() == 0
 
     smargon.stub_offsets.set.assert_called_once_with(StubPosition.RESET_TO_ROBOT_LOAD)  # type: ignore
-    aperture_scatterguard.set.assert_called_once_with(AperturePosition.ROBOT_LOAD)  # type: ignore
+    aperture_scatterguard.set.assert_called_once_with((ApertureInOut.OUT, None))  # type: ignore
 
 
 @patch(