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

Fzp move beyond #338

Merged
holler merged 20 commits from fzp-move-beyond into main 2026-10-26 13:19:41 +01:00
Conversation 0 Commits 20 Files Changed 29
+1764 -351
holler commented 2026-10-26 13:07:33 +01:00
Member
Copy link
Copy source
No description provided.
holler added 20 commits 2026-10-26 13:07:33 +01:00
docs(flomni): FZP how-tos as Markdown, updated for the PREEMPT_RT loop, move-ahead renamed to move-beyond ea9f8cdf01 
Markdown versions of local_contact_only-howto_calibrate_the_fzp_scanner.pdf and
local_contact_only-howto_limit_the_fzp_scanner_range.pdf (original text kept, update sections for the present
flOMNI loop). New section "Move-beyond" (FAST_FZP_PID_LOOP(0) < 0 of the sample PIDs): mechanism, sizing (about
half the FZP stroke), Abbe correction on the FZP side, hold (5) now reads the FZP drive incl. feedforward
(flomni repo, branch fzp-move-beyond, 6a15f68). The PDFs are kept.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019aWcwG89wi7oVyrefukXX6
feat(flomni): flomni.realtime_system - loop settings through the web HMI; ConstEmitter emitter_* removed 79f5cced42 
The ConstEmitter is no longer in the flOMNI loop (flOMNI 773df74, branch fzp-move-beyond): its values are module
parameters, set with their rules by the web HMI on mpc2844 (RT-system webhmi/loopsettings.py, REST /api/settings).

- flomni_realtime_system.py (new): FlomniRealtimeSystem, flomni.realtime_system: show / get / check / set
  (refused with the reason, adjust=True for the dependent settings) / profiles / apply_profile / unsaved /
  save_as_default, shortcuts trigger_* and tracking_targets; stdlib HTTP, API token from ~/.flomni_webhmi_token
  (FLOMNI_WEBHMI_TOKEN_FILE), URL http://<rtx host>:8080 (FLOMNI_WEBHMI_URL). No logic of its own: the same rules
  as the web page.
- flomni.py: flomni.realtime_system; laser_parameters_* and laser_parameters_tweak_tracking() through it;
  interferometer_trigger_* are aliases of realtime_system.trigger_* (renamed, Mirko: "interferometer" was
  confusing next to flomni.laser_*)
- rt_flomni_ophyd.py: emitter_* methods and their USER_ACCESS entries removed (the e-commands now answer with an
  error line); move_xyz stays
- tests: test_flomni_realtime_system.py against a small local HTTP server standing in for the web HMI

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019aWcwG89wi7oVyrefukXX6
docs(flomni): realtime_system in the user guide; FZP how-tos with the loop-settings profiles 6dbf8784ff 
- user guide: detector-trigger commands under flomni.realtime_system.trigger_* (old names still work), new section
  "Real-time loop settings (expert)"
- calibration how-to: steps 1-3 as profiles fzp_off / fzp_calibration / production (+ fast_scan); trigger values are
  OnTargetTrigger parameters; move-beyond sizing with the loop-settings rule (0.6 x stroke - Abbe limit)
- range how-to: FZP range through the loop settings (Ub / Lb and Feedforward limits together)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019aWcwG89wi7oVyrefukXX6
flomni: interferometer_trigger_* removed (use realtime_system.trigger_*); realtime_system falls back to port 80 1806b721b1 
- the former flomni.interferometer_trigger_* aliases are removed (Mirko 2026-10-23); user guide updated
- flomni.realtime_system: when the default URL http://<rtx host>:8080 is not reachable, the request goes to port
  80 of the same host (nftables redirect to the web HMI on the loop machine) and that URL is kept; an explicit URL
  (argument or FLOMNI_WEBHMI_URL) gets no fallback; test added

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019aWcwG89wi7oVyrefukXX6
feat(flomni): baseline device flomni_loop_settings - the loop settings stored with every scan e418f96a1e 
Decisions Mirko 2026-10-23: settings only (not all loop parameters), snapshot at the scan start, web HMI down ->
marked unavailable and the scan continues, flOMNI only for now, token part of the device configuration.

- devices/omny/flomni_loop_settings.py (new): FlomniLoopSettings, readoutPriority baseline (the Fermat scan reads
  the baseline devices in prepare_scan): one signal per setting (21, NaN when not available), available, message,
  unsaved / inconsistent counts, violated error rules, definition path + sha1, compact snapshot_json; never
  raises; after a failure no new attempt for 60 s (a tomogram does not wait for the timeout at every projection);
  show() / snapshot() for the user
