DAQ: Handle transmission/dtz null
This commit is contained in:
+10
-5
@@ -377,7 +377,8 @@ class AareDAQ:
|
||||
|
||||
def __raster(self, r: RasterGridRequest) -> CompletedRasterGridElem:
|
||||
max_time = r.exp_time_s * r.n_y * r.n_x + 60
|
||||
self.__cfg.dtz = r.dtz
|
||||
if r.dtz is not None:
|
||||
self.__cfg.dtz = r.dtz
|
||||
self.__set_state(BeamlineStateEnum.DataCollection)
|
||||
|
||||
save_smargon_position = self.__devs.smargon.readback
|
||||
@@ -390,8 +391,8 @@ class AareDAQ:
|
||||
self.__devs.smargon.target = SmargonCoordinate(sh_mm=r.smargon.sh_mm + delta_mm,
|
||||
phi_deg=r.smargon.phi_deg,
|
||||
chi_deg=r.smargon.chi_deg)
|
||||
|
||||
self.__devs.transmission.set(r.transmission, wait=False)
|
||||
if r.transmission is not None:
|
||||
self.__devs.transmission.set(r.transmission, wait=False)
|
||||
self.__devs.aerotech.move(r.omega_deg, wait=True, speed=360.0)
|
||||
self.__devs.transmission.wait()
|
||||
self.__devs.smargon.wait()
|
||||
@@ -437,10 +438,14 @@ class AareDAQ:
|
||||
raise e
|
||||
|
||||
def __rotation(self, request: RotationScanRequest) -> CompletedRotationScan:
|
||||
self.__cfg.dtz = request.dtz
|
||||
if request.dtz is not None:
|
||||
self.__cfg.dtz = request.dtz
|
||||
|
||||
self.__set_state(BeamlineStateEnum.DataCollection)
|
||||
|
||||
self.__devs.transmission.set(request.transmission, wait=False)
|
||||
if request.transmission is not None:
|
||||
self.__devs.transmission.set(request.transmission, wait=False)
|
||||
|
||||
if request.start is not None:
|
||||
self.__devs.smargon.target = request.start
|
||||
|
||||
|
||||
Reference in New Issue
Block a user