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; idetnumberOfDetectors; 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:"<