diff --git a/daq/src/aaredaq/daq.py b/daq/src/aaredaq/daq.py index 1e47be18..c19f3d99 100644 --- a/daq/src/aaredaq/daq.py +++ b/daq/src/aaredaq/daq.py @@ -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 diff --git a/daq/src/aaredaq/workflows.py b/daq/src/aaredaq/workflows.py index 5e203b04..65907785 100644 --- a/daq/src/aaredaq/workflows.py +++ b/daq/src/aaredaq/workflows.py @@ -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