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

progress bug

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-11-03 13:44:24 +01:00
parent 26d8d6e108
commit dfe39ef3e5
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsReceiverSoftware/include/sls_receiver_defs.h
View File

@ -25,7 +25,7 @@ typedef int int32_t;
#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 2000
#define JFRAU_MAX_FRAMES_PER_FILE 10000 #define JFRAU_MAX_FRAMES_PER_FILE 10000
#define JFCTB_MAX_FRAMES_PER_FILE 100000 #define JFCTB_MAX_FRAMES_PER_FILE 5
/** /**

12
slsReceiverSoftware/src/UDPStandardImplementation.cpp
View File

@ -1582,12 +1582,12 @@ int UDPStandardImplementation::createNewFile(int ithread){
printf("\nThread:%d File:%s\n" printf("\nThread:%d File:%s\n"
//"\ttotalpacketsinfile:%d\t" //"\ttotalpacketsinfile:%d\t"
"Packets Lost:%d" "Packets Lost:%d"
//"\tCurrentFrameNumber:%lld\tPreviousFrameNumber:%lld" "\tCurrentFrameNumber:%lld\tPreviousFrameNumber:%lld"
"\n", "\n",
ithread,completeFileName[ithread], ithread,completeFileName[ithread],
//totalPacketsInFile[ithread], //totalPacketsInFile[ithread],
( ((int)(currentFrameNumber[ithread]-frameNumberInPreviousFile[ithread])*packetsPerFrame) - totalPacketsInFile[ithread]) ( ((int)(currentFrameNumber[ithread]-frameNumberInPreviousFile[ithread])*packetsPerFrame) - totalPacketsInFile[ithread])
//,currentFrameNumber[ithread],frameNumberInPreviousFile[ithread] ,currentFrameNumber[ithread],frameNumberInPreviousFile[ithread]
); );
} }
@ -2737,14 +2737,14 @@ void UDPStandardImplementation::stopWriting(int ithread, char* wbuffer){
frameNumberInPreviousFile[ithread] = startFrameIndex-1; frameNumberInPreviousFile[ithread] = startFrameIndex-1;
printf("\nThread:%d File:%s\n" printf("\nThread:%d File:%s\n"
//"\ttotalpacketsinfile:%d\t" "\ttotalpacketsinfile:%d\t"
"Packets Lost:%d" "Packets Lost:%d"
//"\tCurrentFrameNumber:%lld\tPreviousFrameNumber:%lld" "\tCurrentFrameNumber:%lld\tPreviousFrameNumber:%lld"
"\n", "\n",
ithread,completeFileName[ithread], ithread,completeFileName[ithread],
//totalPacketsInFile[ithread], totalPacketsInFile[ithread],
( ((int)(currentFrameNumber[ithread]-frameNumberInPreviousFile[ithread])*packetsPerFrame) - totalPacketsInFile[ithread]) ( ((int)(currentFrameNumber[ithread]-frameNumberInPreviousFile[ithread])*packetsPerFrame) - totalPacketsInFile[ithread])
//,currentFrameNumber[ithread],frameNumberInPreviousFile[ithread] ,currentFrameNumber[ithread],frameNumberInPreviousFile[ithread]
); );
} }
closeFile(ithread); closeFile(ithread);