bec/csaxs_bec
0
0
Fork 1
Code Issues 17 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

added tracker check

Browse Source
This commit is contained in:
Holler Mirko
2024-10-02 13:24:34 +02:00
committed by wakonig_k
parent 2e3ed9f6f0
commit 0d66d2d364
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
csaxs_bec/scans/omny_fermat_scan.py
+3 -7
View File
@@ -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):