Files
Jungfraujoch/tests/RugnuxScaleInputsTest.cpp
leonarski_f 4809c1622c
Build Packages / build:portable:linux-x86_64:nocuda (push) Successful in 16m43s
Build Packages / build:jfjoch:ubuntu2404:nocuda (push) Successful in 28m46s
Build Packages / build:jfjoch:rocky8:cuda-sls9 (push) Successful in 32m5s
Build Packages / build:jfjoch:rocky9:cuda (push) Successful in 39m44s
Build Packages / build:portable:macos-arm64:nocuda (push) Successful in 5m7s
Build Packages / Create release (push) Successful in 8s
Build Packages / Build documentation (push) Successful in 49s
Build Packages / build:portable:linux-x86_64:cuda (push) Successful in 22m30s
Build Packages / build:jfjoch:rocky8:nocuda (push) Successful in 31m54s
Build Packages / build:rugnux:linux-aarch64:cuda (push) Successful in 11m29s
Build Packages / build:portable:windows-x86_64:nocuda (push) Successful in 23m51s
Build Packages / build:jfjoch:ubuntu2204:nocuda (push) Successful in 26m7s
Build Packages / build:jfjoch:ubuntu2204:cuda (push) Successful in 29m38s
Build Packages / build:portable:windows-x86_64:cuda (push) Successful in 28m6s
Build Packages / HDF5 consumer tests (DIALS, XDS) (push) Successful in 29m44s
Build Packages / build:jfjoch:rocky9:nocuda (push) Successful in 33m22s
Build Packages / Generate python client (push) Successful in 47s
Build Packages / build:jfjoch:rocky9:cuda-sls9 (push) Successful in 34m6s
Build Packages / Unit tests (push) Successful in 1h2m47s
Build Packages / build:jfjoch:rocky8:cuda (push) Successful in 35m59s
Build Packages / build:jfjoch:ubuntu2404:cuda (push) Successful in 34m8s
Build Packages / Validation Battery (push) Successful in 38m31s
v1.0.0-rc.187 (#98)
* Rugnux: Refinement several times faster, one protocol on the CPU and the GPU, parts of it on the Apple GPU; its random draws are the same on every platform.
* Rugnux: Refinement follows common practice: the free set decides only the restraint weights and the displacement model (isotropic, TLS or anisotropic, by Hamilton's test), everything else is decided on the working set; lower R-free for placed and predicted models.
* Rugnux: Restraint dictionaries via `--restraints` (or among the inputs) and more built-in ligands; a model whose space group is a subgroup of the data's is refined in its own group; reflections plus a model select `--mode refine` on their own.
* Rugnux: `-C` fixes the crystal system on the axes as typed; `-S` alone fixes the space group only, the cell is still found and reduced; a space group or cell stored in the input file is ignored, with a line in the log.
* Rugnux: More reliable multi-sweep merging; `--mode scale` merges several stills runs as one; `_plot.txt` and the report name each input; a second crystal form is reported for stills given a cell.
* jfjoch_broker (experimental): Live Rugnux on FPGA detectors (JUNGFRAU) takes the same path as a DECTRIS stream, rotation and serial alike, model step included, with analysis threads per GPU; frames waiting for the analysis can be viewed; no host stage drops a frame - a source faster than the analysis is held at the card.
* jfjoch_broker: Summation of more than 256 frames per image is split between the card and the host (`summation_mode` is then `hybrid`), and live Rugnux runs on such collections; pedestal runs take a receiver of their own.
* jfjoch_broker (experimental): `stills_downsample` analyses 1 of every N serial images (chosen by a hash; the first 2000 all; the others written without analysis; reset to 1 by `/initialize`); `max_spot_count` left out means 250 for per-image indexing and up to 1000 for live stills; the live status gives the merge before the model work, the fitted resolution and the anomalous peak height of each unexplained blob.
* jfjoch_broker: Without a `pcie` entry the broker runs on a mock of the card instead of the HLS simulation; its spot, ROI and azimuthal results are zero then.
* Web frontend: Redesigned Rugnux live page; Vite 8, TypeScript 6, Mol* 5.13 and dependency security updates.
* Tools: `jfjoch_fpga_stills_test` measures live stills on the cards with a stored dataset; `jfjoch_fpga_test` loses the HLS-simulation option.
* Other: FFTW no longer fetched or linked (the CPU FFT indexer keeps the name `FFTW`); PCIe driver now GPL-2.0-or-later and third-party notices complete; several crash fixes.

Reviewed-on: #98
Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
2026-11-19 20:49:28 +01:00

93 lines
5.0 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 "../common/DiffractionExperiment.h"
#include "../rugnux/ResultReport.h"
#include "../rugnux/StillsLiveMerge.h"
namespace {
const UnitCell orthorhombic_uc{.a = 40.0f, .b = 60.0f, .c = 90.0f, .alpha = 90.0f, .beta = 90.0f, .gamma = 90.0f};
ScaleInput Still(const std::string &file, const UnitCell &cell, int space_group = 19) {
return ScaleInput{file, false, cell, space_group};
}
}
TEST_CASE("ScaleInputsRefusal_OneCrystal", "[RugnuxScale]") {
const IndexingSettings settings;
// The same cell, and the same lattice on permuted axes (the merge relabels those onto the first's).
const UnitCell permuted{.a = 60.0f, .b = 90.0f, .c = 40.0f, .alpha = 90.0f, .beta = 90.0f, .gamma = 90.0f};
const UnitCell refined{.a = 40.05f, .b = 59.95f, .c = 90.1f, .alpha = 90.0f, .beta = 90.0f, .gamma = 90.0f};
CHECK(ScaleInputsRefusal({Still("a", orthorhombic_uc), Still("b", refined), Still("c", permuted)}, false, false,
settings).empty());
}
TEST_CASE("ScaleInputsRefusal_CellsDisagree", "[RugnuxScale]") {
const IndexingSettings settings;
const UnitCell other{.a = 45.0f, .b = 60.0f, .c = 90.0f, .alpha = 90.0f, .beta = 90.0f, .gamma = 90.0f};
// An axis doubled: a lattice that contains the first, but is not it.
const UnitCell doubled{.a = 80.0f, .b = 60.0f, .c = 90.0f, .alpha = 90.0f, .beta = 90.0f, .gamma = 90.0f};
const auto refusal = ScaleInputsRefusal({Still("a", orthorhombic_uc), Still("b", other)}, false, false, settings);
CHECK(refusal.find("not one lattice") != std::string::npos);
CHECK(refusal.find("a=40.000 b=60.000 c=90.000") != std::string::npos);
CHECK(refusal.find("a=45.000 b=60.000 c=90.000") != std::string::npos);
CHECK(refusal.find("-C") != std::string::npos);
CHECK(!ScaleInputsRefusal({Still("a", orthorhombic_uc), Still("b", doubled)}, false, false, settings).empty());
// A cell given on the command line is what they are merged in.
CHECK(ScaleInputsRefusal({Still("a", orthorhombic_uc), Still("b", other)}, true, false, settings).empty());
// A file without a cell, unless one is given.
ScaleInput no_cell{"b", false, std::nullopt, 19};
CHECK(ScaleInputsRefusal({Still("a", orthorhombic_uc), no_cell}, false, false, settings).find("no unit cell")
!= std::string::npos);
CHECK(ScaleInputsRefusal({Still("a", orthorhombic_uc), no_cell}, true, false, settings).empty());
}
TEST_CASE("ScaleInputsRefusal_SpaceGroupsDisagree", "[RugnuxScale]") {
const IndexingSettings settings;
const auto refusal = ScaleInputsRefusal({Still("a", orthorhombic_uc, 19), Still("b", orthorhombic_uc, 16)},
false, false, settings);
CHECK(refusal.find("space group 19") != std::string::npos);
CHECK(refusal.find("-S") != std::string::npos);
CHECK(ScaleInputsRefusal({Still("a", orthorhombic_uc, 19), Still("b", orthorhombic_uc, 16)}, false, true,
settings).empty());
}
TEST_CASE("ScaleInputsRefusal_Rotation", "[RugnuxScale]") {
const IndexingSettings settings;
const ScaleInput sweep{"r", true, orthorhombic_uc, 19};
// Stills and a rotation sweep: refused, whatever is given.
const auto mixed = ScaleInputsRefusal({Still("a", orthorhombic_uc), sweep}, true, true, settings);
CHECK(mixed.find("r is a rotation sweep and a is stills") != std::string::npos);
// Several sweeps: refused, pointing to --mode mx.
const auto sweeps = ScaleInputsRefusal({sweep, sweep}, false, false, settings);
CHECK(sweeps.find("--mode mx") != std::string::npos);
}
TEST_CASE("AppendScaleInput_FramesStayDistinct", "[RugnuxScale]") {
std::vector<IntegrationOutcome> all(3);
all[1].reflections.push_back(Reflection{.image_number = 1.0f});
std::vector<IntegrationOutcome> more(2);
more[0].reflections.push_back(Reflection{.image_number = 0.0f});
more[1].reflections.push_back(Reflection{.image_number = 1.0f});
AppendScaleInput(all, std::move(more));
REQUIRE(all.size() == 5);
CHECK(all[1].reflections[0].image_number == 1.0f);
CHECK(all[3].reflections[0].image_number == 3.0f);
CHECK(all[4].reflections[0].image_number == 4.0f);
}
TEST_CASE("ScaleInputs_Report", "[RugnuxScale]") {
DiffractionExperiment x(DetJF(1));
ProcessResult result;
result.images_processed = 300;
result.scale_inputs = {{"run1_process.h5", 100, 90, 85}, {"run2_process.h5", 200, 150, 140}};
const std::string text = RenderResultReport("p", "run1_process.h5", x, result);
CHECK(text.find("\nINPUT_01= 100 90 85 5 run1_process.h5\n") != std::string::npos);
CHECK(text.find("\nINPUT_02= 200 150 140 10 run2_process.h5\n") != std::string::npos);
// One file: no rows.
result.scale_inputs.clear();
CHECK(RenderResultReport("p", "in.h5", x, result).find("INPUT_01") == std::string::npos);
}