From 9f28cc686c2bd4eb7b1d09dfb5ba09e57c842c6c Mon Sep 17 00:00:00 2001
From: Dhanya Maliakal <dhanya.maliakal@psi.ch>
Date: Tue, 18 Oct 2016 11:10:42 +0200
Subject: [PATCH] done

---
 .../multiSlsDetector/multiSlsDetector.cpp             | 11 ++++-------
 slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp  |  4 ++--
 .../slsDetectorAnalysis/postProcessing.cpp            |  5 +++--
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
index b69d2103e..80a8bacc2 100644
--- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
+++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
@@ -5126,9 +5126,9 @@ void multiSlsDetector::startReceivingDataThread(){
 				datavalue--;
 
 				if(!datavalue){
-					//#ifdef VERYVERBOSE
+#ifdef VERYVERBOSE
 					cprintf(RED,"End of socket for %d\n", ithread);
-					//#endif
+#endif
 					singleframe[ithread] = NULL;
 					break;
 				}
@@ -5602,7 +5602,7 @@ int multiSlsDetector::enableDataStreamingFromReceiver(int enable){
 			}
 		}
 
-	}
+	}else enable = threadStarted;
 	int ret=-100, ret1;
 	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
 		if (detectors[idet]) {
@@ -5616,10 +5616,7 @@ int multiSlsDetector::enableDataStreamingFromReceiver(int enable){
 		}
 	}
 
-	if(enable == -1)
-		return threadStarted;
-	else
-		return (threadStarted & ret);
+	return (threadStarted & ret);
 }
 
 int multiSlsDetector::enableReceiverCompression(int i){
diff --git a/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp b/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
index 0c93b917b..cdb726107 100644
--- a/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
+++ b/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
@@ -68,8 +68,8 @@ int  slsDetectorUtils::acquire(int delflag){
 
 	  //start/stop data streaming threads if threads in client enabled/disabled
 	  ret = enableDataStreamingFromReceiver(-1);
-	  //cout<<"getting datastream:"<<ret<<endl;
-	  //cout<<"result of enabledatastream:"<<enableDataStreamingFromReceiver(ret)<<endl;
+	 // cout<<"getting datastream:"<<ret<<endl;
+	 // cout<<"result of enabledatastream:"<<enableDataStreamingFromReceiver(ret)<<endl;
   }
 
   int nc=setTimer(CYCLES_NUMBER,-1);
diff --git a/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp b/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
index 5229ce89f..7e158371f 100644
--- a/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
+++ b/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
@@ -481,7 +481,8 @@ void* postProcessing::processData(int delflag) {
 		}
 		}
 	//receiver
-	else{cprintf(RED,"In post processing threads\n");
+	else{
+		//cprintf(RED,"In post processing threads\n");
 
 
 		if(dataReady){
@@ -517,7 +518,7 @@ void* postProcessing::processData(int delflag) {
 
 		//cout<<"exiting from proccessing thread"<<endl;
 
-		cprintf(RED,"Exiting post processing thread\n");
+		//cprintf(RED,"Exiting post processing thread\n");
 	}
 
 	return 0;