DAQ: rse2sa transition
This commit is contained in:
1 parent
d9fcfc4140
commit
ad77ea9612
2 files changed
+11
-1
No files matched your search
@@ -904,7 +904,7 @@ class AareDAQ:
|
||||
raise TransformationInvalidException()
|
||||
case BeamlineStateEnum.RobotSampleExchange:
|
||||
if target == BeamlineStateEnum.SampleAlignment:
|
||||
workflows.se2sa(self.__devs, self.__cfg)
|
||||
workflows.rse2sa(self.__devs, self.__cfg)
|
||||
else:
|
||||
raise TransformationInvalidException()
|
||||
self.__cfg.state = target
|
||||
|
||||
@@ -142,6 +142,16 @@ def se2sa(devs: BeamlineDevices, cfg: BeamlineConfig):
|
||||
|
||||
devs.dtz.move(cfg.dtz, wait=False)
|
||||
|
||||
def rse2sa(devs: BeamlineDevices, cfg: BeamlineConfig):
|
||||
if devs.tell.is_in_park():
|
||||
devs.tell.move_cold(wait=True)
|
||||
start_time = time.time()
|
||||
se2sa(devs, cfg)
|
||||
elapsed_time = time.time() - start_time
|
||||
remaining_time = max(0.0, 30 - elapsed_time)
|
||||
time.sleep(remaining_time)
|
||||
else:
|
||||
se2sa(devs, cfg)
|
||||
|
||||
def sa2dc(devs: BeamlineDevices, cfg: BeamlineConfig):
|
||||
devs.reflector_up = False
|
||||
|
||||
Reference in new issue
Block a user