mx/AareDAQ
0
1
Fork 0
Code Issues 27 Pull Requests Actions Packages Projects Releases 95 Wiki Activity

workflows: changed workflows to use to ABR_POS and ABR_OMEGA MOUNT

Browse Source
This commit is contained in:
appleb_m
2026-06-24 15:29:57 +02:00
parent a4923eed00
commit 53baddc243
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/aare/daq/workflows.py
+9 -5
View File
@@ -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