almost done

slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp

@@ -4969,10 +4969,13 @@ void multiSlsDetector::readFrameFromReceiver(){
 	//determine number of half readouts and maxX and maxY
 	int maxX=0,maxY=0;
 	int numReadout = 1;
+	bool checkbottom = false;
+
 	if(getDetectorsType() == EIGER){
 		numReadout = 2;
 		maxX = thisMultiDetector->numberOfChannel[X];
 		maxY = thisMultiDetector->numberOfChannel[Y];
+		checkbottom = true;
 	}
 
 	//Note:num threads correspond to num detectors as task calls each slsdet
@@ -5031,6 +5034,7 @@ void multiSlsDetector::readFrameFromReceiver(){
 
 
 
+
 	while(true){
 		memset(((char*)multiframe),0x0,slsdatabytes*thisMultiDetector->numberOfDetectors);
 
@@ -5056,7 +5060,7 @@ void multiSlsDetector::readFrameFromReceiver(){
 
 
 					//assemble data
-					//eiger, so interleaving
+					//eiger, so interleaving between ports in one readout itself
 					if(maxX){
 
 						//if(ireadout == 3){
@@ -5064,19 +5068,29 @@ void multiSlsDetector::readFrameFromReceiver(){
 							if(!(ireadout%numReadout)) 	offsetX = thisMultiDetector->offsetX[idet];
 							else 		offsetX = thisMultiDetector->offsetX[idet] + halfreadoutoffset;
 							offsetX *= bytesperchannel;
-							cprintf(BLUE,"offsetx:%d offsety:%d maxx:%d slsmaxX:%d slsmaxY:%d bytesperchannel:%d\n",
+							//cprintf(BLUE,"offsetx:%d offsety:%d maxx:%d slsmaxX:%d slsmaxY:%d bytesperchannel:%d\n",
-									offsetX,offsetY,maxX,slsmaxX,slsmaxY,bytesperchannel);
+								//	offsetX,offsetY,maxX,slsmaxX,slsmaxY,bytesperchannel);
 
-							cprintf(BLUE,"copying bytes:%d\n", (slsmaxX/numReadout)*bytesperchannel);
+							//cprintf(BLUE,"copying bytes:%d\n", (slsmaxX/numReadout)*bytesperchannel);
 							//itnerleaving with other detectors
-							for(int i=0;i<slsmaxY;i++){
+
-							memcpy(((char*)multiframe) + offsetY + offsetX + (i*maxX*bytesperchannel),
+							//bottom
-									(char*)slsframe[ireadout]+ i*(slsmaxX/numReadout)*bytesperchannel,
+							if(((idet+1)%2) == 0){
-									(slsmaxX/numReadout)*bytesperchannel);
+								for(int i=0;i<slsmaxY;++i)
+									memcpy(((char*)multiframe) + offsetY + offsetX + ((slsmaxY-i)*maxX*bytesperchannel),
+											(char*)slsframe[ireadout]+ i*(slsmaxX/numReadout)*bytesperchannel,
+											(slsmaxX/numReadout)*bytesperchannel);
+							}
+							//top
+							else{
+								for(int i=0;i<slsmaxY;++i)
+									memcpy(((char*)multiframe) + offsetY + offsetX + (i*maxX*bytesperchannel),
+											(char*)slsframe[ireadout]+ i*(slsmaxX/numReadout)*bytesperchannel,
+											(slsmaxX/numReadout)*bytesperchannel);
+
 
 							}
 
-
 						//}//end of ireadout
 
 					}
@@ -5105,7 +5119,7 @@ void multiSlsDetector::readFrameFromReceiver(){
 			dataReady(thisData, framecount, framecount, pCallbackArg);//should be fnum and subfnum from json header
 			delete thisData;
 			fdata = NULL;
-			cout<<"Send frame #"<< framecount << " to gui"<<endl;
+			//cout<<"Send frame #"<< framecount << " to gui"<<endl;
 		}
 
 		framecount++;

slsDetectorSoftware/slsDetector/slsDetector.cpp

@@ -3955,9 +3955,9 @@ int64_t slsDetector::setTimer(timerIndex index, int64_t t){
 	if (index!=MEASUREMENTS_NUMBER) {
 
 
-	  //#ifdef VERBOSE
+#ifdef VERBOSE
 		std::cout<< "Setting timer "<< index << " to " <<  t << "ns/value" << std::endl;
-		//#endif
+#endif
 		if (thisDetector->onlineFlag==ONLINE_FLAG) {
 			if (connectControl() == OK){
 				controlSocket->SendDataOnly(&fnum,sizeof(fnum));
@@ -7181,7 +7181,7 @@ void slsDetector::readFrameFromReceiver(){
 		runningMask|=(1<<(i));
 
 	}
-
+	cout<<detId<<" started"<<endl;
 
 	//receive msgs and let multi know
 	zmq_msg_t message;
@@ -7211,14 +7211,16 @@ void slsDetector::readFrameFromReceiver(){
 						 //int size = zmq_msg_size (&message);
 				if (len <= 3 ) {
 					if(!len) cprintf(RED,"Received no data in socket for %d\n", readoutId+idet);
-					cout<<readoutId+idet <<" sls Received end data"<<endl;
+					//cout<<readoutId+idet <<" sls Received end data"<<endl;
 
 					parentDet->slsframe[readoutId+idet] = NULL;
 					sem_post(&parentDet->sem_slsdone[readoutId+idet]);//let multi know is ready
 
 					runningMask^=(1<<idet);
+					cout<<detId<<" " << idet << " finished"<<endl;
 					//all done, get out
 					if(!runningMask){
+						cout<<detId<<" all done"<<endl;
 						break;
 					}
 					continue;

slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp

@@ -156,8 +156,8 @@ int  slsDetectorUtils::acquire(int delflag){
   }
 
 
-
   if (*threadedProcessing) {
+	  sem_init(&dataThreadStartedSemaphore,1,0);
     startThread(delflag);
   }
 #ifdef VERBOSE
@@ -169,6 +169,8 @@ int  slsDetectorUtils::acquire(int delflag){
     resetFramesCaught();
   }
 
+  if(*threadedProcessing && dataReady)
+	  sem_wait(&dataThreadStartedSemaphore);
   for(int im=0;im<nm;im++) {
 
 #ifdef VERBOSE
@@ -346,6 +348,7 @@ int  slsDetectorUtils::acquire(int delflag){
 		  pthread_mutex_lock(&mg);
 		  stopReceiver();
 		  pthread_mutex_unlock(&mg);
+		  cout<<"receiver stopped"<<endl;
 	  }
 
 
@@ -468,6 +471,8 @@ int  slsDetectorUtils::acquire(int delflag){
 #ifdef VERBOSE
     cout << "data processing thread joined" << endl;
 #endif
+    if(dataReady)
+  	  sem_destroy(&dataThreadStartedSemaphore);
   }
 
 

slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp

@@ -484,10 +484,13 @@ void* postProcessing::processData(int delflag) {
 	else{
 
 
-
+		if(dataReady){
+			startdatathreads();
+			sem_post(&dataThreadStartedSemaphore);
+		}
 		readFrameFromReceiver();
 
-
+		cout<<"exiting from proccessing thread"<<endl;
 
 
 

slsDetectorSoftware/slsDetectorAnalysis/postProcessing.h

@@ -17,7 +17,7 @@
 #include <sstream>
 #include <queue>
 #include <math.h>
-
+#include <semaphore.h>
 
 class postProcessingFuncs;
 
@@ -334,6 +334,8 @@ s
   void *pCallbackArg; 
   detectorData *thisData;
   
+  sem_t dataThreadStartedSemaphore;
+
  private:
  // double *fdata;