mx/AareDAQ
0
1
Fork 0
Code Issues 52 Pull Requests 2 Actions Packages Projects Releases 77 Wiki Activity

DAQ: After 1D scan, X and Y movement were swapped

Browse Source
This commit is contained in:
leonarski_f
2026-04-08 10:43:51 +02:00
parent 9692dab6f7
commit 5c207ed5de
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/aare/daq/daq.py
+4 -6
View File
@@ -944,15 +944,13 @@ class AareDAQ:
self.__devs.aerotech.wait_till_done(timeout=int(360))
if request.n_x == 1:
x= ((request.n_y - 1) * request.grid_size_mm.y) / 2.0
y = request.grid_size_mm.x / 2.0
grid_centre_offset = self.sample_geometry.smargon_nudge(
Coordinate(x=x, y=y))
x = request.grid_size_mm.x / 2.0
y = ((request.n_y - 1) * request.grid_size_mm.y) / 2.0
grid_centre_offset = self.sample_geometry.smargon_nudge(Coordinate(x=x, y=y))
else:
x = ((request.n_x - 1) * request.grid_size_mm.x) / 2.0
y = ((request.n_y - 1) * request.grid_size_mm.y) / 2.0
grid_centre_offset = self.sample_geometry.smargon_nudge(
Coordinate(x=x, y=y))
grid_centre_offset = self.sample_geometry.smargon_nudge(Coordinate(x=x, y=y))
logger.info(f"moving Smargon to grid centre offset {grid_centre_offset}")