From f0ac9a2e9cf2ccd4403bc021487908e2027e1bc8 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Tue, 1 Nov 2016 15:59:43 +0100 Subject: [PATCH] back to not asking getframescaught --- slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp | 4 ++-- .../slsDetectorAnalysis/postProcessing.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index 27444ca07..e29b39151 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -4928,7 +4928,7 @@ slsDetectorDefs::runStatus multiSlsDetector::getReceiverStatus(){ int multiSlsDetector::getFramesCaughtByReceiver() { int ret=0,ret1=0; -/* + if(thisMultiDetector->numberOfDetectors>10) { if (detectors[0]){ ret =detectors[0]->getFramesCaughtByReceiver(); @@ -4937,7 +4937,7 @@ int multiSlsDetector::getFramesCaughtByReceiver() { } return ret; } - */ + for (int i=0; inumberOfDetectors; i++) if (detectors[i]){ diff --git a/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp b/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp index f35b66690..b28e3b3c0 100644 --- a/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp +++ b/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp @@ -497,15 +497,15 @@ void* postProcessing::processData(int delflag) { int caught = -1; while(true){ - cout.flush(); - cout<