Commit Graph
718 Commits
Author SHA1 Message Date
x12sa 2fa7a7de1d docs(flomni): document tomo_scan_resume, scan queueing, and related tomo_parameters() additions
CI for csaxs_bec / test (push) Successful in 1m29s
CI for csaxs_bec / test (pull_request) Successful in 1m30s
- Add tomo_scan_resume() as the primary recommended way to continue an
  interrupted scan, in both the user guide and the setup reference
  (manual subtomo_start/start_angle/projection_number kept as fallback)
- Add a new "Queueing multiple scans" section (short walkthrough in the
  user guide, full command reference + status semantics in the setup
  reference, cross-linked via a new anchor)
- Document the live progress report's ETA, automatic gap detection, and
  the total-time-lost-to-gaps summary
- Document the zero_deg_reference_at_each_subtomo tomo_parameters() option
- Fix stale SPEC_ptycho_align.m references -> BEC_ptycho_align.m
2026-06-30 14:22:49 +02:00
x12sa 553d83c1aa feat(flomni): tomo scan queue, crash-safe resume, idle-time-aware ETA, uniform angular step fix
CI for csaxs_bec / test (push) Successful in 1m32s
CI for csaxs_bec / test (pull_request) Successful in 1m31s
- Tomo scan queue: queue multiple parameter sets and run them sequentially,
  unattended, on the same sample (tomo_queue_add/show/execute/delete/clear);
  resumes a partially-completed job automatically rather than restarting it
- tomo_scan_resume(): resume a crashed/interrupted tomo scan from the exact
  subtomo/angle it stopped at, instead of restarting from the beginning
- Idle-time-aware ETA: detects gaps (crashes, beamline-down pauses) and
  excludes them from the remaining-time estimate; reports total time lost
  to gaps at the end of a scan
- Fixed non-uniform angular spacing in the interlaced 8-sub-tomogram
  tomogram (sub_tomo_scan): phase offsets and per-projection step now
  derive from the same corrected value, independent of requested total
- Fixed corr_pos_y/corr_angle_y/corr_pos_y_2/corr_angle_y_2/
  tomo_alignment_fit being silently wiped on every client restart
  (XrayEyeAlign.__init__); tomo_alignment_fit now also resets at sample
  change, where it was previously missed
- Tracked, stepped fsamy moves (umvr_fsamy_tracked/umv_fsamy_tracked) to
  keep the laser tracker locked during large moves, used in sample
  transfer and manual x-ray-eye alignment jogs
- Added zero_deg_reference_at_each_subtomo for radiation-damage tracking
- tomo_parameters(): fixed several display/rounding inconsistencies and
  added a notification when the requested projection count gets adjusted
2026-06-30 14:09:37 +02:00
x12sa 05259fb92e fix/get new tomo ID
CI for csaxs_bec / test (pull_request) Successful in 1m28s
CI for csaxs_bec / test (push) Successful in 1m30s
2026-06-30 13:08:54 +02:00
x12sa 373edbfb75 feat / added auto vertical centering in first step of alignment.
CI for csaxs_bec / test (pull_request) Successful in 1m29s
CI for csaxs_bec / test (push) Successful in 1m31s
2026-06-30 12:24:46 +02:00
x12sa 38d71744d8 tracked fsamy movements 2026-06-30 11:34:38 +02:00
x12sa 6597f2c528 removed a description field
CI for csaxs_bec / test (pull_request) Successful in 1m29s
CI for csaxs_bec / test (push) Successful in 1m33s
2026-06-30 09:52:39 +02:00
x12sa cdf2ecca2a fix/slits_show_all working again 2026-06-30 09:17:56 +02:00
x12sa b0196c9a05 feat(xray_eye): add target crosshair, zoom controls, fix ROI styling and zoom-reset bug
CI for csaxs_bec / test (push) Successful in 1m30s
CI for csaxs_bec / test (pull_request) Successful in 1m30s
- Add show/hide/positionable target crosshair (RPC), separate from bec_widgets' mouse crosshair
- Add zoom in/out/fit buttons; fix manual zoom/pan being wiped on every live-view re-enable
- Add reset_zoom() RPC method, called at start of x_ray_eye_align.py
- Style ROI outline blue/thinner (was near-white via compact_color default)
2026-06-29 13:22:46 +02:00
x12sa e01e71b108 Add scan number display and beamline states diagnostic card
- Append the current BEC scan number to the Projection info-item,
  e.g. "120 / 400 (S06650→S06770)", for direct comparison against
  ptycho reconstruction filenames (which use the same S##### scan
  number convention). Read from
  primary.info[0].active_request_block.scan_number — already
  available on the queue object, no new global var needed.

