diff --git a/ophyd_devices/galil/galil_ophyd.py b/ophyd_devices/galil/galil_ophyd.py index 4498800..881ed6b 100644 --- a/ophyd_devices/galil/galil_ophyd.py +++ b/ophyd_devices/galil/galil_ophyd.py @@ -312,7 +312,7 @@ class GalilSetpointSignal(GalilSignalBase): Returns: float: setpoint / target value """ - return self.setpoint + return self.setpoint * self.parent.sign @retry_once @threadlocked diff --git a/ophyd_devices/rt_lamni/rt_flomni_ophyd.py b/ophyd_devices/rt_lamni/rt_flomni_ophyd.py index d26dc81..f1ee55d 100644 --- a/ophyd_devices/rt_lamni/rt_flomni_ophyd.py +++ b/ophyd_devices/rt_lamni/rt_flomni_ophyd.py @@ -35,6 +35,8 @@ class RtFlomniController(RtController): "feedback_enable_with_reset", "feedback_is_running", "add_pos_to_scan", + "get_pid_x", + "move_samx_to_scan_region", "clear_trajectory_generator", "show_cyclic_error_compensation", "laser_tracker_on", @@ -74,7 +76,7 @@ class RtFlomniController(RtController): parent._min_scan_buffer_reached = False start_time = time.time() 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: 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("foptx", False) self.set_device_enabled("fopty", False) - print("rt feedback is now enabled.") def move_samx_to_scan_region(self, fovx: float, cenx: float): time.sleep(0.05) diff --git a/ophyd_devices/rt_lamni/rt_lamni_ophyd.py b/ophyd_devices/rt_lamni/rt_lamni_ophyd.py index 9390ee1..43028b3 100644 --- a/ophyd_devices/rt_lamni/rt_lamni_ophyd.py +++ b/ophyd_devices/rt_lamni/rt_lamni_ophyd.py @@ -257,7 +257,7 @@ class RtLamniController(Controller): def send_positions(parent, positions): parent._min_scan_buffer_reached = False 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: parent._min_scan_buffer_reached = True parent._min_scan_buffer_reached = True