Files
leonarski_fandFilip Leonarski 19b135186d
Build Packages / Create release (push) Successful in 7s
Build Packages / build:portable:macos-arm64:nocuda (push) Successful in 4m56s
Build Packages / build:rugnux:linux-aarch64:cuda (push) Successful in 9m10s
Build Packages / build:portable:linux-x86_64:nocuda (push) Successful in 13m51s
Build Packages / build:portable:linux-x86_64:cuda (push) Successful in 16m56s
Build Packages / build:jfjoch:rocky8:nocuda (push) Successful in 20m59s
Build Packages / build:portable:windows-x86_64:nocuda (push) Successful in 21m25s
Build Packages / build:jfjoch:rocky9:nocuda (push) Successful in 21m17s
Build Packages / build:jfjoch:ubuntu2204:nocuda (push) Successful in 14m14s
Build Packages / HDF5 consumer tests (DIALS, XDS) (push) Successful in 25m59s
Build Packages / build:portable:windows-x86_64:cuda (push) Successful in 25m48s
Build Packages / build:jfjoch:ubuntu2404:nocuda (push) Successful in 15m52s
Build Packages / build:jfjoch:rocky8:cuda-sls9 (push) Successful in 19m33s
Build Packages / Generate python client (push) Successful in 29s
Build Packages / Build documentation (push) Successful in 1m19s
Build Packages / build:jfjoch:ubuntu2204:cuda (push) Successful in 20m49s
Build Packages / build:jfjoch:rocky9:cuda-sls9 (push) Successful in 25m31s
Build Packages / build:jfjoch:rocky8:cuda (push) Successful in 25m24s
Build Packages / build:jfjoch:rocky9:cuda (push) Successful in 26m5s
Build Packages / build:jfjoch:ubuntu2404:cuda (push) Successful in 22m19s
Build Packages / Unit tests (push) Failing after 2h28m24s
Build Packages / Validation Battery (push) Successful in 40m33s
v1.0.0-rc.175 (#85)
* Rugnux: Processes a collection live while jfjoch_broker writes it (`rugnux <master.h5> <broker URL>`).
* Rugnux: Processing starts on the first images and confirms its choices once all are in, so analysis can begin during collection.
* Rugnux: Faster processing, especially on servers with several GPUs and CPU sockets and on computers without a GPU (`--no-gpu`, macOS).
* Rugnux: Uses much less GPU memory, so large data sets stay on the GPU of smaller cards, and a data set too large for the card is processed on the CPU instead.
* Rugnux: On macOS, Bragg integration runs on the Apple GPU.
* Rugnux: Better handling of twinning and pseudo-symmetry, with the twin hypothesis written as `<prefix>_twin_<SG>.mtz`, and a wrong `--model` no longer confirms the data or decides the hand.
* Rugnux: `--model` accepts predicted (AlphaFold) models and falls back to molecular replacement when the model is not placed as a rigid body (experimental `--mr` forces it), settling space group, hand and twinning and writing a different answer as `<prefix>_mr.mtz`.
* Rugnux: Molecular replacement is faster and settles the space group in more cases with several copies in the asymmetric unit.
* Rugnux: Deposition-ready mmCIF, a richer report, and numbered steps on the terminal with the full log in `<prefix>_log.txt`; `_P1.mtz`, `--estimate-beam-center` and `--beam-center-search` are removed.
* Rugnux: The beam-stop shadow is found correctly on tilted detectors.
* Rugnux: Stills files that record a stationary goniometer axis get the default stills geometry refinement.
* jfjoch_viewer: "Analyze dataset" uses the same defaults as a bare `rugnux <file>`, and shows the results of processed CBF, marCCD and SMV sweeps.
* jfjoch_viewer: The Files panel refreshes on F5 and every few seconds, and the plot type and other selections stay put during live collection.
* jfjoch_writer: Memory stays bounded and old data files are closed efficiently on long runs, any failure ends the run in an error state the broker is told about, and the master file appears only after its data files; the ZeroMQ pusher logs when a stalled writer makes it drop images.
* Fixes: The TCP image pusher no longer blocks the broker's receiver, GPU out-of-memory failures stop with a clear message, and the XDS plugin masks module and chip edges.

---------

Co-authored-by: Filip Leonarski <jungfrau@filips-mac-mini.home>
Reviewed-on: #85
Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
2026-10-16 15:34:43 +02:00

75 lines
3.0 KiB
C++

// SPDX-FileCopyrightText: 2026 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
// SPDX-License-Identifier: GPL-3.0-only
#pragma once
#include <chrono>
#include <condition_variable>
#include <cstdint>
#include <mutex>
#include <optional>
#include <string>
#include <vector>
#include "../common/JFJochMessages.h"
// What a reader following the current collection needs from the broker (GET /live/start.cbor and
// GET /live/events): the start message the writer of the master file received, then each data file
// as a writer reports it closed and renamed into place, then the end of the collection. Fed by the
// image pusher; read by the HTTP routes. One follower at a time.
class LiveCollection {
public:
struct DataFile {
uint64_t file_number = 0;
std::string file; // relative to the collection's root, as the writer named it
uint64_t first_image = 0;
uint64_t image_count = 0;
};
struct Snapshot {
uint64_t generation = 0; // 0: no collection since the broker started
bool started = false; // the start message is known
uint64_t run_number = 0;
std::string run_name;
std::string file_prefix;
uint64_t number_of_images = 0;
int64_t images_per_file = 0;
std::vector<DataFile> files; // in the order they were closed
bool ended = false;
uint64_t end_images = 0;
std::string end_error;
};
// A collection was accepted (/start); its start message comes with Begin, once the image pusher
// starts the writers - for a DECTRIS detector only when the detector's own start message arrives.
// A reader following it in between waits for it.
void Expect();
// start_cbor: the start message as the writer of the master file received it.
void Begin(const StartMessage &start, std::vector<uint8_t> start_cbor);
void FileClosed(uint64_t file_number, uint64_t image_count);
// After every writer has acknowledged END: the data files and the master are in place.
void End(uint64_t images, const std::string &error = "");
// The measurement is over: ends a collection the image pusher did not end, with this error.
void EndIfOpen(const std::string &error);
// The start message of the current collection; nothing before it is known.
std::optional<std::vector<uint8_t>> StartCBOR() const;
// Blocks until the start message arrives (when not `started_seen`), the collection has more than
// `files_seen` files, has ended, a new collection has begun, or `wait` passes; returns the state then.
Snapshot Wait(uint64_t generation, bool started_seen, size_t files_seen, std::chrono::milliseconds wait);
Snapshot Get() const;
// The single follower slot; false when another follower holds it.
bool AcquireFollower();
void ReleaseFollower();
private:
mutable std::mutex m;
std::condition_variable cv;
Snapshot state;
StartMessage start_message;
std::vector<uint8_t> start_cbor;
bool follower = false;
};