Files
Jungfraujoch/gemmi_gph/gemmi/select.hpp
T
leonarski_f dd0bffb283
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
v1.0.0-rc.159 (#69)
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>
2026-07-13 13:54:03 +02:00

230 lines
6.2 KiB
C++

// Copyright 2018 Global Phasing Ltd.
//
// Selections.
#ifndef GEMMI_SELECT_HPP_
#define GEMMI_SELECT_HPP_
#include <climits> // for INT_MIN, INT_MAX
#include "model.hpp" // for Model
namespace gemmi {
// from http://www.ccp4.ac.uk/html/pdbcur.html
// Specification of the selection sets:
// either
// /mdl/chn/s1.i1-s2.i2/at[el]:aloc
// or
// /mdl/chn/*(res).ic/at[el]:aloc
//
struct GEMMI_DLL Selection {
struct List {
bool all = true;
bool inverted = false;
std::string list; // comma-separated
std::string str() const {
if (all)
return "*";
return inverted ? "!" + list : list;
}
bool has(const std::string& name) const {
if (all)
return true;
bool found = is_in_list(name, list);
return inverted ? !found : found;
}
};
struct FlagList {
std::string pattern;
bool has(char flag) const {
if (pattern.empty())
return true;
bool invert = (pattern[0] == '!');
bool found = (pattern.find(flag, invert ? 1 : 0) != std::string::npos);
return invert ? !found : found;
}
};
struct SequenceId {
int seqnum;
char icode;
bool empty() const {
return seqnum == INT_MIN || seqnum == INT_MAX;
}
std::string str() const;
int compare(const SeqId& seqid) const {
if (seqnum != *seqid.num)
return seqnum < *seqid.num ? -1 : 1;
if (icode != '*' && icode != seqid.icode)
return icode < seqid.icode ? -1 : 1;
return 0;
}
};
struct AtomInequality {
char property;
int relation;
double value;
bool matches(const Atom& a) const {
double atom_value = 0.;
if (property == 'q')
atom_value = a.occ;
else if (property == 'b')
atom_value = a.b_iso;
if (relation < 0)
return atom_value < value;
if (relation > 0)
return atom_value > value;
return atom_value == value;
}
std::string str() const;
};
int mdl = 0; // 0 = all
List chain_ids;
SequenceId from_seqid = {INT_MIN, '*'};
SequenceId to_seqid = {INT_MAX, '*'};
List residue_names;
List entity_types;
// array corresponding to enum EntityType
std::array<char, 6> et_flags;
List atom_names;
std::vector<char> elements;
List altlocs;
FlagList residue_flags;
FlagList atom_flags;
std::vector<AtomInequality> atom_inequalities;
Selection() = default;
Selection(const std::string& cid);
std::string str() const;
bool matches(const Structure&) const { return true; }
bool matches(const Model& model) const {
return mdl == 0 || mdl == model.num;
}
bool matches(const Chain& chain) const {
return chain_ids.has(chain.name);
}
bool matches(const Residue& res) const {
return (entity_types.all || et_flags[(int)res.entity_type]) &&
residue_names.has(res.name) &&
from_seqid.compare(res.seqid) <= 0 &&
to_seqid.compare(res.seqid) >= 0 &&
residue_flags.has(res.flag);
}
bool matches(const Atom& a) const {
return atom_names.has(a.name) &&
(elements.empty() || elements[a.element.ordinal()]) &&
(altlocs.all || altlocs.has(std::string(a.altloc ? 1 : 0, a.altloc))) &&
atom_flags.has(a.flag) &&
std::all_of(atom_inequalities.begin(), atom_inequalities.end(),
[&](const AtomInequality& i) { return i.matches(a); });
}
bool matches(const CRA& cra) const {
return (cra.chain == nullptr || matches(*cra.chain)) &&
(cra.residue == nullptr || matches(*cra.residue)) &&
(cra.atom == nullptr || matches(*cra.atom));
}
FilterProxy<Selection, Model> models(Structure& st) const {
return {*this, st.models};
}
FilterProxy<Selection, Chain> chains(Model& model) const {
return {*this, model.chains};
}
FilterProxy<Selection, Residue> residues(Chain& chain) const {
return {*this, chain.residues};
}
FilterProxy<Selection, Atom> atoms(Residue& residue) const {
return {*this, residue.atoms};
}
CRA first_in_model(Model& model) const {
if (matches(model))
for (Chain& chain : model.chains) {
if (matches(chain))
for (Residue& res : chain.residues) {
if (matches(res))
for (Atom& atom : res.atoms) {
if (matches(atom))
return {&chain, &res, &atom};
}
}
}
return {nullptr, nullptr, nullptr};
}
std::pair<Model*, CRA> first(Structure& st) const {
for (Model& model : st.models) {
CRA cra = first_in_model(model);
if (cra.chain)
return {&model, cra};
}
return {nullptr, {nullptr, nullptr, nullptr}};
}
template<typename T>
void add_matching_children(const T& orig, T& target) const {
for (const auto& orig_child : orig.children())
if (matches(orig_child)) {
target.children().push_back(orig_child.empty_copy());
add_matching_children(orig_child, target.children().back());
}
}
void add_matching_children(const Atom&, Atom&) const {}
Selection& set_residue_flags(const std::string& pattern) {
residue_flags.pattern = pattern;
return *this;
}
Selection& set_atom_flags(const std::string& pattern) {
atom_flags.pattern = pattern;
return *this;
}
template<typename T>
T copy_selection(const T& orig) const {
T copied = orig.empty_copy();
add_matching_children(orig, copied);
return copied;
}
template<typename T>
void remove_selected(T& t) const {
for (auto& child : t.children())
if (matches(child))
remove_selected(child);
vector_remove_if(t.children(),
[&](typename T::child_type& c) { return c.children().empty(); });
}
void remove_selected(Residue& res) const {
if (atom_names.all && elements.empty() && altlocs.all &&
atom_flags.pattern.empty() && atom_inequalities.empty())
res.atoms.clear();
else
vector_remove_if(res.atoms, [&](Atom& c) { return matches(c); });
}
template<typename T>
void remove_not_selected(T& t) const {
vector_remove_if(t.children(), [&](typename T::child_type& c) { return !matches(c); });
for (auto& child : t.children())
remove_not_selected(child);
}
void remove_not_selected(Atom&) const {}
};
} // namespace gemmi
#endif