bec/ophyd_devices
0
0
Fork 0
mirror of https://github.com/bec-project/ophyd_devices.git synced 2025-05-31 17:10:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: renamed pointID to point_id

Browse Source
This commit is contained in:
wakonig_k 2024-03-22 18:22:15 +01:00
parent 505e008806
commit b74627820a
5 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ophyd_devices/rt_lamni/rt_flomni_ophyd.py
View File

@ -467,7 +467,7 @@ class RtFlomniController(RtController):
signals = self._get_signals_from_table(return_table) 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) time.sleep(0.05)
@ -479,7 +479,7 @@ class RtFlomniController(RtController):
read_counter = read_counter + 1 read_counter = read_counter + 1
signals = self._get_signals_from_table(return_table) 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( self.get_device_manager().connector.set(
MessageEndpoints.device_status("rt_scan"), MessageEndpoints.device_status("rt_scan"),
@ -494,11 +494,11 @@ class RtFlomniController(RtController):
f" {self.average_stdeviations_y_st_fzp/number_of_samples_to_read}." 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( self.get_device_manager().connector.set_and_publish(
MessageEndpoints.device_read("rt_flomni"), MessageEndpoints.device_read("rt_flomni"),
messages.DeviceMessage( messages.DeviceMessage(
signals=signals, metadata={"pointID": pointID, **self.readout_metadata} signals=signals, metadata={"point_id": point_id, **self.readout_metadata}
).dumps(), ).dumps(),
) )

8
ophyd_devices/rt_lamni/rt_lamni_ophyd.py
View File

@ -406,7 +406,7 @@ class RtLamniController(Controller):
signals = self._get_signals_from_table(return_table) 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) time.sleep(0.05)
@ -418,7 +418,7 @@ class RtLamniController(Controller):
read_counter = read_counter + 1 read_counter = read_counter + 1
signals = self._get_signals_from_table(return_table) 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( self.get_device_manager().connector.set(
MessageEndpoints.device_status("rt_scan"), 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}." 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( self.get_device_manager().connector.set_and_publish(
MessageEndpoints.device_read("rt_lamni"), MessageEndpoints.device_read("rt_lamni"),
messages.DeviceMessage( messages.DeviceMessage(
signals=signals, metadata={"pointID": pointID, **self.readout_metadata} signals=signals, metadata={"point_id": point_id, **self.readout_metadata}
), ),
) )

8
ophyd_devices/rt_lamni/rt_ophyd.py
View File

@ -376,7 +376,7 @@ class RtController(Controller):
signals = self._get_signals_from_table(return_table) 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) time.sleep(0.05)
@ -388,7 +388,7 @@ class RtController(Controller):
read_counter = read_counter + 1 read_counter = read_counter + 1
signals = self._get_signals_from_table(return_table) 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( self.get_device_manager().connector.set(
MessageEndpoints.device_status("rt_scan"), 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}." 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( self.get_device_manager().connector.set_and_publish(
MessageEndpoints.device_read("rt_lamni"), MessageEndpoints.device_read("rt_lamni"),
messages.DeviceMessage( messages.DeviceMessage(
signals=signals, metadata={"pointID": pointID, **self.readout_metadata} signals=signals, metadata={"point_id": point_id, **self.readout_metadata}
).dumps(), ).dumps(),
) )

6
ophyd_devices/sim/sim.py
View File

@ -515,7 +515,7 @@ class SimFlyer(Device, PositionerBase, FlyerInterface):
"flyer_samy": {"value": positions[ii, 1], "timestamp": 0}, "flyer_samy": {"value": positions[ii, 1], "timestamp": 0},
} }
}, },
metadata={"pointID": ii, **metadata}, metadata={"point_id": ii, **metadata},
) )
) )
ttime.sleep(exp_time) ttime.sleep(exp_time)
@ -529,7 +529,7 @@ class SimFlyer(Device, PositionerBase, FlyerInterface):
device.device_manager.connector.set( device.device_manager.connector.set(
MessageEndpoints.device_status(device.name), MessageEndpoints.device_status(device.name),
messages.DeviceStatusMessage( 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( device.device_manager.connector.set_and_publish(
@ -538,7 +538,7 @@ class SimFlyer(Device, PositionerBase, FlyerInterface):
device.device_manager.connector.set( device.device_manager.connector.set(
MessageEndpoints.device_status(device.name), MessageEndpoints.device_status(device.name),
messages.DeviceStatusMessage( 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") print("done")

6
ophyd_devices/sim/sim_test_devices.py
View File

@ -122,7 +122,7 @@ class SynFlyerLamNI(Device, PositionerBase):
"flyer_samy": {"value": positions[ii, 1], "timestamp": 0}, "flyer_samy": {"value": positions[ii, 1], "timestamp": 0},
} }
}, },
metadata={"pointID": ii, **metadata}, metadata={"point_id": ii, **metadata},
) )
) )
ttime.sleep(exp_time) ttime.sleep(exp_time)
@ -136,14 +136,14 @@ class SynFlyerLamNI(Device, PositionerBase):
device.device_manager.connector.set( device.device_manager.connector.set(
MessageEndpoints.device_status(device.name), MessageEndpoints.device_status(device.name),
messages.DeviceStatusMessage( 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.send(MessageEndpoints.device_read(device.name), bundle)
device.device_manager.connector.set( device.device_manager.connector.set(
MessageEndpoints.device_status(device.name), MessageEndpoints.device_status(device.name),
messages.DeviceStatusMessage( 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") print("done")