From ed4aaa83cedf6478efdf81f90fca31aa7fbe6c19 Mon Sep 17 00:00:00 2001
From: l_maliakal_d <l_maliakal_d@951219d9-93cf-4727-9268-0efd64621fa3>
Date: Mon, 4 Feb 2013 16:04:19 +0000
Subject: [PATCH] changed getframeindex and getacquisitionindex to return
 proper values without checking framescaught

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@450 951219d9-93cf-4727-9268-0efd64621fa3
---
 slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp b/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp
index a0312e404..1771c0eb3 100644
--- a/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp
+++ b/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp
@@ -102,7 +102,7 @@ void slsReceiverFunctionList::setEthernetInterface(char* c){
 int slsReceiverFunctionList::getFrameIndex(){
 	if(startFrameIndex==-1)
 		frameIndex=0;
-	else if(framesCaught)
+	else
 		frameIndex=(currframenum - startFrameIndex)/packetsPerFrame;
 	return frameIndex;
 }
@@ -112,8 +112,8 @@ int slsReceiverFunctionList::getFrameIndex(){
 int slsReceiverFunctionList::getAcquisitionIndex(){
 	if(startAcquisitionIndex==-1)
 		acquisitionIndex=0;
-	else if(framesCaught)
-			acquisitionIndex=(currframenum - startAcquisitionIndex)/packetsPerFrame;
+	else
+		acquisitionIndex=(currframenum - startAcquisitionIndex)/packetsPerFrame;
 
 	return acquisitionIndex;
 }