Skip to content

Commit 8fd2fb3

Browse files
author
Luigi Dello Stritto
committed
fix
1 parent 318dc9b commit 8fd2fb3

File tree

7 files changed

+14
-10
lines changed

7 files changed

+14
-10
lines changed

machine_learning_hep/analysis/analyzerdhadrons.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,8 @@ def fit(self):
338338
pdf_bkg = roo_ws.pdf(self.p_pdfnames["pdf_bkg"])
339339
if pdf_bkg:
340340
self.fit_func_bkg[level][ipt] = pdf_bkg.asTF(roo_ws.var(var_m))
341-
self.fit_range[level][ipt] = (roo_ws.var(var_m).getMin('fit'), roo_ws.var(var_m).getMax('fit'))
341+
self.fit_range[level][ipt] = (roo_ws.var(var_m).getMin('fit'), \
342+
roo_ws.var(var_m).getMax('fit'))
342343
else:
343344
self.logger.error('RooFit failed for %s bin %d', level, ipt)
344345

@@ -535,4 +536,4 @@ def makenormyields(self): # pylint: disable=import-outside-toplevel, too-many-b
535536
fileoutcrosstot.cd()
536537
hcross.Write()
537538
histonorm.Write()
538-
fileoutcrosstot.Close()
539+
fileoutcrosstot.Close()

machine_learning_hep/analysis/analyzerdhadrons_mult.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,8 @@ def fit(self):
370370
pdf_bkg = roo_ws.pdf(self.p_pdfnames["pdf_bkg"])
371371
if pdf_bkg:
372372
self.fit_func_bkg[level][ipt] = pdf_bkg.asTF(roo_ws.var(var_m))
373-
self.fit_range[level][ipt] = (roo_ws.var(var_m).getMin('fit'), roo_ws.var(var_m).getMax('fit'))
373+
self.fit_range[level][ipt] = (roo_ws.var(var_m).getMin('fit'), \
374+
roo_ws.var(var_m).getMax('fit'))
374375
else:
375376
self.logger.error('RooFit failed for %s bin %d', level, ipt)
376377

@@ -639,7 +640,7 @@ def makenormyields(self): # pylint: disable=import-outside-toplevel, too-many-br
639640
# pylint: disable=logging-not-lazy
640641
self.logger.warning("Number of events %d for mult bin %d" % (norm, imult))
641642

642-
if self.p_fprompt_from_mb:
643+
if self.p_fprompt_from_mb:
643644
if imult == 0:
644645
fileoutcrossmb = "%s/finalcross%s%smult0.root" % \
645646
(self.d_resultsallpdata, self.case, self.typean)
@@ -746,4 +747,4 @@ def plotternormyields(self):
746747
cCrossvsvar1.SaveAs("%s/CorrectedYieldsNorm%s%sVs%s.eps" % (self.d_resultsallpdata,
747748
self.case, self.typean,
748749
self.v_var_binning))
749-
fileoutcrosstot.Close()
750+
fileoutcrosstot.Close()

machine_learning_hep/fitting/roofitter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,4 +233,4 @@ def add_text_info_perf(text_info, sig, sig_err, bkg, bkg_err, s_over_b, s_over_b
233233
text_info.AddText(f"S(3#sigma) = {sig:.0f} #pm {sig_err:.0f}")
234234
text_info.AddText(f"B(3#sigma) = {bkg:.0f} #pm {bkg_err:.0f}")
235235
text_info.AddText(f"S/B(3#sigma) = {s_over_b:.3f} #pm {s_over_b_err:.3f}")
236-
text_info.AddText(f"Signif(3#sigma) = {signif:.1f} #pm {signif_err:.1f}")
236+
text_info.AddText(f"Signif(3#sigma) = {signif:.1f} #pm {signif_err:.1f}")

machine_learning_hep/models.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
load and save ML models
1818
obtain control plots
1919
"""
20+
# pylint: disable=too-many-branches
2021
from os.path import exists
2122
import pickle
2223
import pandas as pd
@@ -155,7 +156,7 @@ def apply(ml_type, names_, trainedmodels_, test_set_, mylistvariables_, labels_=
155156
test_set_[f"y_test_prediction{name}"]=0
156157
test_set_[f"y_test_prob{name}"]=0
157158
return test_set_
158-
elif ml_type == "MultiClassification":
159+
else:
159160
for name in names_:
160161
for pred, lab in enumerate(labels_):
161162
safe_lab = lab.replace('-', '_')

machine_learning_hep/processer.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,8 @@ def dfuse(df_spec):
425425
dfs[out] = dfmerge(dfs[base], dfs[ref], left_on=['df', on], right_index=True)
426426
dfs[out].index.name = 'MergedIndex'
427427
dfs[out] = dfs[out].reset_index()
428-
dfs[out] = dfs[out].sort_values('fMultZeqNTracksPV', ascending=False).drop_duplicates('MergedIndex')
428+
sorted_df = dfs[out].sort_values('fMultZeqNTracksPV', ascending=False)
429+
dfs[out] = sorted_df.drop_duplicates('MergedIndex')
429430
dfs[out] = dfs[out].sort_values('MergedIndex', ascending=True)
430431
else:
431432
var = self.df_read[ref]['index']

machine_learning_hep/processerdhadrons.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,4 +233,4 @@ def process_efficiency_single(self, index):
233233
h_sel_pr.Write()
234234
h_gen_fd.Write()
235235
h_presel_fd.Write()
236-
h_sel_fd.Write()
236+
h_sel_fd.Write()

machine_learning_hep/processerdhadrons_mult.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,4 +385,4 @@ def process_efficiency(self):
385385
arguments = [(i,) for i in range(len(self.l_root))]
386386
self.parallelizer(self.process_efficiency_single, arguments, self.p_chunksizeunp)
387387
tmp_merged = f"/data/tmp/hadd/{self.case}_{self.typean}/histoeff_{self.period}/{get_timestamp_string()}/"
388-
mergerootfiles(self.l_histoeff, self.n_fileeff, tmp_merged)
388+
mergerootfiles(self.l_histoeff, self.n_fileeff, tmp_merged)

0 commit comments

Comments
 (0)