Build Packages / Build documentation (push) Successful in 48s
Build Packages / build:portable:linux-x86_64:nocuda (push) Successful in 15m47s
Build Packages / build:portable:linux-x86_64:cuda (push) Successful in 23m19s
Build Packages / build:portable:windows-x86_64:nocuda (push) Successful in 18m47s
Build Packages / build:portable:macos-arm64:nocuda (push) Successful in 5m54s
Build Packages / build:rugnux:linux-aarch64:cuda (push) Successful in 11m27s
Build Packages / build:jfjoch:ubuntu2204:cuda (push) Successful in 26m59s
Build Packages / Unit tests (push) Successful in 1h50m25s
Build Packages / Validation Battery (push) Successful in 46m38s
Build Packages / build:jfjoch:rocky8:nocuda (push) Successful in 32m52s
Build Packages / build:jfjoch:rocky9:nocuda (push) Successful in 32m32s
Build Packages / build:jfjoch:ubuntu2204:nocuda (push) Successful in 28m34s
Build Packages / build:jfjoch:ubuntu2404:nocuda (push) Successful in 29m19s
Build Packages / build:jfjoch:rocky8:cuda-sls9 (push) Successful in 30m11s
Build Packages / build:jfjoch:rocky9:cuda-sls9 (push) Successful in 33m58s
Build Packages / build:jfjoch:rocky8:cuda (push) Successful in 31m26s
Build Packages / build:jfjoch:rocky9:cuda (push) Successful in 34m4s
Build Packages / HDF5 consumer tests (DIALS, XDS) (push) Successful in 32m17s
Build Packages / Generate python client (push) Successful in 32s
Build Packages / Create release (push) Successful in 9s
Build Packages / build:jfjoch:ubuntu2404:cuda (push) Successful in 31m50s
Build Packages / build:portable:windows-x86_64:cuda (push) Successful in 19m38s
* jfjoch_broker (experimental): Live Rugnux covers serial collections from DECTRIS detectors; a rotation collection too large for the image buffer falls back to standard per-image processing with a warning, and a stream that ends without its end message finishes the collection instead of hanging it. * jfjoch_broker (experimental): Live Rugnux settings to build the solvent during refinement and to process a rotation collection as stills, a Clear action for the last result, a `_report.txt` for live rotation runs, R-free reported for the refined model, and ice-ring detection on by default for rotation as in the command line. * jfjoch_broker (experimental): More complete and reproducible live serial merges, analysed for twinning, pseudo-translation and anisotropy, with merging statistics by resolution shell in the live status. * jfjoch_writer: Live results with large models are written reliably; update jfjoch_writer together with jfjoch_broker. * Rugnux: Several masters can be processed together with `--force-still`, including grid scans; more robust and faster merging of several sweeps; improved twinning, pseudo-translation, anisotropy, anomalous-signal and space-group decisions. * Rugnux: Molecular replacement places the copies of a multi-copy solution together; the pseudo-translation warning quotes the Patterson peak and is not raised once a model is placed; the report advises on extending the rotation or reorienting the crystal where the coverage would gain from it. * Web frontend: Light and dark modes, a phone layout, a hideable page list, a redesigned Rugnux live page with step-through of the Fo-Fc peaks in the structure view. * jfjoch_viewer: A broker URL given on the command line follows the running collection. Reviewed-on: #97 Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
82 lines
3.6 KiB
C++
82 lines
3.6 KiB
C++
// SPDX-FileCopyrightText: 2026 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#include <catch2/catch_all.hpp>
|
|
#include <random>
|
|
|
|
#include "../common/Definitions.h"
|
|
#include "../common/JFJochMath.h"
|
|
#include "../image_analysis/scale_merge/IceRingIntensity.h"
|
|
|
|
namespace {
|
|
// A Wilson crystal (B = 20 A^2) to 1.8 A, acentric intensities with 10% plus constant noise, with
|
|
// an additive powder ring of strength `ring(d)` (in units of the local mean) on the core of
|
|
// every hexagonal-ice ring - or, with `whole_band`, over core and flanks alike.
|
|
template <class F>
|
|
std::vector<MergedReflection> Crystal(F ring, bool whole_band = false) {
|
|
std::mt19937 rng(4321);
|
|
std::exponential_distribution<double> wilson(1.0);
|
|
std::normal_distribution<double> noise(0.0, 1.0);
|
|
std::uniform_real_distribution<double> s2(1.0 / (8.0 * 8.0), 1.0 / (1.8 * 1.8));
|
|
std::vector<MergedReflection> out;
|
|
for (int i = 0; i < 40000; ++i) {
|
|
MergedReflection r;
|
|
r.d = static_cast<float>(1.0 / std::sqrt(s2(rng)));
|
|
const double I_mean = 1000.0 * std::exp(-0.5 * 20.0 / (r.d * r.d));
|
|
double I_true = I_mean * wilson(rng);
|
|
const double q = 2.0 * PI / r.d;
|
|
for (const float ice_d : ICE_RING_RES_A)
|
|
if (std::fabs(q - 2.0 * PI / ice_d) < (whole_band ? ICE_INTENSITY_BAND_Q : ICE_INTENSITY_CORE_Q))
|
|
I_true += ring(ice_d) * I_mean;
|
|
r.sigma = static_cast<float>(std::sqrt(0.01 * I_true * I_true + 25.0));
|
|
r.I = static_cast<float>(I_true + r.sigma * noise(rng));
|
|
out.push_back(r);
|
|
}
|
|
return out;
|
|
}
|
|
}
|
|
|
|
TEST_CASE("IceRingIntensity_clean_crystal_is_not_ice") {
|
|
const auto m = MeasureIceRingIntensity(Crystal([](float) { return 0.0; }));
|
|
REQUIRE(m.n_rings >= 5);
|
|
CHECK(!m.Detected());
|
|
CHECK(std::fabs(m.amplitude_z) < 3.0);
|
|
CHECK(std::fabs(m.contrast_z) < 3.0);
|
|
for (const auto &r : m.rings)
|
|
CHECK(std::fabs(r.z) < 4.0);
|
|
}
|
|
|
|
TEST_CASE("IceRingIntensity_hexagonal_ring_system_is_detected") {
|
|
// Ice in proportion to its line strengths: the 3.90 A ring adds 100% of the local mean.
|
|
const auto m = MeasureIceRingIntensity(Crystal([](float d) {
|
|
return d > 3.8f ? 1.0 : d > 3.6f ? 0.75 : d > 3.4f ? 0.53 : d > 2.2f && d < 2.3f ? 0.39 : 0.0;
|
|
}));
|
|
REQUIRE(m.Detected());
|
|
CHECK(m.amplitude_z > 8.0);
|
|
CHECK(m.contrast_z > 5.0);
|
|
for (const auto &r : m.rings)
|
|
if (r.ring_d > 3.8f)
|
|
CHECK(r.ratio == Catch::Approx(2.0).margin(0.2));
|
|
}
|
|
|
|
TEST_CASE("IceRingIntensity_one_strong_shell_is_not_ice") {
|
|
// A crystal whose transform is strong over a shell at one ring position, wider than the ring: the
|
|
// cores stand out against the Wilson line but not against their flanks.
|
|
const auto m = MeasureIceRingIntensity(Crystal([](float d) { return d > 2.6f && d < 2.7f ? 1.0 : 0.0; }, true));
|
|
for (const auto &r : m.rings)
|
|
if (r.ring_d > 2.6f && r.ring_d < 2.7f) {
|
|
CHECK(r.z > 5.0);
|
|
CHECK(r.ratio_flank == Catch::Approx(r.ratio).margin(0.2));
|
|
}
|
|
CHECK(!m.Detected());
|
|
}
|
|
|
|
TEST_CASE("IceRingIntensity_depressed_cores_are_a_ring_too") {
|
|
// A ring in the background annulus beside the spots takes intensity out of the cores instead.
|
|
const auto m = MeasureIceRingIntensity(Crystal([](float d) {
|
|
return d > 3.8f ? -0.5 : d > 3.6f ? -0.4 : d > 3.4f ? -0.3 : d > 2.2f && d < 2.3f ? -0.25 : 0.0;
|
|
}));
|
|
REQUIRE(m.Detected());
|
|
CHECK(m.contrast_z < -5.0);
|
|
}
|