From 6d179ea8a8e41374cfe2b92939e0b71b7962f7cb Mon Sep 17 00:00:00 2001 From: wakonig_k Date: Tue, 5 Mar 2024 16:25:13 +0100 Subject: [PATCH] fix: device_status should use set --- ophyd_devices/rt_lamni/rt_flomni_ophyd.py | 4 ++-- ophyd_devices/rt_lamni/rt_lamni_ophyd.py | 4 ++-- ophyd_devices/rt_lamni/rt_ophyd.py | 4 ++-- ophyd_devices/sim/sim.py | 4 ++-- ophyd_devices/sim/sim_test_devices.py | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ophyd_devices/rt_lamni/rt_flomni_ophyd.py b/ophyd_devices/rt_lamni/rt_flomni_ophyd.py index 5430446..abb5b4e 100644 --- a/ophyd_devices/rt_lamni/rt_flomni_ophyd.py +++ b/ophyd_devices/rt_lamni/rt_flomni_ophyd.py @@ -425,7 +425,7 @@ class RtFlomniController(RtController): # if not (mode==2 or mode==3): # error - self.get_device_manager().connector.set_and_publish( + self.get_device_manager().connector.set( MessageEndpoints.device_status("rt_scan"), messages.DeviceStatusMessage( device="rt_scan", status=1, metadata=self.readout_metadata @@ -460,7 +460,7 @@ class RtFlomniController(RtController): signals = self._get_signals_from_table(return_table) self.publish_device_data(signals=signals, pointID=int(return_table[0])) - self.get_device_manager().connector.set_and_publish( + self.get_device_manager().connector.set( MessageEndpoints.device_status("rt_scan"), messages.DeviceStatusMessage( device="rt_scan", status=0, metadata=self.readout_metadata diff --git a/ophyd_devices/rt_lamni/rt_lamni_ophyd.py b/ophyd_devices/rt_lamni/rt_lamni_ophyd.py index 0e0a37d..9390ee1 100644 --- a/ophyd_devices/rt_lamni/rt_lamni_ophyd.py +++ b/ophyd_devices/rt_lamni/rt_lamni_ophyd.py @@ -385,7 +385,7 @@ class RtLamniController(Controller): # if not (mode==2 or mode==3): # error - self.get_device_manager().connector.set_and_publish( + self.get_device_manager().connector.set( MessageEndpoints.device_status("rt_scan"), messages.DeviceStatusMessage( device="rt_scan", status=1, metadata=self.readout_metadata @@ -420,7 +420,7 @@ class RtLamniController(Controller): signals = self._get_signals_from_table(return_table) self.publish_device_data(signals=signals, pointID=int(return_table[0])) - self.get_device_manager().connector.set_and_publish( + self.get_device_manager().connector.set( MessageEndpoints.device_status("rt_scan"), messages.DeviceStatusMessage( device="rt_scan", status=0, metadata=self.readout_metadata diff --git a/ophyd_devices/rt_lamni/rt_ophyd.py b/ophyd_devices/rt_lamni/rt_ophyd.py index cd56309..59f7a7a 100644 --- a/ophyd_devices/rt_lamni/rt_ophyd.py +++ b/ophyd_devices/rt_lamni/rt_ophyd.py @@ -355,7 +355,7 @@ class RtController(Controller): # if not (mode==2 or mode==3): # error - self.get_device_manager().connector.set_and_publish( + self.get_device_manager().connector.set( MessageEndpoints.device_status("rt_scan"), messages.DeviceStatusMessage( device="rt_scan", status=1, metadata=self.readout_metadata @@ -390,7 +390,7 @@ class RtController(Controller): signals = self._get_signals_from_table(return_table) self.publish_device_data(signals=signals, pointID=int(return_table[0])) - self.get_device_manager().connector.set_and_publish( + self.get_device_manager().connector.set( MessageEndpoints.device_status("rt_scan"), messages.DeviceStatusMessage( device="rt_scan", status=0, metadata=self.readout_metadata diff --git a/ophyd_devices/sim/sim.py b/ophyd_devices/sim/sim.py index 042eddc..4121f9a 100644 --- a/ophyd_devices/sim/sim.py +++ b/ophyd_devices/sim/sim.py @@ -526,7 +526,7 @@ class SimFlyer(Device, PositionerBase, FlyerInterface): MessageEndpoints.device_read(device.name), bundle ) bundle = messages.BundleMessage() - device.device_manager.connector.set_and_publish( + device.device_manager.connector.set( MessageEndpoints.device_status(device.name), messages.DeviceStatusMessage( device=device.name, status=1, metadata={"pointID": ii, **metadata} @@ -535,7 +535,7 @@ class SimFlyer(Device, PositionerBase, FlyerInterface): device.device_manager.connector.set_and_publish( MessageEndpoints.device_read(device.name), bundle ) - device.device_manager.connector.set_and_publish( + device.device_manager.connector.set( MessageEndpoints.device_status(device.name), messages.DeviceStatusMessage( device=device.name, status=0, metadata={"pointID": num_pos, **metadata} diff --git a/ophyd_devices/sim/sim_test_devices.py b/ophyd_devices/sim/sim_test_devices.py index b09f754..5291c12 100644 --- a/ophyd_devices/sim/sim_test_devices.py +++ b/ophyd_devices/sim/sim_test_devices.py @@ -133,14 +133,14 @@ class SynFlyerLamNI(Device, PositionerBase): MessageEndpoints.device_read(device.name), bundle ) bundle = messages.BundleMessage() - device.device_manager.connector.set_and_publish( + device.device_manager.connector.set( MessageEndpoints.device_status(device.name), messages.DeviceStatusMessage( device=device.name, status=1, metadata={"pointID": ii, **metadata} ), ) device.device_manager.connector.send(MessageEndpoints.device_read(device.name), bundle) - device.device_manager.connector.set_and_publish( + device.device_manager.connector.set( MessageEndpoints.device_status(device.name), messages.DeviceStatusMessage( device=device.name, status=0, metadata={"pointID": num_pos, **metadata}