From 22d21dcb6dc229e76cf6d0328b1c3ded38ef0333 Mon Sep 17 00:00:00 2001 From: appleb_m Date: Tue, 18 Nov 2025 17:50:27 +0100 Subject: [PATCH] DAQ: tempoarily bring up reflector for data collection --- daq/src/aaredaq/daq.py | 11 ++++++++++- gui/src/aaregui/panels/rotation_data_collection.py | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/daq/src/aaredaq/daq.py b/daq/src/aaredaq/daq.py index f34bb8e4..67b407d9 100644 --- a/daq/src/aaredaq/daq.py +++ b/daq/src/aaredaq/daq.py @@ -473,7 +473,11 @@ class AareDAQ: grid.file_prefix = f"{old_prefix}_{grid.omega_deg}deg" grid.omega_deg = geom.omega_deg res1 = self.__raster(grid) - + self.__devs.reflector_up = True + time.sleep(0.1) + self.save_screenshot_db(sample.db_id, f"post_raster_{grid.omega_deg}deg") + time.sleep(0.1) + self.__devs.reflector_up = False grid.omega_deg += 90 self.__devs.aerotech.move(grid.omega_deg, wait=True) @@ -486,6 +490,11 @@ class AareDAQ: geom = self.sample_geometry grid.smargon.sh_mm = geom.smargon.sh_mm + geom.smargon_nudge(offset) res2 = self.__raster(grid) + self.__devs.reflector_up = True + time.sleep(0.1) + self.save_screenshot_db(sample.db_id, f"post_raster_{grid.omega_deg}deg") + time.sleep(0.1) + self.__devs.reflector_up = False return CompletedRasterGrid(r=[res1, res2]) else: return None diff --git a/gui/src/aaregui/panels/rotation_data_collection.py b/gui/src/aaregui/panels/rotation_data_collection.py index f7359ff4..66993f64 100644 --- a/gui/src/aaregui/panels/rotation_data_collection.py +++ b/gui/src/aaregui/panels/rotation_data_collection.py @@ -205,6 +205,7 @@ class RotationDataCollectionPanel(ScanSettingsPanel): ('totalrange', self.total_angle, lambda v: float(v)), ('oscillation', self.image_angle, None), ('exposure', self.image_time_enter, None), + ('directory', self._filename, None), ]