Take event counter from DB

alisw · Aug 31, 2024 · ef2ec57 · ef2ec57
1 parent 809d0ad
commit ef2ec57
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/machine_learning_hep/data/data_run3/database_ml_parameters_D0Jet_pp.yml b/machine_learning_hep/data/data_run3/database_ml_parameters_D0Jet_pp.yml
@@ -373,6 +373,7 @@ D0jet_pp:
 
       cand_collidx: fIndexHfD0CollBases
       # sigmamb: 57.8e-3 #NB: multiplied by 1e12 before giving to HFPtSpectrum!
+      cnt_events_read: fReadCountsWithTVXAndZVertexAndSel8
 
       observables:
         zg:

diff --git a/machine_learning_hep/processer_jet.py b/machine_learning_hep/processer_jet.py
@@ -174,8 +174,7 @@ def process_histomass_single(self, index):
             histonorm.SetBinContent(1, len(dfquery(dfevtorig, self.s_evtsel)))
             dfcollcnt = read_df(self.l_collcnt[index])
             collcnt = functools.reduce(
-                lambda x,y: float(x)+float(y), (ar[0] for ar in dfcollcnt['fReadCountsWithTVXAndZVertexAndSel8'])) # new
-                # lambda x,y: float(x)+float(y), (ar[0] for ar in dfcollcnt['fReadSelectedCounts']))  # old
+                lambda x,y: float(x)+float(y), (ar[0] for ar in dfcollcnt[self.cfg('cnt_events_read', 'fReadSelectedCounts')]))
             self.logger.info('sampled %g collisions', collcnt)
             histonorm.SetBinContent(2, collcnt)
             get_axis(histonorm, 0).SetBinLabel(1, 'N_{evt}')