v1.0.0-rc.188 #99

Merged
leonarski_f merged 6 commits from rc188 into main 2026-11-20 06:50:07 +01:00
Owner
  • jfjoch_viewer: The file browser and the open dialog list every format the viewer opens, including frames numbered in their extension (name.001) and .cbf.gz, .mccd, .sfrm, .nxs, .cxi and .xtc files.
  • jfjoch_viewer: After processing a CBF, marCCD, SMV or SFRM sweep, the images stay on screen with the results drawn over them.
  • rugnux: No more Ceres thread warnings on machines with fewer than 16 CPU threads.
* jfjoch_viewer: The file browser and the open dialog list every format the viewer opens, including frames numbered in their extension (`name.001`) and `.cbf.gz`, `.mccd`, `.sfrm`, `.nxs`, `.cxi` and `.xtc` files. * jfjoch_viewer: After processing a CBF, marCCD, SMV or SFRM sweep, the images stay on screen with the results drawn over them. * rugnux: No more Ceres thread warnings on machines with fewer than 16 CPU threads.
leonarski_f added 6 commits 2026-11-20 06:49:57 +01:00
The file browser listed only *_master.h5, *_process.h5 and *.cbf, and the open
dialog had no filter covering frames numbered in their extension, so a marCCD or
ADSC sweep written as name.001 / name.0001 was invisible in both, as were .cbf.gz,
.mccd, .osc, .sfrm, .nxs, .cxi and .xtc in the browser.

One list of wildcards (reader/FileNamePatterns.h) now serves both: the HDF5
masters and processing results, .nxs, .cxi, .xtc, the raw frame extensions and
frame numbers of three to five digits. The open dialog offers it first as
"All supported", plus any .h5 and .geom for the files of an XFEL run.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01HVeDQrPqZ52Tp6rzzZGxf3
A processing job on a CBF, marCCD, SMV or SFRM sweep writes a _process.h5 that
holds the per-image analysis but no images: there is nothing in a directory of
frames for it to link to. The viewer showed that run by reading the file on its
own, so after processing the image area stayed empty.

JFJochHDF5Reader::ReadFile now takes the reader of the sweep the file was made
from; for a file without pixels each image is read from that sweep (frame
/entry/detector/number[i]) and the file's analysis is laid over it. The viewer
passes its open raw reader when it shows such a run. HDF5 inputs are unchanged:
their runs already link the original images.

Tests: JFJochHDF5Reader_ProcessFileOfRawSweep_PixelsFromSweep (a run over one
frame of a two-frame miniCBF sweep shows that frame's pixels under the run's
analysis) and OpenableFilePatterns (the browser/dialog wildcards). The viewer
documentation said the process file carried the images; corrected.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01HVeDQrPqZ52Tp6rzzZGxf3
Regenerated by update_version.sh: the OpenAPI version, the C++ model and the
Python/TypeScript clients, Redoc, docs/conf.py, the frontend package, the FPGA
and PCIe driver version strings. docs/THIRD_PARTY_NOTICES.md is regenerated
from the root THIRD_PARTY_NOTICES.md, which it had fallen behind.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01HVeDQrPqZ52Tp6rzzZGxf3
CHANGELOG: 1.0.0-rc.188
Build Packages / Create release (push) Successful in 8s
Build Packages / build:portable:macos-arm64:nocuda (push) Successful in 4m58s
Build Packages / Build documentation (push) Successful in 46s
Build Packages / build:rugnux:linux-aarch64:cuda (push) Successful in 11m29s
Build Packages / build:portable:linux-x86_64:nocuda (push) Successful in 16m49s
Build Packages / build:portable:linux-x86_64:cuda (push) Successful in 22m4s
Build Packages / build:portable:windows-x86_64:nocuda (push) Successful in 23m59s
Build Packages / build:jfjoch:ubuntu2204:nocuda (push) Successful in 26m5s
Build Packages / build:portable:windows-x86_64:cuda (push) Successful in 27m52s
Build Packages / HDF5 consumer tests (DIALS, XDS) (push) Successful in 29m28s
Build Packages / build:jfjoch:rocky8:nocuda (push) Successful in 32m5s
Build Packages / build:jfjoch:rocky9:nocuda (push) Successful in 33m46s
Build Packages / build:jfjoch:ubuntu2404:nocuda (push) Successful in 27m33s
Build Packages / Generate python client (push) Successful in 1m17s
Build Packages / build:jfjoch:rocky8:cuda-sls9 (push) Successful in 34m1s
Build Packages / build:jfjoch:rocky9:cuda-sls9 (push) Successful in 36m3s
Build Packages / build:jfjoch:ubuntu2204:cuda (push) Successful in 26m2s
Build Packages / build:jfjoch:rocky8:cuda (push) Successful in 32m41s
Build Packages / Unit tests (push) Failing after 1h1m20s
Build Packages / build:jfjoch:ubuntu2404:cuda (push) Successful in 29m40s
Build Packages / build:jfjoch:rocky9:cuda (push) Successful in 35m31s
Build Packages / Validation Battery (push) Successful in 32m18s
81c8b48b1f
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01HVeDQrPqZ52Tp6rzzZGxf3
PostRefine: bound its fixed 16 Ceres threads by the machine's hardware threads
Build Packages / Create release (push) Successful in 8s
Build Packages / Build documentation (push) Successful in 46s
Build Packages / build:portable:linux-x86_64:cuda (push) Canceled after 2m50s
Build Packages / build:portable:linux-x86_64:nocuda (push) Canceled after 2m52s
Build Packages / build:rugnux:linux-aarch64:cuda (push) Canceled after 2m48s
Build Packages / Unit tests (push) Canceled after 3m8s
Build Packages / Validation Battery (push) Canceled after 0s
Build Packages / build:jfjoch:rocky8:cuda (push) Canceled after 0s
Build Packages / build:jfjoch:rocky8:cuda-sls9 (push) Canceled after 0s
Build Packages / build:jfjoch:rocky8:nocuda (push) Canceled after 2m46s
Build Packages / build:jfjoch:rocky9:cuda (push) Canceled after 0s
Build Packages / build:jfjoch:ubuntu2204:nocuda (push) Canceled after 2m8s
Build Packages / HDF5 consumer tests (DIALS, XDS) (push) Canceled after 3m6s
Build Packages / build:jfjoch:rocky9:cuda-sls9 (push) Canceled after 0s
Build Packages / build:jfjoch:ubuntu2404:cuda (push) Canceled after 0s
Build Packages / build:portable:macos-arm64:nocuda (push) Canceled after 2m6s
Build Packages / build:jfjoch:rocky9:nocuda (push) Canceled after 2m44s
Build Packages / build:jfjoch:ubuntu2204:cuda (push) Canceled after 0s
Build Packages / build:jfjoch:ubuntu2404:nocuda (push) Canceled after 0s
Build Packages / Generate python client (push) Canceled after 0s
Build Packages / build:portable:windows-x86_64:cuda (push) Canceled after 2m26s
Build Packages / build:portable:windows-x86_64:nocuda (push) Canceled after 2m26s
c44056b3f9
Post-refinement asks Ceres for a fixed 16 threads (so the pieces Ceres sums the
cost in do not move with -N). On a machine with fewer hardware threads, Ceres
bounds the request itself and prints, through abseil logging, "Specified
options.num_threads: 16 exceeds maximum available from the threading model Ceres
was compiled with: 14" for every solve, along with the "All log messages before
absl::InitializeLog()" banner. The count is now bounded first, by the same
std::thread::hardware_concurrency() Ceres uses, so Ceres runs exactly as it did
before and stays silent. Machines with 16 or more hardware threads are unchanged.

