Build Packages / Unit tests (push) Successful in 1h28m28s
Build Packages / build:windows:nocuda (push) Successful in 14m45s
Build Packages / build:windows:cuda (push) Successful in 13m13s
Build Packages / build:viewer-tgz:cpu (push) Successful in 6m47s
Build Packages / build:viewer-tgz:cuda (push) Successful in 7m22s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 13m52s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 14m16s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 13m19s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 12m50s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 14m40s
Build Packages / build:rpm (rocky8) (push) Successful in 11m18s
Build Packages / build:rpm (rocky9) (push) Successful in 12m4s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 11m55s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 11m22s
Build Packages / DIALS test (push) Successful in 13m37s
Build Packages / XDS test (durin plugin) (push) Successful in 8m47s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 9m4s
Build Packages / XDS test (neggia plugin) (push) Successful in 7m45s
Build Packages / Generate python client (push) Successful in 34s
Build Packages / Build documentation (push) Successful in 1m4s
Build Packages / Create release (push) Skipped
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 7m16s
This is an UNSTABLE release. It includes many experimental features, as well as many AI generated fixes. We recommend using rc.152 for production use. * rugnux: Rebrand the offline data-processing subsystem as `rugnux` and consolidate all offline analysis into the single `rugnux` binary - `jfjoch_process` is now `rugnux`, the former `jfjoch_azint` is now `rugnux --azint-only`, and `jfjoch_scale` is now `rugnux --scale` (see the new docs/NAMING.md and docs/RUGNUX.md). Scaling and merging are on by default for rotation and stills (`--no-merge` disables them), replacing the previous opt-in `-M, --scale-merge`. * rugnux: CLI fixes - default `-N` to all hardware threads, parse numeric option arguments strictly (reject non-numeric or trailing input instead of silently yielding 0), require `--wavelength > 0`, and correct the reproduced command line and `--scale` reference-cell handling. * rugnux: De-novo space-group improvements - recover genuine high symmetry and centred Bravais lattices from intensities, add an automatic CC1/2 high-resolution cutoff, and report L-test twinning statistics. * rugnux: Index weakly-diffracting low-resolution rotation data that previously failed (e.g. F-cubic crystals that diffract only to ~4 A on a detector reaching ~1.5 A). The per-frame indexing gate now measures the indexed fraction only within the resolution range the lattice actually diffracts to, so the many sub-diffraction ice/noise spots no longer make the fraction floor unreachable; the two-pass first pass tries several image-sampling schemes (spread across the whole rotation vs a consecutive wedge whose native stride keeps a reflection's rocking curve continuous, letting the FFT resolve a long axis) and keeps the one that indexes the most frames; and the de-novo space-group search no longer discards all reflections (and crashes) when every resolution shell falls below <I/sigma> = 1. * rugnux: Lower the low-resolution R-meas for strongly-diffracting rotation data - drop edge-of-sweep truncated fulls whose rocking curve was captured below `--min-captured-fraction` (default 0.7 for rotation), and report R-meas only over the observations kept by outlier rejection (matching XDS). The 0.7 default also strips the partiality-extrapolated fulls that dominate the intensity second moment on weakly-diffracting crystals, so the de-novo space-group search is no longer starved by the error-model I/sigma floor and recovers the correct symmetry (e.g. the F-cubic Benas crystals: Benas_3 -> F432, Benas_7 -> P6122, instead of P4/P1); on the reference battery every other crystal keeps its space group. * rugnux: Write the refined geometry (beam, tilt, axis) to _process.h5 and place non-standard mmCIF items under a reserved `jfjoch` prefix. * jfjoch_broker: Ordinary acquisition failures (receiver/writer/analysis problems, missed packets, writer disconnect) now return to the Idle state with an Error-severity message, so a run can be retried without an expensive re-initialisation; only failures that leave the detector in an undefined state (new JFJochCriticalException, e.g. PCIe/FPGA faults) go to the Error state and force re-initialisation. * jfjoch_broker: A synchronous /start now reports its failure to the HTTP caller instead of returning HTTP 200, and an incomplete or truncated dataset (missing packets, writer disconnect) is reported as an error rather than a "reduce frame rate" warning. * jfjoch_broker: Drop uncollected placeholder rows (number = -1) from the scan_result REST endpoint. * jfjoch_broker: Fix the inverted per-image compression ratio reported by the Lite receiver (was compressed/uncompressed instead of uncompressed/compressed). * jfjoch_broker: Bragg integration adds a quantization-noise variance floor with a box-sum fallback, and treats the type-maximum marker as an invalid pixel for unsigned image types. * jfjoch_writer: Detect file-overwrite conflicts at start for back-channel transports, and reset the writer when end-of-collection finalisation fails. * jfjoch_viewer: Preview overlays follow the geometry (resolution/ROI arcs, true beam centre, predictions, coral secondary-lattice spots, legend), add save-as-JPEG, and fix an HTTP live-follow memory leak. * Frontend: Improved aesthetics and usability, and added in-browser pixel-mask and JUNGFRAU-pedestal visualisation. * CI: Name the Windows installer jfjoch-viewer-* instead of jfjoch-*.Reviewed-on: #67 Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
134 lines
7.2 KiB
Markdown
134 lines
7.2 KiB
Markdown
# jfjoch_viewer
|
|
|
|
`jfjoch_viewer` is the **interactive** desktop application of Jungfraujoch. It opens diffraction
|
|
datasets, displays each image together with the analysis overlay (spots, predictions, azimuthal
|
|
integration, per-image statistics), and can follow a live data collection by syncing with a
|
|
running [`jfjoch_broker`](JFJOCH_BROKER.md) over its HTTP interface.
|
|
|
|
It is a standalone Qt 6 application, distributed pre-built on the Gitea release page and in the
|
|
Jungfraujoch RPM/APT repositories (see [Deployment](DEPLOYMENT.md)).
|
|
|
|
## Where it fits among the three analysis tools
|
|
|
|
| Tool | Mode | Driven by | Output |
|
|
| --- | --- | --- | --- |
|
|
| [`jfjoch_broker`](JFJOCH_BROKER.md) | Online, real-time streaming analysis on FPGA + GPU | HTTP/REST + ZeroMQ | Live results and statistics, images streamed to [`jfjoch_writer`](JFJOCH_WRITER.md) |
|
|
| **`jfjoch_viewer`** | **Interactive, on-screen exploration** | **Qt desktop application** | **Displayed on screen (results not saved to disk)** |
|
|
| [`rugnux`](RUGNUX.md) | Offline batch processing of a stored dataset | Command-line interface | `_process.h5`, and `.mtz`/`.cif`/`.hkl` when merging |
|
|
|
|
## Functionality
|
|
|
|
- Opens HDF5 files written by [`jfjoch_writer`](JFJOCH_WRITER.md) (`*_master.h5`) and the
|
|
`*_process.h5` files produced by [`rugnux`](RUGNUX.md). It also opens NXmx files
|
|
written by DECTRIS detectors, though that path has had only limited testing.
|
|
- Runs an **embedded data-processing pipeline** — the same analysis code as the rest of
|
|
Jungfraujoch — performing spot finding, indexing and integration on the displayed images.
|
|
Results are shown on screen but are **not** saved to disk.
|
|
- Auxiliary windows and panels: image list, image metadata, spot list, reflection list,
|
|
per-region-of-interest statistics, the azimuthal-integration profile, and dataset-info charts.
|
|
- User-mask editing: build a user mask interactively, clear it, save it as TIFF, or upload it to a
|
|
connected server.
|
|
|
|
## Hardware
|
|
|
|
As with the rest of Jungfraujoch, **serious performance requires an NVIDIA GPU**. On systems with a
|
|
GPU, use the CUDA build (provided as separate RPM/APT repositories) for the embedded indexing and
|
|
integration; the non-CUDA build runs the same pipeline on the CPU at much lower throughput.
|
|
|
|
## Opening data
|
|
|
|
- **File ▸ Open** (`Ctrl+O`) — open a local HDF5 file.
|
|
- **File ▸ Open HTTP** (`Ctrl+H`) — connect to a `jfjoch_broker` HTTP endpoint to follow a live
|
|
collection. The dialog defaults to host `localhost` and port `8080`; these defaults can be
|
|
overridden with the environment variables `JUNGFRAUJOCH_HTTP_HOST` and `JUNGFRAUJOCH_HTTP_PORT`.
|
|
- **Command line** — `jfjoch_viewer <file.h5>` opens a file (or an `http://host:port` URL) on
|
|
start-up. `--dbus <true|false>` (`-d`) enables or disables the D-Bus interface (default: enabled);
|
|
`--help` and `--version` behave as usual.
|
|
|
|
## D-Bus interface
|
|
|
|
When enabled, the viewer registers the D-Bus interface `ch.psi.jfjoch_viewer`, so other processes
|
|
can drive it:
|
|
|
|
- `LoadFile(filename, image_number=0, summation=1)` — open a file (or an `http://host:port` URL)
|
|
and display the given image.
|
|
- `LoadImage(image_number, summation=1)` — navigate to an image in the already-open dataset.
|
|
|
|
`summation` sums that many consecutive images before display.
|
|
|
|
## Building from source on Windows
|
|
|
|
`jfjoch_viewer` is the one Jungfraujoch component that is cross-platform: it builds on Windows 11
|
|
with MSVC and the full CUDA GPU path. (The rest of Jungfraujoch — broker, receiver, FPGA host — is
|
|
Linux-only.) There is no pre-built Windows package yet, so build it from source. On Windows the
|
|
build is automatically restricted to the viewer and the libraries it needs (`JFJOCH_VIEWER_ONLY` is
|
|
forced on), and the remaining dependencies are fetched and built automatically (the first configure
|
|
needs network access).
|
|
|
|
Verified toolchain:
|
|
|
|
- Windows 11
|
|
- Visual Studio 2026 with the C++ (MSVC) toolset — required; CUDA on Windows builds through MSVC
|
|
- CUDA Toolkit 13.3 (12.8 or newer is required) — for the GPU indexing/integration path
|
|
- Qt 6.11 for MSVC (`msvc2022_64`), including the **Qt Charts** module — e.g. `C:\Qt\6.11.1\msvc2022_64`
|
|
- CMake plus Ninja. The CMake that ships with Visual Studio is the simplest choice and works out of
|
|
the box — it comes with the C++ workload, so there is nothing extra to install. Any recent
|
|
standalone CMake (from cmake.org, or the one bundled with Qt in `C:\Qt\Tools\CMake_64`) works too.
|
|
- zlib and Eigen — the two libraries not auto-fetched on Windows. Build/install both into one prefix
|
|
(here `C:\deps`) and point CMake at it:
|
|
```
|
|
:: static zlib
|
|
git clone --branch v1.3.1 https://github.com/madler/zlib
|
|
cmake -G Ninja -S zlib -B zlib-build -DCMAKE_INSTALL_PREFIX=C:/deps
|
|
cmake --build zlib-build --target install
|
|
:: Eigen 3.4 (header-only) -- install just the headers with `cmake --install`; the BLAS/LAPACK/test
|
|
:: targets are disabled since they are not needed (and fail to build under MSVC). Use the 3.4 series:
|
|
:: the project requests find_package(Eigen3 3.4), which Eigen's same-major rule rejects for 5.x.
|
|
git clone --branch 3.4.0 https://gitlab.com/libeigen/eigen.git
|
|
cmake -G Ninja -S eigen -B eigen-build -DCMAKE_INSTALL_PREFIX=C:/deps ^
|
|
-DEIGEN_BUILD_BLAS=OFF -DEIGEN_BUILD_LAPACK=OFF -DEIGEN_BUILD_DOC=OFF -DBUILD_TESTING=OFF
|
|
cmake --install eigen-build
|
|
```
|
|
- Optional: [NSIS](https://nsis.sourceforge.io) to build the `.exe` installer.
|
|
|
|
Configure and build from an **x64 Native Tools Command Prompt for VS 2026** (so `cl`, `nvcc` and
|
|
`ninja` are on `PATH`):
|
|
|
|
```
|
|
cmake -G Ninja -B build-win -DCMAKE_BUILD_TYPE=Release ^
|
|
-DCMAKE_PREFIX_PATH="C:/deps;C:/Qt/6.11.1/msvc2022_64"
|
|
cmake --build build-win --target jfjoch_viewer
|
|
```
|
|
|
|
Notes:
|
|
|
|
- `CMAKE_PREFIX_PATH` (the `C:/deps` prefix plus Qt) is the only required flag — CMake finds zlib and
|
|
Eigen from the prefix, so no separate `-DZLIB_ROOT` is needed.
|
|
- The CUDA toolchain is located automatically from the `CUDA_PATH` environment variable that the
|
|
CUDA installer sets (or from `nvcc` on `PATH`). Pass `-DCMAKE_CUDA_COMPILER=".../bin/nvcc.exe"`
|
|
only if `nvcc` is installed in a nonstandard location and is not found.
|
|
- For a machine without an NVIDIA GPU, add `-DJFJOCH_USE_CUDA=OFF`: the viewer then runs the same
|
|
pipeline on the CPU (FFTW indexer) at lower throughput.
|
|
|
|
To produce a self-contained installer (bundles the Qt runtime via `windeployqt`, the analysis CLIs,
|
|
and — on the CUDA build — the cuFFT runtime DLL, so the target host needs no Qt and no CUDA toolkit,
|
|
only an NVIDIA GPU driver), with NSIS installed:
|
|
|
|
```
|
|
cd build-win
|
|
cpack
|
|
```
|
|
|
|
The NSIS generator is selected automatically on Windows (no `-G` needed). The installer filename and
|
|
the Add/Remove Programs entry mark the CUDA/CPU variant, while the install folder and Start Menu
|
|
group stay plain `Jungfraujoch` (the two variants share an install location and replace each other —
|
|
CUDA is a strict superset):
|
|
|
|
| Build | Installer file | Add/Remove Programs |
|
|
| --- | --- | --- |
|
|
| CUDA (default) | `jfjoch-<version>-win64-cuda<major>.exe` | `Jungfraujoch (CUDA)` |
|
|
| `-DJFJOCH_USE_CUDA=OFF` | `jfjoch-<version>-win64-cpu.exe` | `Jungfraujoch (CPU)` |
|
|
|
|
`<major>` is the CUDA toolkit major version (e.g. `cuda13`). The cuFFT DLL is ~256 MB, so the CUDA
|
|
installer is correspondingly larger — hence the variant tag in the filename.
|