c981e1b91c
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 10m7s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 10m35s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 11m8s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 9m24s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 11m29s
Build Packages / build:rpm (rocky8) (push) Successful in 10m27s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 11m41s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 11m1s
Build Packages / Generate python client (push) Successful in 45s
Build Packages / Unit tests (push) Has been skipped
Build Packages / Create release (push) Has been skipped
Build Packages / build:rpm (rocky9) (push) Successful in 12m48s
Build Packages / Build documentation (push) Successful in 1m3s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 12m10s
Build Packages / XDS test (durin plugin) (push) Successful in 8m59s
Build Packages / XDS test (neggia plugin) (push) Successful in 7m32s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 8m39s
Build Packages / DIALS test (push) Successful in 13m13s
This is an UNSTABLE release. The release has significant modifications and bug fixes, if things go wrong, it is better to revert to 1.0.0-rc.132. * jfjoch_broker: Better track time for each operation in the processing stack * jfjoch_broker: Rewrite preprocessing of diffraction images in the non-FPGA workflow to better use GPUs (work in progress) * jfjoch_broker: Remove ROI calculation in the non-FPGA workflow (work in progress) * jfjoch_viewer: Toolbar displays image number starting from 1 (instead of 0) Reviewed-on: #46
183 lines
5.5 KiB
C++
183 lines
5.5 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") {
|
|
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);
|
|
auto spots = s.Run(buffer, settings, mask_resolution);
|
|
|
|
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;
|
|
auto spots = s.Run(buffer, settings, mask_resolution);
|
|
|
|
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;
|
|
auto spots = s.Run(buffer, settings, mask_resolution);
|
|
|
|
REQUIRE(spots.size() == 2);
|
|
REQUIRE(spots[0].RawCoord().y == 25);
|
|
REQUIRE(spots[1].RawCoord().y == 75);
|
|
}
|
|
|
|
TEST_CASE("ImageSpotFinderCPU_CountThreshold_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 * 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);
|
|
auto spots = s.Run(buffer, settings, mask_resolution);
|
|
|
|
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);
|
|
auto spots = s.Run(buffer, settings, mask_resolution);
|
|
|
|
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);
|
|
} |