The live merge's per-image merged vector (rotation: the rugnux run's MergeStatistics::image_merged; stills: the final StillsLiveMerge) is put into the receiver plots as the new plot type image_merged and into the end message, so the broker's master file carries imageMerged and jfjoch_viewer on a broker fills its image list's Merged column and filter through /preview/plot (empty, so N/A, until the merge is made, and on an older broker). Frontend client and Redoc regenerated; the C++ model is unchanged (plot_type is a query parameter). The frontend plot menu has a "Merged" entry. --mode scale re-reads the imageIndexed of its input files, so the report's IMAGES_INDEXED and the indexed column of _plot.txt are filled (absent / nan for a file without it). The summary line names a lattice count only where one was counted. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01HVeDQrPqZ52Tp6rzzZGxf3
160 lines
4.8 KiB
C++
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});
|
|
}
|