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

use AbsDataIndex in MultiBuilder

Browse Source
This commit is contained in:
Ryan Tang 2024-10-21 19:53:42 -04:00
parent ae0e0f2c7b
commit 0d379fec92
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
MultiBuilder.cpp
View File

@ -58,7 +58,6 @@ void MultiBuilder::ClearEvents(){
for( int i = 0; i < MaxNDigitizer; i++){ for( int i = 0; i < MaxNDigitizer; i++){
for( int j = 0; j < MaxNChannels; j++){ for( int j = 0; j < MaxNChannels; j++){
loopIndex[i][j] = 0;
nextIndex[i][j] = -1; nextIndex[i][j] = -1;
chExhaused[i][j] = false; chExhaused[i][j] = false;
lastBackWardIndex[i][j] = 0; lastBackWardIndex[i][j] = 0;
@ -79,7 +78,7 @@ void MultiBuilder::PrintStat(){
printf("Total number of evet built : %ld\n", totalEventBuilt); printf("Total number of evet built : %ld\n", totalEventBuilt);
for( int i = 0; i < nData ; i++){ for( int i = 0; i < nData ; i++){
for( int ch = 0; ch < data[i]->GetNChannel() ; ch++){ for( int ch = 0; ch < data[i]->GetNChannel() ; ch++){
if( nextIndex[i][ch] >= 0 ) printf("%d %3d %2d | %7d (%d)\n", i, snList[i], ch, nextIndex[i][ch], loopIndex[i][ch]); if( nextIndex[i][ch] >= 0 ) printf("%d %3d %2d | %7ld (%d)\n", i, snList[i], ch, nextIndex[i][ch]);
} }
} }
} }
@ -117,8 +116,7 @@ void MultiBuilder::FindEarlistTimeAndCh(bool verbose){
continue; continue;
} }
if( data[i]->GetTimestamp(ch, index) == 0 || if( data[i]->GetTimestamp(ch, index) == 0 || nextIndex[i][ch] > data[i]->GetAbsDataIndex(ch)) {
loopIndex[i][ch] * dataSize[i] + nextIndex[i][ch] > data[i]->GetLoopIndex(ch) * dataSize[i] + data[i]->GetDataIndex(ch)) {
nExhaushedCh ++; nExhaushedCh ++;
chExhaused[i][ch] = true; chExhaused[i][ch] = true;
continue; continue;
@ -197,8 +195,7 @@ void MultiBuilder::BuildEvents(bool isFinal, bool skipTrace, bool verbose){
// printf(" ch : %2d | %d(%d) | %d(%d)\n", ch, loopIndex[bd][ch], nextIndex[bd][ch], data[bd]->GetLoopIndex(ch), data[bd]->GetDataIndex(ch) ); // printf(" ch : %2d | %d(%d) | %d(%d)\n", ch, loopIndex[bd][ch], nextIndex[bd][ch], data[bd]->GetLoopIndex(ch), data[bd]->GetDataIndex(ch) );
if( nextIndex[bd][ch] == -1 if( nextIndex[bd][ch] == -1 || nextIndex[bd][ch] > data[bd]->GetAbsDataIndex(ch)) {
|| loopIndex[bd][ch] * dataSize[bd] + nextIndex[bd][ch] > data[bd]->GetLoopIndex(ch) * dataSize[bd] + data[bd]->GetDataIndex(ch)) {
nExhaushedCh ++; nExhaushedCh ++;
chExhaused[bd][ch] = true; chExhaused[bd][ch] = true;
@ -223,10 +220,7 @@ void MultiBuilder::BuildEvents(bool isFinal, bool skipTrace, bool verbose){
events[eventIndex].push_back(em); events[eventIndex].push_back(em);
nextIndex[bd][ch]++; nextIndex[bd][ch]++;
if( nextIndex[bd][ch] >= dataSize[bd]) {
loopIndex[bd][ch] ++;
nextIndex[bd][ch] = 0;
}
}else{ }else{
break; break;
} }
@ -374,8 +368,7 @@ void MultiBuilder::BuildEventsBackWard(int maxNumEvent, bool verbose){
for( int k = 0; k < nData; k++){ for( int k = 0; k < nData; k++){
for( int i = 0; i < data[k]->GetNChannel(); i++){ for( int i = 0; i < data[k]->GetNChannel(); i++){
nextIndex[k][i] = data[k]->GetDataIndex(i); nextIndex[k][i] = data[k]->GetAbsDataIndex(i);
loopIndex[k][i] = data[k]->GetLoopIndex(i);
} }
} }
@ -418,7 +411,7 @@ void MultiBuilder::BuildEventsBackWard(int maxNumEvent, bool verbose){
events[eventIndex].push_back(em); events[eventIndex].push_back(em);
nextIndex[bd][ch]--; nextIndex[bd][ch]--;
if( nextIndex[bd][ch] < 0 && data[bd]->GetLoopIndex(ch) > 0 ) nextIndex[bd][ch] = dataSize[bd] - 1; // if( nextIndex[bd][ch] < 0 && data[bd]->GetLoopIndex(ch) > 0 ) nextIndex[bd][ch] = dataSize[bd] - 1;
}else{ }else{
break; break;
@ -474,7 +467,7 @@ void MultiBuilder::BuildEventsBackWard(int maxNumEvent, bool verbose){
// remember the end of DataIndex, prevent over build // remember the end of DataIndex, prevent over build
for( int k = 0; k < nData; k++){ for( int k = 0; k < nData; k++){
for( int i = 0; i < data[k]->GetNChannel(); i++){ for( int i = 0; i < data[k]->GetNChannel(); i++){
lastBackWardIndex[k][i] = data[k]->GetDataIndex(i); lastBackWardIndex[k][i] = data[k]->GetAbsDataIndex(i);
} }
} }

6
MultiBuilder.h
View File

@ -61,8 +61,8 @@ private:
unsigned long long timeJump; //time diff for a time jump, default is 1e8 ns unsigned long long timeJump; //time diff for a time jump, default is 1e8 ns
unsigned long long lastEventTime; // timestamp for detect time jump unsigned long long lastEventTime; // timestamp for detect time jump
int loopIndex[MaxNDigitizer][MaxNChannels]; // int loopIndex[MaxNDigitizer][MaxNChannels];
int nextIndex[MaxNDigitizer][MaxNChannels]; long nextIndex[MaxNDigitizer][MaxNChannels]; // loopIndex * dataSize + index
int nExhaushedCh; int nExhaushedCh;
bool chExhaused[MaxNDigitizer][MaxNChannels]; bool chExhaused[MaxNDigitizer][MaxNChannels];
@ -79,7 +79,7 @@ private:
void FindEarlistTimeAmongLastData(bool verbose = false); void FindEarlistTimeAmongLastData(bool verbose = false);
void FindLatestTimeOfData(bool verbose = false); void FindLatestTimeOfData(bool verbose = false);
int lastBackWardIndex[MaxNDigitizer][MaxNChannels]; int lastBackWardIndex[MaxNDigitizer][MaxNChannels]; // abs. index
bool forceStop; bool forceStop;