removed external gui flag, acquiring flag is now not reset in stop acquisition, slsdet does not have acquiring flag anymore, busy accomodating acquiringflag, acquire cleanup, in acquire made lock for receiver more local, moved setacquiringflag false to bottom of acquire

slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp

@@ -207,7 +207,6 @@ multiSlsDetector::multiSlsDetector(int id) :  slsDetectorUtils(), shmId(-1)
     }
 
     thisMultiDetector->acquiringFlag = false;
-    thisMultiDetector->externalgui = false;
     thisMultiDetector->receiver_upstream = false;
     thisMultiDetector->alreadyExisting=1;
   }
@@ -1592,7 +1591,7 @@ int multiSlsDetector::stopAcquisition(){
 	}
 
 	*stoppedFlag=1;
-	setAcquiringFlag(false);
+
 	return ret;
 };
 
@@ -6520,11 +6519,6 @@ int multiSlsDetector::pulseChip(int n) {
 
 void multiSlsDetector::setAcquiringFlag(bool b){
 	thisMultiDetector->acquiringFlag = b;
-	for(int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet){
-		if(detectors[idet]){
-			detectors[idet]->setAcquiringFlag(b);
-		}
-	}
 }
 
 bool multiSlsDetector::getAcquiringFlag(){
@@ -6532,10 +6526,12 @@ bool multiSlsDetector::getAcquiringFlag(){
 }
 
 
-void multiSlsDetector::setExternalGuiFlag(bool b){
+bool multiSlsDetector::isAcquireReady() {
-	thisMultiDetector->externalgui = b;
+	if (thisMultiDetector->acquiringFlag) {
+		std::cout << "Acquire has already started. If previous acquisition terminated unexpectedly, reset busy flag to restart.(sls_detector_put busy 0)" << std::endl;
+		return FAIL;
 	}
 
-bool multiSlsDetector::getExternalGuiFlag(){
+	thisMultiDetector->acquiringFlag = true;
-	return thisMultiDetector->externalgui;
+	return OK;
 }

slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h

@@ -1469,18 +1469,10 @@ class multiSlsDetector  : public slsDetectorUtils {
   bool getAcquiringFlag();
 
   /**
-     Set external gui flag in shared memory
+   * Check if acquiring flag is set, set error if set
-     \param b set external gui flag
+   * \returns FAIL if not ready, OK if ready
    */
-  void setExternalGuiFlag(bool b=false);
+  bool isAcquireReady();
-
-  /**
-     Get external gui flag from shared memory
-     \returns external gui flag
-   */
-  bool getExternalGuiFlag();
-
-
 
 private:
 

slsDetectorSoftware/slsDetector/slsDetector.cpp

@@ -774,7 +774,6 @@ int slsDetector::initializeDetectorSize(detectorType type) {
     thisDetector->actionMask=0;
 
     thisDetector->tenGigaEnable=0;
-    thisDetector->acquiringFlag = false;
     thisDetector->flippedData[0] = 0;
     thisDetector->flippedData[1] = 0;
     thisDetector->zmqport = 0;
@@ -9154,21 +9153,15 @@ int slsDetector::pulseChip(int n) {
 
 
 void slsDetector::setAcquiringFlag(bool b){
-	thisDetector->acquiringFlag = b;
+	parentDet->setAcquiringFlag(b);
 }
 
 bool slsDetector::getAcquiringFlag(){
-	return thisDetector->acquiringFlag;
+	return parentDet->getAcquiringFlag();
 }
 
 
-void slsDetector::setExternalGuiFlag(bool b){
+bool slsDetector::isAcquireReady() {
-	pthread_mutex_lock(&ms);
+	return parentDet->isAcquireReady();
-	parentDet->setExternalGuiFlag(b);
-	pthread_mutex_unlock(&ms);
-}
-
-bool slsDetector::getExternalGuiFlag(){
-	return parentDet->getExternalGuiFlag();
 }
 

slsDetectorSoftware/slsDetector/slsDetector.h

@@ -265,8 +265,6 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
     /** 10 Gbe enable*/
     int tenGigaEnable;
 
-    /** flag for acquiring */
-    bool acquiringFlag;
     /** flipped data across x or y axis */
     int flippedData[2];
     /** tcp port from gui/different process to receiver (only data) */
@@ -1915,16 +1913,10 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
   bool getAcquiringFlag();
 
   /**
-     Set external gui flag in shared memory
+   * Check if acquiring flag is set, set error if set
-     \param b set external gui flag
+   * \returns FAIL if not ready, OK if ready
    */
-  void setExternalGuiFlag(bool b=false);
+  bool isAcquireReady();
-
-  /**
-     Get external gui flag from shared memory
-     \returns external gui flag
-   */
-  bool getExternalGuiFlag();
 
 
  protected:

slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp

@@ -184,7 +184,7 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det)  {
 	++i;
 
 	/*! \page acquisition
-   - \b busy returns \c 1 if the acquisition is active, \c 0 otherwise. Works when the acquisition is started in blocking mode. Only get! \c Returns \c (int)
+   - <b>  busy i</b> sets/gets acquiring flag. \c 1 the acquisition is active, \c 0 otherwise. Acquire command will set this flag to 1 at the beginning and to 0 at the end. Use this to clear flag if acquisition terminated unexpectedly. \c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="busy"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdStatus;
@@ -2438,7 +2438,10 @@ string slsDetectorCommand::cmdStatus(int narg, char *args[], int action) {
 	}
 	else if (cmd=="busy") {
 		if (action==PUT_ACTION) {
-			return string ("cannot put");
+			int i;
+			if(!sscanf(args[1],"%d",&i))
+				return string("cannot parse busy mode");
+			myDet->setAcquiringFlag(i);
 		}
 		char answer[100];
 		sprintf(answer,"%d", myDet->getAcquiringFlag());
@@ -2457,8 +2460,10 @@ string slsDetectorCommand::helpStatus(int narg, char *args[], int action) {
 		os << string("status \t gets the detector status - can be: running, error, transmitting, finished, waiting or idle\n");
 		os << string("busy \t gets the status of acquire- can be: 0 or 1. 0 for idle, 1 for running\n");
 	}
-	if (action==PUT_ACTION || action==HELP_ACTION)
+	if (action==PUT_ACTION || action==HELP_ACTION) {
 		os << string("status \t controls the detector acquisition - can be start or stop \n");
+		os << string("busy i\t sets the status of acquire- can be: 0(idle) or 1(running).Command Acquire sets it to 1 at beignning of acquire and back to 0 at the end. Clear Flag for unexpected acquire terminations. \n");
+	}
 	return os.str();
 }
 

slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp

@@ -42,20 +42,16 @@ slsDetectorUtils::slsDetectorUtils()  {
 
 
 int  slsDetectorUtils::acquire(int delflag){
+
 	//ensure acquire isnt started multiple times by same client
-  if(getAcquiringFlag() == false)
+	if (isAcquireReady() ==  FAIL)
-    setAcquiringFlag(true);
-  else{
-	  std::cout << "Error: Acquire has already been started." << std::endl;
 		return FAIL;
-  }
 
 #ifdef VERBOSE
 	struct timespec begin,end;
 	clock_gettime(CLOCK_REALTIME, &begin);
 #endif
 
-	//not in the loop for real time acqusition yet,
 	//in the real time acquisition loop, processing thread will wait for a post each time
 	sem_init(&sem_newRTAcquisition,1,0);
 
@@ -69,17 +65,13 @@ int  slsDetectorUtils::acquire(int delflag){
 	int nf=setTimer(FRAME_NUMBER,-1);
 	if (nc==0) nc=1;
 	if (nf==0) nf=1;
-
 	int multiframe = nc*nf;
 
-  // setTotalProgress();
-  //moved these 2 here for measurement change
 	progressIndex=0;
 	*stoppedFlag=0;
 
 	angCalLogClass *aclog=NULL;
 	enCalLogClass *eclog=NULL;
-  //  int lastindex=startindex, nowindex=startindex;
 	int connectChannels=0;
 
 #ifdef VERBOSE
@@ -88,8 +80,6 @@ int  slsDetectorUtils::acquire(int delflag){
 #endif
 
 	void *status;
-
-
 	if ((*correctionMask&(1<< ANGULAR_CONVERSION)) || (*correctionMask&(1<< I0_NORMALIZATION)) || getActionMode(angCalLog) || (getScanMode(0)==positionScan)|| (getScanMode(1)==positionScan)) {
 		if (connectChannels==0)
 			if (connect_channels) {
@@ -97,8 +87,6 @@ int  slsDetectorUtils::acquire(int delflag){
 				connectChannels=1;
 			}
 	}
-  
-
 	if (getActionMode(angCalLog)) {
 		aclog=new angCalLogClass(this);
 	}
@@ -108,13 +96,10 @@ int  slsDetectorUtils::acquire(int delflag){
 	}
 
 
-
 	setJoinThread(0);
 	positionFinished(0);
 
 
-
-
 	int nm=timerValue[MEASUREMENTS_NUMBER];
 	if (nm<1)
 		nm=1;
@@ -139,12 +124,13 @@ int  slsDetectorUtils::acquire(int delflag){
 			ns1=1;
 	}
 
+	// verify receiver is idle
 	if(receiver){
-    pthread_mutex_lock(&mg); //cout << "lock"<< endl;
+		pthread_mutex_lock(&mg);
 		if(getReceiverStatus()!=IDLE)
 			if(stopReceiver() == FAIL)
 				*stoppedFlag=1;
-	  pthread_mutex_unlock(&mg);//cout << "unlock"<< endl;
+		pthread_mutex_unlock(&mg);
 	}
 
 
@@ -156,10 +142,10 @@ int  slsDetectorUtils::acquire(int delflag){
 
 	//resets frames caught in receiver
 	if(receiver){
-    pthread_mutex_lock(&mg); //cout << "lock"<< endl;
+		pthread_mutex_lock(&mg);
 		if (resetFramesCaught() == FAIL)
 			*stoppedFlag=1;
-    pthread_mutex_unlock(&mg);//cout << "unlock"<< endl;
+		pthread_mutex_unlock(&mg);
 	}
 
 
@@ -169,23 +155,12 @@ int  slsDetectorUtils::acquire(int delflag){
 		cout << " starting measurement "<< im << " of " << nm << endl;
 #endif
 
-
+		// start script
-    //cout << "data thread started " << endl;
- 
-
-    //loop measurements
-
-//     pthread_mutex_lock(&mp);
-//     setStartIndex(*fileIndex);
-//     pthread_mutex_unlock(&mp);
- 
-    //cout << "action at start" << endl;
 		if (*stoppedFlag==0) {
 			executeAction(startScript);
 		}
 
 		for (int is0=0; is0<ns0; ++is0) {
-      //  cout << "scan0 loop" << endl;
 
 			if (*stoppedFlag==0) {
 				executeScan(0,is0);
@@ -194,7 +169,6 @@ int  slsDetectorUtils::acquire(int delflag){
 
 
 			for (int is1=0; is1<ns1; ++is1) {
-	// cout << "scan1 loop" << endl;
 
 				if (*stoppedFlag==0) {
 					executeScan(1,is1);
@@ -210,7 +184,6 @@ int  slsDetectorUtils::acquire(int delflag){
 
 				for (int ip=0; ip<np; ++ip) {
 
-	  //   cout << "positions " << endl;
 					if (*stoppedFlag==0) {
 						if  (getNumberOfPositions()>0) {
 							moveDetector(detPositions[ip]);
@@ -227,25 +200,22 @@ int  slsDetectorUtils::acquire(int delflag){
 					createFileName();
 					pthread_mutex_unlock(&mp);
 
+					// script before
 					if (*stoppedFlag==0) {
 						executeAction(scriptBefore);
 					} else
 						break;
 
 
-       
+					// header before
-
 					if (*stoppedFlag==0) {
-
-
 						executeAction(headerBefore);
 
-	    if (*correctionMask&(1<< ANGULAR_CONVERSION) || aclog){// || eclog) { 
+						if (*correctionMask&(1<< ANGULAR_CONVERSION) || aclog){
 							positionFinished(0);
 							setCurrentPosition(getDetectorPosition());
 						}
 
-
 						if (aclog)
 							aclog->addStep(getCurrentPosition(), getCurrentFileName());
 
@@ -261,34 +231,33 @@ int  slsDetectorUtils::acquire(int delflag){
 						setCurrentFrameIndex(0);
 
 						if(receiver)
-	      pthread_mutex_lock(&mg); //cout << "lock"<< endl;
+							pthread_mutex_lock(&mg);
 						if (multiframe>1)
 							setFrameIndex(0);
 						else
 							setFrameIndex(-1);
 
-
+						// file name and start receiver
 						if(receiver){
-	      pthread_mutex_unlock(&mg);//cout << "unlock"<< endl;
+							pthread_mutex_unlock(&mg);
 							pthread_mutex_lock(&mp);
 							createFileName();
 							pthread_mutex_unlock(&mp);
 							//send receiver file name
-	    	pthread_mutex_lock(&mg); //cout << "lock"<< endl;
+							pthread_mutex_lock(&mg);
 							setFileName(fileIO::getFileName());
 
-	    	//start receiver
 							if(startReceiver() == FAIL) {
 								cout << "Start receiver failed " << endl;
 								stopReceiver();
 								*stoppedFlag=1;
-	    		pthread_mutex_unlock(&mg);//cout << "unlock"<< endl;
+								pthread_mutex_unlock(&mg);
 								break;
 							}
 #ifdef VERBOSE
 							cout << "Receiver started " << endl;
 #endif
-		  pthread_mutex_unlock(&mg);//cout << "unlock"<< endl;
+							pthread_mutex_unlock(&mg);
 
 							//let processing thread listen to these packets
 							sem_post(&sem_newRTAcquisition);
@@ -299,16 +268,13 @@ int  slsDetectorUtils::acquire(int delflag){
 						startAndReadAll();
 #ifdef VERBOSE
 						cout << "detector finished" << endl;
-#endif
-	   #ifdef VERBOSE
 						cout << "returned! " << endl;
 #endif
 
 
-
 						if (*correctionMask&(1<< I0_NORMALIZATION)) {
 							if (get_i0)
-		currentI0=get_i0(1,IOarg); // this is the correct i0!!!!!
+								currentI0=get_i0(1,IOarg);
 						}
 #ifdef VERBOSE
 						cout << "pos finished? " << endl;
@@ -325,7 +291,6 @@ int  slsDetectorUtils::acquire(int delflag){
 #ifdef VERBOSE
 							cout << "start unthreaded process data " << endl;
 #endif
-
 							processData(delflag);
 						}
 
@@ -333,60 +298,54 @@ int  slsDetectorUtils::acquire(int delflag){
 						break;
 
 					while (dataQueueSize()) usleep(100000);
-	  // cout << "mglock " << endl;;
 
-
+					// close file
-
-	  pthread_mutex_lock(&mg); //cout << "lock"<< endl;
-	  // cout << "done " << endl;;
-	  //offline
 					if(!receiver){
-		  if ((getDetectorsType()==GOTTHARD) || (getDetectorsType()==MOENCH) || (getDetectorsType()==JUNGFRAU)|| (getDetectorsType()==JUNGFRAUCTB) ){
+						detectorType type = getDetectorsType();
+						if ((type==GOTTHARD) || (type==MOENCH) || (type==JUNGFRAUCTB) ){
 							if((*correctionMask)&(1<<WRITE_FILE))
 								closeDataFile();
 						}
 					}
-	  //online
+
+					// stop receiver
 					else{
+						pthread_mutex_lock(&mg);
 						if (stopReceiver() == FAIL)
 							*stoppedFlag = 1;
-		  //	  cout<<"***********receiver stopped"<<endl;
+						pthread_mutex_unlock(&mg);
 					}
-	  pthread_mutex_unlock(&mg);//cout << "unlock"<< endl;
 
-
+					// header after
-
-	  pthread_mutex_lock(&mp);
 					if (*stoppedFlag==0) {
+						pthread_mutex_lock(&mp);
 						executeAction(headerAfter);
-
 						pthread_mutex_unlock(&mp);
-	    // setLastIndex(*fileIndex);
-	  } else {
-	    //   setLastIndex(*fileIndex);
-
-		pthread_mutex_unlock(&mp);
-	    break;
 					}
 
-
 					if (*stoppedFlag) {
 #ifdef VERBOSE
 						std::cout<< "exiting since the detector has been stopped" << std::endl;
 #endif
 						break;
-	  } else if (ip<(np-1)) {
-// 	    pthread_mutex_lock(&mp);
-// 	    *fileIndex=setStartIndex(); 
-// 	    pthread_mutex_unlock(&mp);
 					}
-	} // loop on position finished
+
+				}//end position loop ip
+
 
 				//script after
 				if (*stoppedFlag==0) {
 					executeAction(scriptAfter);
-	} else
+				}
+
+				if (*stoppedFlag) {
+#ifdef VERBOSE
+					std::cout<< "exiting since the detector has been stopped" << std::endl;
+#endif
 					break;
+				}
+
+			}//end scan1 loop is1
 
 
 			if (*stoppedFlag) {
@@ -394,46 +353,28 @@ int  slsDetectorUtils::acquire(int delflag){
 				std::cout<< "exiting since the detector has been stopped" << std::endl;
 #endif
 				break;
-	} else if (is1<(ns1-1)) {
-// 	  pthread_mutex_lock(&mp);
-// 	  *fileIndex=setStartIndex(); 
-// 	  pthread_mutex_unlock(&mp);
-	}
-      } 
-
-      //end scan1 loop is1
-  
-
-      if (*stoppedFlag) {
-#ifdef VERBOSE
-	std::cout<< "exiting since the detector has been stopped" << std::endl;
-#endif
-	break;
-      } else if (is0<(ns0-1)) {
-// 	pthread_mutex_lock(&mp);
-// 	*fileIndex=setStartIndex();  
-// 	pthread_mutex_unlock(&mp);
 			}
 
 		}//end scan0 loop is0
 
-//     pthread_mutex_lock(&mp);
+
-//     *fileIndex=setLastIndex();  
-//     pthread_mutex_unlock(&mp);
 
 		if (*stoppedFlag==0) {
 			executeAction(stopScript);
-    } else{
+		}
 
+		if (*stoppedFlag) {
 #ifdef VERBOSE
 			cout << "findex incremented " << endl;
 #endif
 			if(*correctionMask&(1<<WRITE_FILE))
 				IncrementFileIndex();
-    pthread_mutex_lock(&mg); //cout << "lock"<< endl;
+			pthread_mutex_lock(&mg);
 			setFileIndex(fileIO::getFileIndex());
-    pthread_mutex_unlock(&mg);//cout << "unlock"<< endl;
+			pthread_mutex_unlock(&mg);
-
+#ifdef VERBOSE
+			std::cout<< "exiting since the detector has been stopped" << std::endl;
+#endif
 			break;
 		}
 
@@ -454,12 +395,13 @@ int  slsDetectorUtils::acquire(int delflag){
 		}
 
 		if (*stoppedFlag) {
+#ifdef VERBOSE
+			std::cout<< "exiting since the detector has been stopped" << std::endl;
+#endif
 			break;
 		}
 
-
+	}//end measurements loop im
-    // loop measurements
-  }
 
 
 
@@ -503,13 +445,15 @@ int  slsDetectorUtils::acquire(int delflag){
 	cout << "acquisition finished callback done " << endl;
 #endif
 
-  setAcquiringFlag(false);
 	sem_destroy(&sem_newRTAcquisition);
 
 #ifdef VERBOSE
 	clock_gettime(CLOCK_REALTIME, &end);
 	cout << "Elapsed time for acquisition:" << (( end.tv_sec - begin.tv_sec )	+ ( end.tv_nsec - begin.tv_nsec ) / 1000000000.0) << " seconds" << endl;
 #endif
+
+	setAcquiringFlag(false);
+
 	return OK;
 
 }

slsDetectorSoftware/slsDetector/slsDetectorUtils.h

@@ -899,33 +899,12 @@ virtual int setReceiverSilentMode(int i = -1)=0;
    */
   virtual bool getAcquiringFlag() = 0;
 
-  /**
-     Set external gui flag in shared memory
-     \param b set external gui flag
-   */
-  virtual void setExternalGuiFlag(bool b=false) = 0;
 
   /**
-     Get external gui flag from shared memory
+   * Check if acquiring flag is set, set error if set
-     \returns external gui flag
+   * \returns FAIL if not ready, OK if ready
    */
-  virtual bool getExternalGuiFlag() = 0;
+  virtual bool isAcquireReady() = 0;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-