fix processer and hadron analyzer

alisw · Feb 12, 2025 · 7affb8b · 7affb8b
1 parent 0e7a4e3
commit 7affb8b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/machine_learning_hep/analysis/analyzerdhadrons.py b/machine_learning_hep/analysis/analyzerdhadrons.py
@@ -93,6 +93,7 @@ def __init__(self, datap, case, typean, period):
         self.include_reflection = datap["analysis"][self.typean].get(
             "include_reflection", False)
 
+        self.p_nevents = datap["analysis"][self.typean]["nevents"]
         self.p_sigmamb = datap["analysis"]["sigmamb"]
         self.p_br = datap["ml"]["opt"]["BR"]
 
@@ -494,9 +495,14 @@ def makenormyields(self):  # pylint: disable=import-outside-toplevel, too-many-b
         filemass = TFile.Open(self.n_filemass)
         hevents = filemass.Get("all_events")
         hselevents = filemass.Get("sel_events")
-        norm, selnorm = self.calculate_norm(self.logger, hevents, hselevents)
-        histonorm.SetBinContent(1, selnorm)
-        self.logger.warning("Number of events %d", norm)
+
+        if self.p_nevents is not None:
+                        selnorm = self.p_nevents
+        else:
+            norm, selnorm = self.calculate_norm(self.logger, hevents, hselevents)
+            histonorm.SetBinContent(1, selnorm)
+            self.logger.warning("Number of events %d", norm)
+
         self.logger.warning("Number of events after event selection %d", selnorm)
 
         if self.p_dobkgfromsideband:

diff --git a/machine_learning_hep/processer.py b/machine_learning_hep/processer.py
@@ -250,7 +250,7 @@ def __init__(self, case, datap, run_param, mcordata, p_maxfiles, # pylint: disab
                             for ipt in range(self.p_nptbins)]
         self.f_evt_count_ml = os.path.join(self.d_pkl_ml, self.n_evt_count_ml)
 
-          self.lpt_gensk_sl = [self.n_gen_sl.replace(".p", "_%s%d_%d.p" %
+        self.lpt_gensk_sl = [self.n_gen_sl.replace(".p", "_%s%d_%d.p" %
                         (self.v_var_binning, self.lpt_anbinmin[i], self.lpt_anbinmax[i]))
                         for i in range(self.p_nptbins)] if self.n_gen_sl else None
 
@@ -282,8 +282,8 @@ def __init__(self, case, datap, run_param, mcordata, p_maxfiles, # pylint: disab
                                     self.lpt_gensk[ipt]) for ipt in range(self.p_nptbins)]
             self.lpt_gendecmerged = [os.path.join(self.d_pkl_decmerged, self.lpt_gensk[ipt])
                                      for ipt in range(self.p_nptbins)]
-              self.mptfiles_gensk_sl = [createlist(self.d_pklsk, self.l_path,
-                                         self.lpt_gensk_sl[ipt]) for ipt in range(self.p_nptbins)] if self.lpt_gensk_sl else None
+            self.mptfiles_gensk_sl = [createlist(self.d_pklsk, self.l_path,
+                                    self.lpt_gensk_sl[ipt]) for ipt in range(self.p_nptbins)] if self.lpt_gensk_sl else None
 
         # self.triggerbit = datap["analysis"][self.typean]["triggerbit"]
         self.runlistrigger = runlisttrigger