DAQ: add a pause between raster scans in automation too take screenshot. Probably jsut need to move reflector in and out.
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user