- devices/omny/webhmi_client.py (new): the HTTP client (URL with port-80 fallback, token value or file, errors)
  shared by the device and flomni.realtime_system (which now uses it; behaviour unchanged)
- ptycho_flomni.yaml: flomni_loop_settings with token_file (the token value only in a config that is not
  committed), host mpc2844.psi.ch, timeout 2 s
- tests: tests_devices/test_flomni_loop_settings.py (stub web HMI: values, counts, unavailable / back-off,
  unreachable, token file); checked end-to-end against the web HMI with the flOMNI definition and fakecore (all
  21 settings filled)
- user guide: the settings are stored with every scan

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019aWcwG89wi7oVyrefukXX6
feat(flomni): realtime_system goes through the device flomni_loop_settings (RPC); token in its device config 533fca8c24 
Mirko 2026-10-23: the token goes into the device config (behind the beamline firewall like the other devices); the
user commands call the BEC device in the background.

- FlomniLoopSettings: api_get / api_post (RPC for flomni.realtime_system; only /api/settings* and /api/status;
  10 s timeout, no back-off). Not named set / put: the BEC device server treats those as ophyd writes (refused on
  a readOnly device; checked in bec_server rpc_handler.py)
- FlomniRealtimeSystem: requests through dev.flomni_loop_settings when it exists and is enabled (errors from the
  device -> RealtimeSystemError), else direct HTTP as before; show() names the route
- ptycho_flomni.yaml: token field (empty: token_file is used)
- tests: RPC methods and path check; routing through a device and back to direct HTTP when it is disabled
  (checked against bec_server: deviceConfig keys are matched to the constructor parameters, device_manager is
  passed, the constructor does no network access)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019aWcwG89wi7oVyrefukXX6
feat(flomni): realtime_system.help(name) / help("all"); marked beamline scientists / local contact only 76aa2b9e56 
- help("<setting>"): what it does (help text of the flOMNI definition, as the web HMI tooltips), range, live and
  saved value, the loop parameters it sets, its rules; help("all"): every setting by group
- realtime_system is for beamline scientists / local contact only (Mirko 2026-10-23): module docstring, a line at
  show() / help(), user guide section heading and note
- tests: help output

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019aWcwG89wi7oVyrefukXX6
docs(flomni): loop settings out of the user guide; beamline-scientist document local_contact_only-realtime_system.md 7c0a15115d 
Mirko 2026-10-23: a user could change the loop settings and even save them as the new default. The user guide now
only says that the real-time loop settings are set by the local contact, that every scan stores them, and where the
details are; the commands (realtime_system, trigger, tracker), the profiles, save_as_default, the baseline device,
the connection and the web HMI are in plugins/flomni/docs/local_contact_only-realtime_system.md. The detector
trigger section of the user guide keeps the explanation and the measured times, without commands. show() / help()
name the document.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019aWcwG89wi7oVyrefukXX6
fix(flomni): review fixes: absolute isclose tolerances, alignment retry, special angles, resume after completion 1a5b53c031 
- np.isclose(a, b, x) took x as rtol: fsamx out (+-1.6 mm), gripper sensor voltage (+-0.55 V / +-1.1 V at
  -2.2 V), fsamx in checks now use atol (0.2 / 0.5 mm, 0.25 / 0.5 V, fsamx out 0.5 mm = Galil tolerance)
- tomo_alignment_scan: an angle with a TimeoutError is repeated (successful was set unconditionally, the
  angle was skipped); ptychotomoalign_scannum.txt is rewritten with the accepted scans if numbers shifted
- special angles: special_angle_tolerance is used (was hard-coded 0.5; init value 20 -> 0.5), any remaining
  special angle matches (not only the first in the list), kept on tomo_scan_resume in the same session
- tomo_scan_resume after a completed scan does nothing (progress tomo_completed; re-acquired the last
  projection and repeated the end-of-scan steps before); tomo_queue_reacquire clears the flag
- laser_parameters_tweak_tracking docstring: step 0.02

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019aWcwG89wi7oVyrefukXX6
fix(flomni): x-ray eye Ctrl-C handler looked up fsamx by device object; ffzp_info collision position b939793416 
- start_x_ray_eye_alignment: _get_user_param_safe() needs the device name (dev[name]); with dev.fsamx the
  KeyboardInterrupt handler raised KeyError and fsamx was never returned to its in position
