Build Packages / Unit tests (push) Skipped
Build Packages / build:windows:nocuda (push) Successful in 11m6s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 10m27s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 10m54s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 9m25s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 10m5s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 11m33s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 11m19s
Build Packages / build:rpm (rocky8) (push) Successful in 12m23s
Build Packages / build:rpm (rocky9) (push) Successful in 13m21s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 12m30s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 11m55s
Build Packages / DIALS test (push) Successful in 13m42s
Build Packages / XDS test (durin plugin) (push) Successful in 9m26s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 6m41s
Build Packages / XDS test (neggia plugin) (push) Successful in 6m12s
Build Packages / Generate python client (push) Successful in 19s
Build Packages / Build documentation (push) Successful in 52s
Build Packages / Create release (push) Skipped
Build Packages / build:viewer-tgz:cpu (push) Successful in 5m29s
Build Packages / build:viewer-tgz:cuda (push) Successful in 6m12s
Build Packages / build:windows:cuda (push) Successful in 18m36s
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: #69 Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
80 lines
3.7 KiB
C++
80 lines
3.7 KiB
C++
// SPDX-FileCopyrightText: 2026 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#include "RfreeFlags.h"
|
|
|
|
#include <algorithm>
|
|
#include <unordered_map>
|
|
#include <unordered_set>
|
|
|
|
#include "HKLKey.h"
|
|
|
|
namespace {
|
|
// splitmix64 bit-mix of a key -> uniform double in [0, 1). Same key -> same value, so all
|
|
// mates of a reflection (which share the Laue-ASU key) get the same draw. Same idiom as the
|
|
// CC1/2 half-set split (HalfForImage in Merge.cpp).
|
|
double UniformFromKey(uint64_t key) {
|
|
uint64_t z = key + 0x9e3779b97f4a7c15ULL;
|
|
z = (z ^ (z >> 30)) * 0xbf58476d1ce4e5b9ULL;
|
|
z = (z ^ (z >> 27)) * 0x94d049bb133111ebULL;
|
|
z = z ^ (z >> 31);
|
|
return static_cast<double>(z >> 11) * (1.0 / 9007199254740992.0);
|
|
}
|
|
}
|
|
|
|
void AssignRfreeFlags(std::vector<MergedReflection> &merged, int32_t space_group_number,
|
|
double rfree_fraction, int min_free_reflections) {
|
|
for (auto &r : merged)
|
|
r.rfree_flag = false;
|
|
if (rfree_fraction <= 0.0 || merged.empty())
|
|
return;
|
|
|
|
// The flag is a pure function of the Friedel-merged (Laue) ASU key: symmetry- and Friedel-
|
|
// equivalent reflections collapse to one key and so share a flag (a Bijvoet pair I(+)/I(-) is
|
|
// never split across the work and free sets), and the draw depends only on the reflection index
|
|
// - not on this dataset's resolution range or which reflections it happens to contain. So every
|
|
// dataset of one crystal form gets the SAME free set, which is what a multi-dataset campaign
|
|
// (ensemble refinement, PanDDA) needs. A uniform hash draws ~rfree_fraction of the distinct
|
|
// reflections free; a stratified per-shell draw would be tied to the dataset and break that.
|
|
const HKLKeyGenerator laue_key(/*merge_friedel=*/true, space_group_number);
|
|
|
|
// Count the distinct test-eligible reflections (distinct Laue-ASU keys; mates collapse to one) so
|
|
// the fraction can be floored to a usable test-set size on small data.
|
|
std::unordered_set<uint64_t> distinct;
|
|
distinct.reserve(merged.size());
|
|
for (const auto &r : merged)
|
|
distinct.insert(laue_key(r).pack());
|
|
|
|
// Effective fraction: at least rfree_fraction, lifted toward min_free_reflections/N on small data
|
|
// (so R-free is not sampling-noise dominated), but the floor's lift is capped at MAX_FRACTION so a
|
|
// large test set never steals working data. An explicitly large rfree_fraction is always honoured.
|
|
constexpr double MAX_FRACTION = 0.10;
|
|
const double floor_fraction =
|
|
std::min(min_free_reflections / static_cast<double>(distinct.size()), MAX_FRACTION);
|
|
const double eff_fraction = std::max(rfree_fraction, floor_fraction);
|
|
|
|
for (auto &r : merged)
|
|
r.rfree_flag = UniformFromKey(laue_key(r).pack()) < eff_fraction;
|
|
}
|
|
|
|
size_t ApplyReferenceFreeFlags(std::vector<MergedReflection> &merged, int32_t space_group_number,
|
|
const std::vector<MergedReflection> &reference) {
|
|
// Reference free/work partition keyed by the Friedel-merged (Laue) ASU index, so it transfers
|
|
// regardless of which Bijvoet mate / symmetry equivalent each dataset happens to have measured.
|
|
const HKLKeyGenerator laue_key(/*merge_friedel=*/true, space_group_number);
|
|
std::unordered_map<uint64_t, bool> ref_flag;
|
|
ref_flag.reserve(reference.size());
|
|
for (const auto &r : reference)
|
|
ref_flag[laue_key(r).pack()] = r.rfree_flag;
|
|
|
|
size_t matched = 0;
|
|
for (auto &r : merged) {
|
|
const auto it = ref_flag.find(laue_key(r).pack());
|
|
if (it != ref_flag.end()) { // reflections absent from the reference keep their hash flag
|
|
r.rfree_flag = it->second;
|
|
++matched;
|
|
}
|
|
}
|
|
return matched;
|
|
}
|