bec/ophyd_devices
1
0
Fork 0
Code Issues 9 Pull Requests 9 Actions Packages Projects Releases 126 Wiki Activity

fix: fix inheritance for SimMonitor

Browse Source
This commit is contained in:
appel_c 2024-09-04 16:02:14 +02:00
parent 3f2c6dc4ef
commit f56961ba8c
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ophyd_devices/sim/sim_monitor.py
View File

@ -21,7 +21,7 @@ from ophyd_devices.utils.errors import DeviceStopError
logger = bec_logger.logger logger = bec_logger.logger
class SimMonitor(Device): class SimMonitor(ReadOnlySignal):
""" """
A simulated device mimic any 1D Axis (position, temperature, beam). A simulated device mimic any 1D Axis (position, temperature, beam).
@ -46,10 +46,10 @@ class SimMonitor(Device):
sim_cls = SimulatedDataMonitor sim_cls = SimulatedDataMonitor
BIT_DEPTH = np.uint32 BIT_DEPTH = np.uint32
readback = Cpt(ReadOnlySignal, value=BIT_DEPTH(0), kind=Kind.hinted, compute_readback=True)
SUB_READBACK = "readback" SUB_READBACK = "readback"
_default_sub = SUB_READBACK _default_sub = SUB_READBACK
# TODO: to be removed once changes in BEC are merged
readback = Cpt(ReadOnlySignal, value=BIT_DEPTH(0), kind=Kind.hinted, compute_readback=True)
def __init__( def __init__(
self, self,
@ -58,7 +58,7 @@ class SimMonitor(Device):
precision: int = 3, precision: int = 3,
sim_init: dict = None, sim_init: dict = None,
parent=None, parent=None,
kind=None, kind: Kind = None,
device_manager=None, device_manager=None,
**kwargs, **kwargs,
): ):
@ -68,9 +68,14 @@ class SimMonitor(Device):
self.sim = self.sim_cls(parent=self, **kwargs) self.sim = self.sim_cls(parent=self, **kwargs)
self._registered_proxies = {} self._registered_proxies = {}
super().__init__(name=name, parent=parent, kind=kind, **kwargs) super().__init__(
self.sim.sim_state[self.name] = self.sim.sim_state.pop(self.readback.name, None) name=name,
self.readback.name = self.name parent=self,
kind=kind,
value=self.BIT_DEPTH(0),
compute_readback=True,
**kwargs,
)
if self.sim_init: if self.sim_init:
self.sim.set_init(self.sim_init) self.sim.set_init(self.sim_init)

5
tests/test_simulation.py
View File

@ -155,8 +155,7 @@ def test_signal__init__(signal):
def test_monitor__init__(monitor): def test_monitor__init__(monitor):
"""Test the __init__ method of SimMonitor.""" """Test the __init__ method of SimMonitor."""
assert isinstance(monitor, SimMonitor) assert isinstance(monitor, SimMonitor)
assert isinstance(monitor, BECDeviceProtocol) assert isinstance(monitor, BECSignalProtocol)
assert isinstance(monitor, BECScanProtocol)
def test_camera__init__(camera): def test_camera__init__(camera):
@ -193,7 +192,7 @@ def test_init_async_monitor(async_monitor):
def test_monitor_readback(monitor, center): def test_monitor_readback(monitor, center):
"""Test the readback method of SimMonitor.""" """Test the readback method of SimMonitor."""
motor_pos = 0 motor_pos = 0
monitor.device_manager.add_device("samx", value=motor_pos) monitor.device_manager.add_device(name="samx", value=motor_pos)
for model_name in monitor.sim.get_models(): for model_name in monitor.sim.get_models():
monitor.sim.select_model(model_name) monitor.sim.select_model(model_name)
monitor.sim.params["noise_multipler"] = 10 monitor.sim.params["noise_multipler"] = 10