From cb1dbdb0033620f2b83ff18d85b9bd9e12b3c271 Mon Sep 17 00:00:00 2001
From: x12sa <x12sa@psi.ch>
Date: Tue, 3 Nov 2026 11:37:12 +0100
Subject: [PATCH] config(sastt): aerotech beamline setup in main.yaml, PandA
 config to legacy

main.yaml loads sastt_aerotech.yaml instead of ptycho_lamni.yaml. aeroz and
aerorot are commented out in sastt_aerotech.yaml (not used at the beamline now).
sastt_aerotech_panda.yaml (PandA test setup without beamline timing) moved to
legacy/.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017NrH3poJsYBCTVq2Y9fuHZ
---
 .../{ => legacy}/sastt_aerotech_panda.yaml    |  0
 csaxs_bec/device_configs/main.yaml            |  7 +-
 csaxs_bec/device_configs/sastt_aerotech.yaml  | 92 +++++++++----------
 docs/developer/aerotech_stages.md             |  4 +-
 4 files changed, 53 insertions(+), 50 deletions(-)
 rename csaxs_bec/device_configs/{ => legacy}/sastt_aerotech_panda.yaml (100%)

diff --git a/csaxs_bec/device_configs/sastt_aerotech_panda.yaml b/csaxs_bec/device_configs/legacy/sastt_aerotech_panda.yaml
similarity index 100%
rename from csaxs_bec/device_configs/sastt_aerotech_panda.yaml
rename to csaxs_bec/device_configs/legacy/sastt_aerotech_panda.yaml
diff --git a/csaxs_bec/device_configs/main.yaml b/csaxs_bec/device_configs/main.yaml
index 7a45e202..944a0c1f 100644
--- a/csaxs_bec/device_configs/main.yaml
+++ b/csaxs_bec/device_configs/main.yaml
@@ -25,14 +25,17 @@ detectors:
 #sastt:
 #  - !include ./sastt.yaml
 
+sastt:
+  - !include ./sastt_aerotech.yaml
+
 # flomni:
 #  - !include ./ptycho_flomni.yaml
 
 #omny:
 #  - !include ./ptycho_omny.yaml
 
-lamni:
- - !include ./ptycho_lamni.yaml
+# lamni:
+#  - !include ./ptycho_lamni.yaml
 
 # user setup:
 #   - !include ./user_setup.yaml
diff --git a/csaxs_bec/device_configs/sastt_aerotech.yaml b/csaxs_bec/device_configs/sastt_aerotech.yaml
index 9bf4f75e..861a99de 100644
--- a/csaxs_bec/device_configs/sastt_aerotech.yaml
+++ b/csaxs_bec/device_configs/sastt_aerotech.yaml
@@ -67,52 +67,52 @@ aeroy:
   readoutPriority: baseline
   deviceTags:
     - sastt_aerotech
-aeroz:
-  description: Aerotech Z, ATS20010 linear stage (no PSO input)
-  deviceClass: csaxs_bec.devices.aerotech.a3200.A3200Motor
-  deviceConfig:
-    axis_Id: Z
-    axis_nr: 1
-    acceleration: 10.0
-    host: pc14643.psi.ch
-    port: 8000
-    velocity: 5.0
-    egu: mm
-    tolerance: 0.005
-    limits:
-    - -100
-    - 100
-    sign: 1
-  enabled: true
-  onFailure: buffer
-  readOnly: false
-  readoutPriority: baseline
-  deviceTags:
-    - sastt_aerotech
-aerorot:
-  description: Aerotech U, ABRT-200 rotation stage (UU follows as gantry slave)
-  deviceClass: csaxs_bec.devices.aerotech.a3200.A3200Motor
-  deviceConfig:
-    axis_Id: U
-    axis_nr: 3
-    pso_input: 7
-    pso_counts_divider: 40
-    acceleration: 2000.0
-    host: pc14643.psi.ch
-    port: 8000
-    velocity: 30.0
-    egu: deg
-    tolerance: 0.001
-    limits:
-    - 0
-    - 0
-    sign: 1
-  enabled: true
-  onFailure: buffer
-  readOnly: false
-  readoutPriority: baseline
-  deviceTags:
-    - sastt_aerotech
+# aeroz:
+#   description: Aerotech Z, ATS20010 linear stage (no PSO input)
+#   deviceClass: csaxs_bec.devices.aerotech.a3200.A3200Motor
+#   deviceConfig:
+#     axis_Id: Z
+#     axis_nr: 1
+#     acceleration: 10.0
+#     host: pc14643.psi.ch
+#     port: 8000
+#     velocity: 5.0
+#     egu: mm
+#     tolerance: 0.005
+#     limits:
+#     - -100
+#     - 100
+#     sign: 1
+#   enabled: true
+#   onFailure: buffer
+#   readOnly: false
+#   readoutPriority: baseline
+#   deviceTags:
+#     - sastt_aerotech
+# aerorot:
+#   description: Aerotech U, ABRT-200 rotation stage (UU follows as gantry slave)
+#   deviceClass: csaxs_bec.devices.aerotech.a3200.A3200Motor
+#   deviceConfig:
+#     axis_Id: U
+#     axis_nr: 3
+#     pso_input: 7
+#     pso_counts_divider: 40
+#     acceleration: 2000.0
+#     host: pc14643.psi.ch
+#     port: 8000
+#     velocity: 30.0
+#     egu: deg
+#     tolerance: 0.001
+#     limits:
+#     - 0
+#     - 0
+#     sign: 1
+#   enabled: true
+#   onFailure: buffer
+#   readOnly: false
+#   readoutPriority: baseline
+#   deviceTags:
+#     - sastt_aerotech
 aerocapture:
   # always used by aerotech_cont_grid (positions at the start and centre of each exposure)
   description: Aerotech position capture (Npaq DATAACQ, latched on the detector trigger at UINT1)
diff --git a/docs/developer/aerotech_stages.md b/docs/developer/aerotech_stages.md
index a9bd2951..b12d22d4 100644
--- a/docs/developer/aerotech_stages.md
+++ b/docs/developer/aerotech_stages.md
@@ -10,7 +10,7 @@ Developer notes for the Aerotech A3200 integration and the continuous grid scan
 | Scan | `csaxs_bec/scans/scans_v4/aerotech_cont_grid.py` |
 | PandABox line trigger (test setup) | `csaxs_bec/devices/panda_box/panda_line_trigger.py` |
 | Simulation | `csaxs_bec/devices/sim/sim_a3200.py` |
-| Configs | `device_configs/sastt_aerotech.yaml`, `sastt_aerotech_panda.yaml`, `simulated_omny/simulated_sastt_aerotech.yaml` |
+| Configs | `device_configs/sastt_aerotech.yaml`, `legacy/sastt_aerotech_panda.yaml`, `simulated_omny/simulated_sastt_aerotech.yaml` |
 | Hardware notes, wiring, channel table | `csaxs_bec/devices/aerotech/README.md` |
 
 ## Hardware and interface
@@ -160,7 +160,7 @@ along the line, and line period with the motion and readout parts.
 
 ## PandABox as line trigger (test setup)
 
-Without beamline timing, `sastt_aerotech_panda.yaml` adds `pandatrig`
+Without beamline timing, `legacy/sastt_aerotech_panda.yaml` adds `pandatrig`
 (`omny-panda.psi.ch`) as a DDG stand-in. It stays armed like the DDG, and every
 accepted line trigger edge produces: