diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index 68a251b2a..1478ffbaf 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -5090,7 +5090,9 @@ void multiSlsDetector::startReceivingDataThread(){ int* image = new int[nel]; int len,idet = 0; singleframe[ithread]=NULL; -/* int datavalue = 2;*/ +///* + int datavalue = 2; + // */ threadStarted = true; //let calling function know thread started and obtained current @@ -5108,6 +5110,7 @@ void multiSlsDetector::startReceivingDataThread(){ //scan header------------------------------------------------------------------- zmq_msg_init (&message); + /* //---- with end len = zmq_msg_recv(&message, zmqsocket, 0); if (len == -1) { @@ -5116,8 +5119,10 @@ void multiSlsDetector::startReceivingDataThread(){ continue; } //---- + */ + + -/* while(1){ len = zmq_msg_recv(&message, zmqsocket, ZMQ_DONTWAIT); @@ -5150,16 +5155,16 @@ void multiSlsDetector::startReceivingDataThread(){ usleep(4000); } - */ - /*if(datavalue){ + + if(datavalue){ //len = zmq_msg_recv(&message, zmqsocket, 0); if (len == -1) { zmq_msg_close(&message); cprintf(RED, "%d message null\n",ithread); continue; } -*/ + // error if you print it // cout << ithread << " header len:"<0 && (dataReady == NULL)){ @@ -151,18 +153,24 @@ int slsDetectorUtils::acquire(int delflag){ stopReceiver(); if(setReceiverOnline()==OFFLINE_FLAG){ *stoppedFlag=1; - /*receiverStoppedFlag = 1;*/ + ///* + receiverStoppedFlag = 0; + //*/ } //multi detectors shouldnt have different receiver read frequencies enabled/disabled if(setReadReceiverFrequency(0) < 0){ std::cout << "Error: The receiver read frequency is invalid:" << setReadReceiverFrequency(0) << std::endl; *stoppedFlag=1; - /*receiverStoppedFlag = 1;*/ + ///* + receiverStoppedFlag = 0; + //*/ } if(setReceiverOnline()==OFFLINE_FLAG){ *stoppedFlag=1; - /*receiverStoppedFlag = 1;*/ + ///* + receiverStoppedFlag = 0; + //*/ } } @@ -296,7 +304,9 @@ int slsDetectorUtils::acquire(int delflag){ if(setReceiverOnline()==OFFLINE_FLAG){ stopReceiver(); *stoppedFlag=1; - /*receiverStoppedFlag = 1;*/ + ///* + receiverStoppedFlag = 0; + //*/ pthread_mutex_unlock(&mg); break; } @@ -304,7 +314,9 @@ int slsDetectorUtils::acquire(int delflag){ if(startReceiver() == FAIL) { stopReceiver(); *stoppedFlag=1; - /*receiverStoppedFlag = 1;*/ + ///* + receiverStoppedFlag = 0; + //*/ pthread_mutex_unlock(&mg); break; } @@ -351,7 +363,9 @@ int slsDetectorUtils::acquire(int delflag){ pthread_mutex_lock(&mg); //offline if(setReceiverOnline()==OFFLINE_FLAG){ - /* receiverStoppedFlag = 1;*/ + ///* + receiverStoppedFlag = 0; + //*/ if ((getDetectorsType()==GOTTHARD) || (getDetectorsType()==MOENCH) || (getDetectorsType()==JUNGFRAU) ){ if((*correctionMask)&(1<