From 94a4f16e0bbd76d43853d0d26eb31fb82bc897c8 Mon Sep 17 00:00:00 2001 From: appleb_m Date: Tue, 18 Nov 2025 16:30:29 +0100 Subject: [PATCH] DAQ: add a pause between raster scans in automation too take screenshot. Probably jsut need to move reflector in and out. --- daq/src/aaredaq/daq.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/daq/src/aaredaq/daq.py b/daq/src/aaredaq/daq.py index b35bf36d..bf5f716a 100644 --- a/daq/src/aaredaq/daq.py +++ b/daq/src/aaredaq/daq.py @@ -472,6 +472,13 @@ class AareDAQ: grid.file_prefix = f"{old_prefix}_{grid.omega_deg}deg" grid.omega_deg = geom.omega_deg res1 = self.__raster(grid) + if sample.db_id is not None: + time.sleep(0.1) + self.__set_state(BeamlineStateEnum.SampleAlignment) + time.sleep(0.1) + self.save_screenshot_db(sample.db_id, f"after_raster_{grid.omega_deg}deg") + time.sleep(0.1) + self.__set_state(BeamlineStateEnum.DataCollection) grid.omega_deg += 90 self.__devs.aerotech.move(grid.omega_deg, wait=True) @@ -485,6 +492,13 @@ class AareDAQ: geom = self.sample_geometry grid.smargon.sh_mm = geom.smargon.sh_mm + geom.smargon_nudge(offset) res2 = self.__raster(grid) + if sample.db_id is not None: + time.sleep(0.1) + self.__set_state(BeamlineStateEnum.SampleAlignment) + time.sleep(0.1) + self.save_screenshot_db(sample.db_id, f"after_raster_{grid.omega_deg}deg") + time.sleep(0.1) + self.__set_state(BeamlineStateEnum.DataCollection) return CompletedRasterGrid(r=[res1, res2]) else: return None