bec/ophyd_devices
0
0
Fork 0
mirror of https://github.com/bec-project/ophyd_devices.git synced 2026-02-03 22:08:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

rename dm to device_manager

Browse Source
This commit is contained in:
appel_c
2025-12-05 15:54:29 +01:00
committed by Christian Appel
parent 80eaae6c7c
commit d4a1e1545c
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ophyd_devices/utils/controller.py
View File

@@ -105,7 +105,7 @@ class Controller(OphydObject):
self._initialize() self._initialize()
self._initialized = True self._initialized = True
self.sock = None self.sock = None
self.dm = device_manager self.device_manager = device_manager
self._socket_cls = socket_cls self._socket_cls = socket_cls
self._socket_host = socket_host self._socket_host = socket_host
self._socket_port = socket_port self._socket_port = socket_port
@@ -170,12 +170,12 @@ class Controller(OphydObject):
device_name (str): Name of the device device_name (str): Name of the device
enabled (bool): Set device to read-only or writable enabled (bool): Set device to read-only or writable
""" """
if device_name not in self.dm.devices: if device_name not in self.device_manager.devices:
logger.warning( logger.warning(
f"Device {device_name} is not available on the device manager, cannot be set to read-only: {not enabled}." f"Device {device_name} is not available on the device manager, cannot be set to read-only: {not enabled}."
) )
return return
self.dm.devices[device_name].read_only = not enabled self.device_manager.devices[device_name].read_only = not enabled
def set_device_enable(self, device_name: str, enabled: bool) -> None: def set_device_enable(self, device_name: str, enabled: bool) -> None:
""" """
@@ -185,17 +185,19 @@ class Controller(OphydObject):
device_name (str): Name of the device device_name (str): Name of the device
enabled (bool): Enable or disable the device enabled (bool): Enable or disable the device
""" """
if device_name not in self.dm.devices: if device_name not in self.device_manager.devices:
logger.warning( logger.warning(
f"Device {device_name} is not available on the device manager, cannot be set to enabled: {enabled}." f"Device {device_name} is not available on the device manager, cannot be set to enabled: {enabled}."
) )
return return
self.dm.devices[device_name].enabled = enabled self.device_manager.devices[device_name].enabled = enabled
if enabled: if enabled:
self.on() self.on()
else: else:
all_disabled = all( all_disabled = all(
not self.dm.devices[axis.name].enabled for axis in self._axis if axis is not None not self.device_manager.devices[axis.name].enabled
for axis in self._axis
if axis is not None
) )
if all_disabled: if all_disabled:
self.off() self.off()
@@ -265,7 +267,7 @@ class Controller(OphydObject):
f"Axis {axis_Id_numeric} exceeds the available number of axes ({self._axes_per_controller})" f"Axis {axis_Id_numeric} exceeds the available number of axes ({self._axes_per_controller})"
) )
def on(self, timeout: int = 20) -> None: def on(self, timeout: int = 10) -> None:
""" """
Open a new socket connection to the controller Open a new socket connection to the controller

2
tests/test_controller.py
View File

@@ -47,7 +47,7 @@ def test_controller_with_multiple_axes(dm_with_devices):
controller = Controller( controller = Controller(
socket_cls=socket_cls, socket_host="dummy", socket_port=123, device_manager=dm_with_devices socket_cls=socket_cls, socket_host="dummy", socket_port=123, device_manager=dm_with_devices
) )
with mock.patch.object(controller.dm, "config_helper") as mock_config_helper: with mock.patch.object(controller.device_manager, "config_helper") as mock_config_helper:
# Disable samx, samy first # Disable samx, samy first
dm_with_devices.devices.get("samx").enabled = False dm_with_devices.devices.get("samx").enabled = False
dm_with_devices.devices.get("samy").enabled = False dm_with_devices.devices.get("samy").enabled = False