Build Packages / Unit tests (push) Successful in 1h22m15s
Build Packages / build:windows:nocuda (push) Successful in 18m0s
Build Packages / build:windows:cuda (push) Successful in 20m30s
Build Packages / build:viewer-tgz:cpu (push) Successful in 10m32s
Build Packages / build:viewer-tgz:cuda (push) Successful in 11m39s
Build Packages / build:rugnux-tgz (x86_64) (push) Successful in 8m55s
Build Packages / build:rugnux:windows (push) Successful in 11m25s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 20m6s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 16m27s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 20m19s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 15m34s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 20m25s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 19m36s
Build Packages / build:rpm (rocky8) (push) Successful in 17m43s
Build Packages / build:rpm (rocky9) (push) Successful in 13m34s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 21m28s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 18m19s
Build Packages / DIALS test (push) Successful in 12m36s
Build Packages / XDS test (durin plugin) (push) Successful in 6m56s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 6m48s
Build Packages / XDS test (neggia plugin) (push) Successful in 6m7s
Build Packages / Generate python client (push) Successful in 11s
Build Packages / Build documentation (push) Successful in 36s
Build Packages / Create release (push) Skipped
Build Packages / build:rugnux:aarch64 (cross) (push) Successful in 5m11s
* `rugnux --mode calibration` writes `<prefix>.json` beside the `.poni`, whose `dataset_settings` member is a `jfjoch_broker` `dataset_settings` body as it stands. * `rugnux` and `jfjoch_viewer` read PILATUS miniCBF sweeps natively, without conversion. * Masters written by other facilities open, including Eiger 1.x and third-party NXmx variants. * `rugnux` measures the beam centre on every run, and indexes with it when the file's value indexes nothing. * A detector swung out on a 2theta arm is placed where the file says it stands, and the calibration can hold the tilt fixed. * `rugnux` writes the unmerged MTZ by default, and a P1 merge beside it, so a wrong space group can be re-merged without reprocessing. * Significant improvements to symmetry handling in `rugnux`: the lattice, the point group, the setting and the systematic absences. * The `rugnux` report gives the resolution the CC1/2 fit reached, beside the range the reflections were written to. * The `rugnux` report gives the twinning statistics measured before the space group was decided, beside the ones measured after. * The `rugnux` report gives the strong-direction diffraction limit, and warns when CC1/2 is not monotone with resolution. * `rugnux` ranks screw axes on the evidence their absences carry, rather than on how many control reflections a candidate happens to have. * Twinning is no longer reported when the L-test contradicts it. * The `rugnux` report gives the detector tilt, the measured tilt and the direct beam beside the beam centre, and a post-refined beam centre is judged against the run's own measurement rather than the file's. * `--no-refine-tilt` holds the detector tilt at the value in the file, instead of zeroing it, when the calibration starts from the spots. * The `jfjoch_viewer` grid scan view draws the cells in the proportion of the scan steps, so the map has the shape of the scanned area. Reviewed-on: #76 Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
155 lines
6.0 KiB
C++
155 lines
6.0 KiB
C++
// SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#include <catch2/catch_all.hpp>
|
|
#include "../image_analysis/spot_finding/StrongPixelSet.h"
|
|
|
|
TEST_CASE("DiffractionSpot_AddOperator","[StrongPixelSet]") {
|
|
DiffractionSpot spot1(4,1,10), spot2(3,4,5);
|
|
|
|
spot1 += spot2;
|
|
|
|
// Spot2 is not changed
|
|
REQUIRE(spot2.Count() == 5);
|
|
|
|
REQUIRE(spot1.Count() == 15);
|
|
REQUIRE(spot1.RawCoord().x == Catch::Approx((4*10+3*5)/15.0));
|
|
REQUIRE(spot1.RawCoord().y == Catch::Approx((1*10+4*5)/15.0));
|
|
REQUIRE(spot1.MaxCount() == 10);
|
|
REQUIRE(spot1.PixelCount() == 2);
|
|
}
|
|
|
|
TEST_CASE("StrongPixelSet_BuildSpots","[StrongPixelSet]") {
|
|
DiffractionExperiment experiment(DetJF(1,1,0,0,false));
|
|
experiment.Raw();
|
|
|
|
SpotFindingSettings settings;
|
|
settings.low_resolution_limit = 200.0;
|
|
settings.high_resolution_limit = 0.5;
|
|
settings.min_pix_per_spot = 3;
|
|
settings.max_pix_per_spot = 200;
|
|
|
|
// In raster order, which is what AddStrongPixel requires and what both callers produce.
|
|
std::vector<DiffractionSpot> spots;
|
|
StrongPixelSet strong_pixel_set;
|
|
for (uint16_t line = 104; line <= 106; line++)
|
|
for (uint16_t col = 6; col <= 8; col++)
|
|
strong_pixel_set.AddStrongPixel(col, line);
|
|
strong_pixel_set.FindSpots(experiment, settings, spots, 0);
|
|
REQUIRE(spots.size() == 1);
|
|
|
|
REQUIRE(spots[0].Count() == 9.0f);
|
|
REQUIRE(spots[0].PixelCount() == 9);
|
|
REQUIRE(spots[0].RawCoord().x == Catch::Approx(7.0));
|
|
REQUIRE(spots[0].RawCoord().y == Catch::Approx(105.0));
|
|
}
|
|
|
|
TEST_CASE("StrongPixelSet_LargeSpotMustBeCompact","[StrongPixelSet]") {
|
|
SpotFindingSettings settings; // max_pix_per_spot 200, so all three pass on size alone
|
|
|
|
// A filled 9x9 square: 81 pixels in a 9-wide box, so it fills all of it. A Bragg reflection is
|
|
// this shape however bright it is, and this is what a raised size bound is meant to admit.
|
|
StrongPixelSet square;
|
|
for (uint16_t line = 100; line < 109; line++)
|
|
for (uint16_t col = 200; col < 209; col++)
|
|
square.AddStrongPixel(col, line);
|
|
std::vector<DiffractionSpot> spots;
|
|
square.FindComponentsImage(settings, spots);
|
|
REQUIRE(spots.size() == 1);
|
|
CHECK(spots[0].PixelCount() == 81);
|
|
|
|
// The same 81 pixels drawn as a line: an ice arc, a cosmic-ray track or a lit detector row. It
|
|
// fills 1/81 of its bounding square, so it is refused however many pixels it has.
|
|
StrongPixelSet streak;
|
|
for (uint16_t col = 200; col < 281; col++)
|
|
streak.AddStrongPixel(col, 100);
|
|
spots.clear();
|
|
streak.FindComponentsImage(settings, spots);
|
|
CHECK(spots.empty());
|
|
|
|
// Shape is asked of large components only. A short line of the same one-pixel width is below
|
|
// SPOT_SHAPE_FREE_PIXELS and is kept, exactly as it was before the bound was raised.
|
|
StrongPixelSet short_streak;
|
|
for (uint16_t col = 200; col < 210; col++)
|
|
short_streak.AddStrongPixel(col, 100);
|
|
spots.clear();
|
|
short_streak.FindComponentsImage(settings, spots);
|
|
REQUIRE(spots.size() == 1);
|
|
CHECK(spots[0].PixelCount() == 10);
|
|
}
|
|
|
|
/*
|
|
TEST_CASE("StrongPixelSet_ReadFPGAOutput_1","[StrongPixelSet]") {
|
|
DiffractionExperiment experiment(DetectorGeometry(8, 2, 8, 36, true));
|
|
experiment.BeamX_pxl(1000).BeamY_pxl(1000).DetectorDistance_mm(100).PhotonEnergy_keV(WVL_1A_IN_KEV);
|
|
|
|
StrongPixelSet strong_pixel_set(experiment);
|
|
|
|
DeviceOutput output{};
|
|
for (auto &i: output.spot_finding_result.strong_pixel)
|
|
i = 0;
|
|
output.pixels[0] = 7;
|
|
output.pixels[1] = 7;
|
|
output.pixels[1024] = 7;
|
|
output.pixels[1025] = 7;
|
|
output.pixels[7] = 345;
|
|
|
|
// Pixels 0, 1, 7, 1024 and 1025 will be enabled
|
|
output.spot_finding_result.strong_pixel[0] = (1U<<0) | (1U<<1) | (1U<<7);
|
|
output.spot_finding_result.strong_pixel[RAW_MODULE_COLS/8] = (1<<0) | (1<<1);
|
|
output.spot_finding_result.strong_pixel_count = 5;
|
|
|
|
strong_pixel_set.ReadFPGAOutput(output);
|
|
REQUIRE(strong_pixel_set.GetStrongPixelCount() == 5);
|
|
SpotFindingSettings settings{
|
|
.min_pix_per_spot = 2,
|
|
.max_pix_per_spot = 55,
|
|
.high_resolution_limit = 1.0,
|
|
.low_resolution_limit = 50.0
|
|
};
|
|
std::vector<DiffractionSpot> spots;
|
|
strong_pixel_set.FindSpots(experiment, settings, spots, 2);
|
|
CHECK(spots.size() == 1);
|
|
REQUIRE(spots[0].RawCoord().x == Approx(0.5));
|
|
REQUIRE(spots[0].RawCoord().y == Approx(CONVERTED_MODULE_LINES * 3 + 36 * 2 - 1 - 0.5));
|
|
REQUIRE(spots[0].PixelCount() == 4);
|
|
REQUIRE(spots[0].MaxCount() == 7);
|
|
}
|
|
|
|
TEST_CASE("StrongPixelSet_ReadFPGAOutput_2","[StrongPixelSet]") {
|
|
DiffractionExperiment experiment(DetectorGeometry(8, 2, 8, 36, true));
|
|
experiment.BeamX_pxl(1000).BeamY_pxl(1000).DetectorDistance_mm(100).PhotonEnergy_keV(WVL_1A_IN_KEV);
|
|
|
|
StrongPixelSet strong_pixel_set(experiment);
|
|
|
|
DeviceOutput output{};
|
|
for (auto &i: output.spot_finding_result.strong_pixel)
|
|
i = 0;
|
|
output.pixels[0] = 7;
|
|
output.pixels[1] = 7;
|
|
output.pixels[1024] = 7;
|
|
output.pixels[1025] = 7;
|
|
output.pixels[7] = 345;
|
|
|
|
// Pixels 0, 1, 7, 1024 and 1025 will be enabled
|
|
output.spot_finding_result.strong_pixel[0] = (1U<<0) | (1U<<1) | (1U<<7);
|
|
output.spot_finding_result.strong_pixel[RAW_MODULE_COLS/8] = (1<<0) | (1<<1);
|
|
output.spot_finding_result.strong_pixel_count = 5;
|
|
|
|
strong_pixel_set.ReadFPGAOutput(output);
|
|
REQUIRE(strong_pixel_set.GetStrongPixelCount() == 5);
|
|
SpotFindingSettings settings{
|
|
.min_pix_per_spot = 1,
|
|
.max_pix_per_spot = 3,
|
|
.high_resolution_limit = 1.0,
|
|
.low_resolution_limit = 50.0
|
|
};
|
|
std::vector<DiffractionSpot> spots;
|
|
strong_pixel_set.FindSpots(experiment, settings, spots, 2);
|
|
CHECK(spots.size() == 1);
|
|
REQUIRE(spots[0].RawCoord().x == Approx(7));
|
|
REQUIRE(spots[0].RawCoord().y == Approx(CONVERTED_MODULE_LINES * 3 + 36 * 2 - 1));
|
|
REQUIRE(spots[0].PixelCount() == 1);
|
|
REQUIRE(spots[0].MaxCount() == 345);
|
|
} */
|