rtang/FSUDAQ_Qt6
1
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

remove user input for batch size for EventBuilder and FSU2CAEN

Browse Source
This commit is contained in:
Ryan Tang 2024-06-19 16:59:16 -04:00
parent b9d1a76b7e
commit 9ea67c4554
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Aux/EventBuilder.cpp
View File

@ -37,7 +37,8 @@ int main(int argc, char **argv) {
printf(" verbose : > 0 for debug \n"); printf(" verbose : > 0 for debug \n");
printf(" Output file name is contructed from inFile1 \n"); printf(" Output file name is contructed from inFile1 \n");
printf("\n"); printf("\n");
printf(" Example: %s 0 0 0 10000 '\\ls -1 *001*.fsu'\n", argv[0]); printf(" Example: %s -1 0 0 '\\ls -1 *001*.fsu' (no event build, no trace, no verbose)\n", argv[0]);
printf(" %s 100 0 0 '\\ls -1 *001*.fsu' (event build with 100 ns, no trace, no verbose)\n", argv[0]);
printf("\n\n"); printf("\n\n");
return 1; return 1;

19
Aux/FSU2CAEN.cpp
View File

@ -6,10 +6,7 @@ struct FileInfo{
unsigned long hitCount; unsigned long hitCount;
}; };
unsigned short header = 0xCAE1; #define minNARG 3
unsigned int flags = 0;
#define minNARG 4
//^############################################################# //^#############################################################
//^############################################################# //^#############################################################
@ -21,24 +18,25 @@ int main(int argc, char **argv) {
printf("=========================================\n"); printf("=========================================\n");
if (argc < minNARG) { if (argc < minNARG) {
printf("Incorrect number of arguments:\n"); printf("Incorrect number of arguments:\n");
printf("%s [tar] [batchSize] [inFile1] [inFile2] .... \n", argv[0]); printf("%s [tar] [inFile1] [inFile2] .... \n", argv[0]);
printf(" tar : output tar, 0 = no, 1 = yes \n"); printf(" tar : output tar, 0 = no, 1 = yes \n");
printf(" batchSize : the size of hit in a batch \n");
printf("\n"); printf("\n");
printf(" Example: %s 100000 '\\ls -1 *001*.fsu'\n", argv[0]); printf(" Example: %s '\\ls 0 *001*.fsu'\n", argv[0]);
printf("\n\n"); printf("\n\n");
return 1; return 1;
} }
unsigned int debug = false;
unsigned int debug = false;
uInt runStartTime = getTime_us(); uInt runStartTime = getTime_us();
unsigned short header = 0xCAE1;
unsigned int flags = 0;
///============= read input ///============= read input
// long timeWindow = atoi(argv[1]); // long timeWindow = atoi(argv[1]);
// bool traceOn = atoi(argv[2]); // bool traceOn = atoi(argv[2]);
bool tarFlag = atoi(argv[1]); bool tarFlag = atoi(argv[1]);
unsigned int batchSize = atoi(argv[2]); unsigned int batchSize = 2* DEFAULT_HALFBUFFERSIZE;
int nFile = argc - minNARG + 1; int nFile = argc - minNARG + 1;
std::string inFileName[nFile]; std::string inFileName[nFile];
for( int i = 0 ; i < nFile ; i++){ inFileName[i] = argv[i+ minNARG - 1];} for( int i = 0 ; i < nFile ; i++){ inFileName[i] = argv[i+ minNARG - 1];}
@ -66,6 +64,7 @@ int main(int argc, char **argv) {
FSUReader * readerA = new FSUReader(inFileName[0], 1, 1); FSUReader * readerA = new FSUReader(inFileName[0], 1, 1);
readerA->ScanNumBlock(0,0); readerA->ScanNumBlock(0,0);
if( readerA->GetOptimumBatchSize() > batchSize ) batchSize = readerA->GetOptimumBatchSize();
FileInfo fileInfo = {inFileName[0], readerA->GetSN() * 1000 + readerA->GetFileOrder(), readerA->GetTotalHitCount()}; FileInfo fileInfo = {inFileName[0], readerA->GetSN() * 1000 + readerA->GetFileOrder(), readerA->GetTotalHitCount()};
fileList.push_back(fileInfo); fileList.push_back(fileInfo);
totalHitCount += readerA->GetTotalHitCount(); totalHitCount += readerA->GetTotalHitCount();
@ -73,6 +72,8 @@ int main(int argc, char **argv) {
for( int i = 1; i < nFile; i++){ for( int i = 1; i < nFile; i++){
FSUReader * readerB = new FSUReader(inFileName[i], 1, 1); FSUReader * readerB = new FSUReader(inFileName[i], 1, 1);
readerB->ScanNumBlock(0,0); readerB->ScanNumBlock(0,0);
if( readerB->GetOptimumBatchSize() > batchSize ) batchSize = readerB->GetOptimumBatchSize();
totalHitCount += readerB->GetTotalHitCount(); totalHitCount += readerB->GetTotalHitCount();
fileInfo = {inFileName[i], readerB->GetSN() * 1000 + readerB->GetFileOrder(), readerB->GetTotalHitCount()}; fileInfo = {inFileName[i], readerB->GetSN() * 1000 + readerB->GetFileOrder(), readerB->GetTotalHitCount()};