Files
Jungfraujoch/image_analysis/spot_finding/SpotUtils.cpp
T
leonarski_fandClaude Opus 5 e381d2fd50
Build Packages / build:viewer-tgz:cpu (push) Successful in 12m14s
Build Packages / build:rugnux:aarch64 (cross) (push) Successful in 8m24s
Build Packages / build:rpm (rocky8_nocuda) (push) Failing after 5m36s
Build Packages / build:rugnux-tgz (x86_64) (push) Successful in 12m55s
Build Packages / build:viewer-tgz:cuda (push) Successful in 14m11s
Build Packages / build:rpm (rocky9_nocuda) (push) Failing after 5m6s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Failing after 4m11s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Failing after 3m58s
Build Packages / build:rpm (rocky8) (push) Failing after 3m22s
Build Packages / build:rpm (rocky9_sls9) (push) Failing after 4m12s
Build Packages / build:rpm (rocky9) (push) Failing after 3m20s
Build Packages / build:rpm (rocky8_sls9) (push) Failing after 4m23s
Build Packages / build:rpm (ubuntu2204) (push) Failing after 3m36s
Build Packages / build:windows:nocuda (push) Successful in 17m9s
Build Packages / build:rpm (ubuntu2404) (push) Failing after 4m8s
Build Packages / Generate python client (push) Successful in 35s
Build Packages / Build documentation (push) Successful in 52s
Build Packages / Create release (push) Skipped
Build Packages / build:windows:cuda (push) Successful in 19m32s
Build Packages / XDS test (durin plugin) (push) Successful in 7m22s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 7m28s
Build Packages / XDS test (neggia plugin) (push) Successful in 7m15s
Build Packages / build:rugnux:windows (push) Successful in 12m10s
Build Packages / DIALS test (push) Successful in 17m32s
Build Packages / Unit tests (push) Successful in 1h16m29s
grid scan: review fixes - the ice channel sees its own spots, and a needle is not mirrored
Two independent reviews of the merged grid-scan work. The findings that changed
behaviour:

The ice score's spot channel was fed a list the spot budget had already stripped.
FilterSpotsByCount orders ice-band spots LAST when indexing is not to use them, so on
a frame with more spots than the budget the ice spots are the first discarded - and
the channel that exists for "ice arrives as discrete spots and leaves the radial
profile flat" then read zero on exactly the frames it was written for. Probed at 3000
spots with 1200 on the hexagonal radii and a budget of 1000: 1.000 before the cap,
0.000 after. IceScore now takes d-spacings and is handed the list from before the cap.

The viewer scaled the crystal box by the SIGNED grid step, where every other consumer
takes the magnitude. On a negative step that mirrors the box - +30 deg drawn as -30 -
and hands QRectF a negative width.

rugnux --mode raster never put its settings on the experiment, so the indexing switch
was read at its default while a deprecated per-run flag did the actual work; and
RugnuxCommandLine emitted no --mode for Grid, so a raster job copied to a cluster ran
the default mx - indexing, integrating and merging every cell of the raster.

res_A is NaN where nothing in a blob measured a resolution, and nlohmann writes NaN as
null, which the schema and the generated clients both reject. It is now left unset.

The broker's configuration example named a key that does not exist (calibration, not
calibration_settings); nlohmann ignores unknown keys, so a user copying it got a
silently ignored block. The changelog had lost the rc.166 heading and 21 rc.167
entries to a bad edit of mine, and three entries had been filed under rc.166.

Also: a warning where mode Grid meets a dataset with no grid scan, which was silent
and indistinguishable from finding nothing; the viewer combo still named the retired
ice_ring_score; and the claim that growth "cannot invent a crystal" was too strong -
it cannot start a patch, but the cell count is read over the grown patch, so it does
decide which patches pass.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01EFEJG6WBQv8th4UJFNe53N
2026-09-08 09:04:52 +02:00

301 lines
14 KiB
C++

// SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
// SPDX-License-Identifier: GPL-3.0-only
#include <map>
#include "../../common/JFJochMath.h"
#include "SpotUtils.h"
#include "../../common/ResolutionShells.h"
void CountSpots(DataMessage &msg,
const std::vector<SpotToSave> &spots,
float d_min_A) {
int64_t low_res = 0;
int64_t ice_ring = 0;
for (auto &s: spots) {
if (s.ice_ring)
ice_ring++;
if (s.d_A > d_min_A)
low_res++;
}
msg.spot_count = spots.size();
msg.spot_count_low_res = low_res;
msg.spot_count_ice_rings = ice_ring;
}
// Spots in the ice-free control flanks either side of the hexagonal rings, rescaled to the ring bands'
// own q width. The control for one ring is the two intervals [w, 2w) beside it - same total width as
// the ring band, and symmetric, so the fall-off of spot density with resolution cancels to first
// order. A flank that lands on another ring is not a control and is dropped, its width with it; the
// three rings at 1.947/1.916/1.882 A are 0.05-0.06 apart in q and usually lose both.
float CountIceRingControlSpots(const std::vector<SpotToSave> &spots, float w) {
if (!(w > 0.0f))
return 0.0f;
float control = 0.0f;
for (const float d : ICE_RING_RES_A) {
const float q_ring = 2 * PI / d;
bool lo_free = true, hi_free = true;
for (const float other : ICE_RING_RES_A) {
const float q_other = 2 * PI / other;
if (q_other > q_ring && q_other < q_ring + 3 * w) hi_free = false;
if (q_other < q_ring && q_other > q_ring - 3 * w) lo_free = false;
}
const int free_flanks = (lo_free ? 1 : 0) + (hi_free ? 1 : 0);
if (free_flanks == 0)
continue;
int64_t n = 0;
for (const auto &s: spots) {
if (!(s.d_A > 0.0f)) continue;
const float dq = 2 * PI / s.d_A - q_ring;
if (hi_free && dq >= w && dq < 2 * w) n++;
if (lo_free && dq <= -w && dq > -2 * w) n++;
}
// One free flank covers half the ring band's width, so it counts double.
control += static_cast<float>(n) * 2.0f / static_cast<float>(free_flanks);
}
return control;
}
void MarkIceRings(std::vector<SpotToSave> &spots, float tolerance_q_recipA) {
std::vector<float> ice_rings_q;
for (const auto &i: ICE_RING_RES_A)
ice_rings_q.push_back(2 * PI / i);
for (auto &s: spots) {
auto spot_q = 2 * PI / s.d_A;
bool tmp = false;
for (const auto &q: ice_rings_q)
tmp |= (fabs(spot_q - q) < tolerance_q_recipA);
s.ice_ring = tmp;
}
}
void FilterSpotsByCount(std::vector<SpotToSave> &input, int64_t count, bool deprioritise_ice) {
size_t output_size = std::min<size_t>(input.size(), count);
std::ranges::partial_sort(input, input.begin() + output_size,
std::ranges::less{}, // comparator on the projected key
[deprioritise_ice](const SpotToSave &s) {
// projection: non-ice first (false < true), then strongest intensity
// first. Where the run has no measurable ice the flag marks ordinary
// reflections that happen to lie in the fixed bands, so ordering on it
// would discard a fifth of the strongest spots for nothing.
return std::tuple{deprioritise_ice && s.ice_ring, -s.intensity};
});
input.resize(output_size);
}
void FilterSpuriousHighResolutionSpots(std::vector<SpotToSave> &spots, float threshold) {
std::ranges::sort(spots, [](SpotToSave &a, SpotToSave &b) {
return a.d_A > b.d_A;
});
// Apply 1/d gap threshold: find first gap in q = 1/d exceeding dist_threshold and ignore spots after it
if (spots.size() >= 2 && threshold > 0.0f) {
size_t cut_index = spots.size(); // default: keep all
// d_A sorted descending → q = 1/d_A sorted ascending
// We check consecutive q gaps: Δq_i = (1/d_i) - (1/d_{i+1})
for (size_t i = 0; i + 1 < spots.size(); ++i) {
float d1 = spots[i].d_A;
float d2 = spots[i + 1].d_A;
// Avoid division by zero; d_A should be > 0 in valid data
if (d1 <= 0.0f || d2 <= 0.0f)
continue;
float q1 = 2 * PI / d1;
float q2 = 2 * PI / d2;
float dq = q2 - q1; // should be >= 0 due to sorting
if (dq > threshold) {
cut_index = i + 1; // keep up to i inclusive
break;
}
}
if (cut_index < spots.size())
spots.resize(cut_index);
}
}
namespace {
// Fraction of the image's weighted spot signal that is allowed to lie beyond the quantile read
// off below. A quantile near the middle of the distribution measures the shape of the fall-off,
// which is the crystal's own; the extreme end of it measures the detection threshold and how many
// reflections the unit cell puts on the frame, which are not.
constexpr float SPOT_RESOLUTION_TAIL_FRACTION = 0.30f;
// How much further in 1/d the merged data reach than that quantile. Merging averages many
// observations of each reflection, so intensities go on being measurable well past the point where
// one image's spot finder still detects them. Calibrated on rotation data against the resolution at
// which per-shell CC1/2 falls through 0.30.
constexpr float SPOT_RESOLUTION_MERGE_REACH = 2.25f;
// Fewer spots than this and the quantile is not a fall-off, it is a handful of points.
constexpr size_t SPOT_RESOLUTION_MIN_SPOTS = 4;
}
std::optional<float> GetResolution(const std::vector<SpotToSave> &spots) {
// Each spot enters weighted by its own signal-to-noise. The intensity is a summed photon count, so
// it is Poisson and its significance is sqrt(I): that keeps a marginal high-resolution detection
// from counting for as much as a real reflection, without letting the handful of very strong
// low-resolution reflections - which say nothing about how far the crystal diffracts - decide the
// answer, as weighting by intensity itself would.
std::vector<std::pair<float, float>> spot_1_over_d2_weight; // (1/d^2, sqrt(intensity))
spot_1_over_d2_weight.reserve(spots.size());
float total_weight = 0.0f;
for (const auto &spot: spots) {
if (spot.ice_ring || !(spot.d_A > 0.0f) || !(spot.intensity > 0.0f))
continue;
const float weight = std::sqrt(spot.intensity);
spot_1_over_d2_weight.emplace_back(1.0f / (spot.d_A * spot.d_A), weight);
total_weight += weight;
}
if (spot_1_over_d2_weight.size() < SPOT_RESOLUTION_MIN_SPOTS || !(total_weight > 0.0f))
return std::nullopt;
// Walk in from the highest-resolution spot until the tail fraction of the weight is behind us.
std::ranges::sort(spot_1_over_d2_weight, std::ranges::greater{},
[](const std::pair<float, float> &s) { return s.first; });
float walked = 0.0f;
float one_over_d2 = spot_1_over_d2_weight.front().first;
for (const auto &[s, weight]: spot_1_over_d2_weight) {
walked += weight;
one_over_d2 = s;
if (walked >= SPOT_RESOLUTION_TAIL_FRACTION * total_weight)
break;
}
// Not clamped at the corner of the detector. The quantile is read from the middle of the
// fall-off, so it still measures the crystal where the detector cuts that fall-off short;
// clamping reported where the detector stops instead, which is the one thing this is not for.
return 1.0f / (SPOT_RESOLUTION_MERGE_REACH * std::sqrt(one_over_d2));
}
namespace {
// The band nothing but a protein-scale repeat reaches. Its floor sits above every ice and salt
// spacing; its ceiling is where a "spot" stops being a lattice reflection and starts being
// beam-stop halo. Measured: dropping the ceiling costs a factor of two in false positives.
constexpr float PROTEIN_BAND_LOW_A = 5.0f;
constexpr float PROTEIN_BAND_HIGH_A = 40.0f;
// Shell width for the saturation, in ln(1/d) - 2% in d. Spots are grouped into shells this wide and
// each shell contributes at most 1, so a single narrow parasitic ring cannot accumulate evidence.
constexpr float PROTEIN_SHELL_BIN = 0.02f;
// Evidence at which the score reaches 0.5. The only fitted number in the score; calibrated by
// leaving out one negative loop at a time and taking the smallest value that holds the pooled false
// positive rate over the rest below 5e-4.
constexpr float PROTEIN_SATURATION = 3.70f;
}
float ProteinScore(const std::vector<SpotToSave> &spots) {
// Intensity reference: the frame's own median spot. The weight below is 1 for a spot at or above it
// and falls off smoothly beneath, so what counts is how a candidate stands against the rest of this
// image - not an absolute photon count, which would make the score follow the exposure.
std::vector<float> intensity;
intensity.reserve(spots.size());
for (const auto &s: spots)
intensity.push_back(std::max(s.intensity, 0.0f));
float i_ref = 0.0f;
if (!intensity.empty()) {
const size_t mid = intensity.size() / 2;
std::ranges::nth_element(intensity, intensity.begin() + mid);
i_ref = intensity[mid];
}
// Sum the weights shell by shell, then saturate each shell separately.
std::map<int, float> shell_weight;
for (const auto &s: spots) {
if (!(s.d_A > PROTEIN_BAND_LOW_A) || !(s.d_A < PROTEIN_BAND_HIGH_A))
continue;
const float i = std::max(s.intensity, 0.0f);
const float w = (i_ref > 0.0f) ? std::min(2.0f * i / (i + i_ref), 1.0f) : 1.0f;
shell_weight[static_cast<int>(std::log(1.0f / s.d_A) / PROTEIN_SHELL_BIN)] += w;
}
float evidence = 0.0f;
for (const auto &[shell, w]: shell_weight)
evidence += 1.0f - std::exp(-w);
return evidence / (evidence + PROTEIN_SATURATION);
}
void GenerateSpotPlot(DataMessage &msg, const std::vector<SpotToSave> &spots, float d_min_A) {
const int nshells = 20;
// The geometry gives no usable high-resolution corner (no distance or no wavelength), so there is
// no resolution axis to plot the spots against. ResolutionShells would throw on it, once per image.
if (d_min_A <= 0.0f || d_min_A >= 50.0f)
return;
ResolutionShells shells(d_min_A, 50.0, nshells);
std::vector<float> intensity(nshells);
std::vector<float> count(nshells);
for (const auto &s: spots) {
if (s.ice_ring)
continue;
if (auto shell = shells.GetShell(s.d_A)) {
intensity[*shell] += s.intensity;
count[*shell] += 1.0f;
}
}
std::vector<float> result(nshells);
for (int i = 0; i < nshells; ++i) {
if (count[i] > 0)
result[i] = intensity[i] / count[i];
else
result[i] = 0.0f;
}
msg.spot_plot_one_over_d_square = shells.GetShellMeanOneOverResSq();
msg.spot_plot_intensity = result;
msg.spot_plot_count = count;
}
void SpotAnalyze(const DiffractionExperiment &experiment,
const SpotFindingSettings &spot_finding_settings,
const std::vector<DiffractionSpot> &spots,
DataMessage &output) {
auto geom = experiment.GetDiffractionGeometry();
std::vector<SpotToSave> spots_out;
for (const auto &spot: spots) {
if (auto s = spot.Export(geom, output.number); s.has_value())
spots_out.push_back(s.value());
}
if (spot_finding_settings.high_res_gap_Q_recipA.has_value())
FilterSpuriousHighResolutionSpots(spots_out, spot_finding_settings.high_res_gap_Q_recipA.value());
if (experiment.GetDatasetSettings().IsDetectIceRings() && spot_finding_settings.ice_ring_width_Q_recipA > 0.0f) {
MarkIceRings(spots_out, spot_finding_settings.ice_ring_width_Q_recipA);
// Before FilterSpotsByCount below, which orders ice spots LAST and would throw them away first.
output.spot_count_ice_control =
CountIceRingControlSpots(spots_out, spot_finding_settings.ice_ring_width_Q_recipA);
}
CountSpots(output, spots_out, spot_finding_settings.cutoff_spot_count_low_res);
// 0 spells "no limit" everywhere else the limit is read (value_or(0) then compares against it), so it
// has to mean the same here - passing it on as a resolution makes ResolutionShells throw per image.
const auto &spot_d_min = spot_finding_settings.high_resolution_limit;
GenerateSpotPlot(output, spots_out,
spot_d_min.value_or(0.0f) > 0 ? *spot_d_min : experiment.GetDetectorMaxResolution_A());
output.resolution_estimate = GetResolution(spots_out);
output.protein_score = ProteinScore(spots_out);
// The ice score's spot channel has to see the ice spots, and the cap below throws them away
// first, so its input is taken here rather than from output.spots.
output.spot_d_A_unfiltered.clear();
output.spot_d_A_unfiltered.reserve(spots_out.size());
for (const auto &s: spots_out)
output.spot_d_A_unfiltered.push_back(s.d_A);
// One decision drives both: if indexing is to use the ice-band spots, the spot budget must not
// throw them away before it gets the chance.
FilterSpotsByCount(spots_out, experiment.GetMaxSpotCount(),
!experiment.GetIndexingSettings().GetIndexIceRings());
output.spots = spots_out;
}