From 7affb8b74d12b2408bbf0171ddc745f4451b6466 Mon Sep 17 00:00:00 2001 From: Luigi Dello Stritto Date: Wed, 12 Feb 2025 11:15:19 +0100 Subject: [PATCH 1/4] fix processer and hadron analyzer --- machine_learning_hep/analysis/analyzerdhadrons.py | 12 +++++++++--- machine_learning_hep/processer.py | 6 +++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/machine_learning_hep/analysis/analyzerdhadrons.py b/machine_learning_hep/analysis/analyzerdhadrons.py index b0631c24bf..4b5326fa1b 100644 --- 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 index a4f2a825ad..480cd139dd 100644 --- 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 From bf77b0fa50fa7c3a75615ea66ae43c8adb0222f3 Mon Sep 17 00:00:00 2001 From: Luigi Dello Stritto Date: Wed, 12 Feb 2025 11:22:28 +0100 Subject: [PATCH 2/4] fix --- machine_learning_hep/analysis/analyzerdhadrons.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/machine_learning_hep/analysis/analyzerdhadrons.py b/machine_learning_hep/analysis/analyzerdhadrons.py index 4b5326fa1b..ef1fe370ca 100644 --- a/machine_learning_hep/analysis/analyzerdhadrons.py +++ b/machine_learning_hep/analysis/analyzerdhadrons.py @@ -497,7 +497,7 @@ def makenormyields(self): # pylint: disable=import-outside-toplevel, too-many-b hselevents = filemass.Get("sel_events") if self.p_nevents is not None: - selnorm = self.p_nevents + selnorm = self.p_nevents else: norm, selnorm = self.calculate_norm(self.logger, hevents, hselevents) histonorm.SetBinContent(1, selnorm) From a381eaa87b3ef250c4bb75a81edb81d5e5ad5719 Mon Sep 17 00:00:00 2001 From: Luigi Dello Stritto Date: Wed, 12 Feb 2025 11:30:29 +0100 Subject: [PATCH 3/4] fix --- machine_learning_hep/processer.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/machine_learning_hep/processer.py b/machine_learning_hep/processer.py index 480cd139dd..fd1b0823ea 100644 --- a/machine_learning_hep/processer.py +++ b/machine_learning_hep/processer.py @@ -282,8 +282,9 @@ 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 From e4932a66bd580e9a63c9cde336dff194c38a2a8e Mon Sep 17 00:00:00 2001 From: Luigi Dello Stritto Date: Wed, 12 Feb 2025 11:33:55 +0100 Subject: [PATCH 4/4] fix --- machine_learning_hep/processer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/machine_learning_hep/processer.py b/machine_learning_hep/processer.py index fd1b0823ea..b8c6da31a3 100644 --- a/machine_learning_hep/processer.py +++ b/machine_learning_hep/processer.py @@ -282,7 +282,7 @@ 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]) + 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