Files
Jungfraujoch/tests/JFJochReceiverPlotsTest.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

160 lines
4.8 KiB
C++

// SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
// SPDX-License-Identifier: GPL-3.0-only
#include <catch2/catch_all.hpp>
#include "../common/JFJochReceiverPlots.h"
TEST_CASE("JFJochReceiverPlots") {
DiffractionExperiment experiment;
experiment.Goniometer(GoniometerAxis("omega", 15, 2, Coord(0,1,0), {}));
PixelMask mask(experiment);
AzimuthalIntegrationMapping integration(experiment, mask);
JFJochReceiverPlots plots;
plots.Setup(experiment, integration);
DataMessage msg_0 {
.number = 0,
.error_pixel_count = 11
};
DataMessage msg_1 {
.number = 2,
.error_pixel_count = 12
};
plots.Add(msg_0, AzimuthalIntegrationProfile(integration));
plots.Add(msg_1, AzimuthalIntegrationProfile(integration));
auto p = plots.GetPlots(PlotRequest{
.type = PlotType::ErrorPixels,
.binning = 0,
.experimental_coord = false
});
REQUIRE(p.GetUnits() == MultiLinePlotUnits::ImageNumber);
REQUIRE(p.GetPlots().size() == 1);
REQUIRE(p.GetPlots()[0].x.size() == 2);
REQUIRE(p.GetPlots()[0].y.size() == 2);
REQUIRE(p.GetPlots()[0].z.empty());
REQUIRE(p.GetPlots()[0].x[0] == 0);
REQUIRE(p.GetPlots()[0].x[1] == 2);
REQUIRE(p.GetPlots()[0].y[0] == 11);
REQUIRE(p.GetPlots()[0].y[1] == 12);
}
TEST_CASE("JFJochReceiverPlots_Angle") {
DiffractionExperiment experiment;
experiment.Goniometer(GoniometerAxis("omega", 15, 2, Coord(0,1,0), {}));
PixelMask mask(experiment);
AzimuthalIntegrationMapping integration(experiment, mask);
JFJochReceiverPlots plots;
plots.Setup(experiment, integration);
DataMessage msg_0 {
.number = 0,
.error_pixel_count = 11
};
DataMessage msg_1 {
.number = 2,
.error_pixel_count = 12
};
plots.Add(msg_0, AzimuthalIntegrationProfile(integration));
plots.Add(msg_1, AzimuthalIntegrationProfile(integration));
auto p = plots.GetPlots(PlotRequest{
.type = PlotType::ErrorPixels,
.binning = 0,
.experimental_coord = true
});
REQUIRE(p.GetUnits() == MultiLinePlotUnits::Angle_deg);
REQUIRE(p.GetPlots().size() == 1);
REQUIRE(p.GetPlots()[0].x.size() == 2);
REQUIRE(p.GetPlots()[0].y.size() == 2);
REQUIRE(p.GetPlots()[0].z.empty());
REQUIRE(p.GetPlots()[0].x[0] == 15.0);
REQUIRE(p.GetPlots()[0].x[1] == 15.0 + 2.0 * 2);
REQUIRE(p.GetPlots()[0].y[0] == 11);
REQUIRE(p.GetPlots()[0].y[1] == 12);
}
TEST_CASE("JFJochReceiverPlots_Grid") {
DatasetSettings dataset;
dataset.GridScan(GridScanSettings(5, 10, 20, false, false));
dataset.ImagesPerTrigger(12);
DiffractionExperiment experiment;
experiment.ImportDatasetSettings(dataset);
PixelMask mask(experiment);
AzimuthalIntegrationMapping integration(experiment, mask);
JFJochReceiverPlots plots;
plots.Setup(experiment, integration);
DataMessage msg_0 {
.number = 0,
.error_pixel_count = 11
};
DataMessage msg_1 {
.number = 2,
.error_pixel_count = 12
};
DataMessage msg_3 {
.number = 11,
.error_pixel_count = 8
};
plots.Add(msg_0, AzimuthalIntegrationProfile(integration));
plots.Add(msg_1, AzimuthalIntegrationProfile(integration));
plots.Add(msg_3, AzimuthalIntegrationProfile(integration));
auto p = plots.GetPlots(PlotRequest{
.type = PlotType::ErrorPixels,
.binning = 0,
.experimental_coord = true
});
REQUIRE(p.GetUnits() == MultiLinePlotUnits::Grid_um);
REQUIRE(p.GetPlots().size() == 1);
REQUIRE(p.GetPlots()[0].x.size() == 3);
REQUIRE(p.GetPlots()[0].y.size() == 3);
REQUIRE(p.GetPlots()[0].z.size() == 3);
REQUIRE(p.GetPlots()[0].x[0] == 0.5 * 10.0);
REQUIRE(p.GetPlots()[0].x[1] == 2.5 * 10.0);
REQUIRE(p.GetPlots()[0].x[2] == 1.5 * 10.0);
REQUIRE(p.GetPlots()[0].y[0] == 0.5 * 20.0);
REQUIRE(p.GetPlots()[0].y[1] == 0.5 * 20.0);
REQUIRE(p.GetPlots()[0].y[2] == 2.5 * 20.0);
REQUIRE(p.GetPlots()[0].z[0] == 11);
REQUIRE(p.GetPlots()[0].z[1] == 12);
REQUIRE(p.GetPlots()[0].z[2] == 8);
REQUIRE(p.GetSizeX() == 10.0 * 5);
REQUIRE(p.GetSizeY() == 20.0 * 3);
}
TEST_CASE("JFJochReceiverPlots_ImageMerged") {
DiffractionExperiment experiment;
PixelMask mask(experiment);
AzimuthalIntegrationMapping integration(experiment, mask);
JFJochReceiverPlots plots;
plots.Setup(experiment, integration);
// Nothing merged yet: no plot, rather than a run of zeros.
std::vector<float> v;
plots.GetPlotRaw(v, PlotType::ImageMerged, "");
CHECK(v.empty());
plots.SetImageMerged({1, 0, 1});
plots.GetPlotRaw(v, PlotType::ImageMerged, "");
CHECK(v == std::vector<float>{1.0f, 0.0f, 1.0f});
}