From 4f28df03ab24a92d7a2ff9b13e82b461a56ab6ca Mon Sep 17 00:00:00 2001
From: Dhanya Maliakal <dhanya.maliakal@psi.ch>
Date: Tue, 22 Aug 2017 19:43:26 +0200
Subject: [PATCH] trials

---
 .../multiSlsDetector/multiSlsDetector.cpp      | 18 +++++++++---------
 .../slsDetector/slsDetectorCommand.cpp         |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
index d86ecc319..b577290f1 100644
--- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
+++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
@@ -3590,10 +3590,10 @@ string multiSlsDetector::setNetworkParameter(networkParameter p, string s){
 
 	// disable data streaming before changing zmq port (but only if they were on)
 	/*int prev_streaming = 0;*/
-	if (p == RECEIVER_STREAMING_PORT) {
+  //	if (p == RECEIVER_STREAMING_PORT) {
 		/*prev_streaming = getStreamingSocketsCreatedInClient();*/
-		enableDataStreamingFromReceiver(0);
-	}
+  //	enableDataStreamingFromReceiver(0);
+  //	}
 
 	if (s.find('+')==string::npos) {
 
@@ -5883,8 +5883,8 @@ int multiSlsDetector::getStreamingSocketsCreatedInClient() {
 
 int multiSlsDetector::enableDataStreamingFromReceiver(int enable){
 
-	if(enable >= 0){
-		/*if(dataSocketsStarted != enable){*/
+  /*	if(enable >= 0){
+	
 			//destroy data threads
 			if(dataSocketsStarted)
 				createReceivingDataSockets(true);
@@ -5899,9 +5899,9 @@ int multiSlsDetector::enableDataStreamingFromReceiver(int enable){
 					return -1;
 				}
 			}
-		/*}*/
+	
 
-	}
+			}*/
 
 
 
@@ -5937,9 +5937,9 @@ int multiSlsDetector::enableDataStreamingFromReceiver(int enable){
 		}
 	}
 
-	if(ret != dataSocketsStarted)
+	/*	if(ret != dataSocketsStarted)
 		ret = -1;
-
+	*/
 	return ret;
 }
 
diff --git a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
index d5d551b61..280027c46 100644
--- a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
+++ b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
@@ -5868,7 +5868,7 @@ string slsDetectorCommand::cmdReceiver(int narg, char *args[], int action) {
 		if (action==PUT_ACTION) {
 			if(!strcasecmp(args[1],"start")) {
 				//to ensure data streaming enable is the same across client and receiver
-				if (receivers == ONLINE_FLAG) {
+				/*if (receivers == ONLINE_FLAG) {
 					//if it was not off
 					if (myDet->enableDataStreamingFromReceiver(-1) != 0){
 						//switch it off, if error
@@ -5876,7 +5876,7 @@ string slsDetectorCommand::cmdReceiver(int narg, char *args[], int action) {
 							return string("could not disable data streaming in receiver\n");
 						}
 					}
-				}
+					}*/
 				myDet->startReceiver();
 			}
 			else if(!strcasecmp(args[1],"stop")){