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

Merge branch '3.0' into externalgui

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-08-23 18:26:46 +02:00
commit 19d973f5d6
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -5325,16 +5325,6 @@ slsDetectorDefs::runStatus multiSlsDetector::getReceiverStatus(){
int multiSlsDetector::getFramesCaughtByReceiver() { int multiSlsDetector::getFramesCaughtByReceiver() {
int ret=0,ret1=0; int ret=0,ret1=0;
if(thisMultiDetector->numberOfDetectors>10) {
if (detectors[0]){
ret =detectors[0]->getFramesCaughtByReceiver();
if(detectors[0]->getErrorMask())
setErrorMask(getErrorMask()|(1<<0));
}
return ret;
}
for (int i=0; i<thisMultiDetector->numberOfDetectors; i++) for (int i=0; i<thisMultiDetector->numberOfDetectors; i++)
if (detectors[i]){ if (detectors[i]){
ret1+=detectors[i]->getFramesCaughtByReceiver(); ret1+=detectors[i]->getFramesCaughtByReceiver();