bec/csaxs_bec
0
0
Fork 2
Code Issues 17 Pull Requests 2 Actions 2 Packages Projects Releases Wiki Activity

fix(LamNI): don't auto-retry lsamrot moves aborted by stop() #281

Merged
holler merged 1 commits from fix/lsamrot_stop_retry into main 2026-07-28 11:54:11 +02:00
Conversation 0 Commits 1 Files Changed 2
+53 -7
holler commented 2026-07-28 11:37:45 +02:00
Member
Copy Link
Copy Source

move_and_finish()'s spurious-trip retry (added in 1f85106) couldn't tell a
genuine Galil safety-thread trip apart from a user/scan-initiated stop()
(e.g. Ctrl+C): an aborted move looked like an incomplete move either way,
so the abort got silently undone by resetting the error latches and
re-issuing the original move to the same target.

Track stop() requests on a per-motor threading.Event, cleared at the start
of each move() and checked (twice, since reset_axis_errors() itself takes
a few round-trips) before the retry branch fires, so an aborted move is
now reported as a failure instead of being retried.

Co-Authored-By: Claude Sonnet 5 noreply@anthropic.com

move_and_finish()'s spurious-trip retry (added in 1f85106) couldn't tell a genuine Galil safety-thread trip apart from a user/scan-initiated stop() (e.g. Ctrl+C): an aborted move looked like an incomplete move either way, so the abort got silently undone by resetting the error latches and re-issuing the original move to the same target. Track stop() requests on a per-motor threading.Event, cleared at the start of each move() and checked (twice, since reset_axis_errors() itself takes a few round-trips) before the retry branch fires, so an aborted move is now reported as a failure instead of being retried. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
holler added 1 commit 2026-07-28 11:37:46 +02:00
fix(LamNI): don't auto-retry lsamrot moves aborted by stop()
CI for csaxs_bec / test (pull_request) Successful in 1m50s
Details
Read the Docs Deploy Trigger / trigger-rtd-webhook (push) Successful in 2s
Details
CI for csaxs_bec / test (push) Successful in 1m57s
Details
89c5ed1c9e 
move_and_finish()'s spurious-trip retry (added in 1f85106) couldn't tell a
genuine Galil safety-thread trip apart from a user/scan-initiated stop()
(e.g. Ctrl+C): an aborted move looked like an incomplete move either way,
so the abort got silently undone by resetting the error latches and
re-issuing the original move to the same target.

Track stop() requests on a per-motor threading.Event, cleared at the start
of each move() and checked (twice, since reset_axis_errors() itself takes
a few round-trips) before the retry branch fires, so an aborted move is
now reported as a failure instead of being retried.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
holler merged commit 89c5ed1c9e into main 2026-07-28 11:54:11 +02:00
holler deleted branch fix/lsamrot_stop_retry 2026-07-28 11:54:11 +02:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
issue::not confirmed
Used if an issue has not yet been confirmed by a developer
 issue::not reproducible
Used if an issue is not reproducible
 issue::reproducible
Used if a developer was able to reproduce the issue
 priority::critical
Should be done as soon as possible
 priority::needed
An important update to the code base
 priority::nice to have
Not really needed but a good improvement
 scope::backend
An issue regarding the backend services
 scope::frontend
An issue regarding the user-facing services
 stage::in development
This issue is currently being worked on
 stage::on hold
Something is blocking the development
 stage::pre_release
For issues that have been merged into a pre-release branch and are waiting for their release.
stage::ready for review
For issues that have been resolved and are ready for review
 stage::selected for development
This issue has been selected for development but has not been scheduled yet
 stage::weekly backlog
This issue has been selected for development for the next development cycle
 type::bug
It's a bug!
 type::discussion
A discussion is wanted/needed
 type::doc
Improvements to the documentation
 type::feature
A new feature
 type::improvement
Neither a feature nor a bug but an improvement to the code base
 type::test
Missing tests or improvements to the test suite
bug
Something is not working
 duplicate
This issue or pull request already exists
 enhancement
New feature
 help wanted
Need some help
 invalid
Something is wrong
 question
More information is needed
 wontfix
This won't be fixed
No labels
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
acerbo_a (acerbo_a) appel_c (appel_c) bec-gitea celcer_t (celcer_t) debenjak_l (debenjak_l) diaz (diaz) divall_e (divall_e) guizar_m (guizar_m) haghta_s (haghta_s) holler (holler) lombosi_c (lombosi_c) menzel (menzel) perl_d (perl_d) usov_i (usov_i) wakonig_k (wakonig_k) wang_x1 (wang_x1) wyzula_j (wyzula_j) zamofing_t (zamofing_t)
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: bec/csaxs_bec#281