Files
Jungfraujoch/image_analysis/rotation_indexer/RotationIndexer.cpp
T
leonarski_f 67dca388bd
Build Packages / Unit tests (push) Skipped
Build Packages / build:windows:cuda (push) Successful in 18m44s
Build Packages / build:viewer-tgz:cpu (push) Successful in 6m11s
Build Packages / build:viewer-tgz:cuda (push) Successful in 6m54s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 9m40s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 10m41s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 10m10s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 10m4s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 11m5s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 12m23s
Build Packages / build:rpm (rocky8) (push) Successful in 11m30s
Build Packages / build:rpm (rocky9) (push) Successful in 12m51s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 12m8s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 11m21s
Build Packages / DIALS test (push) Successful in 13m22s
Build Packages / XDS test (durin plugin) (push) Successful in 9m2s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 7m55s
Build Packages / XDS test (neggia plugin) (push) Successful in 5m57s
Build Packages / Generate python client (push) Successful in 23s
Build Packages / Build documentation (push) Successful in 57s
Build Packages / Create release (push) Skipped
Build Packages / build:windows:nocuda (push) Successful in 10m24s
v1.0.0-rc.160 (#70)
This is an UNSTABLE release. It includes many experimental features, as well as many AI generated fixes. We recommend using rc.152 for production use.

* rugnux: Add `--model model.pdb` - score the merged data against an atomic model and compute initial maps. It reports R-work/R-free (scaling the model to the observed amplitudes with an overall scale, an anisotropic B and a flat bulk solvent - the standard few-parameter model, so a batch of maps stays directly comparable) and writes 2Fo-Fc / Fo-Fc electron-density maps (CCP4) plus a map-coefficient MTZ. The structure itself is not refined; the model is only re-fractionalised into the data cell.
* rugnux: The merged reflection output now carries French-Wilson amplitudes (|F| and its sigma) next to the intensities - MTZ `F`/`SIGF`, mmCIF `_refln.F_meas_au`, and the text HKL - computed with the correct centric/acentric Wilson prior and epsilon multiplicity, so a downstream program (e.g. phenix.refine) can refine against amplitudes. The intensity columns are unchanged.
* rugnux: R-free test-set flags are now assigned deterministically and consistently across symmetry - a Bijvoet pair I(+)/I(-) is never split between the work and free sets, and the assignment is a reproducible per-hkl hash that depends only on the reflection index, so every dataset of one crystal form gets the same ~5% free set (what a multi-dataset campaign such as PanDDA needs). On small data the fraction is floored so the test set stays large enough for a stable R-free (~500 reflections, capped at 10%); it stays flat at 5% on ordinary data. When a reference MTZ carries a `FreeR_flag` column its test set is imported instead, letting a whole campaign inherit one shared free set.
* rugnux: A reference MTZ (`--reference-mtz`) can now fix the space group and cell for rotation data too (previously rejected), without being used to scale - the rotation merge stays self-consistent. When the crystal has an indexing (merohedral) ambiguity - a lattice symmetry higher than its Laue symmetry, e.g. P3/P4/P6/C2 - the reference also resolves it: each candidate reindexing (identity plus the twin-law cosets of the metric symmetry) is scored by its intensity correlation against the reference and the data are re-merged in the best-correlating one. This is a metric-preserving relabelling of hkl (the cell is unchanged) and a no-op for a holohedral crystal such as lysozyme.
* rugnux: `--model` validation now aligns the data to the model before scoring - the observed reflections are reindexed into the model's enantiomorph when the two differ only by hand (indistinguishable from merged intensities). A merohedral indexing ambiguity is resolved against the reference MTZ when one is given (so a whole campaign shares one indexing convention); only with a model and no reference does validation fall back to fitting each candidate reindexing and keeping the lowest R-free.
* rugnux: De-novo symmetry - recover a genuine high-symmetry group whose data are imperfectly scaled. Such a merge's within-orbit chi² lands just past the self-consistency bound (each real symmetry step adds a little systematic scatter), right where a merohedral twin also lands, so the chi² ratio alone cannot separate them. The candidate is now rescued when the extra intensity-proportional systematic error it invokes stays small relative to the confirmed subgroup - a genuine symmetry step gains multiplicity without inflating the merge error model's b, whereas a twin forces non-equivalent reflections together and b balloons. Fixes cubic insulin (I23 instead of I222) with no change to any other crystal in the test battery, including the twins that must stay in their lower symmetry.
* Docs: Document the French-Wilson amplitude estimation, R-free flagging, reference-based space-group/ambiguity resolution, and model-based validation/maps in CPU_DATA_ANALYSIS.md.
* Frontend: The status-bar pill now shows a progress bar during detector calibration (previously only during measurement), and the calibration state and its button are labelled "Calibration"/"CALIBRATE" (the internal `Pedestal` state name is unchanged for back-compatibility).Reviewed-on: #70

Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
2026-07-19 09:39:28 +02:00

440 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 (CQ066 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',
};
}