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>
78 lines
2.9 KiB
C++
78 lines
2.9 KiB
C++
// Copyright 2018 Global Phasing Ltd.
|
|
|
|
#include "gemmi/calculate.hpp"
|
|
#include "gemmi/eig3.hpp"
|
|
|
|
namespace gemmi {
|
|
|
|
std::array<double, 4> find_best_plane(const std::vector<Atom*>& atoms) {
|
|
Vec3 mean;
|
|
for (const Atom* atom : atoms)
|
|
mean += atom->pos;
|
|
mean /= (double) atoms.size();
|
|
SMat33<double> m{0, 0, 0, 0, 0, 0};
|
|
for (const Atom* atom : atoms) {
|
|
Vec3 p = Vec3(atom->pos) - mean;
|
|
m.u11 += p.x * p.x;
|
|
m.u22 += p.y * p.y;
|
|
m.u33 += p.z * p.z;
|
|
m.u12 += p.x * p.y;
|
|
m.u13 += p.x * p.z;
|
|
m.u23 += p.y * p.z;
|
|
}
|
|
double eig[3] = {};
|
|
Mat33 V = eigen_decomposition(m, eig);
|
|
int smallest_idx = std::fabs(eig[0]) < std::fabs(eig[1]) ? 0 : 1;
|
|
if (std::fabs(eig[2]) < std::fabs(eig[smallest_idx]))
|
|
smallest_idx = 2;
|
|
Vec3 eigvec = V.column_copy(smallest_idx);
|
|
if (eigvec.x < 0)
|
|
eigvec *= -1;
|
|
return {{eigvec.x, eigvec.y, eigvec.z, -eigvec.dot(mean)}};
|
|
}
|
|
|
|
FTransform parse_triplet_as_ftransform(const std::string& s) {
|
|
// c.f. parse_triplet()
|
|
if (std::count(s.begin(), s.end(), ',') != 2)
|
|
fail("expected exactly two commas in triplet");
|
|
size_t comma1 = s.find(',');
|
|
size_t comma2 = s.find(',', comma1 + 1);
|
|
FTransform frac_tr;
|
|
auto set_ftransform_row = [](FTransform& tr, int i, const std::string& part) {
|
|
const double mult = 1. / Op::DEN;
|
|
double decfr[4] = {};
|
|
char x_ = 'x';
|
|
const auto op_row = parse_triplet_part(part, x_, decfr);
|
|
for (int j = 0; j < 3; ++j)
|
|
tr.mat[i][j] = decfr[j] == 0. ? mult * op_row[j] : decfr[j];
|
|
tr.vec.at(i) = decfr[3] == 0. ? mult * op_row[3] : decfr[3];
|
|
};
|
|
set_ftransform_row(frac_tr, 0, s.substr(0, comma1));
|
|
set_ftransform_row(frac_tr, 1, s.substr(comma1 + 1, comma2 - (comma1 + 1)));
|
|
set_ftransform_row(frac_tr, 2, s.substr(comma2 + 1));
|
|
return frac_tr;
|
|
}
|
|
|
|
SMat33<double> calculate_u_from_tls(const TlsGroup& tls, const Position& pos) {
|
|
Position r = (pos - tls.origin) * rad(1);
|
|
SMat33<double> l_contrib = {
|
|
r.y * r.y * tls.L.u33 + r.z * r.z * tls.L.u22 - 2 * r.z * r.y * tls.L.u23,
|
|
r.x * r.x * tls.L.u33 + r.z * r.z * tls.L.u11 - 2 * r.z * r.x * tls.L.u13,
|
|
r.x * r.x * tls.L.u22 + r.y * r.y * tls.L.u11 - 2 * r.y * r.x * tls.L.u12,
|
|
-r.x * r.y * tls.L.u33 + r.z * ( r.x * tls.L.u23 + r.y * tls.L.u13 - r.z * tls.L.u12),
|
|
-r.x * r.z * tls.L.u22 + r.y * ( r.x * tls.L.u23 - r.y * tls.L.u13 + r.z * tls.L.u12),
|
|
-r.y * r.z * tls.L.u11 + r.x * (-r.x * tls.L.u23 + r.y * tls.L.u13 + r.z * tls.L.u12)
|
|
};
|
|
SMat33<double> s_contrib = {
|
|
2 * (tls.S[1][0] * r.z - tls.S[2][0] * r.y),
|
|
2 * (tls.S[2][1] * r.x - tls.S[0][1] * r.z),
|
|
2 * (tls.S[0][2] * r.y - tls.S[1][2] * r.x),
|
|
tls.S[2][0] * r.x - tls.S[2][1] * r.y + (tls.S[1][1] - tls.S[0][0]) * r.z,
|
|
tls.S[1][2] * r.z - tls.S[1][0] * r.x + (tls.S[0][0] - tls.S[2][2]) * r.y,
|
|
tls.S[0][1] * r.y - tls.S[0][2] * r.z + (tls.S[2][2] - tls.S[1][1]) * r.x
|
|
};
|
|
return tls.T + l_contrib + s_contrib;
|
|
}
|
|
|
|
} // namespace gemmi
|