diff --git a/ophyd_devices/__init__.py b/ophyd_devices/__init__.py index bb3c5c4..67e6e1d 100644 --- a/ophyd_devices/__init__.py +++ b/ophyd_devices/__init__.py @@ -4,9 +4,13 @@ from .galil.galil_ophyd import GalilMotor from .galil.sgalil_ophyd import SGalilMotor from .npoint.npoint import NPointAxis from .rt_lamni import RtLamniMotor -from .sim.sim import SimPositioner +from .sim.sim import SimPositioner, SimMonitor from .sim.sim import SimPositioner as SynAxisOPAAS -from .sim.sim import SynAxisMonitor, SynDeviceOPAAS, SynFlyer, SynSignalRO, SynSLSDetector +from .sim.sim import SimMonitor as SynAxisMonitor +from .sim.sim import SimMonitor as SynGaussBEC +from .sim.sim import SimCamera as SynSLSDetector +from .sim.sim_signals import ReadOnlySignal as SynSignalRO +from .sim.sim import SynDeviceOPAAS, SynFlyer from .sls_devices.sls_devices import SLSInfo, SLSOperatorMessages from .smaract.smaract_ophyd import SmaractMotor from .utils.static_device_test import launch diff --git a/ophyd_devices/sim/__init__.py b/ophyd_devices/sim/__init__.py index 92d8fb6..f185011 100644 --- a/ophyd_devices/sim/__init__.py +++ b/ophyd_devices/sim/__init__.py @@ -1,11 +1,10 @@ from .sim import ( - SynAxisMonitor, SimPositioner, + SimMonitor, + SimCamera, SynDynamicComponents, SynFlyer, - SynSignalRO, - SynSLSDetector, ) from .sim_xtreme import SynXtremeOtf -from .sim_signals import ReadbackSignal, SetpointSignal, IsMovingSignal +from .sim_signals import SetableSignal, ReadOnlySignal, ComputedReadOnlySignal