diff --git a/daq/src/aaredaq/workflows.py b/daq/src/aaredaq/workflows.py index 65907785..3c01ba94 100644 --- a/daq/src/aaredaq/workflows.py +++ b/daq/src/aaredaq/workflows.py @@ -63,6 +63,8 @@ def common_2rse(devs: BeamlineDevices, cfg: BeamlineConfig): def m2se(devs: BeamlineDevices, cfg: BeamlineConfig): print("executing MAINTENANCE -> sample exchange") + devs.detector_cover.put(1) # Close detector cover + hub = cfg.settings hub_cryo = cfg.cryojet_settings @@ -111,6 +113,7 @@ def sa2se(devs: BeamlineDevices, cfg: BeamlineConfig): devs.reflector_up = False devs.beamstop_stage_up = False devs.smargon.move_home(wait=True) + devs.detector_cover.put(1) # Close detector cover if devs.dtz.position < _dtzpark: devs.dtz.move(_dtzpark) @@ -124,6 +127,8 @@ def dc2rse(devs: BeamlineDevices, cfg: BeamlineConfig): def se2sa(devs: BeamlineDevices, cfg: BeamlineConfig): + devs.detector_cover.put(2) # Open detector cover + hub = cfg.settings hub_cryo = cfg.cryojet_settings _cryo = hub_cryo.cryojet_in_use @@ -143,6 +148,8 @@ def se2sa(devs: BeamlineDevices, cfg: BeamlineConfig): devs.dtz.move(cfg.dtz, wait=False) def rse2sa(devs: BeamlineDevices, cfg: BeamlineConfig): + devs.detector_cover.put(2) # Open detector cover + if devs.tell.is_in_park(): devs.tell.move_cold(wait=True) start_time = time.time() @@ -154,6 +161,8 @@ def rse2sa(devs: BeamlineDevices, cfg: BeamlineConfig): se2sa(devs, cfg) def sa2dc(devs: BeamlineDevices, cfg: BeamlineConfig): + devs.detector_cover.put(2) # Open detector cover + devs.reflector_up = False #devs.reflector.wait("park")