- ffzp_info: the OSA collides at fosaz = 33 - foptz (compute_osa_remaining_space), printed 33 - fosaz

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019aWcwG89wi7oVyrefukXX6
fix(flomni): two 0-deg shots at the start of type 1, stop on declined gates, arrow-key tweaks, CLI angle range
CI for csaxs_bec / test (push) Successful in 4m34s
Details
04aa7713fb 
- tomo_scan type 1 with zero_deg_reference_at_each_subtomo: no extra reference before sub-tomogram 1
  of a new scan (fixed 0-deg shot + sub-tomogram 1's first projection = 2 in a row, was 3)
- tomo_scan: a declined eye/optics or filter gate raises FlomniError instead of returning (the tomo
  queue marked the job "done" without data)
- feye_out / feye_in: "no" (direct beam still visible, fttrx1 missing) raises FlomniOpticsError instead
  of returning (tomo_alignment_scan measured on with the eye in)
- tweak_cursor and laser_parameters_tweak_tracking: read_escape_suffix() waits briefly for a split
  arrow-key sequence and ignores ESC alone (read(2) unpacking raised); tweak_cursor message names the device
- tomo_parameters_cli: angle range re-asked until 180 or 360; _get_val re-asks on a non-number
- check_position_is_valid message 0-20; collect_empty_frames docstring: the sample is moved out
- omny/AI_docs/TODO_flomni_review_2026-10_findings.md: the same bugs in OMNY (x-ray eye Ctrl-C, special angles)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019aWcwG89wi7oVyrefukXX6
mod config files
CI for csaxs_bec / test (push) Successful in 4m40s
Details
5937d93040
token added to config file
CI for csaxs_bec / test (push) Failing after 2m35s
Details
692ee47836
docs(flomni): PDFs of the realtime_system guide and the FZP how-tos (for the web HMI tab Docs)
CI for csaxs_bec / test (push) Successful in 4m29s
Details
81d9e9eec0 
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QnSJvqxh9oDbshx8qXgeiX
feat(flomni): rt_positions prints the average of the per-point standard deviations (sample vs FZP during the exposures) to the BEC CLI at the end of each scan; no ZeroDivisionError when no point was read
CI for csaxs_bec / test (push) Successful in 4m18s
Details
68ea8235e6 
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QnSJvqxh9oDbshx8qXgeiX
feat(lamni): rt_positions prints the average of the per-point standard deviations and the average angle to the BEC CLI at the end of each scan (as flOMNI); the log line printed the sums
CI for csaxs_bec / test (push) Successful in 4m28s
Details
9edeb661f9 
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QnSJvqxh9oDbshx8qXgeiX
feat(flomni, lamni): end-of-scan statistics with the time split: scan time (kickoff -> end in the RT loop), exposure (points x requested exp_time x frames, passed with the kickoff), overhead per point
CI for csaxs_bec / test (push) Successful in 4m18s
Details
43e92f1e44 
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QnSJvqxh9oDbshx8qXgeiX
docs(flomni): scan-mode profiles (high_res, high_res_1v5, normal, low_res) instead of fast_scan
CI for csaxs_bec / test (push) Successful in 4m30s
Details
76723df5e3 
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QnSJvqxh9oDbshx8qXgeiX
feat(flomni): flomni_loop_settings stores target_shaper_scale and jump_max_um_x/_y as own signals (scan-mode profiles)
CI for csaxs_bec / test (push) Successful in 4m26s
Details
2c168e6154 
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QnSJvqxh9oDbshx8qXgeiX
Merge main into fzp-move-beyond: FZP how-tos keep the branch version (rewritten 2026-10-23: move-beyond, loop settings, scan modes; supersedes the 2026-10-20 update on main)
CI for csaxs_bec / test (pull_request) Successful in 4m42s
Details
Read the Docs Deploy Trigger / trigger-rtd-webhook (push) Successful in 2s
Details
CI for csaxs_bec / test (push) Successful in 4m30s
Details
98abc5a1ca 
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QnSJvqxh9oDbshx8qXgeiX
holler merged commit 98abc5a1ca into main 2026-10-26 13:19:41 +01:00
holler deleted branch fzp-move-beyond 2026-10-26 13:19:41 +01: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) bec-gitea chen_h2 (chen_h2) debenjak_l (debenjak_l) diaz (diaz) divall_e (divall_e) guizar_m (guizar_m) haghta_s (haghta_s) holler (holler) lombosi_c (lombosi_c) malu_s (malu_s) 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) zhang_y7 (zhang_y7)
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: bec/csaxs_bec#338