Files
leonarski_f 4809c1622c
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
v1.0.0-rc.187 (#98)
* 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>
2026-11-19 20:49:28 +01:00

184 lines
7.8 KiB
C++

// SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
// SPDX-License-Identifier: GPL-3.0-only AND MPL-2.0
// SparseCCL code taken from https://github.com/acts-project/traccc/blob/main/core/include/traccc/clusterization/detail/sparse_ccl.hpp
// (c) 2021-2022 CERN for the benefit of the ACTS project
// Mozilla Public License Version 2.0
// The algorithm: Hennequin, Couturier, Gligorov & Lacassagne (2019) DASIP 2019, 65-70 (SparseCCL)
//
// The union-find and the two-scan structure are theirs. How a pixel's earlier neighbours are FOUND
// is not: see sparseccl below.
#include <algorithm>
#include <bitset>
#include "StrongPixelSet.h"
StrongPixelSet::StrongPixelSet() : strong_pixel_count(0) {
pixels.reserve(max_strong_pixel_per_module);
}
void StrongPixelSet::AddStrongPixel(uint16_t col, uint16_t line, int32_t photons) {
pixels.push_back(strong_pixel{.col = col, .line = line, .counts = photons});
++strong_pixel_count;
}
uint32_t StrongPixelSet::find_root(uint32_t e) {
uint32_t r = e;
while (L[r] != r)
r = L[r];
return r;
}
uint32_t StrongPixelSet::make_union(uint32_t e1, uint32_t e2) {
uint32_t e;
if (e1 < e2) {
e = e1;
L[e2] = e;
} else {
e = e2;
L[e1] = e;
}
return e;
}
std::vector<DiffractionSpot> StrongPixelSet::sparseccl(const SpotFindingSettings &settings) {
L.resize(pixels.size());
unsigned int labels = 0;
// First scan: pixel association. The pixels arrive in raster order - line ascending, column
// ascending within a line - which upstream uses to walk a sliding window of the last two lines,
// testing every pixel in it for adjacency. That is quadratic in how many strong pixels a line
// pair holds: fine for the silicon-tracker hits it was written for, but a flooded detector line
// holds four thousand of them, and labelling a fully lit frame took 76 seconds.
//
// Since the columns ascend, the window need not be walked. A pixel's earlier 8-neighbours are
// exactly the one to its left and the at most three above it, so keep the previous line's range
// and a cursor into it that only ever moves forward - the same four neighbours the GPU extractor
// finds by binary search. Same edge set, same unions in the same order, therefore the same
// labels; the flooded frame now takes 0.16 s.
uint32_t line_begin = 0; // first pixel of the line being scanned
uint32_t prev_begin = 0, prev_end = 0; // the pixels of the line above it
uint32_t up = 0; // cursor into [prev_begin, prev_end)
for (uint32_t i = 0; i < pixels.size(); ++i) {
L[i] = i;
if (i > 0 && pixels[i].line != pixels[i - 1].line) {
// The line above is the previous one only if it really is the line above: a line with no
// strong pixel at all leaves nothing to join to.
prev_begin = (pixels[i].line == pixels[i - 1].line + 1) ? line_begin : i;
prev_end = i;
line_begin = i;
up = prev_begin;
}
uint32_t ai = i;
while (up < prev_end && pixels[up].col + 1 < pixels[i].col)
++up;
for (uint32_t j = up; j < prev_end && pixels[j].col <= pixels[i].col + 1; ++j)
ai = make_union(ai, find_root(j));
// The pixel to the left comes last, as it did when the window was walked in order.
if (i > line_begin && pixels[i - 1].col + 1 == pixels[i].col)
ai = make_union(ai, find_root(i - 1));
}
// second scan: transitive closure
for (uint32_t i = 0; i < L.size(); ++i) {
if (L[i] == i) {
L[i] = labels++;
} else {
L[i] = L[L[i]];
}
}
std::vector<DiffractionSpot> spots(labels);
// The bounding box travels with the accumulation rather than on DiffractionSpot: it is wanted
// only to judge the shape here, and carrying it further would leave a member that
// ConvertToImageCoordinates silently invalidates.
std::vector<uint16_t> min_col(labels, UINT16_MAX), max_col(labels, 0);
std::vector<uint16_t> min_line(labels, UINT16_MAX), max_line(labels, 0);
for (uint32_t i = 0; i < L.size(); i++) {
const uint32_t l = L[i];
spots[l].AddPixel(pixels[i].col, pixels[i].line, pixels[i].counts);
min_col[l] = std::min(min_col[l], pixels[i].col);
max_col[l] = std::max(max_col[l], pixels[i].col);
min_line[l] = std::min(min_line[l], pixels[i].line);
max_line[l] = std::max(max_line[l], pixels[i].line);
}
std::vector<DiffractionSpot> out;
for (uint32_t l = 0; l < labels; l++) {
if (spots[l].PixelCount() > settings.max_pix_per_spot)
continue;
const int64_t w = static_cast<int64_t>(max_col[l]) - min_col[l] + 1;
const int64_t h = static_cast<int64_t>(max_line[l]) - min_line[l] + 1;
if (SpotShapeAccepted(spots[l].PixelCount(), std::max(w, h)))
out.push_back(spots[l]);
}
return out;
}
void StrongPixelSet::FindComponentsImage(const SpotFindingSettings &settings, std::vector<DiffractionSpot> &spots) {
// No StrongPixelLimit test here: the caller knows how big the image is and has already applied it.
// Size and shape are applied by sparseccl.
for (const auto &spot: sparseccl(settings))
spots.push_back(spot);
}
void StrongPixelSet::FindSpots(const DiffractionExperiment &experiment, const SpotFindingSettings &settings,
std::vector<DiffractionSpot> &spots, uint16_t module_number) {
// Per module, so the bar is the module's own - and ReadFPGAOutput has already refused anything
// past max_strong_pixel_per_module, far below it.
if (!pixels.empty() && (strong_pixel_count < StrongPixelLimit(RAW_MODULE_SIZE))) {
for (const auto &spot: sparseccl(settings)) {
if (spot.PixelCount() >= settings.min_pix_per_spot.value_or(2)) {
auto s = spot;
s.ConvertToImageCoordinates(experiment, module_number);
spots.push_back(s);
}
}
}
}
void StrongPixelSet::ReadFPGAOutput(const DiffractionExperiment & experiment,
const DeviceOutput &output) {
// Too many strong pixels will kill performance in data processing, so protection is needed
// Also if there are no strong pixels, there is no point in looking for them
if ((output.spot_finding_result.strong_pixel_count == 0) ||
(output.spot_finding_result.strong_pixel_count > max_strong_pixel_per_module)) {
// If max strong pixel per module condition kicks-in, still report correct strong pixel count
strong_pixel_count = output.spot_finding_result.strong_pixel_count;
return;
}
auto pixel_depth = experiment.GetByteDepthImage();
auto out_ptr = (uint32_t *) output.spot_finding_result.strong_pixel;
for (int i = 0; i < RAW_MODULE_SIZE / (8 * sizeof(out_ptr[0])); i++) {
size_t npixel = i * 8 * sizeof(out_ptr[0]);
size_t line = npixel / RAW_MODULE_COLS;
if (out_ptr[i] != 0) {
std::bitset<32> bitset(out_ptr[i]);
for (int j = 0; j < 32; j++) {
if (bitset.test(j)) {
size_t col = (npixel | j) % RAW_MODULE_COLS;
if (pixel_depth == 2)
AddStrongPixel(col, line, output.pixels[npixel | j]);
else if (pixel_depth == 1)
AddStrongPixel(col, line, ((int8_t *)output.pixels)[npixel | j]);
else if (pixel_depth == 4)
AddStrongPixel(col, line, ((int32_t *)output.pixels)[npixel | j]);
}
}
}
}
}
uint32_t StrongPixelSet::GetStrongPixelCount() const {
return strong_pixel_count;
}