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

bug fix on timestamp for QDC

Browse Source
This commit is contained in:
carina@hades 2023-10-18 18:33:29 -04:00
parent 66437f0262
commit 5279dfad72
2 changed files with 83 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
ClassData.h
View File

@ -9,6 +9,7 @@
#include <iostream> ///cout #include <iostream> ///cout
#include <sstream> #include <sstream>
#include <iomanip> // for setw #include <iomanip> // for setw
#include <algorithm>
#include <bitset> #include <bitset>
#include <vector> #include <vector>
#include <sys/stat.h> #include <sys/stat.h>
@ -382,6 +383,8 @@ inline void Data::DecodeBuffer(bool fastDecode, int verbose){
if( nByte == 0 ) return; if( nByte == 0 ) return;
nw = 0; nw = 0;
//printf("############################# agg\n");
do{ do{
if( verbose >= 1 ) printf("Data::DecodeBuffer ######################################### Board Agg.\n"); if( verbose >= 1 ) printf("Data::DecodeBuffer ######################################### Board Agg.\n");
unsigned int word = ReadBuffer(nw, verbose); unsigned int word = ReadBuffer(nw, verbose);
@ -443,8 +446,8 @@ inline void Data::DecodeBuffer(bool fastDecode, int verbose){
// printf("%s | ch %d | %d %d \n", __func__, ch, LoopIndex[ch], DataIndex[ch]); // printf("%s | ch %d | %d %d \n", __func__, ch, LoopIndex[ch], DataIndex[ch]);
IsNotRollOverFakeAgg = true; IsNotRollOverFakeAgg = true;
}else{ }else{
TriggerRate[ch] = 0; // TriggerRate[ch] = 0;
NonPileUpRate[ch] = 0; // NonPileUpRate[ch] = 0;
continue; continue;
} }
@ -454,6 +457,8 @@ inline void Data::DecodeBuffer(bool fastDecode, int verbose){
continue; continue;
} }
//printf("Ch : %2d | Decoded Event : %d \n", ch, NumEventsDecoded[ch]);
if( NumEventsDecoded[ch] > 4 ){ if( NumEventsDecoded[ch] > 4 ){
int indexStart = DataIndex[ch] - NumEventsDecoded[ch] + 1; int indexStart = DataIndex[ch] - NumEventsDecoded[ch] + 1;
@ -468,34 +473,81 @@ inline void Data::DecodeBuffer(bool fastDecode, int verbose){
}else{ // look in to the data in the memory, not just this agg. }else{ // look in to the data in the memory, not just this agg.
if( calIndexes[ch][0] == -1 ) calIndexes[ch][0] = 0; const short nEvent = 10;
if( calIndexes[ch][0] > -1 && calIndexes[ch][1] == -1 ) calIndexes[ch][1] = DataIndex[ch];
short nEvent = calIndexes[ch][1] - calIndexes[ch][0] ; if( TotNumNonPileUpEvents[ch] >= nEvent ){
if( nEvent < 0 ) nEvent += MaxNData;
//printf("ch %2d ----- %d %d | %d \n", ch, calIndexes[ch][0], calIndexes[ch][1], nEvent);
if( calIndexes[ch][0] > -1 && calIndexes[ch][1] > -1 && nEvent > 10 ){ calIndexes[ch][1] = DataIndex[ch];
unsigned long long dTime = Timestamp[ch][calIndexes[ch][1]] - Timestamp[ch][calIndexes[ch][0]]; calIndexes[ch][0] = DataIndex[ch] - nEvent + 1;
double sec = dTime * tick2ns / 1e9; if (calIndexes[ch][0] < 0 ) calIndexes[ch][0] += MaxNData;
// std::vector<unsigned long long> tList ;
// for( int i = 0; i < nEvent ; i ++){
// int j = (calIndexes[ch][0] + i) % MaxNData;
// tList.push_back( Timestamp[ch][j]);
// }
// if( DPPType == DPPType::DPP_QDC_CODE){
// //std::sort(tList.begin(), tList.end());
// unsigned long long t0 = tList.front(); // earlier
// unsigned long long t1 = tList.back(); // latest
// for( int i = 0; i < (int) tList.size(); i++){
// if( t0 < tList[i]) t0 = tList[i];
// if( t1 > tList[i]) t1 = tList[i];
// }
// tList.front() = t0;
// tList.back() = t1;
// }
//double sec = ( tList.back() - tList.front() ) * tick2ns / 1e9;
unsigned long long t0 = Timestamp[ch][(calIndexes[ch][0]) % MaxNData]; // earlier
unsigned long long t1 = Timestamp[ch][(calIndexes[ch][1]) % MaxNData];; // latest
double sec = ( t1 - t0 ) * tick2ns / 1e9;
TriggerRate[ch] = nEvent / sec; TriggerRate[ch] = nEvent / sec;
short pileUpCount = 0; short pileUpCount = 0;
for( int i = calIndexes[ch][0] ; i <= calIndexes[ch][0] + nEvent; i++ ) { for( int i = 0 ; i < nEvent; i++ ) {
if( PileUp[ch][i % MaxNData] ) pileUpCount ++; int j = (calIndexes[ch][0] + i) % MaxNData;
if( PileUp[ch][j] ) pileUpCount ++;
} }
//printf("%2d | %10llu %10llu, %.0f = %f sec, rate = %f, nEvent %d pileUp %d \n", ch, Timestamp[ch][calIndexes[ch][0]], Timestamp[ch][calIndexes[ch][1]], tick2ns, sec, nEvent / sec, nEvent, pileUpCount);
NonPileUpRate[ch] = (nEvent - pileUpCount)/sec; NonPileUpRate[ch] = (nEvent - pileUpCount)/sec;
calIndexes[ch][0] = calIndexes[ch][1]; //printf("%2d | %10llu %10llu, %.0f = %f sec, rate = %f, nEvent %d pileUp %d \n", ch, tList.front() ,tList.back(), tick2ns, sec, nEvent / sec, nEvent, pileUpCount);
calIndexes[ch][1] = -1;
}else{
calIndexes[ch][1] = -1;
} }
// if( calIndexes[ch][0] == -1 ) calIndexes[ch][0] = 0;
// if( calIndexes[ch][0] > -1 && calIndexes[ch][1] == -1 ) calIndexes[ch][1] = DataIndex[ch];
// short nEvent = calIndexes[ch][1] - calIndexes[ch][0] ;
// if( nEvent < 0 ) nEvent += MaxNData;
// printf("ch %2d ----- %d %d | %d \n", ch, calIndexes[ch][0], calIndexes[ch][1], nEvent);
// if( calIndexes[ch][0] > -1 && calIndexes[ch][1] > -1 && nEvent > 2 ){
// unsigned long long dTime = Timestamp[ch][calIndexes[ch][1]] - Timestamp[ch][calIndexes[ch][0]];
// double sec = dTime * tick2ns / 1e9;
// TriggerRate[ch] = nEvent / sec;
// short pileUpCount = 0;
// for( int i = calIndexes[ch][0] ; i <= calIndexes[ch][0] + nEvent; i++ ) {
// if( PileUp[ch][i % MaxNData] ) pileUpCount ++;
// }
// printf("%2d | %10llu %10llu, %.0f = %f sec, rate = %f, nEvent %d pileUp %d \n", ch, Timestamp[ch][calIndexes[ch][0]], Timestamp[ch][calIndexes[ch][1]], tick2ns, sec, nEvent / sec, nEvent, pileUpCount);
// NonPileUpRate[ch] = (nEvent - pileUpCount)/sec;
// calIndexes[ch][0] = calIndexes[ch][1];
// calIndexes[ch][1] = -1;
// }else{
// calIndexes[ch][1] = -1;
// }
} }
} }
@ -1031,12 +1083,12 @@ inline int Data::DecodeQDCGroupedChannelBlock(unsigned int ChannelMask, bool fas
if( hasExtra ){ if( hasExtra ){
nw = nw +1 ; word = ReadBuffer(nw, verbose); nw = nw +1 ; word = ReadBuffer(nw, verbose);
extra = word; extra = word;
baseline = (word & 0xFFF); extTimeStamp = (word & 0xFFF);
extTimeStamp = (word >> 16); baseline = (word >> 16) / 16;
if( verbose >= 2 ) printf("extra : 0x%lx, baseline : %d\n", extra, baseline); if( verbose >= 2 ) printf("extra : 0x%lx, baseline : %d\n", extra, baseline);
} }
unsigned long long timeStamp = (extTimeStamp << 31) ; unsigned long long timeStamp = (extTimeStamp << 32) ;
timeStamp = timeStamp + timeStamp0; timeStamp = timeStamp + timeStamp0;
nw = nw +1 ; word = ReadBuffer(nw, verbose); nw = nw +1 ; word = ReadBuffer(nw, verbose);

4
fsuReader.h
View File

@ -119,6 +119,10 @@ inline void FSUReader::ScanNumBlock(){
blockID = 0; blockID = 0;
blockPos.push_back(0); blockPos.push_back(0);
data->ClearData();
fseek(inFile, 0L, SEEK_SET);
filePos = 0;
while( ReadNextBlock(true) == 0 ){ while( ReadNextBlock(true) == 0 ){
blockPos.push_back(filePos); blockPos.push_back(filePos);
blockID ++; blockID ++;