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

small fixes

Browse Source
This commit is contained in:
Holler Mirko 2024-03-22 10:23:20 +01:00 committed by wakonig_k
parent ec0d050088
commit 46063b905b
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ophyd_devices/galil/galil_ophyd.py
View File

@ -312,7 +312,7 @@ class GalilSetpointSignal(GalilSignalBase):
Returns: Returns:
float: setpoint / target value float: setpoint / target value
""" """
return self.setpoint return self.setpoint * self.parent.sign
@retry_once @retry_once
@threadlocked @threadlocked

5
ophyd_devices/rt_lamni/rt_flomni_ophyd.py
View File

@ -35,6 +35,8 @@ class RtFlomniController(RtController):
"feedback_enable_with_reset", "feedback_enable_with_reset",
"feedback_is_running", "feedback_is_running",
"add_pos_to_scan", "add_pos_to_scan",
"get_pid_x",
"move_samx_to_scan_region",
"clear_trajectory_generator", "clear_trajectory_generator",
"show_cyclic_error_compensation", "show_cyclic_error_compensation",
"laser_tracker_on", "laser_tracker_on",
@ -74,7 +76,7 @@ class RtFlomniController(RtController):
parent._min_scan_buffer_reached = False parent._min_scan_buffer_reached = False
start_time = time.time() start_time = time.time()
for pos_index, pos in enumerate(positions): for pos_index, pos in enumerate(positions):
parent.socket_put_and_receive(f"s{pos[0]},{pos[1]},{pos[2]}") parent.socket_put_and_receive(f"s{pos[0]:.05f},{pos[1]:.05f},{pos[2]:.05f}")
if pos_index > 100: if pos_index > 100:
parent._min_scan_buffer_reached = True parent._min_scan_buffer_reached = True
parent._min_scan_buffer_reached = True parent._min_scan_buffer_reached = True
@ -155,7 +157,6 @@ class RtFlomniController(RtController):
self.set_device_enabled("fsamy", False) self.set_device_enabled("fsamy", False)
self.set_device_enabled("foptx", False) self.set_device_enabled("foptx", False)
self.set_device_enabled("fopty", False) self.set_device_enabled("fopty", False)
print("rt feedback is now enabled.")
def move_samx_to_scan_region(self, fovx: float, cenx: float): def move_samx_to_scan_region(self, fovx: float, cenx: float):
time.sleep(0.05) time.sleep(0.05)

2
ophyd_devices/rt_lamni/rt_lamni_ophyd.py
View File

@ -257,7 +257,7 @@ class RtLamniController(Controller):
def send_positions(parent, positions): def send_positions(parent, positions):
parent._min_scan_buffer_reached = False parent._min_scan_buffer_reached = False
for pos_index, pos in enumerate(positions): for pos_index, pos in enumerate(positions):
parent.socket_put_and_receive(f"s{pos[0]},{pos[1]},0") parent.socket_put_and_receive(f"s{pos[0]:.05f},{pos[1]:05f},0")
if pos_index > 100: if pos_index > 100:
parent._min_scan_buffer_reached = True parent._min_scan_buffer_reached = True
parent._min_scan_buffer_reached = True parent._min_scan_buffer_reached = True