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

Jungfraumaster (#518)

Browse Source 
* set jungfrau master only from client
* added tests, fixed a bug in ctb and moench (infinite recursion) that will never happen atm
This commit is contained in:
Dhanya Thattil
2022-08-16 09:51:18 +02:00
committed by GitHub
parent 01696ca89b
commit 809b0bdeb8
14 changed files with 111 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -584,9 +584,11 @@ TEST_CASE("master", "[.cmd]") {
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
if (det_type == defs::EIGER || det_type == defs::MYTHEN3 ||
det_type == defs::GOTTHARD || det_type == defs::GOTTHARD2) {
det_type == defs::GOTTHARD || det_type == defs::GOTTHARD2 ||
det_type == defs::JUNGFRAU) {
REQUIRE_NOTHROW(proxy.Call("master", {}, -1, GET));
if (det_type == defs::EIGER || det_type == defs::GOTTHARD2) {
if (det_type == defs::EIGER || det_type == defs::GOTTHARD2 ||
det_type == defs::JUNGFRAU) {
// get previous master
int prevMaster = 0;
{