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
112 lines
5.0 KiB
C++
112 lines
5.0 KiB
C++
// SPDX-FileCopyrightText: 2026 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#include <catch2/catch_all.hpp>
|
|
|
|
#include <cmath>
|
|
|
|
#include "../image_analysis/spot_finding/AdaptiveThreshold.h"
|
|
|
|
using namespace adaptive_threshold;
|
|
|
|
namespace {
|
|
// Poisson upper tail P(X >= k) for mean mu, summed directly - an independent reference for the
|
|
// threshold's defining property.
|
|
double PoissonUpperTail(double mu, int k) {
|
|
if (k <= 0)
|
|
return 1.0;
|
|
double pmf = std::exp(-mu);
|
|
double cdf = pmf;
|
|
for (int i = 1; i < k; i++) {
|
|
pmf *= mu / i;
|
|
cdf += pmf;
|
|
}
|
|
return std::max(0.0, 1.0 - cdf);
|
|
}
|
|
}
|
|
|
|
TEST_CASE("AdaptiveThreshold_NormalQuantile", "[SpotFinding]") {
|
|
// Textbook values of the inverse standard-normal CDF.
|
|
CHECK(NormalQuantile(0.5) == Catch::Approx(0.0).margin(1e-9));
|
|
CHECK(NormalQuantile(0.975) == Catch::Approx(1.959964).margin(1e-5));
|
|
CHECK(NormalQuantile(0.99) == Catch::Approx(2.326348).margin(1e-5));
|
|
CHECK(NormalQuantile(1.0 - 1e-6) == Catch::Approx(4.753424).margin(1e-4));
|
|
|
|
// Symmetric about 0.5, and monotonically increasing.
|
|
for (const double p: {1e-8, 1e-4, 0.01, 0.2, 0.45})
|
|
CHECK(NormalQuantile(1.0 - p) == Catch::Approx(-NormalQuantile(p)).margin(1e-6));
|
|
CHECK(NormalQuantile(0.6) > NormalQuantile(0.55));
|
|
CHECK(NormalQuantile(1e-3) < NormalQuantile(1e-2));
|
|
|
|
// Degenerate arguments stay finite: the finders divide a tolerated-false-pixel count by the pixel
|
|
// count, so p can legitimately arrive at the very edge of (0, 1).
|
|
CHECK(std::isfinite(NormalQuantile(0.0)));
|
|
CHECK(std::isfinite(NormalQuantile(1.0)));
|
|
CHECK(NormalQuantile(0.0) < 0.0);
|
|
CHECK(NormalQuantile(1.0) > 0.0);
|
|
}
|
|
|
|
TEST_CASE("AdaptiveThreshold_PoissonThreshold", "[SpotFinding]") {
|
|
const double p = 1e-5;
|
|
const float z = static_cast<float>(NormalQuantile(1.0 - p));
|
|
|
|
// The defining property: the returned count is the SMALLEST whose upper tail is within p.
|
|
for (const double mu: {1e-6, 0.1, 1.0, 3.0, 10.0, 40.0, 60.0, 120.0}) {
|
|
const int thr = static_cast<int>(PoissonThreshold(mu, p, z));
|
|
CHECK(PoissonUpperTail(mu, thr) <= p);
|
|
CHECK(PoissonUpperTail(mu, thr - 1) > p);
|
|
}
|
|
|
|
// Non-decreasing in the background level.
|
|
float prev = 0.0f;
|
|
for (const double mu: {1e-6, 0.01, 0.1, 0.5, 1.0, 2.0, 5.0, 20.0, 45.0}) {
|
|
const float thr = PoissonThreshold(mu, p, z);
|
|
CHECK(thr >= prev);
|
|
prev = thr;
|
|
}
|
|
|
|
// Above the summation limit the Cornish-Fisher form takes over, and it has to stay a POISSON
|
|
// quantile: the skewness term (z^2-1)/6 is what a plain mu + z*sqrt(mu) leaves out, and at this
|
|
// z the Gaussian form alone lets through several times the tail asked for.
|
|
for (const double mu: {250.0, 400.0}) {
|
|
const float thr = PoissonThreshold(mu, p, z);
|
|
CHECK(thr > mu + z * std::sqrt(mu));
|
|
CHECK(PoissonUpperTail(mu, static_cast<int>(thr)) <= 2 * p);
|
|
CHECK(PoissonUpperTail(mu, static_cast<int>(mu + z * std::sqrt(mu))) > 2 * p);
|
|
}
|
|
|
|
// And it joins the exact quantile smoothly at the switch - no step for a ring whose background
|
|
// drifts across it from frame to frame.
|
|
CHECK(std::fabs(PoissonThreshold(200.5, p, z) - PoissonThreshold(199.5, p, z)) < 2.0f);
|
|
|
|
// A tighter operating point (smaller p) can only raise the threshold.
|
|
CHECK(PoissonThreshold(5.0, 1e-8, static_cast<float>(NormalQuantile(1.0 - 1e-8)))
|
|
>= PoissonThreshold(5.0, 1e-2, static_cast<float>(NormalQuantile(1.0 - 1e-2))));
|
|
}
|
|
|
|
TEST_CASE("AdaptiveThreshold_RingThreshold", "[SpotFinding]") {
|
|
const double p = 1e-5;
|
|
const float z = static_cast<float>(NormalQuantile(1.0 - p));
|
|
|
|
// Never below the read-noise-aware Gaussian arm, which is what keeps an empty ring's threshold
|
|
// off zero - a per-ring sigma alone would collapse there and flood the frame with noise spots.
|
|
for (const float mean: {0.0f, 0.5f, 5.0f, 50.0f}) {
|
|
for (const float sigma: {0.0f, 1.0f, 7.0f}) {
|
|
const float gauss = mean + z * std::sqrt(sigma * sigma + READ * READ);
|
|
CHECK(RingThreshold(mean, sigma, p, z) >= Catch::Approx(gauss).epsilon(1e-6));
|
|
}
|
|
}
|
|
CHECK(RingThreshold(0.0f, 0.0f, p, z) >= z * READ);
|
|
|
|
// Non-decreasing in the background mean and in the background scatter.
|
|
CHECK(RingThreshold(20.0f, 4.0f, p, z) > RingThreshold(2.0f, 4.0f, p, z));
|
|
CHECK(RingThreshold(5.0f, 9.0f, p, z) > RingThreshold(5.0f, 1.0f, p, z));
|
|
|
|
// Where the background is countable and quiet, Poisson significance is the binding arm: a ring
|
|
// with mean 1 and no measured scatter must still demand several photons.
|
|
CHECK(RingThreshold(1.0f, 0.0f, p, z) > 1.0f + z * READ);
|
|
|
|
// A ring whose scatter is far above Poisson (flat-field / read excess) is set by the Gaussian arm.
|
|
CHECK(RingThreshold(10.0f, 30.0f, p, z) == Catch::Approx(10.0f + z * std::sqrt(900.0f + READ * READ)).epsilon(1e-6));
|
|
}
|