From 8eff1f763804776702f75a6b753256c0b2da1e3a Mon Sep 17 00:00:00 2001 From: Klaus Wakonig Date: Mon, 18 Jul 2022 23:13:12 +0200 Subject: [PATCH 1/2] fixed bug fixed again (overwritten by import) --- ophyd_devices/sim/sim.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ophyd_devices/sim/sim.py b/ophyd_devices/sim/sim.py index 5497c1f..6519c38 100644 --- a/ophyd_devices/sim/sim.py +++ b/ophyd_devices/sim/sim.py @@ -322,6 +322,7 @@ class SynAxisOPAAS(Device, PositionerBase): raise LimitError(f"position={pos} not within limits {self.limits}") def set(self, value): + self._stopped = False self.check_value(value) old_setpoint = self.sim_state["setpoint"] self.sim_state["is_moving"] = 1 @@ -371,7 +372,7 @@ class SynAxisOPAAS(Device, PositionerBase): updates = np.ceil( np.abs(old_setpoint - move_val) / self.speed * self.update_frequency ) - for ii in np.linspace(old_setpoint, move_val - 5, int(updates)): + for ii in np.linspace(old_setpoint, move_val, int(updates)): ttime.sleep(1 / self.update_frequency) update_state(ii) update_state(move_val) @@ -384,8 +385,9 @@ class SynAxisOPAAS(Device, PositionerBase): timestamp=self.sim_state["is_moving_ts"], ) except DeviceStop: - self._stopped = False success = False + finally: + self._stopped = False self._done_moving(success=success) st.set_finished() From 298094d58bf989205ff4e3e12f0c0452e6e33d68 Mon Sep 17 00:00:00 2001 From: Klaus Wakonig Date: Wed, 20 Jul 2022 08:45:18 +0200 Subject: [PATCH 2/2] changed to new config attribute device_mapping --- ophyd_devices/galil/galil_ophyd.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ophyd_devices/galil/galil_ophyd.py b/ophyd_devices/galil/galil_ophyd.py index 196282b..0771817 100644 --- a/ophyd_devices/galil/galil_ophyd.py +++ b/ophyd_devices/galil/galil_ophyd.py @@ -365,14 +365,14 @@ class GalilMotor(Device, PositionerBase): self.controller = GalilController(socket=socket_cls(host=host, port=port)) self.controller.set_axis(axis=self, axis_nr=self.axis_Id_numeric) self.tolerance = kwargs.pop("tolerance", 0.5) - self.device_access = kwargs.pop("device_access", {}) + self.device_mapping = kwargs.pop("device_mapping", {}) self.device_manager = device_manager - if len(self.device_access) > 0 and self.device_manager is None: + if len(self.device_mapping) > 0 and self.device_manager is None: raise BECConfigError( - "device_access has been specified but the device_manager cannot be accessed." + "device_mapping has been specified but the device_manager cannot be accessed." ) - self.rt = self.device_access.get("rt") + self.rt = self.device_mapping.get("rt") super().__init__( prefix,