back

slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp

@@ -5071,13 +5071,12 @@ void multiSlsDetector::startReceivingDataThread(){
 	context = zmq_ctx_new();
 	zmqsocket = zmq_socket(context, ZMQ_PULL);
 	//int hwmval = 10;
-	//zmq_setsockopt(zmqsocket,ZMQ_RCVHWM,&hwmval,sizeof(hwmval)); //set receive HIGH WATER MARK (8-9ms slower)
+	//zmq_setsockopt(zmqsocket,ZMQ_RCVHWM,&hwmval,sizeof(hwmval)); //set receive HIGH WATER MARK (8-9ms slower//should not drop last packets)
 	zmq_connect(zmqsocket, hostname);
 	cout << "ZMQ Client of " << ithread << " at " << hostname << endl;
 	cprintf(BLUE,"%d Created socket\n",ithread);
-	/*
+
-	zmq_pollitem_t pollitem = {zmqsocket, 0 , ZMQ_POLLIN , 0};
+
-*/
 	//initializations
 	int numReadoutPerDetector = 1;
 	bool jungfrau = false;
@@ -5090,9 +5089,6 @@ void multiSlsDetector::startReceivingDataThread(){
 	int* image = new int[nel];
 	int len,idet = 0;
 	singleframe[ithread]=NULL;
-///*
- 	 int datavalue = 2;
- // */
 	threadStarted = true;					//let calling function know thread started and obtained current
 
 
@@ -5109,62 +5105,15 @@ void multiSlsDetector::startReceivingDataThread(){
 
 		//scan header-------------------------------------------------------------------
 		zmq_msg_init (&message);
-
-		/*
-		//---- with end
 		len = zmq_msg_recv(&message, zmqsocket, 0);
 		if (len == -1) {
+			cprintf(BG_RED,"Could not read header for socket %d\n",ithread);
 			zmq_msg_close(&message);
 			cprintf(RED, "%d message null\n",ithread);
 			continue;
 		}
-		//----
-		 */
 
 
-
-		while(1){
-
-			len = zmq_msg_recv(&message, zmqsocket, ZMQ_DONTWAIT);
-			if(len>0)
-				break;//also comment out the next recv
-
-			//zmq_poll(&pollitem, 1, 0);
-			//received something, get out
-			//if(pollitem.revents & ZMQ_POLLIN){
-			//	pollitem.revents = 0;
-			//	break;
-			//}uncomment next recv
-
-			//received nothing
-			else if (receiverStoppedFlag){
-				//one more chance if receiver stopped
-				datavalue--;
-
-				if(!datavalue){
-#ifdef VERYVERBOSE
-					cprintf(RED,"End of socket for %d\n", ithread);
-#endif
-					singleframe[ithread] = NULL;
-					break;
-				}
-
-				//wait to check again only if receiver stopped
-				//usleep(4000);
-			}
-			usleep(4000);
-		}
-
-
-
-		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:"<<len<<" value:"<< (char*)zmq_msg_data(&message)<<endl;
 		//cprintf(BLUE,"%d header %d\n",ithread,len);
@@ -5211,19 +5160,14 @@ void multiSlsDetector::startReceivingDataThread(){
 		//cprintf(BLUE,"%d data %d\n",ithread,len);
 		//end of socket ("end")
 		if (len < 1024*256 ) {
-				/*
+			if(len == 3){
-				if(!len) cprintf(RED,"Received no data in socket for %d\n", ithread);
+				//cprintf(RED,"Received end of acquisition for socket %d\n", ithread);
-				//#ifdef VERYVERBOSE
-				cprintf(RED,"End of socket for %d\n", ithread);
-				//#endif
-				zmq_msg_close(&message);
 				singleframe[ithread] = NULL;
 				//break;
-				 */
+			}else{
-
-
 				cprintf(RED,"Received weird packet size %d in socket for %d\n", len, ithread);
 				memset((char*)(singleframe[ithread]),0xFF,singleDatabytes/numReadoutPerDetector);
+			}
 
 		}
 		else{
@@ -5240,15 +5184,8 @@ void multiSlsDetector::startReceivingDataThread(){
 			}
 		}
 
-
-	///*
-	  }
-	//  */
 		sem_post(&sem_singledone[ithread]);//let multi know is ready
 		zmq_msg_close(&message); // close the message
-	///*
-	  datavalue = 2;
-	 // */
 	}
 
 	cprintf(RED,"%d Closing socket\n",ithread);
@@ -5638,7 +5575,7 @@ int multiSlsDetector::enableDataStreamingFromReceiver(int enable){
 			}
 		}
 
