From eec812f92c28bb210f95275145ec57daab2f5952 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Tue, 18 Oct 2016 12:33:47 +0200 Subject: [PATCH] switched --- .../multiSlsDetector/multiSlsDetector.cpp | 1 - .../slsDetector/slsDetectorUtils.cpp | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index 1478ffbaf..c3a94f77c 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -5212,7 +5212,6 @@ void multiSlsDetector::startReceivingDataThread(){ //end of socket ("end") if (len < 1024*256 ) { /* - } if(!len) cprintf(RED,"Received no data in socket for %d\n", ithread); //#ifdef VERYVERBOSE cprintf(RED,"End of socket for %d\n", ithread); diff --git a/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp b/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp index e475351dc..9011c300a 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp @@ -154,7 +154,7 @@ int slsDetectorUtils::acquire(int delflag){ if(setReceiverOnline()==OFFLINE_FLAG){ *stoppedFlag=1; ///* - receiverStoppedFlag = 0; + receiverStoppedFlag = 1; //*/ } //multi detectors shouldnt have different receiver read frequencies enabled/disabled @@ -162,14 +162,14 @@ int slsDetectorUtils::acquire(int delflag){ std::cout << "Error: The receiver read frequency is invalid:" << setReadReceiverFrequency(0) << std::endl; *stoppedFlag=1; ///* - receiverStoppedFlag = 0; + receiverStoppedFlag = 1; //*/ } if(setReceiverOnline()==OFFLINE_FLAG){ *stoppedFlag=1; ///* - receiverStoppedFlag = 0; + receiverStoppedFlag = 1; //*/ } } @@ -305,7 +305,7 @@ int slsDetectorUtils::acquire(int delflag){ stopReceiver(); *stoppedFlag=1; ///* - receiverStoppedFlag = 0; + receiverStoppedFlag = 1; //*/ pthread_mutex_unlock(&mg); break; @@ -315,7 +315,7 @@ int slsDetectorUtils::acquire(int delflag){ stopReceiver(); *stoppedFlag=1; ///* - receiverStoppedFlag = 0; + receiverStoppedFlag = 1; //*/ pthread_mutex_unlock(&mg); break; @@ -364,7 +364,7 @@ int slsDetectorUtils::acquire(int delflag){ //offline if(setReceiverOnline()==OFFLINE_FLAG){ ///* - receiverStoppedFlag = 0; + receiverStoppedFlag = 1; //*/ if ((getDetectorsType()==GOTTHARD) || (getDetectorsType()==MOENCH) || (getDetectorsType()==JUNGFRAU) ){ if((*correctionMask)&(1<