v1.0.0-rc.172 (#82)
Build Packages / Create release (push) Successful in 16s
Build Packages / build:rugnux:aarch64 (cross) (push) Successful in 8m27s
Build Packages / build:rugnux-tgz (x86_64) (push) Successful in 9m15s
Build Packages / build:viewer-tgz:cpu (push) Successful in 10m11s
Build Packages / build:viewer-tgz:cuda (push) Successful in 12m6s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 15m44s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 16m1s
Build Packages / build:windows:nocuda (push) Successful in 17m29s
Build Packages / build:windows:cuda (push) Successful in 19m58s
Build Packages / HDF5 consumer tests (DIALS, XDS) (push) Successful in 24m7s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 19m8s
Build Packages / build:rugnux:windows (push) Successful in 10m58s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 20m46s
Build Packages / Generate python client (push) Successful in 53s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 20m13s
Build Packages / Build documentation (push) Successful in 1m36s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 19m57s
Build Packages / build:rpm (rocky8) (push) Successful in 18m7s
Build Packages / build:rpm (rocky9) (push) Successful in 18m54s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 19m32s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 17m30s
Build Packages / Unit tests (push) Successful in 1h39m2s
Build Packages / Create release (push) Successful in 16s
Build Packages / build:rugnux:aarch64 (cross) (push) Successful in 8m27s
Build Packages / build:rugnux-tgz (x86_64) (push) Successful in 9m15s
Build Packages / build:viewer-tgz:cpu (push) Successful in 10m11s
Build Packages / build:viewer-tgz:cuda (push) Successful in 12m6s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 15m44s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 16m1s
Build Packages / build:windows:nocuda (push) Successful in 17m29s
Build Packages / build:windows:cuda (push) Successful in 19m58s
Build Packages / HDF5 consumer tests (DIALS, XDS) (push) Successful in 24m7s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 19m8s
Build Packages / build:rugnux:windows (push) Successful in 10m58s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 20m46s
Build Packages / Generate python client (push) Successful in 53s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 20m13s
Build Packages / Build documentation (push) Successful in 1m36s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 19m57s
Build Packages / build:rpm (rocky8) (push) Successful in 18m7s
Build Packages / build:rpm (rocky9) (push) Successful in 18m54s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 19m32s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 17m30s
Build Packages / Unit tests (push) Successful in 1h39m2s
* Fixed `jfjoch_broker` cancelling every data collection with a CUDA "out of memory" error after long operation: GPU memory no longer leaks with each collection. * Rugnux scales a rotation sweep until the per-frame scales settle instead of for a fixed three rounds, and says so when they did not - merged intensities, and the space group, resolution cut and frame rejection read off them, change accordingly; `--scaling-iterations` is now the cap on that loop (default 100). * Rugnux places every frame of a marCCD, SMV or miniCBF series at the spindle angle its own header states, so a series with missing frames, or with angles written modulo 360, is no longer read at the wrong geometry or refused. * Every rotation run writes two diagnostic files beside its reflections: `<prefix>_detector.jpg`, the detector projection with the pixel mask and the detected beam-stop shadow drawn on it, and `<prefix>_plot.txt`, one row per image. Reviewed-on: #82 Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
This commit was merged in pull request #82.
This commit is contained in:
1 parent
30b6800289
commit
6dfe065365
285 files changed
+12194
-2588
No files matched your search
@@ -259,20 +259,64 @@ TEST_CASE("MergeStats_NoReferenceCellLeavesCompletenessUnmeasured") {
|
||||
}
|
||||
}
|
||||
|
||||
// The reference-range table (--report-resolution) is binned over the range it is GIVEN, whether or
|
||||
// not the data reach it: its last shell ends at the declared d_min, and past the run's own limit
|
||||
// nothing is read from anywhere - the reflections the run did not keep count as missing.
|
||||
TEST_CASE("MergeStats_ReferenceRangeIsBinnedOverTheDeclaredRange") {
|
||||
const auto &sg = TestSpaceGroup();
|
||||
const auto merged = MeasuredBetween(sg, TEST_CELL, 2.0, 20.0, true); // what the run kept
|
||||
DiffractionExperiment x;
|
||||
x.SetSpaceGroup(sg);
|
||||
MergeOnTheFly merge(x);
|
||||
merge.ReferenceCell(TEST_CELL);
|
||||
const auto own = merge.MergeStats(merged, {});
|
||||
|
||||
// A range coarser than the run's own: a complete subset, on a grid ending at the declared bound.
|
||||
const auto within = merge.MergeStats(merged, {}, {}, std::nullopt, ReportResolutionRange{3.0, 50.0});
|
||||
CHECK(within.shells.back().d_min == Catch::Approx(3.0));
|
||||
CHECK(within.shells.front().d_max == Catch::Approx(50.0));
|
||||
int coarser_than_3 = 0;
|
||||
for (const auto &m: merged)
|
||||
if (m.d > 3.0f) ++coarser_than_3;
|
||||
CHECK(within.overall.unique_reflections == coarser_than_3);
|
||||
CHECK(within.overall.unique_reflections < own.overall.unique_reflections);
|
||||
CHECK(Completeness(within.overall) > 99.0);
|
||||
|
||||
// A range finer than the run kept: the grid still ends at 1.5 A, the outer shell is empty and its
|
||||
// possible reflections are in the denominator, and the measured range says where the data stop.
|
||||
const auto beyond = merge.MergeStats(merged, {}, {}, std::nullopt, ReportResolutionRange{1.5, 50.0});
|
||||
CHECK(beyond.shells.back().d_min == Catch::Approx(1.5));
|
||||
CHECK(beyond.overall.unique_reflections == own.overall.unique_reflections);
|
||||
CHECK(beyond.overall.possible_unique_reflections > own.overall.possible_unique_reflections);
|
||||
CHECK(Completeness(beyond.overall) < Completeness(own.overall));
|
||||
CHECK(beyond.shells.back().unique_reflections == 0);
|
||||
CHECK(beyond.shells.back().possible_unique_reflections > 0);
|
||||
CHECK(beyond.overall.d_min == Catch::Approx(own.overall.d_min));
|
||||
|
||||
// A range the data never reach at all is still a grid, not an error.
|
||||
const auto empty = merge.MergeStats(merged, {}, {}, std::nullopt, ReportResolutionRange{1.0, 1.5});
|
||||
CHECK(empty.overall.unique_reflections == 0);
|
||||
CHECK(empty.overall.possible_unique_reflections > 0);
|
||||
CHECK(empty.overall.d_min == 0.0f);
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------- the automatic resolution cutoff
|
||||
namespace {
|
||||
// Half-set pairs spread uniformly in s = 1/d^2 over [s_from, s_to), either correlated with each
|
||||
// other (signal) or drawn independently (noise, CC1/2 ~ 0), so a whole CC1/2 curve can be built
|
||||
// band by band.
|
||||
void AddBand(std::vector<MergedReflection> &v, std::mt19937 &rng,
|
||||
double s_from, double s_to, int n, bool correlated) {
|
||||
std::normal_distribution<double> g(0.0, 1.0);
|
||||
double s_from, double s_to, int n, bool correlated, double sigma = 1.0) {
|
||||
std::normal_distribution<double> g(0.0, sigma);
|
||||
for (int j = 0; j < n; ++j) {
|
||||
MergedReflection m;
|
||||
m.d = static_cast<float>(1.0 / std::sqrt(s_from + (j + 0.5) * (s_to - s_from) / n));
|
||||
const double a = g(rng), b = g(rng);
|
||||
m.I_half[0] = static_cast<float>(a);
|
||||
m.I_half[1] = static_cast<float>(correlated ? a : b);
|
||||
// The pair's weight in a CC1/2: the precision it would have had at the typical frame scale
|
||||
// over the precision it has - 1/sigma^2 for a band scaled up by sigma from dead frames.
|
||||
m.cc_weight = static_cast<float>(1.0 / (sigma * sigma));
|
||||
v.push_back(m);
|
||||
}
|
||||
}
|
||||
@@ -295,6 +339,54 @@ TEST_CASE("ResolutionCutoff_CleanFallOff") {
|
||||
CHECK(*rc.d_cut == Catch::Approx(1.92).margin(0.15));
|
||||
}
|
||||
|
||||
// A sweep with a long stretch where the crystal barely diffracted: the reflections measured only there
|
||||
// are noise scaled up by 1/G, sigmas with them, and there are many of them at every resolution. Counted
|
||||
// by the information they carry they must not hide where the well-measured reflections stop.
|
||||
TEST_CASE("ResolutionCutoff_ScaledUpNoiseDoesNotHideTheFallOff") {
|
||||
Logger logger("test");
|
||||
std::mt19937 rng(12345);
|
||||
std::vector<MergedReflection> merged;
|
||||
AddBand(merged, rng, 0.01, 0.25, 480, true);
|
||||
AddBand(merged, rng, 0.25, 0.51, 520, false);
|
||||
AddBand(merged, rng, 0.01, 0.51, 300, false, 50.0);
|
||||
|
||||
const auto rc = ComputeCCHalfLogisticCutoff(merged, 0.30, logger);
|
||||
REQUIRE(rc.d_fit);
|
||||
CHECK(*rc.d_fit == Catch::Approx(2.0).margin(0.15));
|
||||
|
||||
// Counted as equals, the same reflections hide it: the curve reads noise from the first bin on.
|
||||
for (auto &m : merged) m.cc_weight = 1.0f;
|
||||
const auto unweighted = ComputeCCHalfLogisticCutoff(merged, 0.30, logger);
|
||||
CHECK((!unweighted.d_fit || *unweighted.d_fit > 3.0));
|
||||
}
|
||||
|
||||
// The frame factor of the CC1/2 weight is 1 on a sweep whose frames all sit at one scale, however that
|
||||
// scale is spread over the frames, and 1 for any frame brighter than typical.
|
||||
TEST_CASE("CCHalfFrameFactors_UniformScaleIsOne") {
|
||||
const auto f = CCHalfFrameFactors({1.7, 1.7, 1.7, 1.7}, {100, 3, 250, 0});
|
||||
for (double x : f) CHECK(x == 1.0);
|
||||
const auto g = CCHalfFrameFactors({1.0, 2.0}, {100, 100});
|
||||
CHECK(g[1] == 1.0);
|
||||
CHECK(g[0] == Catch::Approx(9.0 / 5.0 * 9.0 / 5.0)); // G_ref = (1 + 8) / (1 + 4)
|
||||
}
|
||||
|
||||
// Most of the sweep at 2% of the good frames' scale: the typical scale is still the good frames', not
|
||||
// the run median, and an observation from a dead frame carries 2500x the variance of a good one.
|
||||
TEST_CASE("CCHalfFrameFactors_DeadStretchDoesNotSetTheTypicalScale") {
|
||||
std::vector<double> scale;
|
||||
std::vector<int64_t> n;
|
||||
for (int f = 0; f < 100; ++f) {
|
||||
scale.push_back(f < 60 ? 0.02 : 1.0);
|
||||
n.push_back(50);
|
||||
}
|
||||
scale.push_back(NAN); // a frame without a scale counts as G = 1
|
||||
n.push_back(50);
|
||||
const auto factor = CCHalfFrameFactors(scale, n);
|
||||
CHECK(factor[0] == Catch::Approx(2500.0).epsilon(0.01));
|
||||
CHECK(factor[99] == Catch::Approx(1.0).epsilon(1e-3));
|
||||
CHECK(factor[100] == Catch::Approx(1.0).epsilon(1e-3));
|
||||
}
|
||||
|
||||
// A fall-off region a logistic cannot follow: CC1/2 drops through the target and comes straight back
|
||||
// up. The fitted crossing is then an extrapolation far past the bins it was made over, and reading
|
||||
// the cut off it writes the data deep into the noise; the crossing the bins themselves show is where
|
||||
|
||||
Reference in new issue
Block a user