Flomni commissioning 5 #256

Merged

holler merged 30 commits from flomni_commissioning_5 into main 2026-07-12 07:28:11 +02:00

Conversation 0 Commits 30 Files Changed 17

+1123 -196

holler commented 2026-07-11 23:34:12 +02:00

Member

Copy Link

Copy Source

No description provided.

holler added 29 commits 2026-07-11 23:34:12 +02:00

flomni: add laser_parameters CLI and laser_tweak tool ... 87d275f569

Expose the ConstEmitter runtime constants through the high-level flomni
interface, alongside the existing laser_tracker_* methods, and add an
interactive tweak tool for the two tracking target positions.

New methods on FlomniSampleTransferMixin (thin wrappers delegating to
dev.rtx.controller, same pattern as laser_tracker_show_all):
  laser_parameters_show_all()
  laser_parameters_set_targety(val)
  laser_parameters_set_targetz(val)
  laser_parameters_set_intensity_threshold_laser(val)
  laser_parameters_set_psd_intensity_threshold_tracking_low(val)

laser_tweak(): interactive 2D raw-terminal loop for the two tracking targets,
modeled on OMNYTools.tweak_cursor.
  left/right : target y -/+   (fixed 0.01 step, absolute set of current +/- step)
  up/down    : target z +/-
  s          : return both targets to their launch positions
  q          : quit (terminal state restored in finally)
On launch and after every change it prints the current y/z targets and the
fzp x interferometer signal (read_ssi_interferometer channel 1), so the signal
response can be watched while tweaking.

termios/tty/fcntl/sys are imported locally in laser_tweak to avoid touching
module-level imports. Additive change; no existing behaviour modified. Requires
the ConstEmitter emitter_* methods on RtFlomniController.

feat(flomni): acquire empty frames at start of tomo_scan ... 036b3b1bd2

Add collect_empty_frames(), which acquires 10 flat-field frames at
angle 0 with fsamx shifted out of the beam by fovx/2 (opposite the
normal alignment x-offset). Called once at the start of a new
tomo_scan() (not on resume). Frames are excluded from the ptycho
reconstruction queue and logged to tomography_scannumbers.txt with
subtomo_number=0.

feat(flomni): add remove-only sample change via ftransfer_sample_change(-1) ... 9126b8d64d

Passing -1 stows the sample currently in the sample stage into a free
tray slot without mounting a replacement, matching the old control
system's sample_change(-1) behavior. Existing swap-path logic is
unchanged.

reverse numbering fea16a74fa

feat(flomni): add GUI confirm/abort console for sample transfer ... c2b5426752

Add a small ConsoleButtonsWidget (Yes/No/Abort + message label) as a
GUI alternative to console yesno() prompts during sample transfer,
docked below the live camera view.

- bec_widgets: new ConsoleButtonsWidget (csaxs_bec/bec_widgets/widgets/
  console_buttons/). Yes/No write to a response property polled by the
  caller; Abort sends a real SIGINT to the BEC client process (captured
  via os.getppid() at construction), stopping any blocking call
  (including an in-progress motor move) exactly like a console Ctrl+C.

- omny_general_tools: add OMNYTools.gui_yesno(), a GUI-backed
  alternative to yesno() with the same message/default/autoconfirm
  semantics, polling the widget's response instead of blocking on
  input(). Not yet used as a general yesno() replacement.

- gui_tools: flomnigui_show_cameras() now also opens the console widget
  docked below the two camera views (set_layout_ratios for relative
  sizing, since dock_area.new() has no pixel width/height kwarg).
  flomnigui_show_gui() now passes an explicit window geometry, right-
  aligned on a 2560x1440 screen.

- flomni: add ftransfer_confirm_dialog(), which uses the GUI console
  when available (falling back to the plain CLI yesno() otherwise) and
  wire it into ftransfer_confirm()'s per-step "All OK? Continue?"
  prompt during sample transfer. Other yesno() call sites (stage-in
  flight-tube check, gripper-move stage-out check) intentionally left
  on the CLI for now.

Known issue: requested window height in flomnigui_show_gui() is not
taking effect as expected at startup; needs follow-up.

minor fix gui confirm 276124e8fd

feat(bec_widgets): grey out Yes/No in ConsoleButtonsWidget when no message ... 6be7e7f369

Yes/No start disabled and are enabled only while a message is set; ABORT
stays always enabled. Clear visual cue that there's nothing to confirm.

feat(flomni): make sample transfer abortable via Ctrl+C and GUI abort button ... 936fc294a0

