From 53baddc2439003c1a356cfb51b18b0616aeed7fb Mon Sep 17 00:00:00 2001 From: appleb_m Date: Mon, 15 Jun 2026 11:41:43 +0200 Subject: [PATCH] workflows: changed workflows to use to ABR_POS and ABR_OMEGA MOUNT --- src/aare/daq/workflows.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/aare/daq/workflows.py b/src/aare/daq/workflows.py index aff97a52..8238c22d 100644 --- a/src/aare/daq/workflows.py +++ b/src/aare/daq/workflows.py @@ -1,6 +1,6 @@ -from aare.common.models import StagePositionEnum, SampleCameraSettings +from aare.common.models import SampleCameraSettings from aare.daq.devices import BeamlineDevices -from aare.daq.config import BeamlineConfig, ABR_POS_MOUNT +from aare.daq.config import BeamlineConfig, ABR_POS_MOUNT, ABR_OMEGA_MOUNT from aare.devices.area_detector import AutoEnum from aare.common.logger_config import setup_logger @@ -18,6 +18,7 @@ def common_2rse(devs: BeamlineDevices, cfg: BeamlineConfig): devs.smargon_move_home() print('try to move aerotech') devs.aerotech_pos = ABR_POS_MOUNT + devs.aerotech_omega = ABR_OMEGA_MOUNT def rse2se(devs: BeamlineDevices, cfg: BeamlineConfig): devs.samcam_auto(AutoEnum.AUTO) @@ -28,7 +29,8 @@ def m2se(devs: BeamlineDevices, cfg: BeamlineConfig): devs.samcam_auto(AutoEnum.AUTO) devs.bec_worker.move_to(BeamlineState.MANUAL_SAMPLE_EXCHANGE) logger.info(f"moved to sample exchange, now moving to {cfg.abr_meas_pos}") - devs.aerotech_pos = cfg.abr_meas_pos + devs.aerotech_pos = ABR_POS_MOUNT + devs.aerotech_omega = ABR_OMEGA_MOUNT devs.smargon_move_home() devs.samcam_auto(AutoEnum.ONCE) @@ -42,12 +44,14 @@ def sa2se(devs: BeamlineDevices, cfg: BeamlineConfig): devs.samcam_auto(AutoEnum.AUTO) devs.bec_worker.move_to(BeamlineState.MANUAL_SAMPLE_EXCHANGE) logger.info(f"moved to sample exchange, now moving to {cfg.abr_meas_pos}") - devs.aerotech_pos = cfg.abr_meas_pos + devs.aerotech_pos = ABR_POS_MOUNT + devs.aerotech_omega = ABR_OMEGA_MOUNT devs.smargon_move_home() devs.samcam_auto(AutoEnum.ONCE) except Exception as e: logger.error(f"Failed to move to sample exchange: {e}") - devs.aerotech_pos = cfg.abr_meas_pos + devs.aerotech_pos = ABR_POS_MOUNT + devs.aerotech_omega = ABR_OMEGA_MOUNT devs.smargon_move_home() raise