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

Merge branch '6.0.1.rc1' of github.com:slsdetectorgroup/slsDetectorPackage into 6.0.1.rc1

Browse Source
This commit is contained in:
maliakal_d 2021-11-25 11:25:24 +01:00
commit 340b18ca83
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -542,8 +542,8 @@ TEST_CASE("fliprows", "[.cmd]") {
auto det_type = det.getDetectorType().squash(); auto det_type = det.getDetectorType().squash();
bool jungfrauhw2 = false; bool jungfrauhw2 = false;
if (det_type == defs::JUNGFRAU && if (det_type == defs::JUNGFRAU &&
(det.getSerialNumber().tsquash("inconsistent serial number to test") & ((det.getSerialNumber().tsquash("inconsistent serial number to test") &
0x30000)) { 0x30000) == 0x30000)) {
jungfrauhw2 = true; jungfrauhw2 = true;
} }
if (det_type == defs::EIGER || jungfrauhw2) { if (det_type == defs::EIGER || jungfrauhw2) {
@ -1559,9 +1559,9 @@ TEST_CASE("readnrows", "[.cmd]") {
if (det_type == defs::EIGER || det_type == defs::JUNGFRAU) { if (det_type == defs::EIGER || det_type == defs::JUNGFRAU) {
bool jungfrauhw2 = false; bool jungfrauhw2 = false;
if (det_type == defs::JUNGFRAU && if (det_type == defs::JUNGFRAU &&
(det.getSerialNumber().tsquash( ((det.getSerialNumber().tsquash(
"inconsistent serial number to test") & "inconsistent serial number to test") &
0x30000)) { 0x30000) == 0x30000)) {
jungfrauhw2 = true; jungfrauhw2 = true;
} }
if (!jungfrauhw2) { if (!jungfrauhw2) {