From 55e0f7893af29edb007c3b758eee5fc1dc3affaf Mon Sep 17 00:00:00 2001 From: appleb_m Date: Fri, 1 May 2026 10:38:37 +0200 Subject: [PATCH] workflows: added maintenance2sa and maintenance2se methods --- src/aare/daq/workflows.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/aare/daq/workflows.py b/src/aare/daq/workflows.py index afb1f023..07fa4214 100644 --- a/src/aare/daq/workflows.py +++ b/src/aare/daq/workflows.py @@ -54,7 +54,17 @@ def common_2rse(devs: BeamlineDevices, cfg: BeamlineConfig): devs.aerotech_pos = ABR_POS_MOUNT def m2se(devs: BeamlineDevices, cfg: BeamlineConfig): - pass + devs.samcam_auto(AutoEnum.AUTO) + devs.bec_worker.planner.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.smargon_move_home() + devs.samcam_auto(AutoEnum.ONCE) + +def m2sa(devs: BeamlineDevices, cfg: BeamlineConfig): + devs.samcam_auto(AutoEnum.AUTO) + devs.bec_worker.planner.move_to(BeamlineState.SAMPLE_ALIGNMENT) + devs.samcam_auto(AutoEnum.ONCE) def sa2se(devs: BeamlineDevices, cfg: BeamlineConfig): try: @@ -64,7 +74,8 @@ def sa2se(devs: BeamlineDevices, cfg: BeamlineConfig): devs.aerotech_pos = cfg.abr_meas_pos devs.smargon_move_home() devs.samcam_auto(AutoEnum.ONCE) - except Exception: + except Exception as e: + logger.error(f"Failed to move to sample exchange: {e}") devs.aerotech_pos = cfg.abr_meas_pos devs.smargon_move_home() raise