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>
168 lines
4.9 KiB
C++
168 lines
4.9 KiB
C++
// Copyright Global Phasing Ltd.
|
|
//
|
|
// DSSP (Define Secondary Structure of Proteins) implementation.
|
|
|
|
#ifndef GEMMI_DSSP_HPP_
|
|
#define GEMMI_DSSP_HPP_
|
|
|
|
#include "topo.hpp"
|
|
#include "neighbor.hpp"
|
|
#include <vector>
|
|
#include <string>
|
|
|
|
namespace gemmi {
|
|
|
|
// Secondary structure types as defined in DSSP
|
|
enum class SecondaryStructure : char {
|
|
Loop = '~', // Loop/coil
|
|
Break = '=', // Break
|
|
Bend = 'S', // Bend
|
|
Turn = 'T', // Turn
|
|
Helix_PP = 'P', // Polyproline helix
|
|
Helix_5 = 'I', // Pi helix (5-turn)
|
|
Helix_3 = 'G', // 3-10 helix
|
|
Strand = 'E', // Extended strand
|
|
Bridge = 'B', // Beta bridge
|
|
Helix_4 = 'H' // Alpha helix (4-turn)
|
|
};
|
|
|
|
// Turn types
|
|
enum class TurnType {
|
|
Turn_3 = 3,
|
|
Turn_4 = 4,
|
|
Turn_5 = 5,
|
|
Turn_PP = 6
|
|
};
|
|
|
|
// Helix positions
|
|
enum class HelixPosition {
|
|
None = 0,
|
|
Start,
|
|
Middle,
|
|
End,
|
|
StartAndEnd
|
|
};
|
|
|
|
// Bridge types
|
|
enum class BridgeType {
|
|
None = 0,
|
|
Parallel,
|
|
AntiParallel
|
|
};
|
|
|
|
struct Bridge {
|
|
size_t partner1;
|
|
size_t partner2;
|
|
BridgeType type;
|
|
};
|
|
|
|
// Hydrogen bond modes
|
|
enum class HydrogenMode {
|
|
Existing = 0, // Use existing hydrogen atoms from structure
|
|
Calculate // Calculate hydrogen positions (original DSSP method)
|
|
};
|
|
|
|
// Hydrogen bond definition
|
|
enum class HBondDefinition {
|
|
Energy = 0, // Energy-based (original DSSP)
|
|
Geometry // Geometry-based (distance + angle)
|
|
};
|
|
|
|
struct GEMMI_DLL HBond {
|
|
Topo::ResInfo *donor = nullptr, *acceptor = nullptr;
|
|
char alt1 = '\0';
|
|
char alt2 = '\0';
|
|
double energy = 0;
|
|
bool is_valid = false;
|
|
};
|
|
|
|
// Per-residue secondary structure information
|
|
struct GEMMI_DLL SecondaryStructureInfo {
|
|
SecondaryStructure ss_type = SecondaryStructure::Loop;
|
|
std::vector<size_t> parallel_bridges;
|
|
std::vector<size_t> antiparallel_bridges;
|
|
std::vector<SecondaryStructureInfo*> break_partners;
|
|
std::array<HelixPosition, 4> helix_positions = {HelixPosition::None, HelixPosition::None,
|
|
HelixPosition::None, HelixPosition::None};
|
|
bool has_break = false;
|
|
bool nturn_acceptor = false;
|
|
|
|
void set_helix_position(TurnType turn, HelixPosition pos) {
|
|
helix_positions[static_cast<int>(turn) - 3] = pos;
|
|
}
|
|
|
|
HelixPosition get_helix_position(TurnType turn) const {
|
|
return helix_positions[static_cast<int>(turn) - 3];
|
|
}
|
|
|
|
void add_bridge(size_t partner_idx, BridgeType type) {
|
|
if (type == BridgeType::Parallel) {
|
|
parallel_bridges.push_back(partner_idx);
|
|
} else if (type == BridgeType::AntiParallel) {
|
|
antiparallel_bridges.push_back(partner_idx);
|
|
}
|
|
}
|
|
|
|
bool has_bridges(BridgeType type) const {
|
|
return type == BridgeType::Parallel ? !parallel_bridges.empty()
|
|
: !antiparallel_bridges.empty();
|
|
}
|
|
};
|
|
|
|
// DSSP options/parameters
|
|
struct GEMMI_DLL DsspOptions {
|
|
HydrogenMode hydrogen_mode = HydrogenMode::Calculate;
|
|
HBondDefinition hbond_definition = HBondDefinition::Energy;
|
|
double cutoff = 0.9; // nm
|
|
bool pi_helix_preference = true;
|
|
bool search_polyproline = true;
|
|
bool shortened_pp_stretch = false;
|
|
double hbond_energy_cutoff = -0.5; // kcal/mol
|
|
double min_ca_distance = 9.0; // Angstrom
|
|
double bend_angle_min = 70.0; // degrees
|
|
double max_peptide_bond_distance = 2.5; // Angstrom
|
|
};
|
|
|
|
// Main DSSP calculator class
|
|
struct GEMMI_DLL DsspCalculator {
|
|
explicit DsspCalculator(const DsspOptions& opts = DsspOptions{}) : options(opts) {}
|
|
|
|
// Calculate secondary structure for a chain
|
|
std::string calculate_secondary_structure(NeighborSearch& ns, Topo::ChainInfo& chain_info);
|
|
|
|
// Get detailed secondary structure information
|
|
const std::vector<SecondaryStructureInfo>& get_detailed_info() const { return ss_info; }
|
|
|
|
DsspOptions options;
|
|
std::vector<SecondaryStructureInfo> ss_info;
|
|
std::vector<Bridge> bridges_;
|
|
|
|
// Calculate hydrogen bonds
|
|
void calculate_hydrogen_bonds(NeighborSearch& ns, Topo::ChainInfo& chain_info);
|
|
void calculate_hbond_energy(Topo::ResInfo* donor, Topo::ResInfo* acceptor);
|
|
void calculate_hbond_geometry(Topo::ResInfo* donor, Topo::ResInfo* acceptor);
|
|
|
|
/*
|
|
// Pattern recognition functions
|
|
void find_bridges_and_strands(Topo::ChainInfo& chain_info);
|
|
void find_turns_and_helices(Topo::ChainInfo& chain_info);
|
|
void find_bends_and_breaks(Topo::ChainInfo& chain_info);
|
|
void find_polyproline_helices(Topo::ChainInfo& chain_info);
|
|
*/
|
|
|
|
// Utility functions
|
|
bool has_hbond_between(Topo::ResInfo* donor, Topo::ResInfo* acceptor) const;
|
|
bool no_chain_breaks_between(Topo::ChainInfo& chain_info, size_t res1_idx, size_t res2_idx) const;
|
|
BridgeType calculate_bridge_type(Topo::ChainInfo& chain_info, size_t res1_idx, size_t res2_idx) const;
|
|
|
|
// Generate final secondary structure string
|
|
//std::string generate_ss_string() const;
|
|
};
|
|
|
|
// Convenience function for simple use cases
|
|
GEMMI_DLL std::string calculate_dssp(NeighborSearch& ns, Topo::ChainInfo& cinfo,
|
|
const DsspOptions& opts = DsspOptions{});
|
|
|
|
} // namespace gemmi
|
|
#endif
|