- Add tomo_start_scan_number to the progress payload, mirroring the
  existing tomo_start_time pattern: a new tomo_progress key to be
  written once by the scan loop when a tomogram begins. Producer side
  (flomni.py) not yet implemented — falls back to showing only the
  current scan number until then.

- New "Beamline states" draggable card (positioned just above
  Contacts): lists every beamline state currently registered with
  BEC, its live status (valid/invalid/warning/unknown), and whether
  the scan interlock is watching it. Cross-references
  bec.builtin_actors.scan_interlock.states_watched/.enabled against
  each state's live status to flag which watched states are
  currently mismatched (i.e. actually contributing to a queue lock),
  vs. states that are invalid but not watched and therefore not
  blocking anything (e.g. a simulated/test shutter).

  This is a display-only diagnostic; the "blocked" experiment_status
  itself is unchanged and still derived from the queue's own locks
  (_read_queue_locks), not from beamline states directly.

- Add fmtScan() JS helper (S##### zero-padded formatting, matching
  the existing ptycho filename convention) and renderBeamlineStates().

- Help panel updated to explain both additions.
2026-06-29 13:22:20 +02:00
x12sa 0f3ff819cf decrease velocity of fsamy for better tracker following
CI for csaxs_bec / test (push) Successful in 1m29s
CI for csaxs_bec / test (pull_request) Successful in 1m31s
2026-06-28 19:20:45 +02:00
x12sa 852f447d9e remove z movement in scan as piezo broken
CI for csaxs_bec / test (pull_request) Successful in 1m32s
CI for csaxs_bec / test (push) Successful in 1m40s
write z propagation to reconstruction file
2026-06-28 17:10:08 +02:00
x12sa a7ea5fcd28 added manual shift y in the user query 2026-06-26 21:05:43 +02:00
x12sa 7657253e94 fix angular start in even subtomos
CI for csaxs_bec / test (push) Successful in 1m30s
CI for csaxs_bec / test (pull_request) Successful in 1m30s
2026-06-26 15:57:07 +02:00
x12sa 798486b2e6 fix in documentation
CI for csaxs_bec / test (pull_request) Successful in 1m30s
CI for csaxs_bec / test (push) Successful in 1m31s
2026-06-26 14:34:08 +02:00
x12sa f661f08ed8 update config 2026-06-26 14:33:56 +02:00
x12sa 1cabf5a7ff added documentation 2026-06-26 14:33:47 +02:00
x12sa 748031ed7b increase sleep for camera to settle 2026-06-26 14:33:39 +02:00
x12sa c8c94cf50b fix all optics in condition 2026-06-26 14:33:19 +02:00
appel_c d8f7b56e71 fix(eiger): activate raise on error again
CI for csaxs_bec / test (pull_request) Successful in 1m29s
CI for csaxs_bec / test (push) Successful in 1m30s
2026-06-25 10:01:22 +02:00
x12sa c326d557ac updated parameters
CI for csaxs_bec / test (pull_request) Successful in 1m28s
CI for csaxs_bec / test (push) Successful in 1m35s
2026-06-25 08:55:35 +02:00
x12sa 8330c75453 switched smaract channels 2026-06-25 08:55:35 +02:00
appel_c 0748e07a73 fix(mcs): fix mcs card monitor thread
CI for csaxs_bec / test (pull_request) Successful in 1m30s
CI for csaxs_bec / test (push) Successful in 1m31s
2026-06-25 08:53:13 +02:00
x12sa 9621c8f814 added user parameters to mirror and xboxsupport for 1/2 reflections
CI for csaxs_bec / test (push) Successful in 1m32s
CI for csaxs_bec / test (pull_request) Successful in 1m32s
2026-06-24 14:15:45 +02:00
x12sa 40b5155389 added flight tube to eye movement, correct cam rotation and transpose in
CI for csaxs_bec / test (pull_request) Successful in 1m31s
CI for csaxs_bec / test (push) Successful in 1m32s
xray eye
2026-06-24 12:46:55 +02:00
x12sa 09658a49f2 fix(mcs): stop monitor async data event when stop is called.
CI for csaxs_bec / test (pull_request) Successful in 1m31s
CI for csaxs_bec / test (push) Successful in 1m32s
2026-06-24 11:58:14 +02:00
x12sa ecbfc8f472 fix(eiger): fix eiger integration for 1.5M with proper calibration files on JFJ server 2026-06-24 11:57:31 +02:00
x12sa 355f22db0c mono energy directly used in ffzp info
CI for csaxs_bec / test (push) Successful in 1m34s
CI for csaxs_bec / test (pull_request) Successful in 1m32s
2026-06-23 21:14:26 +02:00
x12sa 0b8c253201 temp fix for galil_show_all not working after config reload
CI for csaxs_bec / test (push) Successful in 1m33s
CI for csaxs_bec / test (pull_request) Successful in 1m34s
2026-06-23 15:44:22 +02:00
appel_c 39b1da568a fix(bpm-control): fix coupling input arg for BPMControl
CI for csaxs_bec / test (pull_request) Successful in 1m31s
CI for csaxs_bec / test (push) Successful in 1m33s
2026-06-23 15:05:42 +02:00
appel_c 146ac915f8 fix(bpm): fix input device config for bpm.BPM
CI for csaxs_bec / test (push) Successful in 1m33s
CI for csaxs_bec / test (pull_request) Successful in 1m33s
2026-06-23 14:57:14 +02:00
appel_c f09c687b81 fix(signal_forwarder): fix signal_forwarder signal_ref argument name 2026-06-23 14:57:14 +02:00
x12sa b8b5ae81c7 fix: update ptycho flomni config
CI for csaxs_bec / test (push) Successful in 1m32s
CI for csaxs_bec / test (pull_request) Successful in 1m31s
2026-06-23 14:52:49 +02:00
x12sa 9c78ba3c12 fix: resolve merge conflict
CI for csaxs_bec / test (push) Successful in 1m33s
CI for csaxs_bec / test (pull_request) Successful in 1m33s
2026-06-23 14:50:05 +02:00
appel_c 46fc3d77d5 fix(eiger): temporarily hardcode incident energy for detector
CI for csaxs_bec / test (push) Successful in 1m34s
2026-06-23 14:39:56 +02:00
x12sa ac97b51456 adjust gripper sensor voltage in config 2026-06-23 14:36:59 +02:00
appel_c da534b59a9 refactor(mcs): add write timeout to mcs card
CI for csaxs_bec / test (pull_request) Successful in 1m31s
Read the Docs Deploy Trigger / trigger-rtd-webhook (push) Successful in 3s
CI for csaxs_bec / test (push) Successful in 1m31s
2026-06-23 13:04:33 +02:00
appel_c f003390bdc test: fix ddg and mcs tests 2026-06-23 13:04:33 +02:00
appel_c 86bfdffedb refactor: add logs for on_stage 2026-06-23 13:04:33 +02:00
x12sa fe240afcdd fix bug in cont_grid as the slow axis was not moving during scans 2026-06-23 13:04:33 +02:00
x12sa 8e030998e7 change beam center and detector distance for JFJ 2026-06-23 13:04:33 +02:00
x12sa c83140ba3f change from microstepping to normal controllers for samx and samy 2026-06-23 13:04:33 +02:00
wakonig_k 661c546656 fix: put mcs callback cm in rlock 2026-06-23 13:04:33 +02:00
appel_c 03c288af34 fix(ddg1): fix suppress mcs updates 2026-06-23 13:04:33 +02:00
appel_c 16d414904b add wait for acquiring compare status in on_complete of mcs card 2026-06-23 13:04:33 +02:00
wakonig_k c35ab16653 fix: make mcs acquiring fetch without auto monitor 2026-06-23 13:04:33 +02:00
appel_c 57119403b4 wip add timestamp logs 2026-06-23 13:04:33 +02:00
appel_c 6614be50d9 fix cont_grid scan 2026-06-23 13:04:33 +02:00
appel_c 57b42fc1d1 move Compare status acquiring after erase-start call 2026-06-23 13:04:33 +02:00
appel_c 77efd4f55e wip fix ddg mcs call 2026-06-23 13:04:33 +02:00
appel_c 476dbb2969 fix(ddg): fix prepare_mcs_on_trigger method 2026-06-23 13:04:33 +02:00