From 6969b1ee4d1a552ed10bbe5d0fcb2fffe526915c Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Tue, 30 Sep 2025 15:44:53 +0200 Subject: [PATCH] DAQ: detector cover logic adapted --- daq/src/aaredaq/workflows.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/daq/src/aaredaq/workflows.py b/daq/src/aaredaq/workflows.py index 54139d04..0dffd063 100644 --- a/daq/src/aaredaq/workflows.py +++ b/daq/src/aaredaq/workflows.py @@ -140,9 +140,6 @@ def dc2rse(devs: BeamlineDevices, cfg: BeamlineConfig): def se2sa(devs: BeamlineDevices, cfg: BeamlineConfig): - print(time.ctime(), " moving detector cover to open position") - devs.detector_cover.put(2) # Open detector cover - print(time.ctime(), " mchanging settings") hub = cfg.settings cfg.zoom_mode = ZoomModeEnum.User devs.samcam_settings = cfg.zoom_settings.get_camera_settings(devs.zoom) @@ -202,6 +199,7 @@ def sa2dc(devs: BeamlineDevices, cfg: BeamlineConfig): def dc2sa(devs: BeamlineDevices, cfg: BeamlineConfig): hub = cfg.settings + devs.detector_cover.put(1) # Close detector cover devs.collimator = StagePositionEnum.PARK devs.reflector_up = True @@ -284,6 +282,7 @@ def sa2bl(devs: BeamlineDevices, cfg: BeamlineConfig): val=1000 devs.zoom = val cfg.zoom_mode = ZoomModeEnum.BeamLocation + devs.detector_cover.put(1) # Close detector cover devs.samcam_settings = cfg.zoom_settings.get_camera_settings(val) devs.lamp_light = 2.5