From b74627820a5594dc896b059399703baa4917097a Mon Sep 17 00:00:00 2001 From: wakonig_k Date: Fri, 22 Mar 2024 18:22:15 +0100 Subject: [PATCH] refactor: renamed pointID to point_id --- ophyd_devices/rt_lamni/rt_flomni_ophyd.py | 8 ++++---- ophyd_devices/rt_lamni/rt_lamni_ophyd.py | 8 ++++---- ophyd_devices/rt_lamni/rt_ophyd.py | 8 ++++---- ophyd_devices/sim/sim.py | 6 +++--- ophyd_devices/sim/sim_test_devices.py | 6 +++--- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ophyd_devices/rt_lamni/rt_flomni_ophyd.py b/ophyd_devices/rt_lamni/rt_flomni_ophyd.py index 32478dd..e38d843 100644 --- a/ophyd_devices/rt_lamni/rt_flomni_ophyd.py +++ b/ophyd_devices/rt_lamni/rt_flomni_ophyd.py @@ -467,7 +467,7 @@ class RtFlomniController(RtController): signals = self._get_signals_from_table(return_table) - self.publish_device_data(signals=signals, pointID=int(return_table[0])) + self.publish_device_data(signals=signals, point_id=int(return_table[0])) time.sleep(0.05) @@ -479,7 +479,7 @@ class RtFlomniController(RtController): read_counter = read_counter + 1 signals = self._get_signals_from_table(return_table) - self.publish_device_data(signals=signals, pointID=int(return_table[0])) + self.publish_device_data(signals=signals, point_id=int(return_table[0])) self.get_device_manager().connector.set( MessageEndpoints.device_status("rt_scan"), @@ -494,11 +494,11 @@ class RtFlomniController(RtController): f" {self.average_stdeviations_y_st_fzp/number_of_samples_to_read}." ) - def publish_device_data(self, signals, pointID): + def publish_device_data(self, signals, point_id): self.get_device_manager().connector.set_and_publish( MessageEndpoints.device_read("rt_flomni"), messages.DeviceMessage( - signals=signals, metadata={"pointID": pointID, **self.readout_metadata} + signals=signals, metadata={"point_id": point_id, **self.readout_metadata} ).dumps(), ) diff --git a/ophyd_devices/rt_lamni/rt_lamni_ophyd.py b/ophyd_devices/rt_lamni/rt_lamni_ophyd.py index 43028b3..dd8a873 100644 --- a/ophyd_devices/rt_lamni/rt_lamni_ophyd.py +++ b/ophyd_devices/rt_lamni/rt_lamni_ophyd.py @@ -406,7 +406,7 @@ class RtLamniController(Controller): signals = self._get_signals_from_table(return_table) - self.publish_device_data(signals=signals, pointID=int(return_table[0])) + self.publish_device_data(signals=signals, point_id=int(return_table[0])) time.sleep(0.05) @@ -418,7 +418,7 @@ class RtLamniController(Controller): read_counter = read_counter + 1 signals = self._get_signals_from_table(return_table) - self.publish_device_data(signals=signals, pointID=int(return_table[0])) + self.publish_device_data(signals=signals, point_id=int(return_table[0])) self.get_device_manager().connector.set( MessageEndpoints.device_status("rt_scan"), @@ -431,11 +431,11 @@ class RtLamniController(Controller): f"LamNI statistics: Average of all standard deviations: x {self.average_stdeviations_x_st_fzp/number_of_samples_to_read}, y {self.average_stdeviations_y_st_fzp/number_of_samples_to_read}, angle {self.average_lamni_angle/number_of_samples_to_read}." ) - def publish_device_data(self, signals, pointID): + def publish_device_data(self, signals, point_id): self.get_device_manager().connector.set_and_publish( MessageEndpoints.device_read("rt_lamni"), messages.DeviceMessage( - signals=signals, metadata={"pointID": pointID, **self.readout_metadata} + signals=signals, metadata={"point_id": point_id, **self.readout_metadata} ), ) diff --git a/ophyd_devices/rt_lamni/rt_ophyd.py b/ophyd_devices/rt_lamni/rt_ophyd.py index 59f7a7a..819247c 100644 --- a/ophyd_devices/rt_lamni/rt_ophyd.py +++ b/ophyd_devices/rt_lamni/rt_ophyd.py @@ -376,7 +376,7 @@ class RtController(Controller): signals = self._get_signals_from_table(return_table) - self.publish_device_data(signals=signals, pointID=int(return_table[0])) + self.publish_device_data(signals=signals, point_id=int(return_table[0])) time.sleep(0.05) @@ -388,7 +388,7 @@ class RtController(Controller): read_counter = read_counter + 1 signals = self._get_signals_from_table(return_table) - self.publish_device_data(signals=signals, pointID=int(return_table[0])) + self.publish_device_data(signals=signals, point_id=int(return_table[0])) self.get_device_manager().connector.set( MessageEndpoints.device_status("rt_scan"), @@ -401,11 +401,11 @@ class RtController(Controller): f"LamNI statistics: Average of all standard deviations: x {self.average_stdeviations_x_st_fzp/number_of_samples_to_read}, y {self.average_stdeviations_y_st_fzp/number_of_samples_to_read}, angle {self.average_lamni_angle/number_of_samples_to_read}." ) - def publish_device_data(self, signals, pointID): + def publish_device_data(self, signals, point_id): self.get_device_manager().connector.set_and_publish( MessageEndpoints.device_read("rt_lamni"), messages.DeviceMessage( - signals=signals, metadata={"pointID": pointID, **self.readout_metadata} + signals=signals, metadata={"point_id": point_id, **self.readout_metadata} ).dumps(), ) diff --git a/ophyd_devices/sim/sim.py b/ophyd_devices/sim/sim.py index b8704d7..eea68a4 100644 --- a/ophyd_devices/sim/sim.py +++ b/ophyd_devices/sim/sim.py @@ -515,7 +515,7 @@ class SimFlyer(Device, PositionerBase, FlyerInterface): "flyer_samy": {"value": positions[ii, 1], "timestamp": 0}, } }, - metadata={"pointID": ii, **metadata}, + metadata={"point_id": ii, **metadata}, ) ) ttime.sleep(exp_time) @@ -529,7 +529,7 @@ class SimFlyer(Device, PositionerBase, FlyerInterface): device.device_manager.connector.set( MessageEndpoints.device_status(device.name), messages.DeviceStatusMessage( - device=device.name, status=1, metadata={"pointID": ii, **metadata} + device=device.name, status=1, metadata={"point_id": ii, **metadata} ), ) device.device_manager.connector.set_and_publish( @@ -538,7 +538,7 @@ class SimFlyer(Device, PositionerBase, FlyerInterface): device.device_manager.connector.set( MessageEndpoints.device_status(device.name), messages.DeviceStatusMessage( - device=device.name, status=0, metadata={"pointID": num_pos, **metadata} + device=device.name, status=0, metadata={"point_id": num_pos, **metadata} ), ) print("done") diff --git a/ophyd_devices/sim/sim_test_devices.py b/ophyd_devices/sim/sim_test_devices.py index 5291c12..a7f7eb2 100644 --- a/ophyd_devices/sim/sim_test_devices.py +++ b/ophyd_devices/sim/sim_test_devices.py @@ -122,7 +122,7 @@ class SynFlyerLamNI(Device, PositionerBase): "flyer_samy": {"value": positions[ii, 1], "timestamp": 0}, } }, - metadata={"pointID": ii, **metadata}, + metadata={"point_id": ii, **metadata}, ) ) ttime.sleep(exp_time) @@ -136,14 +136,14 @@ class SynFlyerLamNI(Device, PositionerBase): device.device_manager.connector.set( MessageEndpoints.device_status(device.name), messages.DeviceStatusMessage( - device=device.name, status=1, metadata={"pointID": ii, **metadata} + device=device.name, status=1, metadata={"point_id": ii, **metadata} ), ) device.device_manager.connector.send(MessageEndpoints.device_read(device.name), bundle) device.device_manager.connector.set( MessageEndpoints.device_status(device.name), messages.DeviceStatusMessage( - device=device.name, status=0, metadata={"pointID": num_pos, **metadata} + device=device.name, status=0, metadata={"point_id": num_pos, **metadata} ), ) print("done")