Build Packages / build:portable:linux-x86_64:nocuda (push) Successful in 16m43s
Build Packages / build:jfjoch:ubuntu2404:nocuda (push) Successful in 28m46s
Build Packages / build:jfjoch:rocky8:cuda-sls9 (push) Successful in 32m5s
Build Packages / build:jfjoch:rocky9:cuda (push) Successful in 39m44s
Build Packages / build:portable:macos-arm64:nocuda (push) Successful in 5m7s
Build Packages / Create release (push) Successful in 8s
Build Packages / Build documentation (push) Successful in 49s
Build Packages / build:portable:linux-x86_64:cuda (push) Successful in 22m30s
Build Packages / build:jfjoch:rocky8:nocuda (push) Successful in 31m54s
Build Packages / build:rugnux:linux-aarch64:cuda (push) Successful in 11m29s
Build Packages / build:portable:windows-x86_64:nocuda (push) Successful in 23m51s
Build Packages / build:jfjoch:ubuntu2204:nocuda (push) Successful in 26m7s
Build Packages / build:jfjoch:ubuntu2204:cuda (push) Successful in 29m38s
Build Packages / build:portable:windows-x86_64:cuda (push) Successful in 28m6s
Build Packages / HDF5 consumer tests (DIALS, XDS) (push) Successful in 29m44s
Build Packages / build:jfjoch:rocky9:nocuda (push) Successful in 33m22s
Build Packages / Generate python client (push) Successful in 47s
Build Packages / build:jfjoch:rocky9:cuda-sls9 (push) Successful in 34m6s
Build Packages / Unit tests (push) Successful in 1h2m47s
Build Packages / build:jfjoch:rocky8:cuda (push) Successful in 35m59s
Build Packages / build:jfjoch:ubuntu2404:cuda (push) Successful in 34m8s
Build Packages / Validation Battery (push) Successful in 38m31s
* Rugnux: Refinement several times faster, one protocol on the CPU and the GPU, parts of it on the Apple GPU; its random draws are the same on every platform. * Rugnux: Refinement follows common practice: the free set decides only the restraint weights and the displacement model (isotropic, TLS or anisotropic, by Hamilton's test), everything else is decided on the working set; lower R-free for placed and predicted models. * Rugnux: Restraint dictionaries via `--restraints` (or among the inputs) and more built-in ligands; a model whose space group is a subgroup of the data's is refined in its own group; reflections plus a model select `--mode refine` on their own. * Rugnux: `-C` fixes the crystal system on the axes as typed; `-S` alone fixes the space group only, the cell is still found and reduced; a space group or cell stored in the input file is ignored, with a line in the log. * Rugnux: More reliable multi-sweep merging; `--mode scale` merges several stills runs as one; `_plot.txt` and the report name each input; a second crystal form is reported for stills given a cell. * jfjoch_broker (experimental): Live Rugnux on FPGA detectors (JUNGFRAU) takes the same path as a DECTRIS stream, rotation and serial alike, model step included, with analysis threads per GPU; frames waiting for the analysis can be viewed; no host stage drops a frame - a source faster than the analysis is held at the card. * jfjoch_broker: Summation of more than 256 frames per image is split between the card and the host (`summation_mode` is then `hybrid`), and live Rugnux runs on such collections; pedestal runs take a receiver of their own. * jfjoch_broker (experimental): `stills_downsample` analyses 1 of every N serial images (chosen by a hash; the first 2000 all; the others written without analysis; reset to 1 by `/initialize`); `max_spot_count` left out means 250 for per-image indexing and up to 1000 for live stills; the live status gives the merge before the model work, the fitted resolution and the anomalous peak height of each unexplained blob. * jfjoch_broker: Without a `pcie` entry the broker runs on a mock of the card instead of the HLS simulation; its spot, ROI and azimuthal results are zero then. * Web frontend: Redesigned Rugnux live page; Vite 8, TypeScript 6, Mol* 5.13 and dependency security updates. * Tools: `jfjoch_fpga_stills_test` measures live stills on the cards with a stored dataset; `jfjoch_fpga_test` loses the HLS-simulation option. * Other: FFTW no longer fetched or linked (the CPU FFT indexer keeps the name `FFTW`); PCIe driver now GPL-2.0-or-later and third-party notices complete; several crash fixes. Reviewed-on: #98 Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
89 lines
4.0 KiB
C++
89 lines
4.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 <atomic>
|
|
#include <future>
|
|
#include <latch>
|
|
#include <map>
|
|
#include <memory>
|
|
#include <mutex>
|
|
#include <optional>
|
|
#include <vector>
|
|
|
|
#include "FrameTransformation.h"
|
|
#include "ImageMetadata.h"
|
|
#include "../acquisition_device/AcquisitionDeviceGroup.h"
|
|
#include "../common/ADUHistogram.h"
|
|
#include "../common/ModuleSummation.h"
|
|
#include "../image_puller/ImagePuller.h"
|
|
#include "../jungfrau/JFCalibration.h"
|
|
|
|
// The images of a collection from the FPGA cards, as a detector stream, in image order. As JFJochReceiverFPGA: each
|
|
// thread takes the next image, waits for its modules in the cards' buffers, assembles them into an image of its own
|
|
// and compresses it; the image leaves as its compressed bytes, and the cards' buffers go back. The cards' buffers are
|
|
// the only window over the images in flight. No image is discarded here: an image waits for room in the queue to the
|
|
// receiver, holding the cards' buffers meanwhile, so the cards wait for the host. Images are lost only at the card.
|
|
class FPGAImagePuller : public ImagePuller {
|
|
public:
|
|
// Images compressed and waiting for the receiver
|
|
static constexpr size_t Queue = 128;
|
|
// A module this far behind the fastest one of its card is taken as missing from that frame. It must stay beyond
|
|
// AcquisitionCounters::ThresholdFramesLost: the device then returns that frame's buffer itself if it comes later.
|
|
static constexpr int64_t MissingAfterFrames = AcquisitionCounters::ThresholdFramesLost + 2;
|
|
private:
|
|
const DiffractionExperiment experiment;
|
|
Logger &logger;
|
|
AcquisitionDeviceGroup &devices;
|
|
// The cards' images making one image, summed here (DiffractionExperiment::GetHostSummation)
|
|
const int64_t host_summation;
|
|
uint64_t expected_packets_per_image = 0;
|
|
|
|
std::atomic<int64_t> next_to_take = 0;
|
|
|
|
// What is done, waiting for the images before it. No value: that image will not come.
|
|
std::mutex order_mutex;
|
|
std::map<int64_t, std::optional<ImagePullerOutput>> images_done;
|
|
int64_t next_image = 0;
|
|
|
|
std::vector<std::unique_ptr<ADUHistogram>> adu_histogram;
|
|
|
|
std::mutex error_mutex;
|
|
std::exception_ptr error;
|
|
std::atomic<bool> failed = false; // a failed card may never report finished: nothing waits for it then
|
|
std::atomic<bool> cancelled = false; // Cancel(): the receiver takes no more images, nothing waits for it
|
|
void SetError(std::exception_ptr e);
|
|
|
|
std::vector<std::future<void>> acquire_futures;
|
|
std::vector<std::future<void>> image_futures;
|
|
std::future<void> finish_future;
|
|
std::once_flag finish_once;
|
|
|
|
void AcquireThread(uint16_t data_stream, const PixelMask &mask, const JFCalibration *calibration, std::latch &ready);
|
|
void ImageThread();
|
|
void FinalizeMeasurement();
|
|
|
|
// False where the module is missing from the frame
|
|
bool WaitForFrame(uint16_t data_stream, uint16_t module_number, int64_t frame);
|
|
// Every card has finished, all of them before this frame
|
|
bool CardsFinishedBefore(int64_t frame) const;
|
|
void Emit(int64_t image_number, std::optional<ImagePullerOutput> output);
|
|
// Waits for room in the queue, as long as the receiver takes from it: after a cancel it no longer does
|
|
void Put(const ImagePullerOutput &output);
|
|
public:
|
|
// Arms the cards; when it returns the detector can be started.
|
|
FPGAImagePuller(const DiffractionExperiment &experiment, const PixelMask &mask, const JFCalibration *calibration,
|
|
AcquisitionDeviceGroup &devices, Logger &logger, int64_t image_threads);
|
|
~FPGAImagePuller() override;
|
|
|
|
void Disconnect() override {}
|
|
|
|
// The cards finish: what they have got still comes, then the end message.
|
|
void StopCards();
|
|
// As StopCards(), and the receiver takes no more images: nothing waits for it any more.
|
|
void Cancel();
|
|
// After the receiver is done: cancels, waits for the threads, throws what went wrong with the cards.
|
|
void Stop();
|
|
};
|