detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-05-14 13:35:35 +02:00
Code Issues Actions Packages Releases Activity

Merge branch 'developer' into dev/xilinx_power_cmd
Run Simulator Tests on local RHEL9 / build (push) Failing after 3m45s
Details
Build on RHEL8 docker image / build (push) Successful in 4m58s
Details
Build on RHEL9 docker image / build (push) Successful in 5m0s
Details
Run Simulator Tests on local RHEL8 / build (push) Failing after 5m24s
Details

Browse Source
This commit is contained in:
maliakal_d
2026-03-05 12:34:49 +01:00
parent 0c5a9ceafc 384b2480ab
commit b2cd043358
33 changed files with 266 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
slsDetectorSoftware/tests/Caller/test-Caller-rx.cpp
+80 -1
View File
@@ -540,6 +540,16 @@ TEST_CASE("rx_roi", "[.detectorintegration][.disable_check_data_file]") {
REQUIRE(oss.str() == "rx_roi [[5, 10], [" + stringMin + ", " +
stringMax + "]]\n");
// setting to only one port and verify individual roi
{
REQUIRE_NOTHROW(
caller.call("rx_roi", {"[5, 10, -1, -1]"}, -1, PUT));
std::ostringstream oss, oss1;
REQUIRE_NOTHROW(caller.call("rx_roi", {}, 0, GET, oss));
REQUIRE_NOTHROW(caller.call("rx_roi", {}, 1, GET, oss1));
REQUIRE(oss.str() == "rx_roi [[5, 10]]\n");
REQUIRE(oss1.str() == "rx_roi [[0, 0]]\n");
}
// verify individual roi
{
stringMin = std::to_string(moduleSize.x - 50);
@@ -643,6 +653,38 @@ TEST_CASE("rx_roi", "[.detectorintegration][.disable_check_data_file]") {
REQUIRE(oss.str() == "rx_roi [[5, 10, 20, 30], [" + stringMin +
", " + stringMax + ", 20, 30]]\n");
// setting to only one port and verify individual roi
{
REQUIRE_NOTHROW(
caller.call("rx_roi", {"[5, 10, 20, 30]"}, -1, PUT));
std::ostringstream oss, oss1;
REQUIRE_NOTHROW(caller.call("rx_roi", {}, 0, GET, oss));
// eiger returns 2 values for 2 ports per module
if (det_type == defs::EIGER) {
REQUIRE(oss.str() ==
"rx_roi [[5, 10, 20, 30], [0, 0, 0, 0]]\n");
}
// others return only 1 roi per module (1 port per module)
else {
REQUIRE(oss.str() == "rx_roi [[5, 10, 20, 30]]\n");
}
if (det.size() > 1) {
REQUIRE_NOTHROW(
caller.call("rx_roi", {}, 1, GET, oss1));
// eiger returns 2 values for 2 ports per module
if (det_type == defs::EIGER) {
REQUIRE(oss1.str() ==
"rx_roi [[0, 0, 0, 0], [0, 0, 0, 0]]\n");
}
// others return only 1 roi per module (1 port per
// module)
else {
REQUIRE(oss1.str() == "rx_roi [[0, 0, 0, 0]]\n");
}
}
}
// verify individual roi
{
stringMin = std::to_string(portSize.x - delta);
@@ -710,6 +752,43 @@ TEST_CASE("rx_roi", "[.detectorintegration][.disable_check_data_file]") {
REQUIRE(oss.str() == "rx_roi [[5, 10, 20, 30], [25, 28, " +
stringMin + ", " + stringMax + "]]\n");
// setting to only one port and verify individual roi
{
REQUIRE_NOTHROW(
caller.call("rx_roi", {"[ 5, 10, 20, 30]"}, -1, PUT));
std::ostringstream oss, oss1;
REQUIRE_NOTHROW(caller.call("rx_roi", {}, 0, GET, oss));
// 2 ports
if (((det_type == defs::JUNGFRAU ||
det_type == defs::MOENCH) &&
(numinterfaces == 2)) ||
(det_type == defs::EIGER)) {
REQUIRE(oss.str() ==
"rx_roi [[5, 10, 20, 30], [0, 0, 0, 0]]\n");
}
// others return only 1 roi per module (1 port per module)
else {
REQUIRE(oss.str() == "rx_roi [[5, 10, 20, 30]]\n");
}
if (det.size() > 2) {
REQUIRE_NOTHROW(
caller.call("rx_roi", {}, 1, GET, oss1));
// 2 ports
if (((det_type == defs::JUNGFRAU ||
det_type == defs::MOENCH) &&
(numinterfaces == 2)) ||
(det_type == defs::EIGER)) {
REQUIRE(oss1.str() ==
"rx_roi [[0, 0, 0, 0], [0, 0, 0, 0]]\n");
}
// others return only 1 roi per module (1 port per
// module)
else {
REQUIRE(oss1.str() == "rx_roi [[0, 0, 0, 0]]\n");
}
}
}
// verify individual roi
{
stringMin = std::to_string(portSize.y - delta);
@@ -741,7 +820,7 @@ TEST_CASE("rx_roi", "[.detectorintegration][.disable_check_data_file]") {
REQUIRE(oss1.str() ==
"rx_roi [[20, 30, " + stringMin + ", " +
std::to_string(portSize.y - 1) +
"], [-1, -1]]\n");
"], [0, 0, 0, 0]]\n");
} else {
REQUIRE(oss1.str() ==
"rx_roi [[20, 30, " + stringMin + ", " +
slsDetectorSoftware/tests/test-SharedMemory.cpp
+3 -1
View File
@@ -42,9 +42,11 @@ constexpr int shm_id = 10;
// macOS does not expose shm in the filesystem
#ifndef __APPLE__
const char *env_p = std::getenv(SHM_ENV_NAME);
std::string env_name = env_p ? ("_" + std::string(env_p)) : "";
const std::string file_path =
std::string("/dev/shm/slsDetectorPackage_detector_") +
std::to_string(shm_id);
std::to_string(shm_id) + env_name;
TEST_CASE("Free obsolete (without isValid)", "[detector][shm]") {