DAQ: todo reminders for rastering
This commit is contained in:
1 parent
499897cb46
commit
b99635b22e
1 file changed
+6
-2
+6
-2
@@ -1774,6 +1774,8 @@ class AareDAQ:
|
||||
)
|
||||
|
||||
else:
|
||||
#TODO how to handle no beam grids - do we always want to go to the center?
|
||||
#TODO How to handle grids with no/minimal diffraction - use bkg instead?
|
||||
scan_result = self.__jfjoch.wait_till_done(60)
|
||||
com = None
|
||||
if scan_result is None:
|
||||
@@ -1924,7 +1926,9 @@ class AareDAQ:
|
||||
)
|
||||
self.__cfg.try_set_busy(timeout=ceil(360))
|
||||
try:
|
||||
self.__cfg.simulated_detector = True
|
||||
result = self._execute_raster_sequence(request, auto_center=auto_center)
|
||||
self.__cfg.simulated_detector = False
|
||||
|
||||
if result is None:
|
||||
raise RasterScanException("Raster scan failed")
|
||||
@@ -2732,7 +2736,7 @@ class AareDAQ:
|
||||
omega_deg=self.omega,
|
||||
transmission=raster_params.transmission,
|
||||
)
|
||||
|
||||
self.__cfg.simulated_detector = True
|
||||
raster_result = self._execute_raster_sequence(raster_grid, auto_center=True)
|
||||
if raster_result is None:
|
||||
logger.error(
|
||||
@@ -2766,7 +2770,7 @@ class AareDAQ:
|
||||
steps=params.steps,
|
||||
transmission=params.transmission,
|
||||
)
|
||||
|
||||
self.__cfg.simulated_detector = False
|
||||
rotation_result = self._execute_rotation_sequence(rotation_request)
|
||||
if rotation_result is None:
|
||||
logger.error("Rotation result was None")
|
||||
|
||||
Reference in new issue
Block a user