Files
Jungfraujoch/image_analysis/rotation_indexer/RotationIndexer.cpp
T
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

441 lines
21 KiB
C++

// SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
// SPDX-License-Identifier: GPL-3.0-only
#include "../../common/JFJochMath.h"
#include "RotationIndexer.h"
#include "../geom_refinement/XtalOptimizer.h"
#include "../indexing/FFTIndexer.h"
#include "../lattice_search/LatticeSearch.h"
#include "../indexing/MultiLatticeSearch.h"
#include <future>
namespace {
// Sub-cell override thresholds used in candidate selection to undo a spurious axis doubling:
// a later candidate replaces the chosen cell when it is smaller by more than this volume ratio
// (a doubling is 2x, well past 1.5) and indexes within this fraction slack of it. The slack is
// far below the indexed-fraction gap a real superstructure opens between its true cell and its
// sub-cell, so genuine large cells are kept.
constexpr float ROT_SUBCELL_VOLUME_RATIO = 1.5f;
constexpr float ROT_SUBCELL_FRAC_SLACK = 0.02f;
// Re-express a primitive hexagonal/trigonal lattice in the conventional hexagonal setting
// (a = b, gamma = 120). The Niggli-reduced primitive cell carries the two equal-length axes
// at gamma = 60; replacing b with b - a opens that angle to 120 without changing the lattice.
CrystalLattice HexagonalConventional(CrystalLattice latt) {
latt.ReorderABEqual(); // put the equal-length pair in a, b
Coord a = latt.Vec0(), b = latt.Vec1(), c = latt.Vec2();
if (angle_deg(a, b) < 90.0f)
b -= a;
return CrystalLattice(a, b, c); // constructor fixes handedness
}
bool IsHexagonalSystem(gemmi::CrystalSystem s) {
return s == gemmi::CrystalSystem::Trigonal || s == gemmi::CrystalSystem::Hexagonal;
}
// The hexagonal lattice metric (two equal axes at 60/120 deg, both perpendicular to the third) is
// also satisfied by its ortho-hexagonal C-centred supercell, so the geometry-keyed LatticeSearch can
// land there. Detect the hexagonal metric on the reduced PRIMITIVE cell so the de-novo path (no space
// group to key on) can re-express it in conventional hexagonal axes.
bool IsMetricallyHexagonal(CrystalLattice latt, float rel_tol = 0.03f, float angle_tol_deg = 3.0f) {
latt.ReorderABEqual();
const Coord a = latt.Vec0(), b = latt.Vec1(), c = latt.Vec2();
const float la = a.Length(), lb = b.Length();
if (la <= 0.0f || lb <= 0.0f || std::fabs(la - lb) > rel_tol * std::max(la, lb))
return false;
const float gab = angle_deg(a, b);
if (std::fabs(gab - 60.0f) > angle_tol_deg && std::fabs(gab - 120.0f) > angle_tol_deg)
return false;
return std::fabs(angle_deg(a, c) - 90.0f) <= angle_tol_deg &&
std::fabs(angle_deg(b, c) - 90.0f) <= angle_tol_deg;
}
// Fraction of the accumulated reciprocal-space spots that a lattice indexes to near-integer
// Miller indices within tol. Comparing a symmetry-constrained refinement against an
// unconstrained (triclinic) one is a data-driven test for a false promotion: a wrong
// higher-symmetry constraint snaps a pseudo cell onto ideal angles and misplaces most spots.
float IndexedFraction(const CrystalLattice &latt, const std::vector<Coord> &coords, float tol) {
if (coords.empty())
return 0.0f;
const Coord a = latt.Vec0(), b = latt.Vec1(), c = latt.Vec2();
const float tol_sq = tol * tol;
size_t indexed = 0;
for (const Coord &s : coords) {
const float dh = a * s - std::round(a * s); // Coord operator* = dot product = Miller index
const float dk = b * s - std::round(b * s);
const float dl = c * s - std::round(c * s);
if (dh * dh + dk * dk + dl * dl < tol_sq)
++indexed;
}
return static_cast<float>(indexed) / static_cast<float>(coords.size());
}
}
RotationIndexer::RotationIndexer(const DiffractionExperiment &x, IndexerThreadPool &indexer)
: experiment(x),
index_ice_rings(x.GetIndexingSettings().GetIndexIceRings()),
v_(experiment.GetImageNum()),
angle_deg_(experiment.GetImageNum()),
axis_(x.GetGoniometer()),
geom_(x.GetDiffractionGeometry()),
updated_geom_(geom_),
indexer_(indexer) {
}
void RotationIndexer::RunIndexing() {
std::unique_lock ul(m);
if (!axis_)
return;
std::vector<Coord> coords;
coords.reserve(max_spots_per_image * v_.size());
for (int i = 0; i < v_.size(); i++) {
const float angle_deg = angle_deg_[i].value_or(axis_->GetAngle_deg(i) + axis_->GetWedge_deg() / 2.0f);
const auto rot = axis_->GetTransformationAngle(angle_deg);
for (const auto &s: v_[i])
coords.emplace_back(rot * s.ReciprocalCoord(geom_));
}
const auto indexer_result = indexer_.Run(experiment, coords);
if (!indexer_result.lattice.empty() && indexer_result.lattice[0].CalcVolume() > 1.0) {
auto sg = experiment.GetGemmiSpaceGroup();
DiffractionExperiment experiment_copy(experiment);
const float index_tol = experiment.GetIndexingSettings().GetTolerance();
const auto orig_axis = axis_;
// Map an FFT candidate cell to a (metric) space-group setting: the user-fixed SG's conventional
// cell, or the de-novo Bravais lattice. Re-express a metrically-hexagonal cell in conventional
// hexagonal axes (LatticeSearch can land on the ortho-hexagonal C setting) so the 3-fold is not
// hidden from scaling.
auto build_sr = [&](const CrystalLattice &cand) -> LatticeSearchResult {
auto ls = LatticeSearch(cand);
if (sg) {
const auto is_hexagonal = [](gemmi::CrystalSystem s) {
return s == gemmi::CrystalSystem::Trigonal || s == gemmi::CrystalSystem::Hexagonal;
};
CrystalLattice conventional = ls.conventional;
if (is_hexagonal(sg->crystal_system()) && !is_hexagonal(ls.system))
conventional = HexagonalConventional(ls.primitive_reduced);
return LatticeSearchResult{
.niggli_class = ls.niggli_class,
.primitive_reduced = ls.primitive_reduced,
.conventional = conventional,
.system = sg->crystal_system(),
.centering = sg->centring_type(),
.reindex = ls.reindex,
};
}
if (!IsHexagonalSystem(ls.system) && IsMetricallyHexagonal(ls.primitive_reduced)) {
ls.conventional = HexagonalConventional(ls.primitive_reduced);
ls.system = gemmi::CrystalSystem::Hexagonal;
ls.centering = 'P';
}
return ls;
};
// Re-accumulate the reciprocal spots under a refined geometry/axis, to score a refined cell.
auto accumulate = [&](const DiffractionGeometry &g, const std::optional<GoniometerAxis> &ax) {
std::vector<Coord> c;
c.reserve(max_spots_per_image * v_.size());
for (int i = 0; i < v_.size(); i++) {
const float a = angle_deg_[i].value_or(ax->GetAngle_deg(i) + ax->GetWedge_deg() / 2.0f);
const auto rot = ax->GetTransformationAngle(a);
for (const auto &s : v_[i])
c.emplace_back(rot * s.ReciprocalCoord(g));
}
return c;
};
// The FFT offers a few candidate cells (its best reduction plus, for large/elongated cells, a
// widened alternative). Fully refine each and keep the one that indexes the most spots AFTER
// geometry refinement - the pre-refinement fraction is not a reliable discriminator (an
// incorrect larger cell can fit more of the un-refined accumulated spots than the correct one).
const size_t n_try = std::min<size_t>(indexer_result.lattice.size(), 4);
// Bound the axis lengths just above the found cell so a free (triclinic) refine cannot drift
// onto a pseudo-translation / modulation supercell (a modulated crystal whose satellites
// define a ~4x period would otherwise inflate one axis to the max-length clamp).
auto make_data = [&](const CrystalLattice &latt, gemmi::CrystalSystem sys, float length_bound_A) {
XtalOptimizerData d{
.geom = experiment_copy.GetDiffractionGeometry(),
.latt = latt,
.crystal_system = sys,
.min_spots = experiment.GetIndexingSettings().GetViableCellMinSpots(),
.max_length_A = length_bound_A,
// Match the indexers' [30,150] deg bound so a monoclinic beta outside [60,120]
// (e.g. beta>120) is refined, not clamped to the boundary.
.min_angle_deg = 30.0f,
.max_angle_deg = 150.0f,
.refine_beam_center = true,
.refine_distance_mm = false,
.refine_detector_angles = true,
.refine_rotation_axis = true,
.index_ice_rings = experiment.GetIndexingSettings().GetIndexIceRings(),
.axis = orig_axis
};
if (d.crystal_system == gemmi::CrystalSystem::Trigonal)
d.crystal_system = gemmi::CrystalSystem::Hexagonal;
if (d.crystal_system == gemmi::CrystalSystem::Monoclinic)
d.latt.ReorderMonoclinic();
return d;
};
// Refine the FFT candidates. Each candidate is independent, and within a candidate the
// metric-symmetry solve and the de-novo triclinic pseudo-symmetry solve are independent too,
// so refine all of them (up to ~8 solves) at once - these Ceres refinements are the dominant
// first-pass cost. Each solve runs Ceres on a few cores. Selection stays serial and in
// candidate order below, so the outcome is identical to refining them one by one.
constexpr int kCeresThreads = 4;
// Seed each candidate serially (cheap: LatticeSearch + setup), then solve them in parallel.
struct CandidateWork {
bool viable = false;
LatticeSearchResult sr;
XtalOptimizerData constrained;
bool has_tri = false;
XtalOptimizerData tri;
};
std::vector<CandidateWork> work(n_try);
for (size_t ci = 0; ci < n_try; ci++) {
const CrystalLattice &cand = indexer_result.lattice[ci];
if (cand.CalcVolume() <= 1.0)
continue;
CandidateWork &w = work[ci];
w.sr = build_sr(cand);
const auto conv_uc = w.sr.conventional.GetUnitCell();
const float length_bound_A = 1.2f * static_cast<float>(std::max({conv_uc.a, conv_uc.b, conv_uc.c}));
w.constrained = make_data(w.sr.conventional, w.sr.system, length_bound_A);
// Pseudo-symmetry guard (de-novo only - never override a user-fixed space group): also refine
// unconstrained (triclinic) on the primitive cell.
w.has_tri = (!sg && w.sr.system != gemmi::CrystalSystem::Triclinic);
if (w.has_tri)
w.tri = make_data(w.sr.primitive_reduced, gemmi::CrystalSystem::Triclinic, length_bound_A);
w.viable = true;
}
// Refine (constrained metric solve + score by the refined-geometry indexed fraction, the
// reliable discriminator). Runs on its own thread per solve.
struct Solved { bool ok = false; float frac = 0.0f; XtalOptimizerData data; };
auto solve = [&](XtalOptimizerData d) -> Solved {
const bool ok = XtalOptimizer(d, v_, kCeresThreads);
const float frac = ok ? IndexedFraction(d.latt, accumulate(d.geom, d.axis), index_tol) : 0.0f;
return {ok, frac, std::move(d)};
};
std::vector<std::future<Solved>> constrained_f(n_try), tri_f(n_try);
for (size_t ci = 0; ci < n_try; ci++) {
if (!work[ci].viable)
continue;
constrained_f[ci] = std::async(std::launch::async, [&, ci] { return solve(work[ci].constrained); });
if (work[ci].has_tri)
tri_f[ci] = std::async(std::launch::async, [&, ci] { return solve(work[ci].tri); });
}
// Assemble and select serially, in candidate order - identical to refining them one by one.
float best_frac = -1.0f;
float best_vol = 0.0f;
bool have_best = false;
size_t best_ci = 0;
XtalOptimizerData best_data;
LatticeSearchResult best_sr;
for (size_t ci = 0; ci < n_try; ci++) {
if (!work[ci].viable)
continue;
Solved c = constrained_f[ci].get();
bool ok = c.ok;
float frac = c.frac;
XtalOptimizerData data = std::move(c.data);
LatticeSearchResult sr = work[ci].sr;
// Adopt the free triclinic cell only if it indexes CLEARLY more than the constrained cell -
// a false promotion (a near-90 pseudo cell forced to ideal angles + a bogus centering)
// misplaces most reflections (measured indexed-fraction ratio ~0.1), whereas genuine higher
// symmetry (incl. R-centred) indexes comparably (ratio ~0.7). Preferring the constrained
// cell on a near-tie keeps the real symmetry/centering; the intensities settle the final
// space group.
if (work[ci].has_tri) {
Solved t = tri_f[ci].get();
if (t.ok && t.frac > 0.3f && frac < 0.5f * t.frac) {
data = std::move(t.data);
ok = true;
frac = t.frac;
sr.system = gemmi::CrystalSystem::Triclinic;
sr.centering = 'P';
sr.conventional = sr.primitive_reduced;
sr.reindex = gemmi::Mat33(1, 0, 0, 0, 1, 0, 0, 0, 1);
}
}
if (!ok)
continue;
// Prefer the indexer's earlier (primary) candidate; adopt a later one only if it indexes
// clearly more AND indexes reasonably well in absolute terms. The absolute floor stops a
// marginally-higher alternative from displacing the primary when both index poorly (e.g. a
// twin, where the accumulated-spot fraction is a noisy proxy) - only a decisively better
// cell (a superstructure's true cell vs its sublattice) takes over.
// Displace the current best when the candidate indexes clearly more, OR when it is a
// genuine sub-cell: a meaningfully smaller cell that still indexes at least as many spots.
// The sub-cell branch unmasks a spurious supercell (axis doubling): the primitive cell
// always indexes >= its integer multiple, so a doubled cell that wins ci-order by the
// hysteresis margin is overridden by its own primitive. A real superstructure's true
// (larger) cell indexes MORE than its sub-cell and is kept by the clearly-more branch;
// twin lattices share the cell volume, so this never disturbs twin selection.
const float cand_vol = std::abs(data.latt.CalcVolume());
const bool clearly_more = frac > best_frac + 0.05f && frac > 0.15f;
const bool smaller_subcell = have_best && frac > 0.15f
&& frac >= best_frac - ROT_SUBCELL_FRAC_SLACK
&& cand_vol < best_vol / ROT_SUBCELL_VOLUME_RATIO;
if (!have_best || clearly_more || smaller_subcell) {
best_frac = frac;
best_vol = cand_vol;
have_best = true;
best_data = std::move(data);
best_sr = sr;
best_ci = ci;
}
}
if (have_best) {
search_result_ = best_sr;
indexed_lattice = best_data.latt;
updated_geom_ = best_data.geom;
axis_ = best_data.axis;
}
// Extra (twin) lattices: MultiLatticeSearch derives each rotation by relating the FFT's primary
// lattice[0] to its near-copies, so only apply it when the chosen cell IS that primary. If a
// widened alternative won (a superstructure/large cell), lattice[0] is a different (sublattice)
// metric and its rotations would misorient the chosen cell.
if (have_best && best_ci == 0 && indexer_result.lattice.size() > 1) {
auto ml_latt = MultiLatticeSearch(indexer_result.lattice);
for (auto &l : ml_latt) {
if (extra_lattices_.size() >= experiment.GetIndexingSettings().GetMaxExtraLattices())
break;
// Ignore lattices oriented by less than 3.0 degree
if (l.rotation_vector.Length() < 3.0 * PI / 180.0)
continue;
RotMatrix rot(l.rotation_vector.Length(), l.rotation_vector.Normalize());
XtalOptimizerData data_multi{
.geom = experiment_copy.GetDiffractionGeometry(),
.latt = indexed_lattice->Multiply(rot),
.crystal_system = search_result_.system,
.min_spots = experiment.GetIndexingSettings().GetViableCellMinSpots(),
.refine_beam_center = false,
.refine_distance_mm = false,
.refine_detector_angles = false,
.refine_unit_cell = false,
.refine_rotation_axis = false,
.index_ice_rings = experiment.GetIndexingSettings().GetIndexIceRings(),
.axis = axis_
};
// Quick refinement: orientation only. Cell size/angles, beam center,
// detector angles and rotation axis are all kept from the first lattice.
// XtalOptimizer always refines orientation; everything else is frozen above.
XtalOptimizer(data_multi, v_);
extra_lattices_.push_back(data_multi.latt);
}
}
}
}
void RotationIndexer::ProcessImage(int64_t image, const std::vector<SpotToSave> &spots,
std::optional<float> angle_deg) {
std::unique_lock ul(m);
// For non-rotation just ignore the whole procedure
if (!axis_)
return;
// Guard: `image` is a slot in [0, image count); a bad index (e.g. a global number for a subset
// run) must not corrupt memory.
if (image < 0 || image >= static_cast<int64_t>(v_.size()))
return;
if (accumulated_spots >= max_spots)
return;
if (indexed_lattice)
return;
angle_deg_[image] = angle_deg;
v_[image].reserve(spots.size());
for (const auto &s: spots) {
if (index_ice_rings || !s.ice_ring)
v_[image].emplace_back(s);
}
// truncate spots, so we don't get above max_spots (total) and max_spots_per_image (for this image)
size_t max_spots_limit = std::min(max_spots_per_image, max_spots - accumulated_spots);
if (v_[image].size() > max_spots_limit) {
std::ranges::nth_element(v_[image], v_[image].begin() + max_spots_limit,
[](const SpotToSave &a, const SpotToSave &b) {
return a.intensity > b.intensity;
}
);
v_[image].resize(max_spots_limit);
}
accumulated_spots += v_[image].size();
}
std::optional<RotationIndexerResult> RotationIndexer::GetLattice() const {
std::unique_lock ul(m);
if (!indexed_lattice)
return {};
return RotationIndexerResult{
.lattice = indexed_lattice.value(),
.extra_lattices = extra_lattices_,
.search_result = search_result_,
.geom = updated_geom_,
.axis = axis_,
};
}
void RotationIndexer::ForceResult(const RotationIndexerResult &result) {
std::unique_lock ul(m);
indexed_lattice = result.lattice;
extra_lattices_ = result.extra_lattices;
search_result_ = result.search_result;
updated_geom_ = result.geom;
axis_ = result.axis;
}
bool RotationIndexer::AccumulationFull() const {
std::unique_lock ul(m);
return accumulated_spots >= max_spots;
}
void RotationIndexer::ForceLattice(const CrystalLattice &lattice) {
indexed_lattice = lattice;
auto sg_num = experiment.GetSpaceGroupNumber().value_or(1);
auto sg = gemmi::find_spacegroup_by_number(sg_num);
if (sg != nullptr) {
search_result_ = LatticeSearchResult{
.niggli_class = 0, // Since Niggli class was not searched for, we don't know which one
.conventional = lattice, // If lattice provided, it is for now primitive == conventional
.system = sg->crystal_system(),
.centering = sg->centring_type(),
};
} else
search_result_ = LatticeSearchResult{
.niggli_class = 0, // Since Niggli class was not searched for, we don't know which one
.conventional = lattice, // If lattice provided, it is for now primitive == conventional
.system = gemmi::CrystalSystem::Triclinic,
.centering = 'P',
};
}