From 9692dab6f7bc85e0c5e76174f852513ca7160fb0 Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Wed, 8 Apr 2026 10:25:46 +0200 Subject: [PATCH] DAQ: When moving at the end of raster scan nudge was calculated twice --- src/aare/daq/daq.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/aare/daq/daq.py b/src/aare/daq/daq.py index ce1ba9e2..07810390 100644 --- a/src/aare/daq/daq.py +++ b/src/aare/daq/daq.py @@ -954,17 +954,14 @@ class AareDAQ: grid_centre_offset = self.sample_geometry.smargon_nudge( Coordinate(x=x, y=y)) - logger.info(f"new delta mm {grid_centre_offset}") + logger.info(f"moving Smargon to grid centre offset {grid_centre_offset}") - logger.debug(f'moving SMARGON to target new delta mm {request.smargon_top_left.sh_mm+ grid_centre_offset} mm') - smargon_nudge_mm = self.sample_geometry.smargon_nudge(grid_centre_offset) grid_centre_smargon = SmargonCoordinate( - sh_mm=request.smargon_top_left.sh_mm + smargon_nudge_mm, + sh_mm=request.smargon_top_left.sh_mm + grid_centre_offset, phi_deg=request.smargon_top_left.phi_deg, chi_deg=request.smargon_top_left.chi_deg ) self.__devs.smargon_pos = grid_centre_smargon - # self.__devs.smargon_pos = previous_smargon_pos self.__devs.smargon_wait(timeout=180) try: