Build Packages / Create release (push) Successful in 7s
Build Packages / build:portable:macos-arm64:nocuda (push) Successful in 4m56s
Build Packages / build:rugnux:linux-aarch64:cuda (push) Successful in 9m10s
Build Packages / build:portable:linux-x86_64:nocuda (push) Successful in 13m51s
Build Packages / build:portable:linux-x86_64:cuda (push) Successful in 16m56s
Build Packages / build:jfjoch:rocky8:nocuda (push) Successful in 20m59s
Build Packages / build:portable:windows-x86_64:nocuda (push) Successful in 21m25s
Build Packages / build:jfjoch:rocky9:nocuda (push) Successful in 21m17s
Build Packages / build:jfjoch:ubuntu2204:nocuda (push) Successful in 14m14s
Build Packages / HDF5 consumer tests (DIALS, XDS) (push) Successful in 25m59s
Build Packages / build:portable:windows-x86_64:cuda (push) Successful in 25m48s
Build Packages / build:jfjoch:ubuntu2404:nocuda (push) Successful in 15m52s
Build Packages / build:jfjoch:rocky8:cuda-sls9 (push) Successful in 19m33s
Build Packages / Generate python client (push) Successful in 29s
Build Packages / Build documentation (push) Successful in 1m19s
Build Packages / build:jfjoch:ubuntu2204:cuda (push) Successful in 20m49s
Build Packages / build:jfjoch:rocky9:cuda-sls9 (push) Successful in 25m31s
Build Packages / build:jfjoch:rocky8:cuda (push) Successful in 25m24s
Build Packages / build:jfjoch:rocky9:cuda (push) Successful in 26m5s
Build Packages / build:jfjoch:ubuntu2404:cuda (push) Successful in 22m19s
Build Packages / Unit tests (push) Failing after 2h28m24s
Build Packages / Validation Battery (push) Successful in 40m33s
* Rugnux: Processes a collection live while jfjoch_broker writes it (`rugnux <master.h5> <broker URL>`). * Rugnux: Processing starts on the first images and confirms its choices once all are in, so analysis can begin during collection. * Rugnux: Faster processing, especially on servers with several GPUs and CPU sockets and on computers without a GPU (`--no-gpu`, macOS). * Rugnux: Uses much less GPU memory, so large data sets stay on the GPU of smaller cards, and a data set too large for the card is processed on the CPU instead. * Rugnux: On macOS, Bragg integration runs on the Apple GPU. * Rugnux: Better handling of twinning and pseudo-symmetry, with the twin hypothesis written as `<prefix>_twin_<SG>.mtz`, and a wrong `--model` no longer confirms the data or decides the hand. * Rugnux: `--model` accepts predicted (AlphaFold) models and falls back to molecular replacement when the model is not placed as a rigid body (experimental `--mr` forces it), settling space group, hand and twinning and writing a different answer as `<prefix>_mr.mtz`. * Rugnux: Molecular replacement is faster and settles the space group in more cases with several copies in the asymmetric unit. * Rugnux: Deposition-ready mmCIF, a richer report, and numbered steps on the terminal with the full log in `<prefix>_log.txt`; `_P1.mtz`, `--estimate-beam-center` and `--beam-center-search` are removed. * Rugnux: The beam-stop shadow is found correctly on tilted detectors. * Rugnux: Stills files that record a stationary goniometer axis get the default stills geometry refinement. * jfjoch_viewer: "Analyze dataset" uses the same defaults as a bare `rugnux <file>`, and shows the results of processed CBF, marCCD and SMV sweeps. * jfjoch_viewer: The Files panel refreshes on F5 and every few seconds, and the plot type and other selections stay put during live collection. * jfjoch_writer: Memory stays bounded and old data files are closed efficiently on long runs, any failure ends the run in an error state the broker is told about, and the master file appears only after its data files; the ZeroMQ pusher logs when a stalled writer makes it drop images. * Fixes: The TCP image pusher no longer blocks the broker's receiver, GPU out-of-memory failures stop with a clear message, and the XDS plugin masks module and chip edges. --------- Co-authored-by: Filip Leonarski <jungfrau@filips-mac-mini.home> Reviewed-on: #85 Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
231 lines
9.2 KiB
C++
231 lines
9.2 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 per-image isotropic B-factor (A^2). A single frame's fit that
|
|
// lands outside (0, WILSON_B_MAX) comes from a bad frame (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. The dataset-wide estimate below has no such cap: a crystal
|
|
// diffracting to 4-7 A has a true Wilson B of 300 A^2 and more.
|
|
static constexpr float WILSON_B_MAX = 200.0f;
|
|
|
|
// What each of the two per-image estimates makes of its shell sums, once they are gathered. Split out
|
|
// so that the gathering can be done in one pass or in two without the estimates themselves differing.
|
|
static void FillISigma(DataMessage &msg, const ResolutionShells &shells,
|
|
const std::vector<float> &Isigma_sum, const std::vector<float> &count) {
|
|
const int nshells = static_cast<int>(count.size());
|
|
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 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];
|
|
}
|
|
}
|
|
|
|
FillISigma(msg, shells, Isigma_sum, count);
|
|
}
|
|
|
|
static void FillWilsonB(DataMessage &msg, const ResolutionShells &shells,
|
|
const std::vector<float> &I_sum, const std::vector<float> &count,
|
|
bool replace_b) {
|
|
const int nshells = static_cast<int>(count.size());
|
|
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;
|
|
}
|
|
|
|
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];
|
|
}
|
|
}
|
|
|
|
FillWilsonB(msg, shells, I_sum, count, replace_b);
|
|
}
|
|
|
|
// Both per-image estimates in one pass. They walk the same reflections and read the same three fields
|
|
// out of each 80-byte record; the shells differ (I/sigma over the whole range, the Wilson plot only to
|
|
// 6 A) and each keeps its own sums in its own order, so what comes out is what the two passes produced.
|
|
void CalcISigmaAndWilsonBFactor(DataMessage &msg, const std::vector<Reflection> &reflections,
|
|
bool replace_b) {
|
|
if (reflections.empty())
|
|
return;
|
|
|
|
const int nshells = 20;
|
|
ResolutionShells isigma_shells(1.5, 50.0, nshells);
|
|
ResolutionShells wilson_shells(1.5, 6.0, nshells);
|
|
|
|
std::vector<float> Isigma_sum(nshells), isigma_count(nshells);
|
|
std::vector<float> I_sum(nshells), wilson_count(nshells);
|
|
|
|
for (const auto &r: reflections) {
|
|
if (r.sigma == 0.0)
|
|
continue;
|
|
auto si = isigma_shells.GetShell(r.d);
|
|
if (si) {
|
|
Isigma_sum[*si] += r.I / r.sigma;
|
|
++isigma_count[*si];
|
|
}
|
|
auto sw = wilson_shells.GetShell(r.d);
|
|
if (sw) {
|
|
I_sum[*sw] += r.I;
|
|
++wilson_count[*sw];
|
|
}
|
|
}
|
|
|
|
FillISigma(msg, isigma_shells, Isigma_sum, isigma_count);
|
|
FillWilsonB(msg, wilson_shells, I_sum, wilson_count, replace_b);
|
|
}
|
|
|
|
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.
|
|
// But the window never gets narrower than the one a 3 A dataset fits over, 4-3 A in 1/d^2: with
|
|
// d_min just under 4 A the 4 A window is a sliver, and after the shells past the signal limit are
|
|
// dropped it held 0-2 shells. A narrower window is widened towards low resolution instead - into
|
|
// the curved part of the plot, which costs less than a slope over no range at all.
|
|
constexpr double WILSON_LOW_RES_LIMIT_A = 4.0;
|
|
constexpr double WILSON_MIN_WINDOW = 1.0 / (3.0 * 3.0) - 1.0 / (4.0 * 4.0);
|
|
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 double widest_low_s2 = 1.0 / (static_cast<double>(d_min) * d_min) - WILSON_MIN_WINDOW;
|
|
if (1.0 / (static_cast<double>(d_low) * d_low) > widest_low_s2)
|
|
d_low = widest_low_s2 > 0.0 ? std::min(d_max, static_cast<float>(1.0 / std::sqrt(widest_low_s2))) : d_max;
|
|
out.d_low_A = d_low;
|
|
out.d_high_A = d_min;
|
|
|
|
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)
|
|
out.b = b;
|
|
return out;
|
|
}
|