Files
leonarski_fandjungfrau 4dc2534dbf
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 18m57s
Build Packages / Unit tests (push) Skipped
Build Packages / build:windows:nocuda (push) Successful in 16m55s
Build Packages / build:windows:cuda (push) Successful in 18m48s
Build Packages / build:viewer-tgz:cpu (push) Successful in 13m10s
Build Packages / build:viewer-tgz:cuda (push) Successful in 14m45s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 22m23s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 20m12s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 23m7s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 20m43s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 23m9s
Build Packages / XDS test (durin plugin) (push) Successful in 12m26s
Build Packages / build:rpm (rocky9) (push) Successful in 24m58s
Build Packages / Generate python client (push) Successful in 50s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 23m20s
Build Packages / Create release (push) Skipped
Build Packages / XDS test (JFJoch plugin) (push) Successful in 12m37s
Build Packages / build:rpm (rocky8) (push) Successful in 27m58s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 25m38s
Build Packages / Build documentation (push) Successful in 59s
Build Packages / DIALS test (push) Successful in 23m16s
Build Packages / XDS test (neggia plugin) (push) Successful in 6m38s
v1.0.0.rc-162 (#72)
**Files written by Jungfraujoch now import correctly in DIALS, XDS and pyFAI.** A tilted detector, a grid scan, a still recorded at a goniometer position, and saturated or unreadable pixels were each described in a way that a third-party program acted on wrongly. If you process Jungfraujoch data outside Jungfraujoch, prefer this release to any earlier one.

* HDF5: the detector tilt (`rot1`/`rot2`/`rot3`) is exported correctly in the NXmx transformation chain; untilted geometries are unaffected.
* HDF5: a still recorded at a goniometer position is no longer read back as a single image, and a grid scan records a stationary spindle so a program that requires a rotation axis can open it.
* HDF5: the sample transformation chain is written in mounting order, with a Smargon head position told apart from the spindle, one entry per image, `module_offset` as a float unit vector, and `offset_units` on every offset.
* HDF5: saturated, underloaded and unreadable pixels are described so a downstream program masks them - `saturation_value`, `underload_value`, `error_value` and `bit_depth_readout` are written correctly, and a data file missing next to a VDS master reads as the error marker rather than as zero counts.
* HDF5: the rotation axis is read back under whatever name it carries, and `mirror_y` records whether the assembled image is mirrored in Y relative to the detector's raw readout.
* A grid scan and a goniometer axis can both be set; they are no longer alternatives.
* `images_per_file` is chosen from the acquisition when it is not given: a rotation sweep of at most 20000 images goes into a single data file, a grid scan splits on whole fast-axis rows, and stills and serial keep 1000.
* The writer refuses a stream whose start message declares a different pixel format than its images carry, and a DECTRIS detector sending signed images is no longer declared unsigned.
* The image stream can carry the sample transformation chain (`transformations`, in the END message); a producer that does not send it gets the same chain built by the writer.
* rugnux: fixing the space group with `-S` no longer prevents the lattice from being found - a lattice indexed in a different setting is reindexed into that group's own setting, and a run whose crystal does not have that group's lattice stops and names the cell it indexed as, rather than reporting statistics that cannot describe it.
* rugnux: the per-image resolution estimate now predicts the resolution the merged data reach rather than the highest-resolution spot found, and is reported as `SPOT_RESOLUTION_ESTIMATE`.
* rugnux: two runs of the same command on the same images produce the same merged intensities; the azimuthal profile written alongside them is not yet reproducible in the same way.
* rugnux: the offline lattice refinement is bounded by iterations rather than by a wall clock, so a loaded machine can no longer refine to a different lattice; a live acquisition keeps its real-time bound.
* rugnux: the detector-frame modulation correction is fitted on a grid spanning the detector, so whether it is applied no longer depends on how far integration reached.
* rugnux: the geometry pre-pass no longer writes `<prefix>_01.mtz`, `_01.cif`, `_01.hkl` and `_01_image.dat`; the refined second pass writes those files under `<prefix>`, and that is the result to use.
* rugnux: `_process.h5` describes the pixel format of the images it links to, and is written on a thread of its own.
* rugnux: the detector geometry is also logged in XDS's convention (`ORGX`/`ORGY`, detector axis vectors, rotation axis), so it can be compared with an XDS refinement.
* rugnux: an image integrated in pyFAI through the `.poni` file written by `--mode calibration` comes out with the correct azimuth, and the file declares pyFAI's `orientation`, which needs pyFAI 2024.01 or newer. Radial integration is unchanged.
* rugnux: a rotation run is substantially faster throughout - beam-stop detection, first-pass indexing, geometry refinement, integration, scaling and merging - and observations outside the scaling resolution range are dropped as they are ingested. The refined geometry, the space group chosen and the merged statistics are unchanged.
* Faster spot finding and indexing, on the broker as well as in rugnux; the spots found and the lattices indexed are unchanged.
* A run reserves substantially less GPU memory: nothing is allocated for buffers that are never read, and a worker builds only the engines it uses.
* rugnux: with `-N` left at its default the per-image loop of `--mode mx` uses at most 16 workers per GPU, rather than one per hardware thread; an explicit `-N` is obeyed as given.
* CUDA 12 builds now contain device code for Volta, so the RHEL 8 packages and the portable Linux `.tgz` run on a V100; the CUDA 13 artefacts (RHEL 9, Ubuntu, Windows) remain Turing and newer.
* The build resolves a single Eigen for the whole project, and refuses to configure if Ceres picks up a different one; a build that mixed two Eigen versions was undefined behaviour and crashed at -O2.
* Documentation: a security page, and the supported GPU generations and minimum NVIDIA driver version of every released artefact.

**Breaking change to OpenAPI** - regenerate the client (`jfjoch-client` 1.0.0-rc.162, `frontend/src/client`):
* `dataset_settings.images_per_file` is no longer `default: 1000` and no longer accepts `0`; it is optional, and its minimum is 1. A client sending `0` (previously "one file for the whole run") is now rejected - omit the field instead, which for a rotation sweep gives the same single file.
* `file_writer_format` now defaults to `NXmxVDS`, matching the server's own default and the layout recommended for DIALS, XDS and CrystFEL. A generated client that fills in schema defaults and does not set the format explicitly will write VDS masters where it previously wrote legacy ones; set `NXmxLegacy` explicitly to keep them.

---------

Co-authored-by: jungfrau <jungfrau@mx-aare-test.psi.ch>
Reviewed-on: #72
Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
2026-08-25 08:21:39 +02:00

221 lines
8.5 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;
// 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.
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;
}