Checked by making a run see 14 hardware threads (get_nprocs shimmed): the previous
binary printed the warning 6 times on an open rotation set, the new one prints it
0 times.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01HVeDQrPqZ52Tp6rzzZGxf3
CHANGELOG: rc.188 - no Ceres thread warnings on machines with fewer than 16 CPU threads
Build Packages / Build documentation (push) Successful in 47s
Build Packages / Create release (push) Successful in 11s
Build Packages / build:portable:macos-arm64:nocuda (push) Successful in 5m2s
Build Packages / build:rugnux:linux-aarch64:cuda (push) Successful in 11m21s
Build Packages / build:portable:linux-x86_64:nocuda (push) Successful in 16m32s
Build Packages / build:portable:linux-x86_64:cuda (push) Successful in 21m38s
Build Packages / build:portable:windows-x86_64:nocuda (push) Successful in 23m13s
Build Packages / build:jfjoch:ubuntu2204:nocuda (push) Successful in 26m38s
Build Packages / build:portable:windows-x86_64:cuda (push) Successful in 27m8s
Build Packages / HDF5 consumer tests (DIALS, XDS) (push) Successful in 29m13s
Build Packages / build:jfjoch:rocky8:nocuda (push) Successful in 32m51s
Build Packages / build:jfjoch:rocky9:nocuda (push) Successful in 33m25s
Build Packages / build:jfjoch:ubuntu2404:nocuda (push) Successful in 28m41s
Build Packages / Generate python client (push) Successful in 1m5s
Build Packages / build:jfjoch:rocky8:cuda-sls9 (push) Successful in 31m47s
Build Packages / build:jfjoch:rocky9:cuda-sls9 (push) Successful in 35m48s
Build Packages / build:jfjoch:ubuntu2204:cuda (push) Successful in 25m22s
Build Packages / build:jfjoch:rocky8:cuda (push) Successful in 31m47s
Build Packages / Unit tests (push) Successful in 1h0m41s
Build Packages / build:jfjoch:ubuntu2404:cuda (push) Successful in 30m17s
Build Packages / build:jfjoch:rocky9:cuda (push) Successful in 35m29s
Build Packages / Validation Battery (push) Successful in 32m6s
e0a7d5e25c
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01HVeDQrPqZ52Tp6rzzZGxf3
leonarski_f merged commit 3f87e0565f into main 2026-11-20 06:50:07 +01:00
Sign in to join this conversation.
No Reviewers
No labels
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: mx/Jungfraujoch#99