Merge pull request #1384 from DiamondLightSource/dodal_494_use_beamli…

…ne_params_for_apsg_tolerance (dodal 494) Update to match dodal changes
DiamondLightSource · May 20, 2024 · cff5b6d · cff5b6d
2 parents 501168c + 585c7f6
commit cff5b6d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/setup.cfg b/setup.cfg
@@ -42,7 +42,7 @@ install_requires =
     # as by default pip-install will not upgrade to a pre-release.
     # 
     ophyd == 1.9.0
-    ophyd-async >= 0.3a3
+    ophyd-async >= 0.3a5
     bluesky >= 1.13.0a3
     blueapi >= 0.4.3-a1
     dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -20,6 +20,7 @@
     ApertureFiveDimensionalLocation,
     AperturePositions,
     ApertureScatterguard,
+    ApertureScatterguardTolerances,
     SingleAperturePosition,
 )
 from dodal.devices.attenuator import Attenuator
@@ -469,6 +470,7 @@ def aperture_scatterguard(done_status, RE):
             AperturePositions.MEDIUM,
             AperturePositions.SMALL,
             AperturePositions.ROBOT_LOAD,
+            tolerances=ApertureScatterguardTolerances(0.1, 0.1, 0.1, 0.1, 0.1),
         ),
     )
     with (