From 6a7c0745e33a2b2cc561b42ad90e61ac08fb9d51 Mon Sep 17 00:00:00 2001 From: appel_c Date: Thu, 17 Oct 2024 07:37:05 +0200 Subject: [PATCH] fix: cleanup and bugfix in positioner; closes #84 --- ophyd_devices/sim/sim_positioner.py | 3 ++- ophyd_devices/sim/sim_waveform.py | 2 +- tests/test_simulation.py | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ophyd_devices/sim/sim_positioner.py b/ophyd_devices/sim/sim_positioner.py index 9318405..d919727 100644 --- a/ophyd_devices/sim/sim_positioner.py +++ b/ophyd_devices/sim/sim_positioner.py @@ -177,7 +177,8 @@ class SimPositioner(Device, PositionerBase): st.set_exception(exc=exc) finally: self._set_sim_state(self.motor_is_moving.name, 0) - self._update_state(target) + if not self._stopped: + self._update_state(target) def move(self, value: float, **kwargs) -> DeviceStatus: """Change the setpoint of the simulated device, and simultaneously initiate a motion.""" diff --git a/ophyd_devices/sim/sim_waveform.py b/ophyd_devices/sim/sim_waveform.py index 5e70e62..2df832a 100644 --- a/ophyd_devices/sim/sim_waveform.py +++ b/ophyd_devices/sim/sim_waveform.py @@ -194,4 +194,4 @@ class SimWaveform(Device): if __name__ == "__main__": # pragma: no cover waveform = SimWaveform(name="waveform") - waveform.sim.sim_select_model("GaussianModel") + waveform.sim.select_model("GaussianModel") diff --git a/tests/test_simulation.py b/tests/test_simulation.py index cb45975..6c72afd 100644 --- a/tests/test_simulation.py +++ b/tests/test_simulation.py @@ -608,7 +608,7 @@ def test_positioner_updated_timestamp(positioner): def test_waveform(waveform): """Test the SimWaveform class""" - waveform.sim.sim_select_model("GaussianModel") + waveform.sim.select_model("GaussianModel") waveform.sim.params = {"amplitude": 500, "center": 500, "sigma": 10} data = waveform.waveform.get() assert isinstance(data, np.ndarray) @@ -617,7 +617,7 @@ def test_waveform(waveform): waveform.waveform_shape.put(50) data = waveform.waveform.get() for model in waveform.sim.get_all_sim_models(): - waveform.sim.sim_select_model(model) + waveform.sim.select_model(model) waveform.waveform.get() # Now also test the async readback mock_connector = waveform.connector = mock.MagicMock()