if file write not enabled, writing out packet loss and file name removed

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@554 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2013-05-15 15:08:21 +00:00
parent de03868f9f
commit bccffa5c3d
2 changed files with 14 additions and 9 deletions

View File

@ -465,11 +465,14 @@ void slsDetectorUtils::acquire(int delflag){
if (eclog)
delete eclog;
#ifdef VERBOSE
cout << "acquisition finished callback " << endl;
#endif
if (acquisition_finished)
acquisition_finished(getCurrentProgress(),getDetectorStatus(),acqFinished_p);
#ifdef VERBOSE
cout << "acquisition finished callback done " << endl;
#endif
}

View File

@ -492,16 +492,18 @@ int slsReceiverFunctionList::startWriting(){
address = mmap(NULL,memsize,PROT_READ|PROT_WRITE,MAP_SHARED,fileno(sfilefd),0);
if(address == MAP_FAILED)
perror("Error: Could not map file to memory:");
//printing packet losses and file names
if(prevframenum == 0)
cout << savefilename << endl;
else{
cout << savefilename << "\tpacket loss " << fixed << setprecision(4) << ((currframenum-prevframenum-(packetsPerFrame*framesInFile))/(double)(packetsPerFrame*framesInFile))*100.000 << "%\t\t"
"framenum " << currframenum << endl;
}
}
//printing packet losses and file names
if(prevframenum == 0)
cout << savefilename << endl;
else{
cout << savefilename << "\tpacket loss " << fixed << setprecision(4) << ((currframenum-prevframenum-(packetsPerFrame*framesInFile))/(double)(packetsPerFrame*framesInFile))*100.000 << "%\t\t"
"framenum " << currframenum << "\t\t"
"p " << prevframenum << endl;
if(prevframenum != 0){
prevframenum=currframenum;
framesInFile = 0;
}