Commit Graph
716 Commits
Author SHA1 Message Date
x12saandholler 05ef894e4a fix/slits_show_all working again 2026-06-30 14:31:36 +02:00
x12saandholler 716e2e8e61 feat(xray_eye): add target crosshair, zoom controls, fix ROI styling and zoom-reset bug
- 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-30 14:31:36 +02:00
x12saandholler c4fa9b2eb7 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-30 14:31:36 +02:00
x12saandholler 88a320fd59 decrease velocity of fsamy for better tracker following 2026-06-30 14:31:36 +02:00
x12saandholler 00b1996c21 remove z movement in scan as piezo broken
write z propagation to reconstruction file
2026-06-30 14:31:36 +02:00
x12saandholler 59072625b3 added manual shift y in the user query 2026-06-30 14:31:36 +02:00
x12saandholler 6acaadbc24 fix angular start in even subtomos 2026-06-30 14:31:36 +02:00
x12saandholler 3e1d4bc152 fix in documentation 2026-06-30 14:31:36 +02:00
x12saandholler d34b75392f update config 2026-06-30 14:31:36 +02:00
x12saandholler 7e50296c20 added documentation 2026-06-30 14:31:36 +02:00
x12saandholler fa55642f32 increase sleep for camera to settle 2026-06-30 14:31:36 +02:00
x12saandholler 7c5ff011dc fix all optics in condition 2026-06-30 14:31:36 +02:00
appel_candholler 2e87faa64a fix(eiger): activate raise on error again 2026-06-30 14:31:36 +02:00
x12saandholler d61be6ccc2 updated parameters 2026-06-30 14:31:36 +02:00
x12saandholler abe0e0c9a5 switched smaract channels 2026-06-30 14:31:36 +02:00
appel_candholler 29f2c88d31 fix(mcs): fix mcs card monitor thread 2026-06-30 14:31:36 +02:00
x12saandholler 8eea466f69 added user parameters to mirror and xboxsupport for 1/2 reflections 2026-06-30 14:31:36 +02:00
x12saandholler cdc9e2248a added flight tube to eye movement, correct cam rotation and transpose in
xray eye
2026-06-30 14:31:36 +02:00
x12saandholler 4a4bc4abf5 fix(mcs): stop monitor async data event when stop is called. 2026-06-30 14:31:36 +02:00
x12saandholler 032b42e851 fix(eiger): fix eiger integration for 1.5M with proper calibration files on JFJ server 2026-06-30 14:31:36 +02:00
x12saandholler bf3235da0f mono energy directly used in ffzp info 2026-06-30 14:31:36 +02:00
x12saandholler bec81a886e temp fix for galil_show_all not working after config reload 2026-06-30 14:31:36 +02:00
appel_candholler 7937b328f9 fix(bpm-control): fix coupling input arg for BPMControl 2026-06-30 14:31:36 +02:00
appel_candholler b6131b1b36 fix(bpm): fix input device config for bpm.BPM 2026-06-30 14:31:36 +02:00
appel_candholler a03cc97c60 fix(signal_forwarder): fix signal_forwarder signal_ref argument name 2026-06-30 14:31:36 +02:00
x12saandholler 30675f4b70 fix: update ptycho flomni config 2026-06-30 14:31:36 +02:00
x12saandholler 8df72193ad fix: resolve merge conflict 2026-06-30 14:31:36 +02:00
appel_candholler 4e8267155c fix(eiger): temporarily hardcode incident energy for detector 2026-06-30 14:31:36 +02:00
x12saandholler d4eb4e10cb adjust gripper sensor voltage in config 2026-06-30 14:31:36 +02:00
menzelandClaude Opus 4.8 ba27af5a71 docs(developer): add "How to edit these docs" contributor guide
CI for csaxs_bec / test (pull_request) Successful in 1m34s
Read the Docs Deploy Trigger / trigger-rtd-webhook (push) Successful in 3s
CI for csaxs_bec / test (push) Successful in 1m35s
Add docs/developer/editing_docs.md documenting the MyST/Sphinx conventions
for this site: page anatomy (cross-reference label + single H1), language-
tagged code fences, admonitions, cross-references, the {download} role for
non-image files, the {figure} directive, and how to add a page to a toctree.
Also covers local preview, the merge-then-RTD-build flow, and pitfalls
(broken refs are warnings, public visibility, placeholder consistency).

Turn the empty developer.md stub into a landing page with a toctree and a
card linking to the new guide.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-24 18:19:39 +02:00
menzelandClaude Opus 4.8 19aa25c7a7 docs(saxs): import data analysis guide from the documentation wiki
Read the Docs Deploy Trigger / trigger-rtd-webhook (push) Successful in 3s
CI for csaxs_bec / test (push) Successful in 1m34s
Migrate the SAXS data-analysis content into the RTD/Sphinx docs as
user/saxs/data_analysis.md, and turn the empty saxs.md stub into a
landing page linking to it.

Source: cSAXS documentation wiki, page "SAXS-data-analysis"
https://gitea.psi.ch/cSAXS/documentation/wiki/SAXS-data-analysis
(git@gitea.psi.ch:cSAXS/documentation.wiki.git, as of 408e535)

Converted Gitea-flavored Markdown to MyST: added cross-reference
labels, bash code fences, and {note} admonitions.

Also bundle the SAXS standards plate datasheet (SAXS_standards_plate.pdf),
previously at cSAXS/documentation/attachments/, linked via the MyST
{download} role so Sphinx copies it into the build.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-24 17:32:49 +02:00
wakonig_k 282d311a9b fix: adjust cont grid to first axis is fast axis convention
CI for csaxs_bec / test (pull_request) Successful in 1m33s
Read the Docs Deploy Trigger / trigger-rtd-webhook (push) Successful in 3s
CI for csaxs_bec / test (push) Successful in 1m34s
2026-06-24 12:56:45 +02:00
wakonig_k 69e7b28e5c test: add cont grid scan tests
CI for csaxs_bec / test (pull_request) Successful in 1m35s
Read the Docs Deploy Trigger / trigger-rtd-webhook (push) Successful in 3s
CI for csaxs_bec / test (push) Failing after 1m29s
2026-06-24 12:55:32 +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
x12saandappel_c fe240afcdd fix bug in cont_grid as the slow axis was not moving during scans 2026-06-23 13:04:33 +02:00
x12saandappel_c 8e030998e7 change beam center and detector distance for JFJ 2026-06-23 13:04:33 +02:00
x12saandappel_c c83140ba3f change from microstepping to normal controllers for samx and samy 2026-06-23 13:04:33 +02:00
wakonig_kandappel_c 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_kandappel_c 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
appel_c f5f3358b66 fix(ddg): put_complete for trigger_shot 2026-06-23 13:04:33 +02:00
appel_c 2b5f9fb70c fix(cont-grid): fix cont grid timing issue 2026-06-23 13:04:33 +02:00