From 761d78a918f73369e67546b098a68ec6f09a26ce Mon Sep 17 00:00:00 2001 From: appleb_m Date: Fri, 24 Apr 2026 11:07:41 +0200 Subject: [PATCH] DAQ: raster, fix bug where there was an incorrect state call, added wait varaible before screenshot, default set to 200 ms. --- src/aare/daq/daq.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/aare/daq/daq.py b/src/aare/daq/daq.py index d8e78f4e..459d2b1a 100644 --- a/src/aare/daq/daq.py +++ b/src/aare/daq/daq.py @@ -1081,7 +1081,7 @@ class AareDAQ: grid.omega_deg += 90 self.__devs.aerotech_omega = grid.omega_deg - self.__set_state(BeamlineStateEnum.XtalSnapshot) + self.__set_state(BeamlineStateEnum.DataCollection) grid.n_x = 1 # TODO generate y scan rather than had code for 1x50 @@ -1235,7 +1235,7 @@ class AareDAQ: centre_of_mass=None, ) - def __raster(self, request: RasterGridRequest) -> CompletedRasterGridElem: + def __raster(self, request: RasterGridRequest, wait_for_screenshot: float | None = 0.2) -> CompletedRasterGridElem: smargon_top_left =request.smargon_top_left self.__devs.set_smargon_pos( SmargonCoordinate( @@ -1366,7 +1366,8 @@ class AareDAQ: if sample_id: logger.debug(f"moving to XtalSnapshot to take a screenshot of the sample") self.__set_state(BeamlineStateEnum.XtalSnapshot) - time.sleep(0.1) + if wait_for_screenshot and wait_for_screenshot > 0: + time.sleep(wait_for_screenshot) self.save_screenshot_db(sample_id, f"{sample_id}_post_raster_{request.omega_deg}deg") self.__aare.ingest_gridscan( sample=self.sample,