Build Packages / build:rugnux:aarch64 (cross) (push) Successful in 8m41s
Build Packages / build:windows:nocuda (push) Successful in 16m50s
Build Packages / build:rugnux-tgz (x86_64) (push) Successful in 18m22s
Build Packages / build:windows:cuda (push) Successful in 19m40s
Build Packages / build:viewer-tgz:cpu (push) Successful in 21m2s
Build Packages / build:viewer-tgz:cuda (push) Successful in 22m43s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 23m21s
Build Packages / build:rugnux:windows (push) Successful in 10m45s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 27m37s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 27m50s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 19m52s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 22m6s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 25m47s
Build Packages / build:rpm (rocky9) (push) Successful in 23m52s
Build Packages / build:rpm (rocky8) (push) Successful in 26m33s
Build Packages / Generate python client (push) Successful in 45s
Build Packages / Build documentation (push) Successful in 1m16s
Build Packages / Create release (push) Skipped
Build Packages / build:rpm (ubuntu2404) (push) Successful in 23m57s
Build Packages / DIALS test (push) Successful in 25m7s
Build Packages / XDS test (durin plugin) (push) Successful in 11m18s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 27m24s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 10m58s
Build Packages / XDS test (neggia plugin) (push) Successful in 8m43s
Build Packages / Unit tests (push) Successful in 1h22m26s
The self-calibrating finder was meant to replace the classic finder's FIXED PHOTON FLOOR with a per-resolution-ring threshold read off the image's own noise. As written it replaced the local-box SNR test as well, and that is the defect: a whole-ring threshold is an ABSOLUTE contour with no feedback from a pixel's own surroundings, so the area a spot puts above it grows as sigma^2*ln(peak/threshold) and never saturates. Measured on a strongly diffracting rotation set, the detected footprint grows by +8.05 pixels per e-fold of peak, so the brightest reflections came out as 100-500 pixel blobs and were then discarded for exceeding the size bound - every one of the ten strongest on an image. Intersecting with the local box gives -0.24 pixels per e-fold, the classic finder's own number to two decimals. WHY the local box is the right partner, rather than merely the incumbent: it is a prominence rule whose reference level is a 961-pixel mean. A spot inflates the box's own variance and the peak divides out of the acceptance test, so it cuts at a fixed FRACTION of the spot's own height. Referring that level to fewer pixels makes it inherit their shot noise - at FIXED footprint, estimating the level from 961 pixels, from 25, and from the single maximum gives centroid residuals of 0.524, 0.539 and 0.656 - so flat growth and a stable centroid turn out to be two ends of one dial. A contour on the bare maximum has the flattest growth of anything tried (+0.1) and merges worst. The two arms bind in different regimes, which is why intersecting beats choosing: on serial stills the ring threshold is 0.6x the classic floor, on this rotation sweep 2.3-6.0x. Stills are a strict no-op - 175 components against 175, identical per frame - so the +40% in stills indexing that the adaptive threshold was introduced for is untouched. What it buys, stated as one fact rather than two. Across five geometry pins spanning 1.1 mm it indexes the most frames of any arm tried, 0.831 against 0.803, and integrates 3.04 to 5.76% more observations - but those are the SAME number: regressing observation count on indexing rate over four arms leaves residuals of +/-0.7 percentage points against swings of -7 to +4.5%, so the extra observations ARE the extra indexed frames, not better data per frame. CC1/2, the only statistic here carrying per-observation quality, is +0.66 at one pin and -0.06 at the other: not harmed, not improved. <I/sigma>, ISa and R_meas cannot arbitrate on this data - across those pins each crosses zero as a monotone function of the pin. WHY an absolute contour indexes fewer frames, when its spot list is equal or better on every axis measured - recall, top-1000 recall, centroid, ice fraction, component count - is the interesting part, and it is not a detection effect at all: ITS OWN SIZE BOUND DELETES THE BRIGHTEST REFLECTIONS ON THE FRAME. A component is discarded because it grew past 200 px, and it grew past 200 px because it was bright, so the deletions are drawn from the head of the indexing budget rather than uniformly from it: they are 11x enriched in the top 250 of the thousand spots handed to the indexer, and the bound's own real deletions sit at MEDIAN RANK 12. Turning the bound off recovers 66% and 50% of the deficit at the two pins, against a bar registered at 33% before the run. Three of us dismissed this for most of a day on the grounds that the gates delete only ~4% of what is detected. That arithmetic was right and the denominator was wrong - a rate is not an impact when the thing being lost is selected for the property that makes it matter. Reworking the bound instead was measured and rejected: it recovers half the deficit, and it cannot be done without re-admitting what the bound is for - 68 components past 200 px, of which 8 are real and 60 are junk, where the intersect gets the 8 without the 60. The residual once the bound is off, +1.08%/+1.70%, is the contour itself. Component merging is ruled out separately: geometrically impossible here, 33.9 px minimum reflection separation against components spanning 10 px. So is a ranking effect - the intersect's lead runs +0.06% at --max-spots 250, +3.46% at 1000 and +14.26% at 2000, which is backwards for a selection artefact. Costs 0.48 ms per image in the finder, and 0.044 px of bright-spot centroid precision - measured convention-free, by fitting a line to a reflection's own centroid across five frames, after an XDS-referenced figure proved to be four fifths aperture convention. It also makes the compactness gate above it safe. On the absolute contour that gate is net damage, deleting 37 genuine reflections per ten frames; once the footprint stops growing nothing reaches its threshold at all. Also fixes a real but unexercised defect in PoissonThreshold, where the exact tail handed over to a normal approximation with a step. It changes nothing here: the clipped ring sigma is over-dispersed 1.2-4.9x against sqrt(mu) because it still contains diffraction, so the Gaussian arm wins every ring above mu=50 and none of the 522 thresholds move. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01FBumeJVx4oeXxiBRpkrE5H
100 lines
6.2 KiB
C++
100 lines
6.2 KiB
C++
// SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#pragma once
|
|
|
|
#include <cstddef>
|
|
#include <optional>
|
|
#include <cstdint>
|
|
|
|
// Strong pixels above which the connected-component search gives up on a frame, unlabelled: an image
|
|
// with this much of the detector over threshold is not a diffraction pattern, and it is what the
|
|
// spot extractor's buffers are sized to. It is no longer a time limit - the search is linear in the
|
|
// strong pixels either way, and a fully lit 18-megapixel frame labels in 0.16 s.
|
|
//
|
|
// The bar has to be a FRACTION of the detector. It stood at a fixed 65535, which is one pixel in 64
|
|
// of the JUNGFRAU 4M it was written for; left fixed while the detectors grew it became one pixel in
|
|
// 276 of an 18-megapixel EIGER - a bar a strongly diffracting crystal clears on its best frames,
|
|
// which were then dropped whole, and in silence. One in 64 everywhere, and never below the value
|
|
// that used to stand here, so no smaller detector loses ground.
|
|
constexpr uint32_t StrongPixelLimit(size_t pixel_count) {
|
|
const auto limit = static_cast<uint32_t>(pixel_count / 64);
|
|
return limit > UINT16_MAX ? limit : UINT16_MAX;
|
|
}
|
|
|
|
// A connected component this size or smaller is judged on size alone. That is where the size bound
|
|
// stood before it was raised, so every component that used to be accepted still is.
|
|
constexpr int64_t SPOT_SHAPE_FREE_PIXELS = 50;
|
|
// A larger one must also be COMPACT: it has to fill at least this percent of the square its bounding
|
|
// box fits inside. A Bragg reflection is round and fills about half of that square however bright it
|
|
// is; an ice arc, a cosmic-ray track or a lit detector row fills a fifth or less, and those are what
|
|
// an upper bound on spot size was ever for.
|
|
//
|
|
// It is INERT on every dataset it has been measured on: gate on and gate off give a byte-identical
|
|
// merge on three rotation crystals including the strongly diffracting one the raised bound was written
|
|
// for. The raised bound is what did nearly all of the work there - of the components an absolute ring
|
|
// contour pushes past 50 pixels, this shape test rejects a few percent and the raise re-admits the
|
|
// rest.
|
|
//
|
|
// Both only matter while a spot's footprint can grow with its brightness, and since the adaptive
|
|
// finder intersects its ring threshold with the local-box SNR test the footprint is peak-relative and
|
|
// no component on that set reaches 50 pixels at all.
|
|
//
|
|
// The shape test is kept anyway because it is the one of the two that does not go stale: a size bound
|
|
// is a bet on how large spots are, and the detectors and the detection rule both move underneath it -
|
|
// under every peak-relative detector tried, the 200-pixel bound became unreachable while this test
|
|
// still fired. The bound is kept alongside it because the cap the local box imposes scales with the
|
|
// spot WIDTH, so a set with wider spots than the ones measured here will reach past 50 pixels again.
|
|
// A shape test rather than a size test is what XDS and DISTL bound spots with; neither uses this
|
|
// statistic, but the choice of shape over size is theirs.
|
|
// Following Kabsch (2010) Acta Cryst. D66, 125-132 and Zhang, Sauter et al. (2006) J. Appl. Cryst. 39, 112-119
|
|
constexpr int64_t SPOT_MIN_FILL_PERCENT = 20;
|
|
|
|
// Integer arithmetic throughout, so the host and the GPU extractor agree by construction.
|
|
constexpr bool SpotShapeAccepted(int64_t pixel_count, int64_t bbox_side) {
|
|
if (pixel_count <= SPOT_SHAPE_FREE_PIXELS)
|
|
return true;
|
|
return pixel_count * 100 >= SPOT_MIN_FILL_PERCENT * bbox_side * bbox_side;
|
|
}
|
|
|
|
struct SpotFindingSettings {
|
|
bool enable = true;
|
|
float signal_to_noise_threshold = 4.0; // STRONG_PIXEL in XDS
|
|
int64_t photon_count_threshold = 10; // Threshold in photon counts
|
|
// Minimum connected pixels per spot. std::nullopt = choose it per image: on the stills indexing
|
|
// path the frame is indexed at min-pix 3/2/1 and the one maximising indexed count x indexed fraction
|
|
// is kept (see MXAnalysisWithoutFPGA::Analyze); a value fixes it. Defaults to a concrete value, so
|
|
// the online receiver and the FPGA path keep the single-pass fixed behaviour unless set otherwise.
|
|
std::optional<int64_t> min_pix_per_spot = 2;
|
|
// Maximum pixels per spot. A component above SPOT_SHAPE_FREE_PIXELS must also pass
|
|
// SpotShapeAccepted, so this bounds how large a ROUND spot may be, not how bright.
|
|
int64_t max_pix_per_spot = 200;
|
|
// High-resolution limit for spot finding [A]. std::nullopt = as far as the detector reaches, i.e. no
|
|
// resolution clipping of the detection at all (DiffractionExperiment::GetDetectorMaxResolution_A
|
|
// supplies the number where one is needed, e.g. for the spot plot's shells).
|
|
std::optional<float> high_resolution_limit;
|
|
// Low-resolution limit for spot finding [A]. std::nullopt = no limit at the low-resolution end, the
|
|
// mirror of high_resolution_limit above. Optional rather than a zero sentinel because zero is not a
|
|
// natural "no limit" here: every pixel has d above it, so the plain comparison would mask the whole
|
|
// image rather than none of it. Defaults to a concrete value, which is where the detection normally
|
|
// stops - the direct beam and its halo sit beyond it.
|
|
std::optional<float> low_resolution_limit = 50.0;
|
|
float cutoff_spot_count_low_res = 5.0;
|
|
std::optional<float> high_res_gap_Q_recipA = 1.5; // 0.25 * 2 * pi
|
|
|
|
// Half-width of the ice-ring exclusion band in q (2*pi/d). Measured hexagonal-ice ring FWHM on the
|
|
// JUNGFRAU is ~0.06 q, so the band half-width is ~0.03; 0.02 under-covered the strong low-res rings.
|
|
float ice_ring_width_Q_recipA = 0.03;
|
|
|
|
bool indexing = true;
|
|
bool quick_integration = true;
|
|
|
|
// Self-calibrating detection (offline/rugnux path): when true, the fixed photon_count_threshold is
|
|
// replaced by a per-resolution-ring threshold set from the image's own noise (see
|
|
// AdaptiveSpotFinderCPU), so the same setting adapts across datasets with no per-dataset tuning.
|
|
// false_pixels_per_frame is the one portable knob: the expected number of noise pixels tolerated
|
|
// per frame (the threshold's operating point), ~100 for a multi-megapixel detector.
|
|
bool adaptive_threshold = false;
|
|
float false_pixels_per_frame = 100.0f;
|
|
};
|