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

example

Browse Source
This commit is contained in:
Erik Frojdh 2018-10-03 14:56:56 +02:00
parent 21ca289ebf
commit 287cd118b0
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -273,19 +273,10 @@ bool multiSlsDetector::isAcquireReady() {
} }
int multiSlsDetector::checkVersionCompatibility(portType t, int detPos) { int multiSlsDetector::checkVersionCompatibility(portType t, int detPos) {
// single // single
if (detPos >= 0) { if (detPos >= 0) {
return = detectors[detPos]->checkVersionCompatibility(t);
if(isDetectorIndexOutOfBounds(detPos))
return -1;
int ret = detectors[detPos]->checkVersionCompatibility(t);
if (detectors[detPos]->getErrorMask())
setErrorMask(getErrorMask() | (1 << detPos));
return ret;
} }
// multi // multi
return parallelCallDetectorMember(&slsDetector::checkVersionCompatibility, t); return parallelCallDetectorMember(&slsDetector::checkVersionCompatibility, t);
} }