From c4ea023f8e6a2e1e090c07802b4441b41d461a4d Mon Sep 17 00:00:00 2001 From: appleb_m Date: Thu, 23 Apr 2026 08:12:54 +0200 Subject: [PATCH] DAQ: refactored measure_raster to use auto_center flag instead of auto to be more explicit and to avoid shadowing outer scope --- src/aare/daq/daq.py | 7 +++---- src/aare/daq/server.py | 4 ++-- src/aare/gui/threads/daq_worker.py | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/aare/daq/daq.py b/src/aare/daq/daq.py index 0468d970..3cdc04f3 100644 --- a/src/aare/daq/daq.py +++ b/src/aare/daq/daq.py @@ -816,7 +816,6 @@ class AareDAQ: offset = Coordinate(x=-grid.grid_size_mm.x/2.0, y=-(grid.n_y + 0.5) * grid.grid_size_mm.y / 2.0) geom = self.sample_geometry logger.debug(f"set offset y scan {offset}") - # self.__devs.smargon.target = geom.translate_smargon(offset) grid.smargon_top_left = geom.translate_smargon(offset) res2 = self.__raster(grid) return CompletedRasterGrid(r=[res1, res2]) @@ -1001,20 +1000,20 @@ class AareDAQ: logger.exception(f"Failed during raster: {e}") raise - def measure_raster(self, r: RasterGridRequest, auto: bool) -> CompletedRasterGrid: + def measure_raster(self, r: RasterGridRequest, auto_center: bool) -> CompletedRasterGrid: """ Execute a raster scan. Args: r: RasterGridRequest parameters for the scan. - auto: Boolean flag indicating if this is part of an automated sequence. + auto_center: Boolean flag indicating if this is part of an automated sequence. Returns: CompletedRasterGrid result. """ self.__cfg.try_set_busy(timeout=ceil(360)) try: - result = self._execute_raster_sequence(r, auto_center=auto) + result = self._execute_raster_sequence(r, auto_center=auto_center) if result is None: raise Exception("Raster scan failed") diff --git a/src/aare/daq/server.py b/src/aare/daq/server.py index b8dd2ba2..e1681a28 100644 --- a/src/aare/daq/server.py +++ b/src/aare/daq/server.py @@ -1098,7 +1098,7 @@ async def recovery_unmount_sample(payload: RecoveryActionRequest, token: str = D # Scans @app.post("/scan/raster") -async def raster(val: RasterGridRequest, auto: bool = False, token: str = Depends(oauth2_scheme)) -> CompletedRasterGrid: +async def raster(val: RasterGridRequest, auto_center: bool = False, token: str = Depends(oauth2_scheme)) -> CompletedRasterGrid: """ Execute a raster scan. @@ -1111,7 +1111,7 @@ async def raster(val: RasterGridRequest, auto: bool = False, token: str = Depend CompletedRasterGrid object. """ auth.check_jwt_rw(cfg, auth.parse_token(token)) - return daq.measure_raster(val, auto) + return daq.measure_raster(val, auto_center) @app.post("/scan/rotation") diff --git a/src/aare/gui/threads/daq_worker.py b/src/aare/gui/threads/daq_worker.py index 4c17e614..35e7a88f 100644 --- a/src/aare/gui/threads/daq_worker.py +++ b/src/aare/gui/threads/daq_worker.py @@ -916,7 +916,7 @@ class DAQWorker(QObject): self.raster_scan_completed.emit(reply) return - request = QNetworkRequest(QUrl(f"{self.__base_url}/scan/raster?auto=false")) + request = QNetworkRequest(QUrl(f"{self.__base_url}/scan/raster?auto_center=false")) request.setRawHeader(b"Authorization", f"Bearer {self.__token}".encode("utf-8")) request.setRawHeader(b"Content-Type", b"application/json") body = r.model_dump_json() @@ -956,7 +956,7 @@ class DAQWorker(QObject): self.raster_scan_completed.emit(reply) return - request = QNetworkRequest(QUrl(f"{self.__base_url}/scan/raster?auto=true")) + request = QNetworkRequest(QUrl(f"{self.__base_url}/scan/raster?auto_center=true")) request.setRawHeader(b"Authorization", f"Bearer {self.__token}".encode("utf-8")) request.setRawHeader(b"Content-Type", b"application/json") body = r.model_dump_json()