From 0d66d2d3641d4efb91674d805584317f7e45cb1d Mon Sep 17 00:00:00 2001 From: Holler Mirko Date: Wed, 2 Oct 2024 13:24:34 +0200 Subject: [PATCH] added tracker check --- csaxs_bec/scans/omny_fermat_scan.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/csaxs_bec/scans/omny_fermat_scan.py b/csaxs_bec/scans/omny_fermat_scan.py index 09c8f5f..04fb980 100644 --- a/csaxs_bec/scans/omny_fermat_scan.py +++ b/csaxs_bec/scans/omny_fermat_scan.py @@ -157,7 +157,7 @@ class OMNYFermatScan(SyncFlyScanBase): yield from self.stubs.set( device="rtz", value=self.positions[0][2], wait_group="prepare_setup_part2" ) - yield from self.stubs.send_rpc_and_wait("rtx", "controller.laser_tracker_on") + yield from self.stubs.send_rpc_and_wait("rtx", "controller.laser_tracker_check_and_wait_for_signalstrength") yield from self.stubs.wait( wait_type="move", device=["rtx", "rtz"], wait_group="prepare_setup_part2" ) @@ -179,17 +179,13 @@ class OMNYFermatScan(SyncFlyScanBase): if np.fabs(osamroy_current_setpoint-(omny_samx_in+self.cenx/1000)) > 0.025: logger.info("Moving osamx to scan center") self.set_device_enabled("osamx", True) - dev.osamx.controller.socket_put_confirmed("axspeed[0]=100") + yield from self.stubs.send_rpc_and_wait("osamx", 'controller.socket_put_confirmed("axspeed[0]=100")') yield from self.stubs.set(device="osamx", value=self.cenx/1000, wait_group="osamx_mv") yield from self.stubs.wait(wait_type="move", device="osamx", wait_group="osamx_mv") self.set_device_enabled("osamx", False) time.sleep(4) yield from self.stubs.send_rpc_and_wait("rtx", "controller.laser_tracker_on") - -# Todo: auto align tracking at beginning of each scan. currently this is implemented in the client only -# this part is probably just ok with wait on target, which should also re align the tracking in OMNY! - - + yield from self.stubs.send_rpc_and_wait("rtx", "controller.laser_tracker_check_and_wait_for_signalstrength") def omny_rotation(self, angle):