75e401f0e5
Build Packages / Unit tests (push) Successful in 1h31m59s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 8m43s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 10m5s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 9m27s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 8m56s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 9m24s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 10m27s
Build Packages / build:rpm (rocky8) (push) Successful in 9m20s
Build Packages / build:rpm (rocky9) (push) Successful in 10m50s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 9m54s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 8m38s
Build Packages / DIALS test (push) Successful in 12m13s
Build Packages / XDS test (durin plugin) (push) Successful in 7m8s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 7m8s
Build Packages / XDS test (neggia plugin) (push) Successful in 7m50s
Build Packages / Generate python client (push) Successful in 16s
Build Packages / Build documentation (push) Successful in 50s
Build Packages / Create release (push) Skipped
This is an UNSTABLE release. It includes many experimental features, as well as many AI generated fixes. We recommend using rc.152 for production use. * jfjoch_broker: Add EXPERIMENTAL pixelrefine mode for image processing * jfjoch_broker: Allow to load user mask from 8-bit and 16-bit TIFF files * jfjoch_broker: Add ROI calculation in non-FPGA workflow * jfjoch_broker: Fixes to TCP image pusher * jfjoch_broker: Remove NUMA bindings * jfjoch_broker: Improvements to indexing * jfjoch_broker: For PSI EIGER, trimming energies are taken from the detector configuration (now compulsory) instead of hardcoded values * jfjoch_writer: Save ROI definitions and the per-pixel ROI bitmap in the master file; azimuthal ROIs support phi (angular) sectors * jfjoch_viewer: Major redesign with dockable panels and saved layouts, plus on-canvas creation/move/resize of box, circle and azimuthal ROIs * jfjoch_viewer: Run jfjoch_process reprocessing jobs from inside the GUI and overlay per-run results Reviewed-on: #63
143 lines
4.3 KiB
C++
143 lines
4.3 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);
|
|
} |