From c267da5ec017ae4ea3d55e50a2eee5b212d95733 Mon Sep 17 00:00:00 2001 From: David Perl Date: Mon, 13 Jul 2026 16:06:38 +0200 Subject: [PATCH] fix: move exptime validation in front of all rotation scans --- src/aare/daq/daq.py | 3 +++ src/aare/daq/operations/rotation/service.py | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/aare/daq/daq.py b/src/aare/daq/daq.py index 75a366c6..d4beff79 100644 --- a/src/aare/daq/daq.py +++ b/src/aare/daq/daq.py @@ -1398,6 +1398,9 @@ class AareDAQ: Returns: CompletedRotationScan result or None if failed """ + if rotation_request.exp_time_s < 0.004: + logger.warning("Exposure time too short for PXII rotation scan") + rotation_request.exp_time_s = 0.004 try: return self._create_rotation_service().run(rotation_request) except JFJochCommunicationError as e: diff --git a/src/aare/daq/operations/rotation/service.py b/src/aare/daq/operations/rotation/service.py index aa63e104..8fcfe2eb 100644 --- a/src/aare/daq/operations/rotation/service.py +++ b/src/aare/daq/operations/rotation/service.py @@ -25,9 +25,6 @@ class RotationService: def _execute_scan(self, request: RotationScanRequest) -> CompletedRotationScan: omega_start = self.ctx.deps.devs.aerotech_omega - if request.exp_time_s < 0.004: - self.logger.warning("Exposure time too short for PXII rotation scan") - request.exp_time_s = 0.004 total_time = request.exp_time_s * request.steps sample = self.ctx.sample