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

multiSlsDetector merging fixed

Browse Source
This commit is contained in:
bergamaschi 2014-11-25 12:00:08 +01:00
parent 91344f54d9
commit 5fe8c6e457
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -1528,11 +1528,7 @@ slsDetectorDefs::runStatus multiSlsDetector::getRunStatus() {
return s; return s;
} }
<<<<<<< HEAD
for (int i=0; i<thisMultiDetector->numberOfDetectors; i++) { //loop started from 0, but it's a problem with only one detector...
=======
for (int i=0; i<thisMultiDetector->numberOfDetectors; i++) { for (int i=0; i<thisMultiDetector->numberOfDetectors; i++) {
>>>>>>> 5c16b389923487a754e2a4dd64c8da86c901d4e6
s1=detectors[i]->getRunStatus(); s1=detectors[i]->getRunStatus();
if(detectors[i]->getErrorMask()) if(detectors[i]->getErrorMask())
setErrorMask(getErrorMask()|(1<<i)); setErrorMask(getErrorMask()|(1<<i));