-	}/*else enable = threadStarted;*/
+	}else enable = threadStarted;
 	int ret=-100, ret1;
 	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
 		if (detectors[idet]) {
@@ -5651,10 +5588,10 @@ int multiSlsDetector::enableDataStreamingFromReceiver(int enable){
 				ret=-1;
 		}
 	}
-	///*
+	/*
 	if(enable == -1)
 		return threadStarted;
-	//	*/
+	*/
 	return (threadStarted & ret);
 }
 

slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp

@@ -58,9 +58,6 @@ int  slsDetectorUtils::acquire(int delflag){
   if(!receiver){
 	  setDetectorIndex(-1);
   }else{
-	///*
-	 receiverStoppedFlag = 0;
-	 //*/
 	  //put receiver read frequency to random if no gui
 	  int ret = setReadReceiverFrequency(0);
 	  if(ret>0 && (dataReady == NULL)){
@@ -151,27 +148,16 @@ int  slsDetectorUtils::acquire(int delflag){
   if(receiver){
 	  if(getReceiverStatus()!=IDLE)
 		  stopReceiver();
-	  if(setReceiverOnline()==OFFLINE_FLAG){
+	  if(setReceiverOnline()==OFFLINE_FLAG)
 		  *stoppedFlag=1;
-			///*
-			 receiverStoppedFlag = 1;
-			 //*/
-	  }
 	  //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;
-	  		 //*/
 	  	}
 
-	  if(setReceiverOnline()==OFFLINE_FLAG){
+	  if(setReceiverOnline()==OFFLINE_FLAG)
 		  *stoppedFlag=1;
-			///*
-			 receiverStoppedFlag = 1;
-			 //*/
-	  }
   }
 
 
@@ -304,9 +290,6 @@ int  slsDetectorUtils::acquire(int delflag){
 	    	if(setReceiverOnline()==OFFLINE_FLAG){
 	    		stopReceiver();
 	    		*stoppedFlag=1;
-	    		///*
-	    		 receiverStoppedFlag = 1;
-	    		 //*/
 	    		pthread_mutex_unlock(&mg);
 	    		break;
 	    	}
@@ -314,9 +297,6 @@ int  slsDetectorUtils::acquire(int delflag){
 	    	if(startReceiver() == FAIL) {
 	    		stopReceiver();
 	    		*stoppedFlag=1;
-	    		///*
-	    		 receiverStoppedFlag = 1;
-	    		 //*/
 	    		pthread_mutex_unlock(&mg);
 	    		break;
 	    	}
@@ -363,9 +343,6 @@ int  slsDetectorUtils::acquire(int delflag){
 	  pthread_mutex_lock(&mg);
 	  //offline
 	  if(setReceiverOnline()==OFFLINE_FLAG){
-			///*
-			 receiverStoppedFlag = 1;
-			 //*/
 		  if ((getDetectorsType()==GOTTHARD) || (getDetectorsType()==MOENCH) || (getDetectorsType()==JUNGFRAU) ){
 			  if((*correctionMask)&(1<<WRITE_FILE))
 				  closeDataFile();
@@ -374,9 +351,6 @@ int  slsDetectorUtils::acquire(int delflag){
 	  //online
 	  else{
 		  stopReceiver();
-			///*
-			 receiverStoppedFlag = 1;
-			 //*/
 		 // cout<<"***********receiver stopped"<<endl;
 	  }
 	  pthread_mutex_unlock(&mg);

slsDetectorSoftware/slsDetector/slsDetectorUtils.h

@@ -837,10 +837,6 @@ virtual int setReceiverFifoDepth(int i = -1)=0;
  
   //protected:
   int *stoppedFlag;	 
- ///*
-  int receiverStoppedFlag;
- // */
-
   int64_t *timerValue;
   detectorSettings *currentSettings;
   int *currentThresholdEV;