From 5c207ed5de982d98d3b5dc045f5eb44784134ed0 Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Wed, 8 Apr 2026 10:43:51 +0200 Subject: [PATCH] DAQ: After 1D scan, X and Y movement were swapped --- src/aare/daq/daq.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/aare/daq/daq.py b/src/aare/daq/daq.py index 07810390..50431aa6 100644 --- a/src/aare/daq/daq.py +++ b/src/aare/daq/daq.py @@ -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}")