adjust the branch data filling, now it does not need to know the data mode

src/esb_analyze.cpp

@@ -241,7 +241,6 @@ void waveform_analysis(const std::vector<uint32_t> &raw, BranchData &res)
     res.nraw = len;
     // sanity check
     if (len == 0) {
-        res.npul = 0;
         return;
     }
 
@@ -294,10 +293,8 @@ void waveform_analysis(const std::vector<uint32_t> &raw, BranchData &res)
 
 
 // fill decoded FADC250 data into the container (branch data)
-void fill_branch(const Fadc250Data &slot_data, const Module &mod, std::unordered_map<std::string, BranchData> &brdata, int mode)
+void fill_branch(const Fadc250Data &slot_data, const Module &mod, std::unordered_map<std::string, BranchData> &brdata)
 {
-    // mode 3 only has integrals and timings
-    if (mode == 3) {
     for (auto &event : slot_data.events) {
         for (auto &ch : mod.channels) {
             auto &channel = event.channels[ch.id];
@@ -307,22 +304,6 @@ void fill_branch(const Fadc250Data &slot_data, const Module &mod, std::unordered
                 bd.integral[i] = channel.integral[i];
                 bd.time[i] = channel.time[i];
             }
-            }
-        }
-        return;
-    }
-
-    // mode 1 needs raw wave form analysis
-    if (mode != 1) {
-        std::cout << "Warning: unsupported data mode = " << mode << ", no data are stored." << std::endl;
-        return;
-    }
-
-    // fill raw data
-    for (auto &event : slot_data.events) {
-        for (auto &ch : mod.channels) {
-            auto &channel = event.channels[ch.id];
-            auto &bd = brdata[ch.name];
             waveform_analysis(channel.raw, bd);
         }
     }
@@ -417,9 +398,8 @@ void write_raw_data(const std::string &dpath, const std::string &opath, int nev,
             br.second.nraw = 0;
         }
 
-        int data_mode = -1;
-
         // read data into event buffer
+        int data_mode = -1;
         for (auto &mod : modules) {
             int blvl = 1;
             simpleGetRocBlockLevel(mod.crate, FADC_BANK, &blvl);
@@ -447,7 +427,7 @@ void write_raw_data(const std::string &dpath, const std::string &opath, int nev,
                 }
 
                 // fill branch data
-                fill_branch(slot_data, mod, brdata, data_mode);
+                fill_branch(slot_data, mod, brdata);
             }
         }