Merge pull request #904 from BCDA-APS/897-temperature-sims

Hoist simulated controllers from bluesky_training
BCDA-APS · Jan 8, 2024 · e5231a4 · e5231a4
2 parents beaba32 + a2318f7
commit e5231a4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/apstools/devices/simulated_controllers.py b/apstools/devices/simulated_controllers.py
@@ -7,11 +7,13 @@
     ~SimulatedTransformControllerPositioner
 """
 
-from . import PVPositionerSoftDoneWithStop
+import time
+
+from ophyd import FormattedComponent as FC
+
 from ..synApps import SwaitRecord
 from ..synApps import TransformRecord
-from ophyd import FormattedComponent as FC
-import time
+from . import PVPositionerSoftDoneWithStop
 
 
 class SimulatedSwaitControllerPositioner(PVPositionerSoftDoneWithStop):

diff --git a/apstools/devices/tests/test_simulated_controllers.py b/apstools/devices/tests/test_simulated_controllers.py
@@ -9,7 +9,7 @@
 
 from ...tests import IOC_GP
 from ...tests import timed_pause
-from .. import simulated_controllers as stc
+from .. import simulated_controllers as sc
 
 PV_SWAIT = f"{IOC_GP}userCalc7"
 PV_TRANS = f"{IOC_GP}userTran7"
@@ -19,12 +19,12 @@
 @pytest.mark.parametrize(
     "pv, controller_class, context, exp_info",
     [
-        [PV_SWAIT, stc.SimulatedSwaitControllerPositioner, does_not_raise(), "None"],
-        [PV_TRANS, stc.SimulatedTransformControllerPositioner, does_not_raise(), "None"],
-        ["", stc.SimulatedSwaitControllerPositioner, pytest.raises(ValueError), "Must supply a value for"],
-        ["", stc.SimulatedTransformControllerPositioner, pytest.raises(ValueError), "Must supply a value for"],
-        ["wrong_pv", stc.SimulatedSwaitControllerPositioner, pytest.raises(TimeoutError), "Failed to connect"],
-        ["wrong_pv", stc.SimulatedTransformControllerPositioner, pytest.raises(TimeoutError), "Failed to connect"],
+        [PV_SWAIT, sc.SimulatedSwaitControllerPositioner, does_not_raise(), "None"],
+        [PV_TRANS, sc.SimulatedTransformControllerPositioner, does_not_raise(), "None"],
+        ["", sc.SimulatedSwaitControllerPositioner, pytest.raises(ValueError), "Must supply a value for"],
+        ["", sc.SimulatedTransformControllerPositioner, pytest.raises(ValueError), "Must supply a value for"],
+        ["wrong_pv", sc.SimulatedSwaitControllerPositioner, pytest.raises(TimeoutError), "Failed to connect"],
+        ["wrong_pv", sc.SimulatedTransformControllerPositioner, pytest.raises(TimeoutError), "Failed to connect"],
     ],
 )
 @pytest.mark.parametrize("tol", [0.99, 2, 5])
@@ -42,7 +42,7 @@ def test_simulators(sp, pv, controller_class, context, exp_info, tol):
     timed_pause()
     assert sim.connected
 
-    sim.setup(sp, tolerance=tol)
+    sim.setup(sp, tolerance=tol, noise=0.8 * tol)
     timed_pause()
 
     assert math.isclose(sim.setpoint.get(), sp, abs_tol=0.01)