Files
Jungfraujoch/image_analysis/scale_merge/ReindexAmbiguity.h
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

85 lines
4.8 KiB
C++

// SPDX-FileCopyrightText: 2026 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
// SPDX-License-Identifier: GPL-3.0-only
#pragma once
#include <functional>
#include <map>
#include <vector>
#include "gemmi/symmetry.hpp"
#include "HKLKey.h"
#include "../../common/DiffractionExperiment.h"
#include "../../common/Reflection.h"
#include "../../common/UnitCell.h"
// Resolving the indexing ("alternative indexing" / reindexing) ambiguity: when the lattice symmetry
// is higher than the crystal Laue symmetry (merohedral / pseudo-merohedral), a crystal can be validly
// indexed in several ways related by reindexing operators. The right one is picked by agreement with a
// reference (reference-MTZ intensities or a model), so no reference-free ambigator (cosym) is needed.
//
// This is distinct from the screw-axis / enantiomorph ambiguity (P4_1 vs P4_3): that leaves the merged
// intensities unchanged, so it is never resolved here — it is adopted from the reference/model.
// The candidate reindexing operators = twin laws = cosets of the crystal point group in the lattice
// symmetry. Empty when the lattice symmetry equals the crystal Laue symmetry (holohedral crystal),
// i.e. there is no indexing ambiguity. Identity is NOT included in the returned list.
std::vector<gemmi::Op> ReindexAmbiguityOperators(const UnitCell &cell, int space_group_number,
double max_obliquity_deg = 2.0);
// A copy of `merged` with each Miller index transformed by `op` (the intensities are unchanged).
std::vector<MergedReflection> ReindexReflections(const std::vector<MergedReflection> &merged,
const gemmi::Op &op);
struct ReindexChoice {
gemmi::Op op = gemmi::Op::identity(); // the winning operator (identity = keep the current indexing)
bool is_identity = true;
double score = 0.0; // score of the winning operator
double identity_score = 0.0; // score with no reindex, for comparison / logging
int n_candidates = 1; // identity + twin laws that were tried
};
// Pick the reindexing operator (identity or one of the twin laws) that MAXIMIZES `score(reindexed)`.
// `score` is higher-is-better (e.g. correlation against a reference, or minus the R-free against a
// model). Returns identity when there is no ambiguity or identity scores best.
ReindexChoice ChooseReindex(const std::vector<MergedReflection> &merged,
const UnitCell &cell, int space_group_number,
const std::function<double(const std::vector<MergedReflection> &)> &score,
double max_obliquity_deg = 2.0);
// Ready-made scorer: Pearson correlation of merged intensities against a reference set, matched by the
// Friedel-merged (Laue) ASU index in `space_group_number`. Returns 0 when too few reflections match.
double ReferenceIntensityCC(const std::vector<MergedReflection> &merged,
const std::vector<MergedReflection> &reference,
int space_group_number);
// Per-image resolver for serial stills. Each crystal is indexed independently in one of the
// merohedrally-equivalent hands at random, so the ambiguity has to be broken per image (unlike rotation
// data, which resolve it once for the whole merged set with ChooseReindex above). Holds the external
// reference intensities and the crystal's twin-law operators, and reindexes one image's reflections into
// the hand best-correlated with the reference. This runs in the per-image pipeline at integration time,
// decoupled from scaling.
class ReindexAmbiguityResolver {
const ScalingSettings s;
const HKLKeyGenerator hkl_key_generator;
std::map<HKLKey, double> reference_data;
// Twin-law reindexing operators (identity excluded). Empty = no ambiguity (holohedral crystal) or the
// cell/space group is unknown, in which case Resolve() is a no-op.
std::vector<gemmi::Op> ops;
bool Accept(const Reflection &r) const;
// Pearson correlation of this image's partiality/Lorentz-corrected intensities against the reference,
// matched by ASU index under `op`. Scale-invariant (the unknown per-image scale cancels). NaN when
// too few reflections match.
double ReferenceCC(const std::vector<Reflection> &reflections, const gemmi::Op &op) const;
public:
// The reference must be an external, correctly-handed dataset (not the data's own running merge).
ReindexAmbiguityResolver(const DiffractionExperiment &x, const std::vector<MergedReflection> &reference);
// Reindex this image's reflections in place into the hand best-correlated with the reference (done
// once per image, for good). No-op when there is no ambiguity.
void Resolve(std::vector<Reflection> &reflections) const;
};