From 6b6c364843043a46bbfd4089b101126e469b4cd3 Mon Sep 17 00:00:00 2001 From: David Perl Date: Wed, 16 Sep 2026 10:01:38 +0200 Subject: [PATCH 1/3] fix: give a better error on attempting to run raster with no sample --- src/aare/daq/daq.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/aare/daq/daq.py b/src/aare/daq/daq.py index c07cebd0..e4c24493 100644 --- a/src/aare/daq/daq.py +++ b/src/aare/daq/daq.py @@ -1275,6 +1275,8 @@ class AareDAQ: Returns: CompletedRasterGrid result or None if failed """ + if self.sample is None: + raise RasterScanException("Please load a sample before running a raster scan. If you have manually mounted a sample, create its record in the 'Manual sample' panel.") try: logger.info( "Starting raster sequence", @@ -2037,7 +2039,7 @@ class AareDAQ: result = self._execute_raster_sequence(request, auto_center=auto_center) if result is None: - raise RasterScanException("Raster scan failed") + raise RasterScanException("Raster scan failed for unknown reason.") self._set_state(BeamlineStateEnum.SampleAlignment) return result except Exception: -- 2.54.0 From fab6e8ed3004a98541c718dc685b4f367f14e5c3 Mon Sep 17 00:00:00 2001 From: David Perl Date: Wed, 16 Sep 2026 10:14:06 +0200 Subject: [PATCH 2/3] fix: reduce log verbosity in raster results --- src/aare/daq/operations/raster/service.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/aare/daq/operations/raster/service.py b/src/aare/daq/operations/raster/service.py index 31129448..4ff4fecf 100644 --- a/src/aare/daq/operations/raster/service.py +++ b/src/aare/daq/operations/raster/service.py @@ -521,8 +521,9 @@ class RasterService: ) raise RasterScanException("JFJoch returned no ScanResult for raster") else: - self.logger.info( - f"Raster scan results from JFJoch: file {scan_result.file_prefix} with images {scan_result.images}" + truncated_images = scan_result.images[:3] if len(scan_result.images) > 3 else scan_result.images + self.logger.debug( + f"Raster scan results from JFJoch: file {scan_result.file_prefix} with images {truncated_images} ..." ) analysis_results = self._get_anaylsis_results( self.ctx.deps.cfg.gridscan_analysis_mode, scan_result, request, daq=self.ctx.status -- 2.54.0 From 21a462d4df9c4bee989e534b6d9ce6851a5401f3 Mon Sep 17 00:00:00 2001 From: David Perl Date: Wed, 16 Sep 2026 10:36:34 +0200 Subject: [PATCH 3/3] style: format --- src/aare/daq/daq.py | 4 +++- src/aare/daq/operations/raster/service.py | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/aare/daq/daq.py b/src/aare/daq/daq.py index e4c24493..b7a792a1 100644 --- a/src/aare/daq/daq.py +++ b/src/aare/daq/daq.py @@ -1276,7 +1276,9 @@ class AareDAQ: CompletedRasterGrid result or None if failed """ if self.sample is None: - raise RasterScanException("Please load a sample before running a raster scan. If you have manually mounted a sample, create its record in the 'Manual sample' panel.") + raise RasterScanException( + "Please load a sample before running a raster scan. If you have manually mounted a sample, create its record in the 'Manual sample' panel." + ) try: logger.info( "Starting raster sequence", diff --git a/src/aare/daq/operations/raster/service.py b/src/aare/daq/operations/raster/service.py index 4ff4fecf..62ebba26 100644 --- a/src/aare/daq/operations/raster/service.py +++ b/src/aare/daq/operations/raster/service.py @@ -521,7 +521,9 @@ class RasterService: ) raise RasterScanException("JFJoch returned no ScanResult for raster") else: - truncated_images = scan_result.images[:3] if len(scan_result.images) > 3 else scan_result.images + truncated_images = ( + scan_result.images[:3] if len(scan_result.images) > 3 else scan_result.images + ) self.logger.debug( f"Raster scan results from JFJoch: file {scan_result.file_prefix} with images {truncated_images} ..." ) -- 2.54.0