detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-17 07:17:13 +02:00
Code Issues Actions Packages Releases Activity

changed getframeindex and getacquisitionindex to return proper values without checking framescaught

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@450 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-02-04 16:04:19 +00:00
parent c420906b0c
commit ed4aaa83ce
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp
View File

@ -102,7 +102,7 @@ void slsReceiverFunctionList::setEthernetInterface(char* c){
int slsReceiverFunctionList::getFrameIndex(){ int slsReceiverFunctionList::getFrameIndex(){
if(startFrameIndex==-1) if(startFrameIndex==-1)
frameIndex=0; frameIndex=0;
else if(framesCaught) else
frameIndex=(currframenum - startFrameIndex)/packetsPerFrame; frameIndex=(currframenum - startFrameIndex)/packetsPerFrame;
return frameIndex; return frameIndex;
} }
@ -112,7 +112,7 @@ int slsReceiverFunctionList::getFrameIndex(){
int slsReceiverFunctionList::getAcquisitionIndex(){ int slsReceiverFunctionList::getAcquisitionIndex(){
if(startAcquisitionIndex==-1) if(startAcquisitionIndex==-1)
acquisitionIndex=0; acquisitionIndex=0;
else if(framesCaught) else
acquisitionIndex=(currframenum - startAcquisitionIndex)/packetsPerFrame; acquisitionIndex=(currframenum - startAcquisitionIndex)/packetsPerFrame;
return acquisitionIndex; return acquisitionIndex;