detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-02-07 17:28:39 +01:00
Code Issues Actions Packages Releases Activity

Merge pull request #1287 from slsdetectorgroup/dev/fix_m3_tests
Some checks failed
Build on RHEL8 / build (push) Failing after 5m20s
Details
Build on RHEL9 / build (push) Failing after 6m30s
Details

Browse Source 
dev/fix_m3_tests
This commit is contained in:
mazzol_a
2025-09-08 15:14:43 +02:00
committed by GitHub
parent 6e3acbdf79 284472b48f
commit ddc44e1065
1 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
slsDetectorSoftware/tests/Caller/test-Caller.cpp
View File

@@ -10,6 +10,7 @@
#include <chrono> #include <chrono>
#include <sstream> #include <sstream>
#include <thread> #include <thread>
#include <variant>
#include "tests/globals.h" #include "tests/globals.h"
#include <filesystem> #include <filesystem>
@@ -819,7 +820,7 @@ TEST_CASE("exptime", "[.cmdcall][.time]") {
Detector det; Detector det;
Caller caller(&det); Caller caller(&det);
auto det_type = det.getDetectorType().squash(); auto det_type = det.getDetectorType().squash();
std::chrono::nanoseconds prev_val; ns prev_val;
if (det_type != defs::MYTHEN3) { if (det_type != defs::MYTHEN3) {
prev_val = det.getExptime().tsquash("inconsistent exptime to test"); prev_val = det.getExptime().tsquash("inconsistent exptime to test");
} else { } else {
@@ -1358,6 +1359,22 @@ TEST_CASE("clkdiv", "[.cmdcall]") {
REQUIRE_THROWS(caller.call("clkdiv", {"7", "4"}, -1, PUT)); REQUIRE_THROWS(caller.call("clkdiv", {"7", "4"}, -1, PUT));
REQUIRE_THROWS(caller.call("clkdiv", {"0", "1"}, -1, PUT)); REQUIRE_THROWS(caller.call("clkdiv", {"0", "1"}, -1, PUT));
auto prev_val = det.getClockDivider(0); auto prev_val = det.getClockDivider(0);
auto prev_period = det.getPeriod().tsquash("Inconsistent period");
auto prev_delay =
det.getDelayAfterTrigger().tsquash("Inconsistent delay");
std::variant<ns, std::array<ns, 3>> prev_exptime{};
std::array<ns, 3> prev_gate_delay{};
ns prev_burst_period{};
if (det_type == defs::MYTHEN3) {
prev_exptime =
det.getExptimeForAllGates().tsquash("Inconsistent exptime");
prev_gate_delay = det.getGateDelayForAllGates().tsquash(
"Inconsistent gate delay");
} else {
prev_exptime = det.getExptime().tsquash("Inconsistent exptime");
prev_burst_period =
det.getBurstPeriod().tsquash("Inconsistent burst period");
}
{ {
std::ostringstream oss1, oss2; std::ostringstream oss1, oss2;
caller.call("clkdiv", {"0", "3"}, -1, PUT, oss1); caller.call("clkdiv", {"0", "3"}, -1, PUT, oss1);
@@ -1368,6 +1385,19 @@ TEST_CASE("clkdiv", "[.cmdcall]") {
for (int i = 0; i != det.size(); ++i) { for (int i = 0; i != det.size(); ++i) {
det.setClockDivider(0, prev_val[i], {i}); det.setClockDivider(0, prev_val[i], {i});
} }
det.setPeriod(prev_period);
det.setDelayAfterTrigger(prev_delay);
if (det_type == defs::MYTHEN3) {
auto exptimes = std::get<std::array<ns, 3>>(prev_exptime);
for (int iCounter = 0; iCounter != 3; ++iCounter) {
det.setExptime(iCounter, exptimes[iCounter]);
det.setGateDelay(iCounter, prev_gate_delay[iCounter]);
}
} else {
auto exptime = std::get<ns>(prev_exptime);
det.setExptime(exptime);
det.setBurstPeriod(prev_burst_period);
}
// other clocks removed for m3 (setting not supported) // other clocks removed for m3 (setting not supported)
if (det_type == defs::MYTHEN3) { if (det_type == defs::MYTHEN3) {
REQUIRE_THROWS(caller.call("clkdiv", {"1", "2"}, -1, PUT)); REQUIRE_THROWS(caller.call("clkdiv", {"1", "2"}, -1, PUT));
@@ -2199,7 +2229,7 @@ TEST_CASE("start", "[.cmdcall]") {
// PUT only command // PUT only command
REQUIRE_THROWS(caller.call("start", {}, -1, GET)); REQUIRE_THROWS(caller.call("start", {}, -1, GET));
auto det_type = det.getDetectorType().squash(); auto det_type = det.getDetectorType().squash();
std::chrono::nanoseconds prev_val; ns prev_val;
if (det_type != defs::MYTHEN3) { if (det_type != defs::MYTHEN3) {
prev_val = det.getExptime().tsquash("inconsistent exptime to test"); prev_val = det.getExptime().tsquash("inconsistent exptime to test");
} else { } else {
@@ -2238,7 +2268,7 @@ TEST_CASE("stop", "[.cmdcall]") {
// PUT only command // PUT only command
REQUIRE_THROWS(caller.call("stop", {}, -1, GET)); REQUIRE_THROWS(caller.call("stop", {}, -1, GET));
auto det_type = det.getDetectorType().squash(); auto det_type = det.getDetectorType().squash();
std::chrono::nanoseconds prev_val; ns prev_val;
if (det_type != defs::MYTHEN3) { if (det_type != defs::MYTHEN3) {
prev_val = det.getExptime().tsquash("inconsistent exptime to test"); prev_val = det.getExptime().tsquash("inconsistent exptime to test");
} else { } else {
@@ -2281,7 +2311,7 @@ TEST_CASE("status", "[.cmdcall]") {
Detector det; Detector det;
Caller caller(&det); Caller caller(&det);
auto det_type = det.getDetectorType().squash(); auto det_type = det.getDetectorType().squash();
std::chrono::nanoseconds prev_val; ns prev_val;
if (det_type != defs::MYTHEN3) { if (det_type != defs::MYTHEN3) {
prev_val = det.getExptime().tsquash("inconsistent exptime to test"); prev_val = det.getExptime().tsquash("inconsistent exptime to test");
} else { } else {