From ab27437604af3bf6b711f6b57c452d2cb7d947f5 Mon Sep 17 00:00:00 2001
From: Dhanya Maliakal <dhanya.maliakal@psi.ch>
Date: Fri, 22 Sep 2017 11:55:35 +0200
Subject: [PATCH] removed setframeindexenable from going to the receiver, it
 can figure it out on its own now

---
 .../multiSlsDetector/multiSlsDetector.cpp     | 38 ------------------
 .../multiSlsDetector/multiSlsDetector.h       |  9 -----
 .../slsDetector/slsDetector.cpp               | 40 -------------------
 slsDetectorSoftware/slsDetector/slsDetector.h |  7 ----
 4 files changed, 94 deletions(-)

diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
index 838b94095..57570a2e9 100644
--- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
+++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
@@ -6011,44 +6011,6 @@ int multiSlsDetector::overwriteFile(int enable){
 }
 
 
-int multiSlsDetector::setFrameIndex(int index){
-	int ret=-100;
-	int posmax = thisMultiDetector->numberOfDetectors;
-	fileIO::setFrameIndex(index);
-	if(!threadpool){
-		cout << "Error in creating threadpool. Exiting" << endl;
-		return -1;
-	}else{
-		//return storage values
-		int* iret[thisMultiDetector->numberOfDetectors];
-		for(int idet=0; idet<posmax; ++idet){
-			if(detectors[idet]){
-				iret[idet]= new int(-1);
-				Task* task = new Task(new func1_t<int,int>(&slsDetector::setFrameIndex,
-						detectors[idet],index,iret[idet]));
-				threadpool->add_task(task);
-			}
-		}
-		threadpool->startExecuting();
-		threadpool->wait_for_tasks_to_complete();
-		for(int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet){
-			if(detectors[idet]){
-				if(iret[idet] != NULL){
-					if (ret==-100)
-						ret=*iret[idet];
-					else if (ret!=*iret[idet])
-						ret=-1;
-					delete iret[idet];
-				}else ret=-1;
-				if(detectors[idet]->getErrorMask())
-					setErrorMask(getErrorMask()|(1<<idet));
-			}
-		}
-	}
-	return ret;
-}
-
-
 
 
 string multiSlsDetector::getErrorMessage(int &critical){
diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
index 6db0ce31d..52bf9d18e 100644
--- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
+++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
@@ -1294,15 +1294,6 @@ class multiSlsDetector  : public slsDetectorUtils {
   */
   int overwriteFile(int enable=-1);
 
-  /**
-   * set frame index to 0 or -1
-   * @param index is the frame index
-  */
-  int setFrameIndex(int index=-1);
-
-
-
-
   int fillModuleMask(int *mM);
 
   /**checks error mask and returns error message if it exists
diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp
index 0699cc8a6..da90b5ec8 100644
--- a/slsDetectorSoftware/slsDetector/slsDetector.cpp
+++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp
@@ -6091,12 +6091,6 @@ string slsDetector::setReceiver(string receiverIP){
 			imask = parentDet->enableOverwriteMask();
 			pthread_mutex_unlock(&ms);
 			overwriteFile(imask);
-
-			if ((thisDetector->timerValue[FRAME_NUMBER]*thisDetector->timerValue[CYCLES_NUMBER])>1)
-				setFrameIndex(0);
-			else
-				setFrameIndex(-1);
-
 			setTimer(FRAME_PERIOD,thisDetector->timerValue[FRAME_PERIOD]);
 			setTimer(FRAME_NUMBER,thisDetector->timerValue[FRAME_NUMBER]);
 			setTimer(ACQUISITION_TIME,thisDetector->timerValue[ACQUISITION_TIME]);
@@ -8444,40 +8438,6 @@ int slsDetector::overwriteFile(int enable){
 
 
 
-int slsDetector::setFrameIndex(int index){
-	int fnum=F_SET_RECEIVER_FRAME_INDEX;
-	int ret = FAIL;
-	int retval=-1;
-	int arg = index;
-
-	if(thisDetector->receiverOnlineFlag==OFFLINE_FLAG){
-		pthread_mutex_lock(&ms);
-		fileIO::setFrameIndex(index);
-		pthread_mutex_unlock(&ms);
-	}
-
-	else if(thisDetector->receiverOnlineFlag==ONLINE_FLAG){
-#ifdef VERBOSE
-		std::cout << "Sending frame index to receiver " << arg << std::endl;
-#endif
-		if (connectData() == OK){
-			ret=thisReceiver->sendInt(fnum,retval,arg);
-			disconnectData();
-		}
-		if(ret!=FAIL){
-			pthread_mutex_lock(&ms);
-			fileIO::setFrameIndex(retval);
-			pthread_mutex_unlock(&ms);
-		}
-		if(ret==FORCE_UPDATE)
-			updateReceiver();
-	}
-	pthread_mutex_lock(&ms);
-	retval = fileIO::getFrameIndex();
-	pthread_mutex_unlock(&ms);
-
-	return retval;
-}
 
 
 int slsDetector::calibratePedestal(int frames){
diff --git a/slsDetectorSoftware/slsDetector/slsDetector.h b/slsDetectorSoftware/slsDetector/slsDetector.h
index cbd33dffe..7efee8e14 100644
--- a/slsDetectorSoftware/slsDetector/slsDetector.h
+++ b/slsDetectorSoftware/slsDetector/slsDetector.h
@@ -1698,13 +1698,6 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
   int overwriteFile(int enable=-1);
 
 
-  /**
-   * set frame index to 0 or -1
-   * @param index is the frame index
-  */
-  int setFrameIndex(int index=-1);
-
-
 
   int fillModuleMask(int *mM);