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

changed the file max to test for 9m and trying to fix packetloss print

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-10-25 12:08:46 +02:00
parent 0cd9261332
commit 58b48aefe2
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsReceiverSoftware/include/sls_receiver_defs.h
View File

@ -23,7 +23,7 @@ typedef int int32_t;
#define MAX_FRAMES_PER_FILE 20000 #define MAX_FRAMES_PER_FILE 20000
#define SHORT_MAX_FRAMES_PER_FILE 100000 #define SHORT_MAX_FRAMES_PER_FILE 100000
#define MOENCH_MAX_FRAMES_PER_FILE 1000 #define MOENCH_MAX_FRAMES_PER_FILE 1000
#define EIGER_MAX_FRAMES_PER_FILE 2000 #define EIGER_MAX_FRAMES_PER_FILE 5
#define JFRAU_MAX_FRAMES_PER_FILE 2000 #define JFRAU_MAX_FRAMES_PER_FILE 2000
#define JFCTB_MAX_FRAMES_PER_FILE 100000 #define JFCTB_MAX_FRAMES_PER_FILE 100000

9
slsReceiverSoftware/src/UDPStandardImplementation.cpp
View File

@ -1572,13 +1572,16 @@ int UDPStandardImplementation::createNewFile(int ithread){
frameNumberInPreviousFile[ithread] = -1; frameNumberInPreviousFile[ithread] = -1;
cout << "Thread " << ithread << " File:" << completeFileName[ithread] << endl; cout << "Thread " << ithread << " File:" << completeFileName[ithread] << endl;
}else{ }else{
if(frameNumberInPreviousFile[ithread] == -1)
frameNumberInPreviousFile[ithread] = startFrameIndex - 1;
cout cout
//<< "Packet Loss:" << //<< "Packet Loss:" <<
//setw(4)<<fixed << setprecision(4) << //setw(4)<<fixed << setprecision(4) <<
//dec << (int)((( (currentFrameNumber-1-previousFrameNumber) - ((packetsInFile-numTotMissingPacketsInFile)/packetsPerFrame))/ //dec << (int)((( (currentFrameNumber-1-previousFrameNumber) - ((packetsInFile-numTotMissingPacketsInFile)/packetsPerFrame))/
// (double)(currentFrameNumber-1-previousFrameNumber))*100.000) // (double)(currentFrameNumber-1-previousFrameNumber))*100.000)
//<< "%\t" //<< "%\t"
<< "\tPackets Lost:" << dec << ( ((int)(currentFrameNumber[ithread]-1-frameNumberInPreviousFile[ithread])*packetsPerFrame) - << "\tPackets Lost:" << dec << ( ((int)(currentFrameNumber[ithread]-frameNumberInPreviousFile[ithread])*packetsPerFrame) -
totalPacketsInFile[ithread]) totalPacketsInFile[ithread])
<< "\tCurrentFrameNumber:" << currentFrameNumber[ithread] << "\tCurrentFrameNumber:" << currentFrameNumber[ithread]
<< "\tPreviousFrameNumber:" << frameNumberInPreviousFile[ithread] << "\tPreviousFrameNumber:" << frameNumberInPreviousFile[ithread]
@ -1593,7 +1596,7 @@ int UDPStandardImplementation::createNewFile(int ithread){
//reset counters for each new file //reset counters for each new file
if(totalWritingPacketCount[ithread]){ if(totalWritingPacketCount[ithread]){
frameNumberInPreviousFile[ithread] = currentFrameNumber[ithread]-1; frameNumberInPreviousFile[ithread] = currentFrameNumber[ithread];
totalPacketsInFile[ithread] = 0; totalPacketsInFile[ithread] = 0;
} }
@ -2628,6 +2631,8 @@ void UDPStandardImplementation::stopWriting(int ithread, char* wbuffer){
} }
if(totalWritingPacketCount[ithread]){ if(totalWritingPacketCount[ithread]){
if(frameNumberInPreviousFile[ithread]==-1)
frameNumberInPreviousFile[ithread] = startFrameIndex - 1;
cout << "\nThread " << ithread << "\tFile:" << completeFileName[ithread] <<endl; cout << "\nThread " << ithread << "\tFile:" << completeFileName[ithread] <<endl;
//<< "Packet Loss:" << //<< "Packet Loss:" <<
//setw(4)<<fixed << setprecision(4) << //setw(4)<<fixed << setprecision(4) <<