fix: soon, binnums won't be multiples of 5

JeffersonLab · Sep 14, 2024 · 32ebbfa · 32ebbfa
1 parent 48372bc
commit 32ebbfa
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/srcC/examples/dumpQADB.cpp b/srcC/examples/dumpQADB.cpp
@@ -33,8 +33,10 @@ int main(int argc, char ** argv) {
 
   // loop through files
   int evnum;
-  for(int filenum=0; filenum<=qa->GetMaxBinnum(runnum); filenum+=5) {
+  for(int filenum=0; filenum<=qa->GetMaxBinnum(runnum); filenum++) {
     sep("=",50);
+    // skip non-existent bin numbers (required since old QADBs' bin numbers are multiples of 5)
+    if(!qa->HasBinnum(runnum, filenum)) continue;
     cout << "FILE NUMBER " << filenum << endl;
 
     // perform the lookup, by filenum

diff --git a/srcC/tests/testCharge.cpp b/srcC/tests/testCharge.cpp
@@ -41,7 +41,10 @@ int main(int argc, char ** argv) {
   for(int runnum : runnumList) {
 
     // loop over files
-    for(int filenum=0; filenum<=qa->GetMaxBinnum(runnum); filenum+=5) {
+    for(int filenum=0; filenum<=qa->GetMaxBinnum(runnum); filenum++) {
+
+      // skip non-existent bin numbers (required since old QADBs' bin numbers are multiples of 5)
+      if(!qa->HasBinnum(runnum, filenum)) continue;
 
       // query by file number
       qa->QueryByBinnum(runnum,filenum);

diff --git a/srcC/tests/testDumpQADB.cpp b/srcC/tests/testDumpQADB.cpp
@@ -42,10 +42,11 @@ int main(int argc, char ** argv) {
   int evnum;
   string defname;
   int chargeInt;
-  for(int filenum=0; filenum<=qa->GetMaxBinnum(runnum); filenum+=5) {
+  for(int filenum=0; filenum<=qa->GetMaxBinnum(runnum); filenum++) {
     sep("=",50);
 
-    //err("test error print");
+    // skip non-existent bin numbers (required since old QADBs' bin numbers are multiples of 5)
+    if(!qa->HasBinnum(runnum, filenum)) continue;
 
     // query by file number
     qa->QueryByBinnum(runnum,filenum);