Files
Jungfraujoch/tests/AdaptiveThresholdTest.cpp
leonarski_fandClaude Opus 5 16bf3408f0 Address code-review findings; make detection limits detector-driven
One changeset, developed together in response to a review of this branch, so the
files carry several of the changes at once. Full test suite passes (733 cases).

Spot finding
- Split ImageSpotFinder into Detect() (flag strong pixels - the expensive
  per-pixel pass) and ExtractSpots() (CCL + min/max-pix + resolution mask), with
  Run() = both. The per-image min-pix escalation now detects ONCE and repeats
  only the cheap extraction, instead of re-running the whole finder four times
  per frame as it did on the default path. It also keeps the winning attempt's
  spot list rather than re-extracting it, so the frame that is integrated is
  exactly the frame that was scored - which a GPU re-extract could not guarantee
  (float atomic ordering).
- spot_finding_time_s no longer swallows indexing time, and indexing_time_s now
  sums every escalation call instead of reporting only the last.

Detection limits follow the detector
- The azimuthal-integration upper q and the spot-finding high-resolution limit
  are now std::optional, in the C++ structs AND in the OpenAPI schema, and
  resolve to the detector's own maximum (DiffractionExperiment::GetDetectorMaxQ_
  recipA). Adaptive detection reads a pixel's ring from the azimuthal bins, so a
  pixel outside that q range could never be strong - the integration range
  silently bounded what detection could see, regardless of the requested
  resolution limit. Regenerated the C++ and TypeScript clients; the viewer and
  the web frontend each gained a "to detector edge" switch.

Detection defaults are now per workflow (measured, not assumed)
- Stills: adaptive detection, min-pix chosen per image, no resolution clipping.
- Rotation: fixed-threshold finder, min-pix 2, 1.5 A limit.
  On a 33-crystal rotation battery, adaptive detection helped four hard crystals
  but deterministically broke three (a lost space group, a halved indexing rate,
  a collapsed merge), and the detector-edge limit cost indexing on a strong
  rotation set (100.0 -> 96.8%). Each is still overridable by its flag, and
  --no-adaptive-spots is new.

Indexer seed escalation
- Stop escalating once a seed's lattice explains >= 90% of the seed spots.
  Previously any frame with >= 80 spots always paid three indexer calls, online
  broker included.

Merge-consistency filter
- --min-image-cc gated on a per-image CC computed BEFORE the stills partiality
  post-refinement and never refreshed; the refiner now recomputes it, so the
  reported CC describes the data that are actually merged.
- Replaced the per-call cc_mask argument with one MergeOnTheFly flag, so the
  merge, the error model and MergeStats can no longer disagree about which
  images are in (the --scale path merged unfiltered while its statistics were
  filtered).

Per-image B-factor refinement (-B) removed
- Measured on four serial-stills datasets: it is a no-op where the per-image fit
  is well conditioned and actively harmful where it is not (CC1/2 -8.1, R_meas
  +23.2 on the weakest large-cell set, whose fits hit their [-50, 200] bounds on
  14-25% of images). It had also been silently DISCARDED since the partiality
  post-refinement landed - reported but not applied. Rather than fix and keep a
  knob with no demonstrated benefit, the flag and the whole image_scale_b_factor
  chain are gone: setting, scaling fit, message field, CBOR, HDF5 write and
  read-back, per-image plot, OpenAPI enum, viewer column and checkbox, docs.
  ScaleOnTheFly no longer needs Ceres at all - the fit is a linear IRLS.
  (The Wilson per-image b_factor is a different quantity and stays.)

Stills partiality width now fits both of its components
- sigma^2 = gamma0^2 + (gamma_e*d*)^2 instead of a purely angular gamma_e*d*
  with gamma0 pinned to 0. Fitted per crystal by least squares of dist_ewald^2
  on d*^2. The angular-only width is fitted over a d*^2-dense population, so it
  was pinned by the high-resolution edge and collapsed at low d*: median
  partiality 0.008 beyond 13 A for reflections that were plainly recorded, 55%
  of them under the merge's partiality floor, and the survivors divided by those
  values - which inflated the merged low-resolution intensity scale 3.6x
  (~ +9 A^2 of apparent B). Measured on 5000 stills: the ramp flattens to 0.89x,
  no observation is dropped any more (701750 -> 716811), shell-mean CC1/2 and
  R-free improve slightly. Note CC1/2, R_meas, completeness and a B-refining
  R-free are all blind to that ramp, which is why it survived earlier validation;
  the cost is high-resolution R_meas (98.5 -> 101.9 shell-averaged).

Removed dead code from add-then-remove churn
- Prediction-time "still partiality" (unreachable: no setter), the phantom
  IndexingSettings::min_indexed_spot_fraction knob (getter, no setter - now the
  constant it always was), StillsPartialityRefine's caller-less Settings
  constructor and its reference to a long-gone env var, ProcessImage's unread
  bool return, an unused include, and a dead viewer overlay hook.

Also
- Viewer: the magnifier compared a QImage with itself, so its scene rect was set
  once ever and it could not pan into a larger dataset; the hover tail timer
  could fire after leaveEvent and resurrect the resolution readout outside the
  image.
- update_version.sh regenerated the frontend lock file BEFORE bumping the
  version (every release shipped an off-by-one lock), and did git rm/git add on
  a path that has not existed since the client moved to src/client - with no
  set -e, both failed silently.
- fpga/pcie_driver/postinstall.sh tested "[ ! occurrences > 0 ]", which is a
  redirect, not a test, so dkms add never ran.
- Unit tests for the adaptive-threshold host functions, which had none.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
2026-07-27 09:07:00 +02:00

101 lines
4.3 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}) {
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 mu = 50 it short-circuits to the Gaussian form mu + z sqrt(mu).
CHECK(PoissonThreshold(100.0, p, z) == Catch::Approx(100.0 + z * 10.0).epsilon(1e-5));
// 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));
}