Files
Jungfraujoch/gemmi_gph/gemmi/ddl.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

86 lines
3.0 KiB
C++

// Copyright Global Phasing Ltd.
//
// Using DDL1/DDL2 dictionaries to validate CIF/mmCIF files.
#ifndef GEMMI_DDL_HPP_
#define GEMMI_DDL_HPP_
#include <map>
#include <memory> // for unique_ptr
#include <regex>
#include "cifdoc.hpp" // for cif::Document
#include "logger.hpp" // for Logger
namespace gemmi { namespace cif {
/// Represents DDL1 or DDL2 dictionary (ontology).
struct GEMMI_DLL Ddl {
/// member functions use logger's callback and threshold for output
Logger logger;
// configuration - some of these flag must be set before read_ddl()
bool print_unknown_tags = true;
// these flags below are relevant to DDL2 only
bool use_regex = true;
bool use_context = false;
bool use_parents = false;
bool use_mandatory = true;
bool use_unique_keys = true;
// instead of _item_type.code, _pdbx_item_enumeration.value, and _item_range
// use _pdbx-prefixed equivalents (_pdbx_item_type.code, etc).
bool use_deposition_checks = false;
// variables set when reading DLL; normally, no need to change them
int major_version = 0; // currently 1 and 2 are supported
std::string dict_name; // _dictionary_name or _dictionary.title
std::string dict_version; // _dictionary_version or _dictionary.version
Ddl() = default;
// MSVC with dllexport attempts to export all non-deleted member functions,
// failing with Error C2280 (because of ddl_docs_) if we don't delete these:
Ddl(Ddl const&) = delete;
Ddl& operator=(Ddl const&) = delete;
/// it moves doc to ddl_docs_ to control lifetime and prevent modifications
void read_ddl(cif::Document&& doc);
bool validate_cif(const cif::Document& doc) const;
bool validate_block(const cif::Block& b, const std::string& source) const;
void check_audit_conform(const cif::Document& doc) const;
const std::map<std::string, std::regex>& regexes() const { return regexes_; }
private:
// items from DDL2 _pdbx_item_linked_group[_list]
struct ParentLink {
std::string group;
std::vector<std::string> child_tags;
std::vector<std::string> parent_tags;
};
std::vector<std::unique_ptr<cif::Document>> ddl_docs_;
std::map<std::string, cif::Block*> name_index_;
std::map<std::string, std::regex> regexes_;
std::vector<ParentLink> parents_;
// storage for DDL2 _item_linked.child_name -> _item_linked.parent_name
std::map<std::string, std::string> item_parents_;
cif::Block* find_rules(const std::string& name) const {
auto iter = name_index_.find(to_lower(name));
return iter != name_index_.end() ? iter->second : nullptr;
}
void check_mandatory_items(const cif::Block& b) const;
void check_unique_keys_in_loop(const cif::Loop& loop, const cif::Block& block) const;
void check_parents(const cif::Block& b) const;
void check_parent_link(const ParentLink& link, const cif::Block& b) const;
void read_ddl1_block(cif::Block& block);
void read_ddl2_block(cif::Block& block);
template<class... Args> void warn(const cif::Block& b, Args const&... args) const {
logger.level<3>('[', b.name, "] ", args...);
}
};
}} // namespace gemmi::cif
#endif