The gripper routines (#GRGET/#GRPUT) run autonomously on the Galil
(thread 3); Ctrl+C previously only killed the BEC-side polling loop
while the controller kept executing, including ongoing motion.

- add FlomniSampleTransferMixin.ftransfer_abort(): dev.ftransy.stop()
  (stop_devices endpoint -> device server -> XQ#STOP), wait for thread 3
  to halt, then put the controller back in posmode; deliberately no
  ensure_gripper_up() - recovery after an abort is manual
- wrap the mntprgs polling loops in ftransfer_get_sample/put_sample in
  try/except KeyboardInterrupt -> ftransfer_abort()
- answering "No" at a confirmation point now also hard-aborts the
  controller routine instead of leaving it parked in #CONFIRL
- ConsoleButtonsWidget ABORT: keep SIGINT to the client, plus a delayed
  (500 ms) backup stop_devices request so the hardware stops even if
  the client is hung; delay ensures the controlled client-side abort
  wins the race against #STOP clearing mntprgs

- ConsoleButtonsWidget ABORT: SIGINT to the client (only if the parent ... 0cc11e6bfb

process looks like a BEC client), plus a delayed (500 ms) backup
  stop_devices request, defaulting to stop-all so the widget doubles as
  a generic emergency stop when opened standalone from the launcher menu

replace yesno with gui yesno d838966bb3

config update 803ea77dc4

added ES shutter to ES config f48d180376

fix/recon folder name from global var was not set when changed in gui 401312fcbb

feat(flomni): offer tomo-param reset on account change at session start ... b638f4d982

At BEC session start, compare bec.active_account against the new global
var defaults_applied_for_account. On a genuine account change, interactively
offer to reset all tomo scan parameters to their defaults for the new
experiment; a client restart within the same account is a silent no-op.
Add _set_default_tomo_params() writing all 20 scan parameters via the
property setters.

feat(flomni): comment-first scilog_last_scans, comment-only mode, no logo ... 4071520f90

scilog_last_scans now puts the user comment at the top of the entry and
drops the flOMNI logo attachment. number_of_scans accepts 0 to send a
comment-only entry. When fewer projection records exist than requested
(e.g. non-ptycho scans, which write no timing record), the available ones
are used and a note reports how many of the requested count were found.

feat(flomni): live ROI size readout and camera-sourced pixel calibration ... 2bfba84512

X-Ray Eye alignment GUI + script now share a single, device-configured
pixel calibration and the GUI shows live ROI dimensions.

GUI (x_ray_eye.py):
- Add read-only "ROI size" field below the message box, showing the active
  ROI's x/y extent, updated live via each ROI's sigRegionChanged. Rectangles
  report width/height; circular ROIs read raw state["size"] so an ellipse
  state would be reflected (currently aspect-locked upstream).
- Add "Calibration" field showing microns/pixel, or "uncalibrated (pixels)"
  when the camera parameter is absent.
- Resolve mm/pixel from dev.cam_xeye.user_parameter["pixel_calibration"];
  fall back to raw pixels (scale 1.0, unit "px") if unavailable.
- Enlarge the message field from 60 to 90 px height.

Alignment script (x_ray_eye_align.py):
- Replace the hard-coded PIXEL_CALIBRATION constant with a pixel_calibration
  property reading the same cam_xeye user parameter; fall back to
  PIXEL_CALIBRATION_DEFAULT if unavailable.
- Fold the recurring factor of 2 into the calibration: xval_x_* come straight
  from raw ROI pixels on submit, so the true scale is 0.05/113 mm/pixel.
  Default is now 0.05/113 and the three /2 factors (FZP center x, height
  centering, FOV) are removed. Computed physical values are unchanged.

Device config (cam_xeye_pixel_calibration.yaml):
- Add pixel_calibration userParameter (0.05/113 mm per raw ROI pixel) to
  cam_xeye. Merge the userParameter block into the existing device entry.

fix(flomni): skip feedback reset in ffzp_in when FZP already in ... ec21916d58

feedback_disable/enable_with_reset cycle re-zeros the interferometers
and moves off the current sample position. Only run it when the FZP
actually needs to move; add force_feedback_reset kwarg and _ffzp_is_in
helper.

feat(flomni): skip feye_out in tomo_alignment_scan when scan-ready ... dbedeb371d

When the eye is already out, optics in, and feedback running, skip the
eye-out/optics-in transition to avoid an interferometer reset. Enables
repeated alignment scans and interleaving alignment into a tomogram
without leaving the current measurement position.

feat(flomni): log projection timing from direct tomo_scan_projection calls 191e889cdd

scilog command changed d3b2c10ba2

better timing printout end of tomogram 247b4125c6

print fov bold 5db55cf763

print green bold bcaa66d5cc

docs fix 68a213b52f

fix(flomni): warn on invalid beamline states before manual xray-eye frame; fix sample-remove slot handling ... 0b5666084a

xrayeye_update_frame() now checks all configured beamline states and, if any
are not valid, warns the user (the frame may be empty when the beam is down)
and asks before taking a frame. The automated alignment path is unaffected.

ftransfer_sample_change(): clarify the remove-only prompt to "sample currently
in the sample stage", and include tray slot 20 in the empty-slot scan
(range(1, 20) -> range(1, 21)) in both the remove and mount branches, matching
check_position_is_valid's 0-20 range.

refactor(flomni): consolidate global-var params into _GlobalVarParam descriptor ... fc31888356

Replace 11 identical global-var-backed getter/setter property pairs with a
single _GlobalVarParam descriptor. Behavior is unchanged: same keys, defaults,
and None-handling; stitch_x/stitch_y retain int enforcement via the descriptor's
type_ guard (typeguard.check_type). Net -57 lines with no functional change.

feat(flomni): include measurement ID in end-of-tomo scilog summary dad70a9cc1

comment on 0 z shift added 7a556ecbc4

reset manual shift and auto set fovx after xray align a1e4be771b

holler added 1 commit 2026-07-11 23:34:17 +02:00

Merge branch 'main' into flomni_commissioning_5 8bb33d4f5b

holler merged commit 6722d1573a into main 2026-07-12 07:28:11 +02:00

holler deleted branch flomni_commissioning_5 2026-07-12 07:28: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) 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

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: bec/csaxs_bec#256