Unit tests for beamstop out of beam

Author: rtuck99

src/dodal/devices/mx_phase1/beamstop.py

@@ -10,6 +10,8 @@
 
 from dodal.common.beamlines.beamline_parameters import GDABeamlineParameters
 
+_BEAMSTOP_OUT_DELTA_Y_MM = -2
+
 
 class BeamstopPositions(StrictEnum):
     """
@@ -64,9 +66,9 @@ def __init__(
             float(beamline_parameters[f"in_beam_{axis}_STANDARD"])
             for axis in ("x", "y", "z")
         ]
-        # XXX need better way to configure this
+
         self._out_of_beam_xyz_mm = list(self._in_beam_xyz_mm)
-        self._out_of_beam_xyz_mm[1] -= 5
+        self._out_of_beam_xyz_mm[1] += _BEAMSTOP_OUT_DELTA_Y_MM
 
         self._xyz_tolerance_mm = [
             float(beamline_parameters[f"bs_{axis}_tolerance"])

tests/devices/mx_phase1/test_beamstop.py

@@ -25,12 +25,13 @@ def beamline_parameters() -> GDABeamlineParameters:
         [0, 0, 0, BeamstopPositions.UNKNOWN],
         [1.52, 44.78, 30.0, BeamstopPositions.DATA_COLLECTION],
         [1.501, 44.776, 29.71, BeamstopPositions.DATA_COLLECTION],
+        [1.52, 42.78, 29.71, BeamstopPositions.OUT],
         [1.499, 44.776, 29.71, BeamstopPositions.UNKNOWN],
         [1.501, 44.774, 29.71, BeamstopPositions.UNKNOWN],
         [1.501, 44.776, 29.69, BeamstopPositions.UNKNOWN],
     ],
 )
-async def test_beamstop_pos_select(
+async def test_beamstop_pos_read_selected_pos(
     beamline_parameters: GDABeamlineParameters,
     run_engine: RunEngine,
     x: float,
@@ -67,8 +68,18 @@ def check_in_beam():
     assert data["beamstop-selected_pos"] == expected_pos
 
 
-async def test_set_beamstop_position_to_data_collection_moves_beamstop_into_beam(
-    beamline_parameters: GDABeamlineParameters, run_engine: RunEngine
+@pytest.mark.parametrize(
+    "demanded_pos, expected_coords",
+    [
+        [BeamstopPositions.DATA_COLLECTION, (1.52, 44.78, 30.0)],
+        [BeamstopPositions.OUT, (1.52, 42.78, 30.0)],
+    ],
+)
+async def test_set_beamstop_position_to_data_collection_moves_beamstop(
+    demanded_pos: BeamstopPositions,
+    expected_coords: tuple[float, float, float],
+    beamline_parameters: GDABeamlineParameters,
+    run_engine: RunEngine,
 ):
     beamstop = Beamstop("-MO-BS-01:", beamline_parameters, name="beamstop")
     await beamstop.connect(mock=True)
@@ -86,13 +97,11 @@ async def test_set_beamstop_position_to_data_collection_moves_beamstop_into_beam
     parent_mock.attach_mock(get_mock_put(y_mock), "beamstop_y")
     parent_mock.attach_mock(get_mock_put(z_mock), "beamstop_z")
 
-    run_engine(
-        bps.abs_set(beamstop.selected_pos, BeamstopPositions.DATA_COLLECTION, wait=True)
-    )
+    run_engine(bps.abs_set(beamstop.selected_pos, demanded_pos, wait=True))
 
-    assert get_mock_put(x_mock).call_args_list == [call(1.52, wait=True)]
-    assert get_mock_put(y_mock).call_args_list == [call(44.78, wait=True)]
-    assert get_mock_put(z_mock).call_args_list == [call(30.0, wait=True)]
+    assert get_mock_put(x_mock).call_args_list == [call(expected_coords[0], wait=True)]
+    assert get_mock_put(y_mock).call_args_list == [call(expected_coords[1], wait=True)]
+    assert get_mock_put(z_mock).call_args_list == [call(expected_coords[2], wait=True)]
 
     assert parent_mock.method_calls[0] == call.beamstop_z(30.0, wait=True)