detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-05-02 02:40:04 +02:00
Code Issues Actions Packages Releases Activity

Merge branch '2.1.1-rc' into developer

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-10-20 07:56:07 +02:00
commit 8d5259d653
1 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
slsReceiverSoftware/src/UDPStandardImplementation.cpp
View File

@ -1373,8 +1373,10 @@ int UDPStandardImplementation::createNewFile(){
FILE_LOG(logDEBUG) << __AT__ << " called"; FILE_LOG(logDEBUG) << __AT__ << " called";
int index = 0; int index = 0;
if(packetsCaught) if(packetsCaught){
index = frameIndex; index = frameIndex;
cout << endl << "File:" << completeFileName <<endl;
}
//create file name //create file name
if(!frameIndexEnable) if(!frameIndexEnable)
@ -1415,19 +1417,17 @@ int UDPStandardImplementation::createNewFile(){
previousFrameNumber = -1; previousFrameNumber = -1;
cout << "File:" << completeFileName << endl; cout << "File:" << completeFileName << endl;
}else{ }else{
if (previousFrameNumber == -1) cout //<< "Packet Loss:" <<
previousFrameNumber = startFrameIndex-1; // setw(4)<<fixed << setprecision(4) <<
// dec << (int)((( (currentFrameNumber-1-previousFrameNumber) - ((packetsInFile-numTotMissingPacketsInFile)/packetsPerFrame))/
cout << completeFileName // (double)(currentFrameNumber-1-previousFrameNumber))*100.000)
<< "\tPacket Loss: " << setw(4)<<fixed << setprecision(4) << dec << // << "%\t"
(int)((( (currentFrameNumber-previousFrameNumber) - ((packetsInFile-numTotMissingPacketsInFile)/packetsPerFrame))/ << "Packets Lost:" << dec << ( ((int)(currentFrameNumber-1-previousFrameNumber)) -
(double)(currentFrameNumber-previousFrameNumber))*100.000) ((packetsInFile-numTotMissingPacketsInFile)/packetsPerFrame))
<< "%\tFramenumber: " << currentFrameNumber << "\tCurrentFrameNumber:" << currentFrameNumber
<< "\t\t PreviousFrameNumber: " << previousFrameNumber << "\tPreviousFrameNumber:" << previousFrameNumber
<< "\tIndex " << dec << index //<< "\tIndex:" << dec << index
<< "\tLost " << dec << ( ((int)(currentFrameNumber-previousFrameNumber)) - << endl;
((packetsInFile-numTotMissingPacketsInFile)/packetsPerFrame)) << endl;
} }
//write file header //write file header
@ -1437,7 +1437,7 @@ int UDPStandardImplementation::createNewFile(){
//reset counters for each new file //reset counters for each new file
if(packetsCaught){ if(packetsCaught){
previousFrameNumber = currentFrameNumber; previousFrameNumber = currentFrameNumber-1;
packetsInFile = 0; packetsInFile = 0;
numTotMissingPacketsInFile = 0; numTotMissingPacketsInFile = 0;
} }
@ -2330,6 +2330,8 @@ void UDPStandardImplementation::processWritingBufferPacketByPacket(int ithread){
//full frame //full frame
if(fullframe[0] && fullframe[1]){ if(fullframe[0] && fullframe[1]){
currentFrameNumber = presentFrameNumber; currentFrameNumber = presentFrameNumber;
acquisitionIndex = currentFrameNumber - startAcquisitionIndex;
frameIndex = currentFrameNumber - startFrameIndex;
numTotMissingPacketsInFile += numMissingPackets; numTotMissingPacketsInFile += numMissingPackets;
numTotMissingPackets += numMissingPackets; numTotMissingPackets += numMissingPackets;
@ -2571,6 +2573,19 @@ void UDPStandardImplementation::stopWriting(int ithread, char* wbuffer[]){
} }
//all threads need to close file, reset mask and exit loop //all threads need to close file, reset mask and exit loop
if(packetsCaught){
cout //<< "Packet Loss:" <<
// setw(4)<<fixed << setprecision(4) <<
// dec << (int)((( (currentFrameNumber-1-previousFrameNumber) - ((packetsInFile-numTotMissingPacketsInFile)/packetsPerFrame))/
// (double)(currentFrameNumber-1-previousFrameNumber))*100.000)
// << "%\t"
<< "Packets Lost:" << dec << ( ((int)(currentFrameNumber-1-previousFrameNumber)) -
((packetsInFile-numTotMissingPacketsInFile)/packetsPerFrame))
<< "\tCurrentFrameNumber:" << currentFrameNumber
<< "\tPreviousFrameNumber:" << previousFrameNumber
//<< "\tIndex:" << dec << index
<< endl;
}
closeFile(ithread); closeFile(ithread);
pthread_mutex_lock(&statusMutex); pthread_mutex_lock(&statusMutex);
writerThreadsMask^=(1<<ithread); writerThreadsMask^=(1<<ithread);