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

included total packets to display

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@682 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-10-04 09:53:22 +00:00
parent 560d61c343
commit 64ab43cb8c
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp
View File

@ -35,6 +35,7 @@ slsReceiverFunctionList::slsReceiverFunctionList(detectorType det):
startFrameIndex(0), startFrameIndex(0),
frameIndex(0), frameIndex(0),
totalFramesCaught(0), totalFramesCaught(0),
totalPacketsCaught(0),
startAcquisitionIndex(0), startAcquisitionIndex(0),
acquisitionIndex(0), acquisitionIndex(0),
packetsInFile(0), packetsInFile(0),
@ -290,7 +291,7 @@ void slsReceiverFunctionList::resetTotalFramesCaught(){
acqStarted = false; acqStarted = false;
startAcquisitionIndex = 0; startAcquisitionIndex = 0;
totalFramesCaught = 0; totalFramesCaught = 0;
totalPacketsCaught = 0;
} }
@ -769,6 +770,7 @@ int slsReceiverFunctionList::startWriting(){
} }
packetsInFile += i; packetsInFile += i;
totalPacketsCaught += i;
//count only if you get full frames //count only if you get full frames
if(i == packetsPerFrame){ if(i == packetsPerFrame){
framesCaught++; framesCaught++;
@ -856,9 +858,9 @@ int slsReceiverFunctionList::startWriting(){
receiver_threads_running=0; receiver_threads_running=0;
pthread_mutex_unlock(&status_mutex); pthread_mutex_unlock(&status_mutex);
cout << "RealTime Packets Caught:" << dec << packetsInFile << endl; cout << "Total RealTime Packets Caught:" << dec << totalPacketsCaught << endl;
cout << "RealTime Frames Caught:" << dec << framesCaught << endl; //cout << "RealTime Full Frames Caught:" << dec << framesCaught << endl;
cout << "Total Frames Caught:"<< dec << totalFramesCaught << endl; cout << "Total Full Frames Caught:"<< dec << totalFramesCaught << endl;
if(sfilefd){ if(sfilefd){

3
slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.h
View File

@ -258,6 +258,9 @@ private:
/** Total Frames Caught for an entire acquisition (including all scans) */ /** Total Frames Caught for an entire acquisition (including all scans) */
int totalFramesCaught; int totalFramesCaught;
/** Total packets caught for an entire acquisition (including all scans) */
int totalPacketsCaught;
/** Frame index at start of an entire acquisition (including all scans) */ /** Frame index at start of an entire acquisition (including all scans) */
uint32_t startAcquisitionIndex; uint32_t startAcquisitionIndex;