From 673e7c8f20badd495b71bae701c076286585bbfd Mon Sep 17 00:00:00 2001
From: Dhanya Maliakal <dhanya.maliakal@psi.ch>
Date: Wed, 19 Oct 2016 10:22:35 +0200
Subject: [PATCH] removed asking only 1 for framescaugh

---
 .../multiSlsDetector/multiSlsDetector.cpp     | 44 ++++++++++---------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
index feee6e144..05c56fcbc 100644
--- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
+++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
@@ -4902,19 +4902,30 @@ slsDetectorDefs::runStatus multiSlsDetector::getReceiverStatus(){
 
 
 int multiSlsDetector::getFramesCaughtByReceiver() {
-  int ret=0,ret1=0;
-  for (int i=0; i<thisMultiDetector->numberOfDetectors; i++)
-    if (detectors[i]){
-      ret1+=detectors[i]->getFramesCaughtByReceiver();
-      if(detectors[i]->getErrorMask())
-	setErrorMask(getErrorMask()|(1<<i));
- 
-    }
-  if(!thisMultiDetector->numberOfDetectors)
-	  return ret;
-  ret=(int)(ret1/thisMultiDetector->numberOfDetectors);
+	int ret=0,ret1=0;
 
-  return ret;
+	/*
+	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++)
+		if (detectors[i]){
+			ret1+=detectors[i]->getFramesCaughtByReceiver();
+			if(detectors[i]->getErrorMask())
+				setErrorMask(getErrorMask()|(1<<i));
+
+		}
+	if(!thisMultiDetector->numberOfDetectors)
+		return ret;
+	ret=(int)(ret1/thisMultiDetector->numberOfDetectors);
+
+	return ret;
 }
 
 
@@ -4939,15 +4950,6 @@ int multiSlsDetector::getReceiverCurrentFrameIndex() {
 int multiSlsDetector::resetFramesCaught() {
 	int ret=-100, ret1;
 
-	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++){
 		if (detectors[i]){
 			ret1=detectors[i]->resetFramesCaught();