diff --git a/ophyd_devices/__init__.py b/ophyd_devices/__init__.py index 22494ff..98c8659 100644 --- a/ophyd_devices/__init__.py +++ b/ophyd_devices/__init__.py @@ -3,6 +3,13 @@ from .epics import * from .galil.galil_ophyd import GalilMotor from .npoint.npoint import NPointAxis from .rt_lamni import RtLamniMotor -from .sim.sim import SynAxisMonitor, SynAxisOPAAS, SynFlyer, SynSignalRO, SynSLSDetector +from .sim.sim import ( + SynAxisMonitor, + SynAxisOPAAS, + SynDeviceOPAAS, + SynFlyer, + SynSignalRO, + SynSLSDetector, +) from .sls_devices.sls_devices import SLSInfo, SLSOperatorMessages from .smaract.smaract_ophyd import SmaractMotor diff --git a/ophyd_devices/sim/sim.py b/ophyd_devices/sim/sim.py index e870373..440e99f 100644 --- a/ophyd_devices/sim/sim.py +++ b/ophyd_devices/sim/sim.py @@ -624,6 +624,7 @@ class SynAxisOPAAS(Device, PositionerBase): else: update_state(value) self._done_moving() + st.set_finished() return st def stop(self, *, success=False): @@ -638,6 +639,16 @@ class SynAxisOPAAS(Device, PositionerBase): return "mm" +class SynDeviceSubOPAAS(Device): + zsub = Cpt(SynAxisOPAAS, name="zsub") + + +class SynDeviceOPAAS(Device): + x = Cpt(SynAxisOPAAS, name="x") + y = Cpt(SynAxisOPAAS, name="y") + z = Cpt(SynDeviceSubOPAAS, name="z") + + if __name__ == "__main__": det = SynSLSDetector(name="moench") det.trigger()