Commit Graph
704 Commits
Author SHA1 Message Date
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
wakonig_k 8f7614908e fix(docs): update OS version in Read the Docs configuration to ubuntu-24.04
CI for csaxs_bec / test (pull_request) Successful in 1m31s
Read the Docs Deploy Trigger / trigger-rtd-webhook (push) Successful in 2s
CI for csaxs_bec / test (push) Successful in 1m31s
2026-06-21 18:17:41 +02:00
x12sa 6ed82d2fea add estimated finish time to progress bar
CI for csaxs_bec / test (pull_request) Successful in 1m30s
Read the Docs Deploy Trigger / trigger-rtd-webhook (push) Successful in 2s
CI for csaxs_bec / test (push) Successful in 1m31s
2026-06-21 09:30:32 +02:00
wyzula_jandholler 906e91cc7f fix(gui_tools): remove all custom gui timeouts
Read the Docs Deploy Trigger / trigger-rtd-webhook (push) Successful in 2s
CI for csaxs_bec / test (push) Successful in 1m29s
2026-06-20 14:05:15 +02:00
wyzula_jandholler dea43edcd9 fix(gui_tools): minimal ring progress bar safeguard in order to not interupt any script using it 2026-06-20 14:05:15 +02:00
x12saandholler 48b21d806a fix(flomni): correct angular-step labeling, wire manual_shift_y, validate frames_per_trigger
Read the Docs Deploy Trigger / trigger-rtd-webhook (push) Successful in 2s
CI for csaxs_bec / test (push) Successful in 1m30s
Fix tomo_parameters() printing the per-sub-tomogram angular step
(self.tomo_angle_stepsize) while labeling it as the final tomogram's
step. At 180° / 2400 total projections this printed 0.6° instead of
the actual combined-tomogram resolution of 0.075°. Both the static
printout and the interactive editor for tomo_type 1 now print and
correctly label both numbers, with explicit parentheses around every
(tomo_angle_range / tomo_angle_stepsize) * 8 expression to remove any
ambiguity. tomo_type 2/3 were already correctly labeled and are
unchanged.

Wire manual_shift_y into sum_offset_y in both tomo_scan_projection
and tomo_acquire_at_angle; it was previously defined and shown in
tomo_parameters() but never applied anywhere. Fix its printed unit
from <mm> to <um>, matching the value it actually holds.

Validate frames_per_trigger on assignment: must be a positive
integer (rejects 0, negative, float, and bool).

Set bec.builtin_actors.scan_interlock (trigger_setting=restart_scan,
enabled=True) at the start of tomo_scan.

Reset estimated_remaining_time at the start of a new tomo_scan, and
add estimated_finish_time (wall-clock projected completion,
stored/reset alongside it). Previously estimated_remaining_time was
never reset between scans, so the progress GUI could display a
leftover estimate from a prior run while the client-side text
printout correctly showed N/A (gated until projection 10).

Also includes: guard tomo_parameters() so stitch_x/stitch_y are
forced to 0 and cannot be set while single_point_instead_of_fermat_scan
is enabled, since stitching is not supported in that mode.
2026-06-20 14:03:05 +02:00
x12saandholler c4a581bbeb feat(flomni): add 360° tomo range and single-point acquire mode
Add optional full-circle (0-360°, inclusive) angular sweep for
tomo_type 1 (equally spaced sub-tomograms), selectable via the new
tomo_angle_range property (180 default, or 360). Fixes the
_tomo_scan_at_angle gate, which previously hardcoded a 180.05° cutoff
and would silently drop any projection beyond 180° without error.

Add an alternative acquisition mode for each projection angle:
tomo_acquire_at_angle moves fsamroy and the alignment-corrected
rtx/rty/rtz position (same offset logic as tomo_scan_projection, no
stitching), runs the existing laser-tracker checks and
move_samx_to_scan_region, then calls scans.acquire instead of
scans.flomni_fermat_scan. Selectable per scan via the new
single_point_instead_of_fermat_scan flag, dispatched from
_at_each_angle, so it applies independently of tomo_type and
tomo_angle_range.

Add frames_per_trigger as a persistent property, used by both
scans.flomni_fermat_scan (already supported it) and the new
scans.acquire call, for burst acquisition.

Surface all three new settings in tomo_parameters()'s printout and
interactive editor. Update write_pdf_report's projection-count
estimate to scale with tomo_angle_range instead of a hardcoded 180.

tomo_alignment_scan and tomo_type 2/3 angle generation remain
unchanged (still 0-180°), as the new range option only applies to
tomo_type 1.
2026-06-20 14:03:05 +02:00
appel_c 778c3c6bf1 fix: incident energy
Read the Docs Deploy Trigger / trigger-rtd-webhook (push) Successful in 3s
CI for csaxs_bec / test (push) Successful in 1m31s
2026-06-19 13:36:55 +02:00
appel_c b01ab791b7 fix(eiger): fix fetching energy 2026-06-19 13:36:55 +02:00
appel_c cfef28e755 fix(eiger): Eiger should take initial energy from ccm 2026-06-19 13:36:55 +02:00
x12saandappel_c 06507d01b8 add diodes in optics hutch 2026-06-19 13:36:55 +02:00
x12saandappel_c 3c1d1cd2f5 correct epics channels for the KB HFM 2026-06-19 13:36:55 +02:00
appel_c 5494b83652 refactor(bl-optics-config): update kb motors part 2 2026-06-19 13:36:55 +02:00