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

fix(gui): wait for hw lock before auto-centering after mount #243

Closed
duan_j wants to merge 3 commits from fix/auto-center-after-mount-wait-idle into main
pull from: fix/auto-center-after-mount-wait-idle
merge into: mx:main
Conversation 1 Commits 3 Files Changed 3
+89 -6
duan_j commented 2026-09-29 11:15:22 +02:00
Owner
Copy link
Copy source

Problem

"apply after mounting" never triggered auto-centering.

The server publishes the new sample (cfg.current_sample, mounting/service.py) while the
mount op still holds the hw lock (state change, events, screenshot). The GUI fired
find_tip.click() on the sample-id change, /alc/center_loop acquires the lock
non-blocking -> BeamlineBusyException -> request rejected, no retry.

Fix

  • data_collection_settings._track_sample arms a pending flag on mount and clicks on the
    first status tick with busy == False (busy == hw lock held). Unmount clears it.
  • Skipped while queue automation runs (SampleQueuePanel.automation_running_changed):
    /scan/auto centers each sample itself and frees the lock between samples, so a GUI
    centering in that gap could steal the lock from the next /scan/auto and stop the queue.

Test

New tests: waits for hw lock release; skipped during queue automation.
tests/unit/gui/test_data_collection_settings.py: 34 passed.

Not yet verified on the beamline.

Generated with Claude Code (https://claude.com/claude-code)

## Problem "apply after mounting" never triggered auto-centering. The server publishes the new sample (cfg.current_sample, mounting/service.py) while the mount op still holds the hw lock (state change, events, screenshot). The GUI fired find_tip.click() on the sample-id change, /alc/center_loop acquires the lock non-blocking -> BeamlineBusyException -> request rejected, no retry. ## Fix - data_collection_settings._track_sample arms a pending flag on mount and clicks on the first status tick with busy == False (busy == hw lock held). Unmount clears it. - Skipped while queue automation runs (SampleQueuePanel.automation_running_changed): /scan/auto centers each sample itself and frees the lock between samples, so a GUI centering in that gap could steal the lock from the next /scan/auto and stop the queue. ## Test New tests: waits for hw lock release; skipped during queue automation. tests/unit/gui/test_data_collection_settings.py: 34 passed. Not yet verified on the beamline. Generated with Claude Code (https://claude.com/claude-code)
duan_j added 1 commit 2026-09-29 11:15:22 +02:00
fix(gui): wait for hw lock before auto-centering after mount
CI / lint (push) Skipped
CI / test (3.12) (push) Skipped
CI / test (3.13) (push) Skipped
CI / test-with-beamline-plugins (pxi_bec) (push) Skipped
CI / test-with-beamline-plugins (pxii_bec) (push) Skipped
CI / test-with-beamline-plugins (pxiii_bec) (push) Skipped
CI / test-with-beamline-plugins (pxiii_bec) (pull_request) Failing after 1m1s
Details
CI / test-with-beamline-plugins (pxii_bec) (pull_request) Successful in 1m26s
Details
CI / lint (pull_request) Successful in 1m35s
Details
CI / test (3.12) (pull_request) Successful in 1m37s
Details
CI / test-with-beamline-plugins (pxi_bec) (pull_request) Successful in 1m40s
Details
CI / test-with-coverage (pull_request) Successful in 1m42s
Details
CI / test (3.13) (pull_request) Successful in 1m45s
Details
CI / test (3.14) (pull_request) Successful in 1m47s
Details
CI / coverage-analysis (pull_request) Successful in 3s
Details
43054dc0e8 
The server publishes the new sample while the mount still holds the hw
lock, and /alc/center_loop takes that lock non-blocking, so the click
fired on the sample-id change was rejected as busy and never retried.
Arm on mount, fire on the first non-busy status tick instead.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
gitea-actions Bot commented 2026-09-29 11:17:12 +02:00
Copy link
Copy source

Coverage report (automated)

Total line + branch coverage: 51%
Diff coverage vs main: 100% (minimum 80%)

Full report: coverage artifact on this run.

Coverage report (automated) Total line + branch coverage: 51% Diff coverage vs main: 100% (minimum 80%) Full report: coverage artifact on this run.
duan_j added 1 commit 2026-09-29 11:20:45 +02:00
fix(gui): skip mount auto-centering during queue automation
CI / lint (push) Skipped
CI / test (3.12) (push) Skipped
CI / test (3.13) (push) Skipped
CI / test-with-beamline-plugins (pxi_bec) (push) Skipped
CI / test-with-beamline-plugins (pxii_bec) (push) Skipped
CI / test-with-beamline-plugins (pxiii_bec) (push) Skipped
CI / lint (pull_request) Successful in 1m18s
Details
CI / test-with-beamline-plugins (pxi_bec) (pull_request) Successful in 1m41s
Details
CI / test-with-beamline-plugins (pxii_bec) (pull_request) Successful in 1m44s
Details
CI / test (3.12) (pull_request) Successful in 1m46s
Details
CI / test (3.13) (pull_request) Successful in 1m45s
Details
CI / test (3.14) (pull_request) Failing after 1m45s
Details
CI / test-with-beamline-plugins (pxiii_bec) (pull_request) Successful in 1m49s
Details
CI / test-with-coverage (pull_request) Successful in 1m58s
Details
CI / coverage-analysis (pull_request) Successful in 4s
Details
f49f34cd27 
Automation centers each sample itself and frees the hw lock between
samples; waiting for idle made the GUI fire center_loop in that gap,
which could steal the lock from the next /scan/auto and stop the queue.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
duan_j added 1 commit 2026-09-29 11:25:39 +02:00
fix(gui): gate mount auto-centering on in-flight /scan/auto, not queue flag
CI / lint (push) Skipped
CI / test (3.12) (push) Skipped
CI / test (3.13) (push) Skipped
CI / test-with-beamline-plugins (pxi_bec) (push) Skipped
CI / test-with-beamline-plugins (pxii_bec) (push) Skipped
CI / test-with-beamline-plugins (pxiii_bec) (push) Skipped
CI / lint (pull_request) Failing after 31s
Details
CI / test-with-beamline-plugins (pxiii_bec) (pull_request) Failing after 32s
Details
CI / test-with-beamline-plugins (pxii_bec) (pull_request) Failing after 31s
Details
CI / test-with-beamline-plugins (pxi_bec) (pull_request) Failing after 30s
Details
CI / test (3.14) (pull_request) Failing after 32s
Details
CI / test-with-coverage (pull_request) Failing after 35s
Details
CI / coverage-analysis (pull_request) Skipped
Details
CI / test (3.13) (pull_request) Failing after 40s
Details
CI / test (3.12) (pull_request) Successful in 1m19s
Details
039c56a9e9 
Pause flips the queue's running flag while the current sample is still
being processed, so a mount seen after Pause armed a centering on an
already handled sample. Track the /scan/auto request instead; a counter
because the queue sends the next scan before the done signal reaches us.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
duan_j closed this pull request 2026-09-29 16:50:29 +02:00
duan_j deleted branch fix/auto-center-after-mount-wait-idle 2026-09-29 16:50:36 +02:00

Pull request closed

This pull request cannot be reopened because the branch was deleted.
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
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
buntschu_d (buntschu_d) duan_j (duan_j) glettig_w (glettig_w) gobbo_a (gobbo_a) gotthard_g (gotthard_g) leonarski_f (leonarski_f) mx-gitea olieric (olieric) perl_d (perl_d) takaba_k (takaba_k) wang_m (wang_m)
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: mx/AareDAQ#243