feat(smargon): drivable O-vector motors; stop leaves the O-vector alone #355

Open
menzel wants to merge 4 commits from feat/smargon into main
pull from: feat/smargon
Member

Make the SmarGon O-vector (OX/OY/OZ) drivable: adds sgox/sgoy/sgoz motors (baseline readout, limits: [-2, 2] as used at the beamline) to the beamline and sim configs, and corrects OZ's unit to mm (the O-vector is a length; /nudgeOBCS shifts it in mm).

Stop no longer retargets OX/OY/OZ: stop works by writing the readback back as the target, and the O readback fluctuates, so every stop shifted the offset. Stopping an O motor now only ends BEC's wait.

The same changes are also on fixes/sastt_beamtime for the current beamtime (not yet pulled on production). Unit-tested against the fake transport (moves, limits, READY gate, move_scs with O axes, /targetSCS stop payload); stop behaviour not yet checked on the hardware.

🤖 Generated with Claude Code

Make the SmarGon O-vector (`OX/OY/OZ`) drivable: adds `sgox/sgoy/sgoz` motors (baseline readout, `limits: [-2, 2]` as used at the beamline) to the beamline and sim configs, and corrects OZ's unit to mm (the O-vector is a length; `/nudgeOBCS` shifts it in mm). Stop no longer retargets OX/OY/OZ: stop works by writing the readback back as the target, and the O readback fluctuates, so every stop shifted the offset. Stopping an O motor now only ends BEC's wait. The same changes are also on `fixes/sastt_beamtime` for the current beamtime (not yet pulled on production). Unit-tested against the fake transport (moves, limits, READY gate, `move_scs` with O axes, `/targetSCS` stop payload); stop behaviour not yet checked on the hardware. 🤖 Generated with [Claude Code](https://claude.com/claude-code)
menzel added 2 commits 2026-11-13 09:04:33 +01:00
OX/OY/OZ are components of the SCS offset vector, which /nudgeOBCS shifts
in mm along the beamline axes; the API example reports OZ: 300.0.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
feat(smargon): drivable O-vector motors sgox/sgoy/sgoz
CI for csaxs_bec / test (pull_request) Successful in 3m45s
CI for csaxs_bec / test (push) Successful in 3m54s
4581609997
Add SmargopoloMotor entries for OX/OY/OZ to the beamline and sim configs
(baseline readout, no default soft limits), document them, and test
single-axis moves, limits, the READY gate and move_scs with O axes.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
menzel force-pushed feat/smargon from 6b0fe76d4d to 4581609997 2026-11-13 09:04:33 +01:00 Compare
Author
Member

Branch rebased onto current main: the earlier SmarGon commits were already merged as #314 (squashed), so this PR now contains only the two O-vector commits on top of the readback monitor from 94d7890a. Conflict in test_smargon_device.py resolved by keeping both test blocks. CI (push and pull_request) is green.

Branch rebased onto current `main`: the earlier SmarGon commits were already merged as #314 (squashed), so this PR now contains only the two O-vector commits on top of the readback monitor from `94d7890a`. Conflict in `test_smargon_device.py` resolved by keeping both test blocks. CI (push and pull_request) is green.
menzel changed title from Feat/smargon to feat(smargon): drivable O-vector motors sgox/sgoy/sgoz 2026-11-13 09:14:42 +01:00
menzel added 2 commits 2026-11-13 17:03:21 +01:00
Stop halts axes by writing their current readback back as the target. The
O-vector readback fluctuates, so stop_all (and BEC's stop on sgox/sgoy/sgoz)
shifted the offset by a random amount on every stop. Exclude OX/OY/OZ from
stop in both transports; stopping an O motor now only ends BEC's wait.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
config(smargon): O-motor entries as used at the beamline (limits [-2, 2])
CI for csaxs_bec / test (pull_request) Successful in 4m22s
CI for csaxs_bec / test (push) Successful in 4m27s
9a765b52fe
Match the sgox/sgoy/sgoz entries committed on x12sa-bec-001 (43b2e18), so
merging fixes/sastt_beamtime into main later does not conflict here.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
menzel changed title from feat(smargon): drivable O-vector motors sgox/sgoy/sgoz to feat(smargon): drivable O-vector motors; stop leaves the O-vector alone 2026-11-13 17:03:29 +01:00
All checks were successful
CI for csaxs_bec / test (pull_request) Successful in 4m22s
Required
Details
CI for csaxs_bec / test (push) Successful in 4m27s
You are not authorized to merge this pull request.
This pull request can be merged automatically.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin feat/smargon:feat/smargon
git checkout feat/smargon
Sign in to join this conversation.
No Reviewers
No labels
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: bec/csaxs_bec#355