Skip to content

Commit fe5884d

Browse files
committed
Manual fix of related pylint errors
1 parent 565a49f commit fe5884d

File tree

2 files changed

+16
-6
lines changed

2 files changed

+16
-6
lines changed

machine_learning_hep/analysis/analyzerdhadrons.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
TF1,
3030
TH1,
3131
TH1F,
32+
RooArgSet,
33+
RooConstVar,
3234
TCanvas,
3335
TFile,
3436
TLegend,
@@ -181,7 +183,8 @@ def _roofit_mass(self, level, hist, ipt, pdfnames, param_names, fitcfg, fixed_si
181183
fixed_sigma, fixed_sigma_val,
182184
roows=roows, plot=True)
183185
except ValueError:
184-
self.logger.error(f"Could not do fitting on {level} for pt {self.bins_candpt[ipt]} - {self.bins_candpt[ipt+1]}")
186+
self.logger.error("Could not do fitting on %d for pt %.1f - %.1f",
187+
level, self.bins_candpt[ipt], self.bins_candpt[ipt+1])
185188
return None, None, None, None, None
186189
frame.SetTitle(f"inv. mass for p_{{T}} {self.bins_candpt[ipt]} - {self.bins_candpt[ipt + 1]} GeV/c")
187190
c = TCanvas()
@@ -389,12 +392,14 @@ def fit(self):
389392
if roo_res:
390393
(sig, sig_err, _, _,
391394
signif, signif_err, s_over_b, s_over_b_err
392-
) = calc_signif(roo_ws, roo_res, self.p_pdfnames, self.p_param_names, mean_sgn, sigma_sgn)
395+
) = calc_signif(roo_ws, roo_res, self.p_pdfnames, self.p_param_names,
396+
mean_sgn, sigma_sgn)
393397
fileout.cd()
394398
one = RooConstVar("one", "constant 1.0", 1.0)
395399
bkg_pdf = roo_ws.pdf(self.p_pdfnames["pdf_bkg"])
396400
sig_pdf = roo_ws.pdf(self.p_pdfnames["pdf_sig"])
397-
for pdf, outlabel in zip((bkg_pdf, sig_pdf, model), ("bkg", "sgn", "total")):
401+
for pdf, outlabel in zip((bkg_pdf, sig_pdf, model), ("bkg", "sgn", "total"),
402+
strict=False):
398403
if not pdf:
399404
continue
400405
obs = pdf.getObservables(dh)
@@ -451,7 +456,8 @@ def efficiency(self):
451456
print(self.n_fileff)
452457
lfileeff = TFile.Open(self.n_fileff)
453458
lfileeff.ls()
454-
fileouteff = TFile.Open(f"{self.d_resultsallpmc}/{self.efficiency_filename}{self.case}{self.typean}.root", "recreate")
459+
fileouteff = TFile.Open(f"{self.d_resultsallpmc}/{self.efficiency_filename}{self.case}{self.typean}.root",
460+
"recreate")
455461
cEff = TCanvas("cEff", "The Fit Canvas")
456462
cEff.SetCanvasSize(1900, 1500)
457463
cEff.SetWindowSize(500, 500)

machine_learning_hep/analysis/analyzerdhadrons_mult.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
TF1,
3030
TH1,
3131
TH1F,
32+
RooArgSet,
33+
RooConstVar,
3234
TCanvas,
3335
TFile,
3436
TLegend,
@@ -209,7 +211,8 @@ def _roofit_mass(self, level, hist, ipt, pdfnames, param_names, fitcfg, fixed_si
209211
fixed_sigma, fixed_sigma_val,
210212
roows=roows, plot=True)
211213
except ValueError:
212-
self.logger.error(f"Could not do fitting on {level} for pt {self.bins_candpt[ipt]} - {self.bins_candpt[ipt+1]}")
214+
self.logger.error("Could not do fitting on %d for pt %.1f - %.1f",
215+
level, self.bins_candpt[ipt], self.bins_candpt[ipt+1])
213216
return None, None, None, None, None
214217
frame.SetTitle(f"inv. mass for p_{{T}} {self.bins_candpt[ipt]} - {self.bins_candpt[ipt + 1]} GeV/c")
215218
c = TCanvas()
@@ -449,7 +452,8 @@ def fit(self):
449452
one = RooConstVar("one", "constant 1.0", 1.0)
450453
bkg_pdf = roo_ws.pdf(self.p_pdfnames["pdf_bkg"])
451454
sig_pdf = roo_ws.pdf(self.p_pdfnames["pdf_sig"])
452-
for pdf, outlabel in zip((bkg_pdf, sig_pdf, model), ("bkg", "sgn", "total")):
455+
for pdf, outlabel in zip((bkg_pdf, sig_pdf, model), ("bkg", "sgn", "total"),
456+
strict=False):
453457
if not pdf:
454458
continue
455459
obs = pdf.getObservables(dh)

0 commit comments

Comments
 (0)