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>
111 lines
4.4 KiB
C++
111 lines
4.4 KiB
C++
// Copyright 2018 Global Phasing Ltd.
|
|
//
|
|
// Converts between enums (EntityType, PolymerType, Connection::Type,
|
|
// SoftwareItem::Classification) and mmCIF strings.
|
|
|
|
#ifndef GEMMI_ENUMSTR_HPP_
|
|
#define GEMMI_ENUMSTR_HPP_
|
|
|
|
#include "metadata.hpp" // for EntityType, PolymerType, SoftwareItem
|
|
#include "util.hpp" // for iequal
|
|
|
|
namespace gemmi {
|
|
|
|
inline const char* entity_type_to_string(EntityType entity_type) {
|
|
switch (entity_type) {
|
|
case EntityType::Polymer: return "polymer";
|
|
case EntityType::Branched: return "branched";
|
|
case EntityType::NonPolymer: return "non-polymer";
|
|
case EntityType::Water: return "water";
|
|
default /*EntityType::Unknown*/: return "?";
|
|
}
|
|
}
|
|
|
|
inline EntityType entity_type_from_string(const std::string& t) {
|
|
if (t == "polymer") return EntityType::Polymer;
|
|
if (t == "branched") return EntityType::Branched;
|
|
if (t == "non-polymer") return EntityType::NonPolymer;
|
|
if (t == "water") return EntityType::Water;
|
|
return EntityType::Unknown;
|
|
}
|
|
|
|
|
|
inline const char* polymer_type_to_string(PolymerType polymer_type) {
|
|
switch (polymer_type) {
|
|
case PolymerType::PeptideL: return "polypeptide(L)";
|
|
case PolymerType::PeptideD: return "polypeptide(D)";
|
|
case PolymerType::Dna: return "polydeoxyribonucleotide";
|
|
case PolymerType::Rna: return "polyribonucleotide";
|
|
case PolymerType::DnaRnaHybrid:
|
|
return "'polydeoxyribonucleotide/polyribonucleotide hybrid'";
|
|
case PolymerType::SaccharideD: return "polysaccharide(D)";
|
|
case PolymerType::SaccharideL: return "polysaccharide(L)";
|
|
case PolymerType::Other: return "other";
|
|
case PolymerType::Pna: return "'peptide nucleic acid'";
|
|
case PolymerType::CyclicPseudoPeptide: return "cyclic-pseudo-peptide";
|
|
default /*PolymerType::Unknown*/: return "?";
|
|
}
|
|
}
|
|
|
|
inline PolymerType polymer_type_from_string(const std::string& t) {
|
|
if (t == "polypeptide(L)") return PolymerType::PeptideL;
|
|
if (t == "polydeoxyribonucleotide") return PolymerType::Dna;
|
|
if (t == "polyribonucleotide") return PolymerType::Rna;
|
|
if (t == "polydeoxyribonucleotide/polyribonucleotide hybrid")
|
|
return PolymerType::DnaRnaHybrid;
|
|
if (t == "polypeptide(D)") return PolymerType::PeptideD;
|
|
if (t == "polysaccharide(D)") return PolymerType::SaccharideD;
|
|
if (t == "other") return PolymerType::Other;
|
|
if (t == "peptide nucleic acid") return PolymerType::Pna;
|
|
if (t == "cyclic-pseudo-peptide") return PolymerType::CyclicPseudoPeptide;
|
|
if (t == "polysaccharide(L)") return PolymerType::SaccharideL;
|
|
return PolymerType::Unknown;
|
|
}
|
|
|
|
|
|
inline const char* connection_type_to_string(Connection::Type t) {
|
|
static constexpr const char* type_ids[] = {
|
|
"covale", "disulf", "hydrog", "metalc", "."
|
|
};
|
|
return type_ids[t];
|
|
}
|
|
|
|
inline Connection::Type connection_type_from_string(const std::string& t) {
|
|
for (int i = 0; i != Connection::Unknown; ++i)
|
|
if (connection_type_to_string(Connection::Type(i)) == t)
|
|
return Connection::Type(i);
|
|
return Connection::Unknown;
|
|
}
|
|
|
|
inline
|
|
std::string software_classification_to_string(SoftwareItem::Classification c) {
|
|
switch (c) {
|
|
case SoftwareItem::DataCollection: return "data collection";
|
|
case SoftwareItem::DataExtraction: return "data extraction";
|
|
case SoftwareItem::DataProcessing: return "data processing";
|
|
case SoftwareItem::DataReduction: return "data reduction";
|
|
case SoftwareItem::DataScaling: return "data scaling";
|
|
case SoftwareItem::ModelBuilding: return "model building";
|
|
case SoftwareItem::Phasing: return "phasing";
|
|
case SoftwareItem::Refinement: return "refinement";
|
|
case SoftwareItem::Unspecified: return "";
|
|
}
|
|
unreachable();
|
|
}
|
|
|
|
inline SoftwareItem::Classification
|
|
software_classification_from_string(const std::string& str) {
|
|
if (iequal(str, "data collection")) return SoftwareItem::DataCollection;
|
|
if (iequal(str, "data extraction")) return SoftwareItem::DataExtraction;
|
|
if (iequal(str, "data processing")) return SoftwareItem::DataProcessing;
|
|
if (iequal(str, "data reduction")) return SoftwareItem::DataReduction;
|
|
if (iequal(str, "data scaling")) return SoftwareItem::DataScaling;
|
|
if (iequal(str, "model building")) return SoftwareItem::ModelBuilding;
|
|
if (iequal(str, "phasing")) return SoftwareItem::Phasing;
|
|
if (iequal(str, "refinement")) return SoftwareItem::Refinement;
|
|
return SoftwareItem::Unspecified;
|
|
}
|
|
|
|
} // namespace gemmi
|
|
#endif
|