detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-12 04:47:14 +02:00
Code Issues Actions Packages Releases Activity

Jungfrautrigger (#516)

Browse Source 
* jungfrau trigger added
* added blocking trigger
This commit is contained in:
Dhanya Thattil
2022-08-16 09:41:47 +02:00
committed by GitHub
parent 1bc4994be6
commit 01696ca89b
11 changed files with 89 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/tests/test-CmdProxy-mythen3.cpp
View File

@ -523,7 +523,7 @@ TEST_CASE("interpolation", "[.cmd]") {
REQUIRE(oss.str() == "interpolation 0\n");
REQUIRE(det.getCounterMask().tsquash(
"inconsistent counter mask") == fixedMask[i]);
uint32_t expectedVth3DacVal =
int expectedVth3DacVal =
(fixedMask[i] & 0x4 ? fixedVth3DacVal : disabledDacValue);
REQUIRE(det.getDAC(defs::VTH3, 0, {0})
.tsquash("inconsistent vth3 dac value") ==

14
slsDetectorSoftware/tests/test-CmdProxy.cpp
View File

@ -1943,11 +1943,9 @@ TEST_CASE("trigger", "[.cmd]") {
CmdProxy proxy(&det);
REQUIRE_THROWS(proxy.Call("trigger", {}, -1, GET));
auto det_type = det.getDetectorType().squash();
if (det_type != defs::EIGER && det_type != defs::MYTHEN3) {
REQUIRE_THROWS(proxy.Call("trigger", {}, -1, PUT));
} else if (det_type == defs::MYTHEN3) {
if (det_type == defs::MYTHEN3) {
REQUIRE_NOTHROW(proxy.Call("trigger", {}, -1, PUT));
} else if (det_type == defs::EIGER) {
} else if (det_type == defs::EIGER || det_type == defs::JUNGFRAU) {
auto prev_timing =
det.getTimingMode().tsquash("inconsistent timing mode in test");
auto prev_frames =
@ -1977,6 +1975,8 @@ TEST_CASE("trigger", "[.cmd]") {
det.setNumberOfFrames(prev_frames);
det.setExptime(prev_exptime);
det.setPeriod(prev_period);
} else {
REQUIRE_THROWS(proxy.Call("trigger", {}, -1, PUT));
}
}
@ -1985,9 +1985,7 @@ TEST_CASE("blockingtrigger", "[.cmd]") {
CmdProxy proxy(&det);
REQUIRE_THROWS(proxy.Call("blockingtrigger", {}, -1, GET));
auto det_type = det.getDetectorType().squash();
if (det_type != defs::EIGER) {
REQUIRE_THROWS(proxy.Call("blockingtrigger", {}, -1, PUT));
} else if (det_type == defs::EIGER) {
if (det_type == defs::EIGER || det_type == defs::JUNGFRAU) {
auto prev_timing =
det.getTimingMode().tsquash("inconsistent timing mode in test");
auto prev_frames =
@ -2020,6 +2018,8 @@ TEST_CASE("blockingtrigger", "[.cmd]") {
det.setNumberOfFrames(prev_frames);
det.setExptime(prev_exptime);
det.setPeriod(prev_period);
} else {
REQUIRE_THROWS(proxy.Call("blockingtrigger", {}, -1, PUT));
}
}