Build Packages / Create release (push) Successful in 24s
Build Packages / build:viewer:macos-arm64:nocuda (push) Successful in 3m29s
Build Packages / build:rugnux:macos-arm64:nocuda (push) Successful in 2m43s
Build Packages / build:rugnux:linux-aarch64:cuda (push) Successful in 8m27s
Build Packages / build:rugnux:linux-x86_64:cuda (push) Successful in 9m53s
Build Packages / build:viewer:linux-x86_64:nocuda (push) Successful in 9m58s
Build Packages / build:viewer:linux-x86_64:cuda (push) Successful in 11m22s
Build Packages / build:jfjoch:rocky8:nocuda (push) Successful in 13m39s
Build Packages / build:viewer:windows-x86_64:nocuda (push) Successful in 18m37s
Build Packages / build:jfjoch:rocky9:nocuda (push) Successful in 16m32s
Build Packages / build:viewer:windows-x86_64:cuda (push) Successful in 24m11s
Build Packages / HDF5 consumer tests (DIALS, XDS) (push) Successful in 25m30s
Build Packages / build:jfjoch:ubuntu2404:nocuda (push) Successful in 19m3s
Build Packages / build:jfjoch:ubuntu2204:nocuda (push) Successful in 20m23s
Build Packages / build:jfjoch:rocky8:cuda-sls9 (push) Successful in 19m41s
Build Packages / Generate python client (push) Successful in 50s
Build Packages / Build documentation (push) Successful in 1m16s
Build Packages / build:jfjoch:rocky9:cuda-sls9 (push) Successful in 21m0s
Build Packages / build:jfjoch:rocky8:cuda (push) Successful in 18m38s
Build Packages / build:rugnux:windows-x86_64:cuda (push) Successful in 14m33s
Build Packages / build:jfjoch:rocky9:cuda (push) Successful in 17m55s
Build Packages / build:jfjoch:ubuntu2204:cuda (push) Successful in 20m50s
Build Packages / build:jfjoch:ubuntu2404:cuda (push) Successful in 18m38s
Build Packages / Unit tests (push) Successful in 1h46m14s
* jfjoch_broker: Optional per-dataset authentication - statistics, images and plots can require a bearer token, which jfjoch_viewer supports. * jfjoch_viewer: Dark mode and a theme-matched colour scheme, a magnifier panel, and simpler contrast and background controls. * Rugnux: Multiple performance improvements on GPU and CPU (CPU-only processing up to 40% faster, faster image decoding on ARM), with unchanged results. * Rugnux: `--model` rigid-body refinement runs on the GPU, and the model-validation check is faster and more reliable. * Rugnux: Improved scaling and merging - error model, outlier rejection, absorption correction and French-Wilson amplitudes now agree more closely with XDS and ctruncate. * Rugnux: Improved integration - radial background on powder and ice rings, crowded rotation data keep their reflections, and CPU-only builds integrate large unit cells as GPU builds do. * Rugnux: More robust detector geometry - measured beam centre, X-ray bandwidth and goniometer rate, and geometry refinement accepted only on significant evidence. * Rugnux: Merged files are written in the standard setting, or in the setting of a reference MTZ, structure-factor mmCIF or model, with its free-R flags. * Rugnux: Richer report - ice and powder rings, further lattices, superstructure candidates and mosaicity, with warnings worded as prompts to check. * Rugnux: Clear error messages when a data set needs more GPU or host memory than is available. Reviewed-on: #83 Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
188 lines
5.7 KiB
C++
188 lines
5.7 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 "../image_analysis/spot_finding/ImageSpotFinderCPU.h"
|
|
|
|
TEST_CASE("ImageSpotFinderCPU_SignalToNoise", "[portable]") {
|
|
size_t width = 100;
|
|
size_t height = 100;
|
|
|
|
ImageSpotFinderCPU s(width, height);
|
|
ImagePreprocessorBuffer buffer(width * height);
|
|
|
|
auto &input = buffer.getBuffer();
|
|
for (int i = 0; i < width * height; i++)
|
|
input[i] = (i % 2) * 5 + 5;
|
|
|
|
input[width * 50 + 50] = 20;
|
|
input[width * 25 + 26] = 16;
|
|
input[width * 75 + 25] = 12;
|
|
|
|
// Mean is 7.5, std. dev is 2.5
|
|
SpotFindingSettings settings{
|
|
.signal_to_noise_threshold = 3.0,
|
|
.photon_count_threshold = 0,
|
|
.min_pix_per_spot = 1,
|
|
.max_pix_per_spot = 20,
|
|
.high_resolution_limit = 0.5,
|
|
.low_resolution_limit = 3.0,
|
|
};
|
|
|
|
std::vector<bool> mask_resolution(width * height, false);
|
|
s.SetResolutionMask(mask_resolution);
|
|
auto spots = s.Run(buffer, settings);
|
|
|
|
REQUIRE(spots.size() == 2);
|
|
REQUIRE(spots[0].RawCoord().y == 25);
|
|
REQUIRE(spots[1].RawCoord().y == 50);
|
|
}
|
|
|
|
TEST_CASE("ImageSpotFinderCPU_SignalToNoise_Resolution") {
|
|
size_t width = 100;
|
|
size_t height = 100;
|
|
|
|
ImageSpotFinderCPU s(width, height);
|
|
|
|
ImagePreprocessorBuffer buffer(width * height);
|
|
auto &input = buffer.getBuffer();
|
|
for (int i = 0; i < width * height; i++)
|
|
input[i] = (i % 2) * 5 + 5;
|
|
|
|
input[width * 50 + 50] = 20;
|
|
input[width * 25 + 26] = 16;
|
|
input[width * 75 + 25] = 12;
|
|
|
|
// Mean is 7.5, std. dev is 2.5
|
|
SpotFindingSettings settings{
|
|
.signal_to_noise_threshold = 3.0,
|
|
.photon_count_threshold = 0,
|
|
.min_pix_per_spot = 1,
|
|
.max_pix_per_spot = 20,
|
|
.high_resolution_limit = 1.5,
|
|
.low_resolution_limit = 3.0,
|
|
};
|
|
|
|
std::vector<bool> mask_resolution(width * height, false);
|
|
mask_resolution[width * 50 + 50] = true;
|
|
s.SetResolutionMask(mask_resolution);
|
|
auto spots = s.Run(buffer, settings);
|
|
|
|
REQUIRE(spots.size() == 1);
|
|
REQUIRE(spots[0].RawCoord().x == 26);
|
|
REQUIRE(spots[0].RawCoord().y == 25);
|
|
}
|
|
|
|
TEST_CASE("ImageSpotFinderCPU_CountThreshold_Resolution") {
|
|
size_t width = 100;
|
|
size_t height = 100;
|
|
|
|
ImageSpotFinderCPU s(width, height);
|
|
|
|
ImagePreprocessorBuffer buffer(width * height);
|
|
auto &input = buffer.getBuffer();
|
|
for (int i = 0; i < width * height; i++)
|
|
input[i] = (i % 2) * 5 + 5;
|
|
|
|
input[width * 50 + 50] = 20;
|
|
input[width * 25 + 26] = 16;
|
|
input[width * 75 + 25] = 12;
|
|
|
|
// Mean is 7.5, std. dev is 2.5
|
|
SpotFindingSettings settings{
|
|
.signal_to_noise_threshold = -1,
|
|
.photon_count_threshold = 11,
|
|
.min_pix_per_spot = 1,
|
|
.max_pix_per_spot = 20,
|
|
.high_resolution_limit = 1.5,
|
|
.low_resolution_limit = 3.0,
|
|
};
|
|
|
|
std::vector<bool> mask_resolution(width * height, false);
|
|
mask_resolution[width * 50 + 50] = true;
|
|
s.SetResolutionMask(mask_resolution);
|
|
auto spots = s.Run(buffer, settings);
|
|
|
|
REQUIRE(spots.size() == 2);
|
|
REQUIRE(spots[0].RawCoord().y == 25);
|
|
REQUIRE(spots[1].RawCoord().y == 75);
|
|
}
|
|
|
|
TEST_CASE("ImageSpotFinderCPU_CountThreshold_Mask", "[portable]") {
|
|
size_t width = 100;
|
|
size_t height = 100;
|
|
|
|
ImageSpotFinderCPU s( width, height);
|
|
|
|
ImagePreprocessorBuffer buffer(width * height);
|
|
auto &input = buffer.getBuffer();
|
|
for (int i = 0; i < width * height; i++)
|
|
input[i] = (i % 2) * 5 + 5;
|
|
|
|
input[width * 50 + 50] = INT32_MIN;
|
|
input[width * 50 + 51] = INT32_MAX;
|
|
input[width * 25 + 26] = 16;
|
|
input[width * 75 + 25] = 12;
|
|
|
|
// Mean is 7.5, std. dev is 2.5
|
|
SpotFindingSettings settings{
|
|
.signal_to_noise_threshold = -1,
|
|
.photon_count_threshold = 11,
|
|
.min_pix_per_spot = 1,
|
|
.max_pix_per_spot = 20,
|
|
.high_resolution_limit = 1.5,
|
|
.low_resolution_limit = 3.0,
|
|
};
|
|
|
|
std::vector<bool> mask_resolution(width * height, false);
|
|
s.SetResolutionMask(mask_resolution);
|
|
auto spots = s.Run(buffer, settings);
|
|
|
|
REQUIRE(spots.size() == 3);
|
|
REQUIRE(spots[0].RawCoord().x == 26);
|
|
REQUIRE(spots[0].RawCoord().y == 25);
|
|
REQUIRE(spots[1].RawCoord().x == 51);
|
|
REQUIRE(spots[1].RawCoord().y == 50);
|
|
REQUIRE(spots[2].RawCoord().x == 25);
|
|
REQUIRE(spots[2].RawCoord().y == 75);
|
|
}
|
|
|
|
TEST_CASE("ImageSpotFinderCPU_SignalToNoise_Mask") {
|
|
size_t width = 100;
|
|
size_t height = 100;
|
|
ImageSpotFinderCPU s(width, height);
|
|
|
|
ImagePreprocessorBuffer buffer(width * height);
|
|
auto &input = buffer.getBuffer();
|
|
for (int i = 0; i < width * height; i++)
|
|
input[i] = (i % 2) * 5 + 5;
|
|
|
|
input[width * 25 + 25] = INT32_MIN;
|
|
input[width * 25 + 26] = 16;
|
|
input[width * 74 + 25] = INT32_MIN;
|
|
input[width * 74 + 26] = INT32_MIN;
|
|
input[width * 75 + 25] = 15;
|
|
input[width * 76 + 27] = INT32_MAX;
|
|
|
|
// Mean is 7.5, std. dev is 2.5
|
|
SpotFindingSettings settings{
|
|
.signal_to_noise_threshold = 3.0,
|
|
.photon_count_threshold = 0,
|
|
.min_pix_per_spot = 1,
|
|
.max_pix_per_spot = 20,
|
|
.high_resolution_limit = 1.5,
|
|
.low_resolution_limit = 3.0,
|
|
};
|
|
|
|
std::vector<bool> mask_resolution(width * height, false);
|
|
s.SetResolutionMask(mask_resolution);
|
|
auto spots = s.Run(buffer, settings);
|
|
|
|
REQUIRE(spots.size() == 3);
|
|
REQUIRE(spots[0].RawCoord().x == 26);
|
|
REQUIRE(spots[0].RawCoord().y == 25);
|
|
REQUIRE(spots[1].RawCoord().x == 25);
|
|
REQUIRE(spots[1].RawCoord().y == 75);
|
|
REQUIRE(spots[2].RawCoord().x == 27);
|
|
REQUIRE(spots[2].RawCoord().y == 76);
|
|
} |