Build Packages / Unit tests (push) Skipped
Build Packages / build:windows:cuda (push) Successful in 18m44s
Build Packages / build:viewer-tgz:cpu (push) Successful in 6m11s
Build Packages / build:viewer-tgz:cuda (push) Successful in 6m54s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 9m40s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 10m41s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 10m10s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 10m4s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 11m5s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 12m23s
Build Packages / build:rpm (rocky8) (push) Successful in 11m30s
Build Packages / build:rpm (rocky9) (push) Successful in 12m51s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 12m8s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 11m21s
Build Packages / DIALS test (push) Successful in 13m22s
Build Packages / XDS test (durin plugin) (push) Successful in 9m2s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 7m55s
Build Packages / XDS test (neggia plugin) (push) Successful in 5m57s
Build Packages / Generate python client (push) Successful in 23s
Build Packages / Build documentation (push) Successful in 57s
Build Packages / Create release (push) Skipped
Build Packages / build:windows:nocuda (push) Successful in 10m24s
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: #70 Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
172 lines
6.4 KiB
C++
172 lines
6.4 KiB
C++
// SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#include <algorithm>
|
|
#include <cmath>
|
|
#include <limits>
|
|
|
|
#include "CalcISigma.h"
|
|
#include "Regression.h"
|
|
#include "../../common/ResolutionShells.h"
|
|
|
|
// Upper bound on a physically plausible macromolecular isotropic B-factor (A^2). A fit that lands
|
|
// outside (0, WILSON_B_MAX) comes from a bad frame / bad dataset (too few or mis-indexed reflections,
|
|
// a degenerate resolution range) rather than real Debye-Waller falloff, so it is rejected as
|
|
// indeterminate rather than reported. Radiation-damaged / low-resolution data rarely exceeds ~120 A^2;
|
|
// 200 leaves generous head-room while still excluding the hundreds-of-A^2 garbage.
|
|
static constexpr float WILSON_B_MAX = 200.0f;
|
|
|
|
void CalcISigma(DataMessage &msg) {
|
|
CalcISigma(msg, msg.reflections);
|
|
}
|
|
|
|
void CalcISigma(DataMessage &msg, const std::vector<Reflection> &reflections) {
|
|
if (reflections.empty())
|
|
return;
|
|
|
|
const int nshells = 20;
|
|
ResolutionShells shells(1.5, 50.0, nshells);
|
|
|
|
std::vector<float> Isigma_sum(nshells);
|
|
std::vector<float> count(nshells);
|
|
|
|
for (const auto &r: reflections) {
|
|
auto s = shells.GetShell(r.d);
|
|
if (s && (r.sigma != 0.0)) {
|
|
Isigma_sum[*s] += r.I / r.sigma;
|
|
++count[*s];
|
|
}
|
|
}
|
|
|
|
std::vector<float> result(nshells);
|
|
for (int i = 0; i < nshells; ++i) {
|
|
if (count[i] > 0)
|
|
result[i] = Isigma_sum[i] / count[i];
|
|
else
|
|
result[i] = 0.0f;
|
|
}
|
|
|
|
msg.integration_Isigma = result;
|
|
msg.integration_Isigma_one_over_d_square = shells.GetShellMeanOneOverResSq();
|
|
}
|
|
|
|
void CalcWilsonBFactor(DataMessage &msg,
|
|
bool replace_b) {
|
|
CalcWilsonBFactor(msg, msg.reflections, replace_b);
|
|
}
|
|
|
|
void CalcWilsonBFactor(DataMessage &msg,
|
|
const std::vector<Reflection> &reflections,
|
|
bool replace_b) {
|
|
if (reflections.empty())
|
|
return;
|
|
|
|
const int nshells = 20;
|
|
ResolutionShells shells(1.5, 6.0, nshells);
|
|
|
|
std::vector<float> I_sum(nshells);
|
|
std::vector<float> count(nshells);
|
|
|
|
for (const auto& r: reflections) {
|
|
auto s = shells.GetShell(r.d);
|
|
if (s && (r.sigma != 0.0)) {
|
|
I_sum[*s] += r.I;
|
|
++count[*s];
|
|
}
|
|
}
|
|
|
|
std::vector<float> log_I_mean(nshells);
|
|
|
|
int32_t valid_shells = nshells;
|
|
for (int i = 0; i < nshells; ++i) {
|
|
if (count[i] > 0 && I_sum[i] > 0) {
|
|
log_I_mean[i] = std::log(I_sum[i] / count[i]);
|
|
} else {
|
|
log_I_mean[i] = 0.0f;
|
|
// First shell that has improper value limits how far the Wilson plot is interpolated
|
|
valid_shells = std::min(valid_shells, i + 1);
|
|
}
|
|
}
|
|
|
|
auto shells_mean_one_over_d_square = shells.GetShellMeanOneOverResSq();
|
|
|
|
if (replace_b && valid_shells > 2) {
|
|
auto reg_result = regression(shells_mean_one_over_d_square, log_I_mean, valid_shells);
|
|
const float b_est = -2.0f * reg_result.slope;
|
|
|
|
// Accept only a well-correlated, physically plausible fit. Occasional bad frames (an indexing
|
|
// glitch, too few reflections) produce a wildly steep Wilson line and a B of several hundred
|
|
// A^2 that pollutes the per-image plot; leaving b_factor unset (rendered as NaN) is better than
|
|
// emitting garbage.
|
|
if (reg_result.r_square > 0.3 && std::isfinite(b_est) && b_est > 0.0f && b_est < WILSON_B_MAX)
|
|
msg.b_factor = b_est;
|
|
}
|
|
|
|
msg.integration_B_logI = log_I_mean;
|
|
msg.integration_B_one_over_d_square = shells_mean_one_over_d_square;
|
|
}
|
|
|
|
GlobalWilsonB CalcGlobalWilsonB(const std::vector<MergedReflection> &merged) {
|
|
GlobalWilsonB out;
|
|
// A dataset-wide estimate needs enough reflections to average the shell means; below this the
|
|
// per-image estimate is the only thing on offer and a global number would be meaningless.
|
|
if (merged.size() < 100)
|
|
return out;
|
|
|
|
float d_min = std::numeric_limits<float>::infinity(), d_max = 0.0f;
|
|
for (const auto &r : merged) {
|
|
if (std::isfinite(r.I) && r.d > 0.0f) {
|
|
d_min = std::min(d_min, r.d);
|
|
d_max = std::max(d_max, r.d);
|
|
}
|
|
}
|
|
if (!(d_min < d_max))
|
|
return out;
|
|
|
|
// Below ~4 A the Wilson plot is non-linear (bonding/solvent structure), so when the data extend to
|
|
// lower resolution than that, restrict the fit to d <= 4 A - the standard Wilson-B convention. If
|
|
// the whole dataset is coarser than 4 A, fall back to using all of it.
|
|
constexpr double WILSON_LOW_RES_LIMIT_A = 4.0;
|
|
const float d_low = (d_max > WILSON_LOW_RES_LIMIT_A && d_min < WILSON_LOW_RES_LIMIT_A)
|
|
? static_cast<float>(WILSON_LOW_RES_LIMIT_A) : d_max;
|
|
|
|
const int nshells = 20;
|
|
ResolutionShells shells(d_min, d_low, nshells);
|
|
std::vector<double> I_sum(nshells, 0.0), sig_sum(nshells, 0.0), count(nshells, 0.0);
|
|
for (const auto &r : merged) {
|
|
if (!std::isfinite(r.I) || r.d <= 0.0f)
|
|
continue;
|
|
auto s = shells.GetShell(r.d); // reflections coarser than d_low fall outside -> skipped
|
|
if (s) {
|
|
I_sum[*s] += r.I;
|
|
if (std::isfinite(r.sigma) && r.sigma > 0.0f)
|
|
sig_sum[*s] += r.sigma;
|
|
++count[*s];
|
|
}
|
|
}
|
|
|
|
const auto s2 = shells.GetShellMeanOneOverResSq();
|
|
std::vector<float> x, y;
|
|
for (int i = 0; i < nshells; ++i) {
|
|
// Skip empty / net-negative shells, and shells past the signal limit (mean I/sigma < 1). The
|
|
// latter keeps the fit out of the noise floor: without a resolution cut the weakest high-angle
|
|
// shells are background-residual-dominated and flatten the Wilson line, deflating B. This mirrors
|
|
// XDS/ctruncate fitting only over the meaningful range and makes the estimate insensitive to how
|
|
// far the merged data were carried.
|
|
if (count[i] > 0 && I_sum[i] > 0.0 && I_sum[i] > sig_sum[i]) {
|
|
x.push_back(s2[i]);
|
|
y.push_back(std::log(static_cast<float>(I_sum[i] / count[i])));
|
|
}
|
|
}
|
|
if (x.size() < 3)
|
|
return out;
|
|
|
|
const auto reg = regression(x, y, x.size());
|
|
const double b = -2.0 * reg.slope; // <I> ~ exp(-2 B s^2), s^2 = 1/(4 d^2), x = 1/d^2
|
|
out.n_shells = static_cast<int>(x.size());
|
|
out.correlation = std::sqrt(std::clamp(static_cast<double>(reg.r_square), 0.0, 1.0));
|
|
if (std::isfinite(b) && b > 0.0 && b < WILSON_B_MAX)
|
|
out.b = b;
|
|
return out;
|
|
}
|