Skip to content

Commit 18309f8

Browse files
vkuceravkucera
committed
Upgrade
1 parent 9ba22ea commit 18309f8

27 files changed

+196
-189
lines changed

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ repos:
2020
rev: v3.19.1
2121
hooks:
2222
- id: pyupgrade
23+
args: ["--py310-plus"]
2324
- repo: https://github.com/shellcheck-py/shellcheck-py
2425
rev: v0.10.0.1
2526
hooks:

‎machine_learning_hep/analysis/analyzerdhadrons.py‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ def efficiency(self):
425425
print(self.n_fileff)
426426
lfileeff = TFile.Open(self.n_fileff)
427427
lfileeff.ls()
428-
fileouteff = TFile.Open("%s/efficiencies%s%s.root" % (self.d_resultsallpmc, self.case, self.typean), "recreate")
428+
fileouteff = TFile.Open(f"{self.d_resultsallpmc}/efficiencies{self.case}{self.typean}.root", "recreate")
429429
cEff = TCanvas("cEff", "The Fit Canvas")
430430
cEff.SetCanvasSize(1900, 1500)
431431
cEff.SetWindowSize(500, 500)
@@ -445,11 +445,11 @@ def efficiency(self):
445445
h_sel_pr.SetName("eff")
446446
h_sel_pr.Write()
447447
h_sel_pr.GetXaxis().SetTitle("#it{p}_{T} (GeV/#it{c})")
448-
h_sel_pr.GetYaxis().SetTitle("Acc x efficiency (prompt) %s %s (1/GeV)" % (self.p_latexnhadron, self.typean))
448+
h_sel_pr.GetYaxis().SetTitle(f"Acc x efficiency (prompt) {self.p_latexnhadron} {self.typean} (1/GeV)")
449449
h_sel_pr.SetMinimum(0.001)
450450
h_sel_pr.SetMaximum(1.0)
451451
gPad.SetLogy()
452-
cEff.SaveAs("%s/Eff%s%s.eps" % (self.d_resultsallpmc, self.case, self.typean))
452+
cEff.SaveAs(f"{self.d_resultsallpmc}/Eff{self.case}{self.typean}.eps")
453453

454454
cEffFD = TCanvas("cEffFD", "The Fit Canvas")
455455
cEffFD.SetCanvasSize(1900, 1500)
@@ -470,12 +470,12 @@ def efficiency(self):
470470
h_sel_fd.SetName("eff_fd")
471471
h_sel_fd.Write()
472472
h_sel_fd.GetXaxis().SetTitle("#it{p}_{T} (GeV/#it{c})")
473-
h_sel_fd.GetYaxis().SetTitle("Acc x efficiency feed-down %s %s (1/GeV)" % (self.p_latexnhadron, self.typean))
473+
h_sel_fd.GetYaxis().SetTitle(f"Acc x efficiency feed-down {self.p_latexnhadron} {self.typean} (1/GeV)")
474474
h_sel_fd.SetMinimum(0.001)
475475
h_sel_fd.SetMaximum(1.0)
476476
gPad.SetLogy()
477477
legeffFD.Draw()
478-
cEffFD.SaveAs("%s/EffFD%s%s.eps" % (self.d_resultsallpmc, self.case, self.typean))
478+
cEffFD.SaveAs(f"{self.d_resultsallpmc}/EffFD{self.case}{self.typean}.eps")
479479

480480
@staticmethod
481481
def calculate_norm(logger, hevents, hselevents): # TO BE FIXED WITH EV SEL
@@ -505,7 +505,7 @@ def makenormyields(self): # pylint: disable=import-outside-toplevel, too-many-b
505505
if not os.path.exists(fileouteff):
506506
self.logger.fatal("Efficiency file %s could not be found", fileouteff)
507507

508-
fileoutcross = "%s/finalcross%s%s.root" % (self.d_resultsallpdata, self.case, self.typean)
508+
fileoutcross = f"{self.d_resultsallpdata}/finalcross{self.case}{self.typean}.root"
509509

510510
namehistoeffprompt = "eff"
511511
namehistoefffeed = "eff_fd"
@@ -522,13 +522,11 @@ def makenormyields(self): # pylint: disable=import-outside-toplevel, too-many-b
522522
self.logger.warning("Number of events after event selection %d", selnorm)
523523

524524
if self.p_dobkgfromsideband:
525-
fileoutbkg = TFile.Open(
526-
"%s/Background_fromsidebands_%s_%s.root" % (self.d_resultsallpdata, self.case, self.typean)
527-
)
525+
fileoutbkg = TFile.Open(f"{self.d_resultsallpdata}/Background_fromsidebands_{self.case}_{self.typean}.root")
528526
hbkg = fileoutbkg.Get("hbkg_fromsidebands")
529527
hbkg.Scale(1.0 / selnorm)
530528
fileoutbkgscaled = TFile.Open(
531-
"%s/NormBackground_fromsidebands_%s_%s.root" % (self.d_resultsallpdata, self.case, self.typean),
529+
f"{self.d_resultsallpdata}/NormBackground_fromsidebands_{self.case}_{self.typean}.root",
532530
"RECREATE",
533531
)
534532
fileoutbkgscaled.cd()
@@ -553,9 +551,7 @@ def makenormyields(self): # pylint: disable=import-outside-toplevel, too-many-b
553551
fileoutcross,
554552
)
555553

556-
fileoutcrosstot = TFile.Open(
557-
"%s/finalcross%s%stot.root" % (self.d_resultsallpdata, self.case, self.typean), "recreate"
558-
)
554+
fileoutcrosstot = TFile.Open(f"{self.d_resultsallpdata}/finalcross{self.case}{self.typean}tot.root", "recreate")
559555

560556
f_fileoutcross = TFile.Open(fileoutcross)
561557
if f_fileoutcross:

‎machine_learning_hep/analysis/analyzerdhadrons_mult.py‎

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -456,15 +456,15 @@ def fit(self):
456456
fileout.Close()
457457

458458
def get_efficiency(self, ibin1, ibin2):
459-
fileouteff = TFile.Open("%s/efficiencies%s%s.root" % (self.d_resultsallpmc, self.case, self.typean), "read")
459+
fileouteff = TFile.Open(f"{self.d_resultsallpmc}/efficiencies{self.case}{self.typean}.root", "read")
460460
h = fileouteff.Get(f"eff_mult{ibin2}")
461461
return h.GetBinContent(ibin1 + 1), h.GetBinError(ibin1 + 1)
462462

463463
def efficiency(self):
464464
self.loadstyle()
465465

466466
lfileeff = TFile.Open(self.n_fileff)
467-
fileouteff = TFile.Open("%s/efficiencies%s%s.root" % (self.d_resultsallpmc, self.case, self.typean), "recreate")
467+
fileouteff = TFile.Open(f"{self.d_resultsallpmc}/efficiencies{self.case}{self.typean}.root", "recreate")
468468
cEff = TCanvas("cEff", "The Fit Canvas")
469469
cEff.SetCanvasSize(1900, 1500)
470470
cEff.SetWindowSize(500, 500)
@@ -489,8 +489,10 @@ def efficiency(self):
489489
legsl.SetTextSize(0.035)
490490

491491
for imult in range(self.p_nbin2):
492-
stringbin2 = "_%s_%.2f_%.2f" % (self.v_var2_binning, self.lvar2_binmin[imult], self.lvar2_binmax[imult])
493-
legeffstring = "%.1f #leq %s < %.1f" % (
492+
stringbin2 = "_{}_{:.2f}_{:.2f}".format(
493+
self.v_var2_binning, self.lvar2_binmin[imult], self.lvar2_binmax[imult]
494+
)
495+
legeffstring = "{:.1f} #leq {} < {:.1f}".format(
494496
self.lvar2_binmin[imult],
495497
self.p_latexbin2var,
496498
self.lvar2_binmax[imult],
@@ -539,7 +541,7 @@ def efficiency(self):
539541
if self.signal_loss:
540542
cSl.cd()
541543
legsl.Draw()
542-
cSl.SaveAs("%s/SignalLoss%s%s.eps" % (self.d_resultsallpmc, self.case, self.typean))
544+
cSl.SaveAs(f"{self.d_resultsallpmc}/SignalLoss{self.case}{self.typean}.eps")
543545

544546
cSlFD = TCanvas("cSlFD", "The Fit Canvas")
545547
cSlFD.SetCanvasSize(1900, 1500)
@@ -553,7 +555,7 @@ def efficiency(self):
553555

554556
cEff.cd()
555557
legeff.Draw()
556-
cEff.SaveAs("%s/Eff%s%s.eps" % (self.d_resultsallpmc, self.case, self.typean))
558+
cEff.SaveAs(f"{self.d_resultsallpmc}/Eff{self.case}{self.typean}.eps")
557559

558560
cEffFD = TCanvas("cEffFD", "The Fit Canvas")
559561
cEffFD.SetCanvasSize(1900, 1500)
@@ -567,8 +569,10 @@ def efficiency(self):
567569
legeffFD.SetTextSize(0.035)
568570

569571
for imult in range(self.p_nbin2):
570-
stringbin2 = "_%s_%.2f_%.2f" % (self.v_var2_binning, self.lvar2_binmin[imult], self.lvar2_binmax[imult])
571-
legeffFDstring = "%.1f #leq %s < %.1f" % (
572+
stringbin2 = "_{}_{:.2f}_{:.2f}".format(
573+
self.v_var2_binning, self.lvar2_binmin[imult], self.lvar2_binmax[imult]
574+
)
575+
legeffFDstring = "{:.1f} #leq {} < {:.1f}".format(
572576
self.lvar2_binmin[imult],
573577
self.p_latexbin2var,
574578
self.lvar2_binmax[imult],
@@ -616,24 +620,22 @@ def efficiency(self):
616620

617621
cEffFD.cd()
618622
legeffFD.Draw()
619-
cEffFD.SaveAs("%s/EffFD%s%s.eps" % (self.d_resultsallpmc, self.case, self.typean))
623+
cEffFD.SaveAs(f"{self.d_resultsallpmc}/EffFD{self.case}{self.typean}.eps")
620624
if self.signal_loss:
621625
cSlFD.cd()
622626
legslFD.Draw()
623-
cSlFD.SaveAs("%s/SignalLossFD%s%s.eps" % (self.d_resultsallpmc, self.case, self.typean))
627+
cSlFD.SaveAs(f"{self.d_resultsallpmc}/SignalLossFD{self.case}{self.typean}.eps")
624628

625629
def plotter(self):
626630
gROOT.SetBatch(True)
627631
self.loadstyle()
628632

629-
fileouteff = TFile.Open("%s/efficiencies%s%s.root" % (self.d_resultsallpmc, self.case, self.typean))
633+
fileouteff = TFile.Open(f"{self.d_resultsallpmc}/efficiencies{self.case}{self.typean}.root")
630634
yield_filename = self.make_file_path(
631635
self.d_resultsallpdata, self.yields_filename, "root", None, [self.case, self.typean]
632636
)
633637
fileoutyield = TFile.Open(yield_filename, "READ")
634-
fileoutcross = TFile.Open(
635-
"%s/finalcross%s%s.root" % (self.d_resultsallpdata, self.case, self.typean), "recreate"
636-
)
638+
fileoutcross = TFile.Open(f"{self.d_resultsallpdata}/finalcross{self.case}{self.typean}.root", "recreate")
637639

638640
cCrossvsvar1 = TCanvas("cCrossvsvar1", "The Fit Canvas")
639641
cCrossvsvar1.SetCanvasSize(1900, 1500)
@@ -667,10 +669,10 @@ def plotter(self):
667669
hcross.Scale(1.0 / norm)
668670
fileoutcross.cd()
669671
hcross.GetXaxis().SetTitle("#it{p}_{T} %s (GeV/#it{c})" % self.p_latexnhadron)
670-
hcross.GetYaxis().SetTitle("d#sigma/d#it{p}_{T} (%s) %s" % (self.p_latexnhadron, self.typean))
672+
hcross.GetYaxis().SetTitle(f"d#sigma/d#it{{p}}_{{T}} ({self.p_latexnhadron}) {self.typean}")
671673
hcross.SetName("hcross%d" % imult)
672674
hcross.GetYaxis().SetRangeUser(1e1, 1e10)
673-
legvsvar1endstring = "%.1f < %s < %.1f" % (
675+
legvsvar1endstring = "{:.1f} < {} < {:.1f}".format(
674676
self.lvar2_binmin[imult],
675677
self.p_latexbin2var,
676678
self.lvar2_binmax[imult],
@@ -683,9 +685,7 @@ def plotter(self):
683685
listvalerrpt = [hcross.GetBinError(ipt + 1) for ipt in range(self.p_nptbins)]
684686
listvalueserr.append(listvalerrpt)
685687
legvsvar1.Draw()
686-
cCrossvsvar1.SaveAs(
687-
"%s/Cross%s%sVs%s.eps" % (self.d_resultsallpdata, self.case, self.typean, self.v_var_binning)
688-
)
688+
cCrossvsvar1.SaveAs(f"{self.d_resultsallpdata}/Cross{self.case}{self.typean}Vs{self.v_var_binning}.eps")
689689

690690
cCrossvsvar2 = TCanvas("cCrossvsvar2", "The Fit Canvas")
691691
cCrossvsvar2.SetCanvasSize(1900, 1500)
@@ -713,17 +713,15 @@ def plotter(self):
713713
hcrossvsvar2[ipt].SetBinError(imult + 1, listvalueserr[imult][ipt])
714714

715715
hcrossvsvar2[ipt].GetYaxis().SetRangeUser(1e4, 1e10)
716-
legvsvar2endstring = "%.1f < %s < %.1f GeV/#it{c}" % (
716+
legvsvar2endstring = "{:.1f} < {} < {:.1f} GeV/#it{{c}}".format(
717717
self.lpt_finbinmin[ipt],
718718
"#it{p}_{T}",
719719
self.lpt_finbinmax[ipt],
720720
)
721721
hcrossvsvar2[ipt].Draw("same")
722722
legvsvar2.AddEntry(hcrossvsvar2[ipt], legvsvar2endstring, "LEP")
723723
legvsvar2.Draw()
724-
cCrossvsvar2.SaveAs(
725-
"%s/Cross%s%sVs%s.eps" % (self.d_resultsallpdata, self.case, self.typean, self.v_var2_binning)
726-
)
724+
cCrossvsvar2.SaveAs(f"{self.d_resultsallpdata}/Cross{self.case}{self.typean}Vs{self.v_var2_binning}.eps")
727725

728726
@staticmethod
729727
def calculate_norm(logger, hevents, hselevents): # TO BE FIXED WITH EV SEL
@@ -783,7 +781,9 @@ def makenormyields(self): # pylint: disable=import-outside-toplevel, too-many-b
783781

784782
if self.p_fprompt_from_mb:
785783
if imult == 0:
786-
fileoutcrossmb = "%s/finalcross%s%smult0.root" % (self.d_resultsallpdata, self.case, self.typean)
784+
fileoutcrossmb = "{}/finalcross{}{}mult0.root".format(
785+
self.d_resultsallpdata, self.case, self.typean
786+
)
787787
output_prompt = []
788788
if self.p_nevents is not None:
789789
norm = self.p_nevents
@@ -844,7 +844,7 @@ def makenormyields(self): # pylint: disable=import-outside-toplevel, too-many-b
844844
)
845845

846846
fileoutcrosstot = TFile.Open(
847-
"%s/finalcross%s%smulttot.root" % (self.d_resultsallpdata, self.case, self.typean), "recreate"
847+
f"{self.d_resultsallpdata}/finalcross{self.case}{self.typean}multtot.root", "recreate"
848848
)
849849

850850
for imult in range(self.p_nbin2):
@@ -871,7 +871,7 @@ def plotternormyields(self):
871871
legvsvar1.SetFillStyle(0)
872872
legvsvar1.SetTextFont(42)
873873
legvsvar1.SetTextSize(0.035)
874-
fileoutcrosstot = TFile.Open("%s/finalcross%s%smulttot.root" % (self.d_resultsallpdata, self.case, self.typean))
874+
fileoutcrosstot = TFile.Open(f"{self.d_resultsallpdata}/finalcross{self.case}{self.typean}multtot.root")
875875

876876
for imult in range(self.p_nbin2):
877877
hcross = fileoutcrosstot.Get("histoSigmaCorr%d" % imult)
@@ -880,9 +880,9 @@ def plotternormyields(self):
880880
hcross.SetMarkerColor(imult + 1)
881881
hcross.GetXaxis().SetTitle("#it{p}_{T} %s (GeV/#it{c})" % self.p_latexnhadron)
882882
hcross.GetYaxis().SetTitleOffset(1.3)
883-
hcross.GetYaxis().SetTitle("Corrected yield/events (%s) %s" % (self.p_latexnhadron, self.typean))
883+
hcross.GetYaxis().SetTitle(f"Corrected yield/events ({self.p_latexnhadron}) {self.typean}")
884884
hcross.GetYaxis().SetRangeUser(1e-10, 1)
885-
legvsvar1endstring = "%.1f #leq %s < %.1f" % (
885+
legvsvar1endstring = "{:.1f} #leq {} < {:.1f}".format(
886886
self.lvar2_binmin[imult],
887887
self.p_latexbin2var,
888888
self.lvar2_binmax[imult],
@@ -891,6 +891,8 @@ def plotternormyields(self):
891891
hcross.Draw("same")
892892
legvsvar1.Draw()
893893
cCrossvsvar1.SaveAs(
894-
"%s/CorrectedYieldsNorm%s%sVs%s.eps" % (self.d_resultsallpdata, self.case, self.typean, self.v_var_binning)
894+
"{}/CorrectedYieldsNorm{}{}Vs{}.eps".format(
895+
self.d_resultsallpdata, self.case, self.typean, self.v_var_binning
896+
)
895897
)
896898
fileoutcrosstot.Close()

‎machine_learning_hep/analysis/do_systematics.py‎

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def __init__(self, path_database_analysis: str, typean: str):
9292
self.logger.setLevel(logging.INFO)
9393
self.verbose = False
9494

95-
with open(path_database_analysis, "r", encoding="utf-8") as file_in:
95+
with open(path_database_analysis, encoding="utf-8") as file_in:
9696
db_analysis = yaml.safe_load(file_in)
9797
case = list(db_analysis.keys())[0]
9898
self.datap = db_analysis[case]
@@ -135,7 +135,7 @@ def __init__(self, path_database_analysis: str, typean: str):
135135
self.logger.critical(make_message_notfound("the variation database"))
136136
if "/" not in path_database_variations:
137137
path_database_variations = f"{os.path.dirname(path_database_analysis)}/{path_database_variations}"
138-
with open(path_database_variations, "r", encoding="utf-8") as file_sys:
138+
with open(path_database_variations, encoding="utf-8") as file_sys:
139139
db_variations = yaml.safe_load(file_sys)
140140

141141
if not healthy_structure(db_variations):
@@ -492,16 +492,28 @@ def do_jet_systematics(self, var: str):
492492
print("Variation: %s" % self.systematic_varlabels[sys_cat][sys_var])
493493
leg_sysvar.AddEntry(
494494
input_histograms_sys[iptjet][sys_cat][sys_var],
495-
("%s, %s" % (self.systematic_catlabels[sys_cat], self.systematic_varlabels[sys_cat][sys_var])),
495+
(
496+
"{}, {}".format(
497+
self.systematic_catlabels[sys_cat], self.systematic_varlabels[sys_cat][sys_var]
498+
)
499+
),
496500
"P",
497501
)
498502
self.logger.info(
499503
"Adding label %s",
500-
("%s, %s" % (self.systematic_catlabels[sys_cat], self.systematic_varlabels[sys_cat][sys_var])),
504+
(
505+
"{}, {}".format(
506+
self.systematic_catlabels[sys_cat], self.systematic_varlabels[sys_cat][sys_var]
507+
)
508+
),
501509
)
502510
print(
503511
"Adding label %s"
504-
% ("%s, %s" % (self.systematic_catlabels[sys_cat], self.systematic_varlabels[sys_cat][sys_var]))
512+
% (
513+
"{}, {}".format(
514+
self.systematic_catlabels[sys_cat], self.systematic_varlabels[sys_cat][sys_var]
515+
)
516+
)
505517
)
506518
setup_histogram(input_histograms_sys[iptjet][sys_cat][sys_var], get_colour(nsys + 1))
507519
input_histograms_sys[iptjet][sys_cat][sys_var].Draw("same")
@@ -522,7 +534,7 @@ def do_jet_systematics(self, var: str):
522534
for sys_cat in range(self.n_sys_cat):
523535
suffix2 = self.systematic_catnames[sys_cat]
524536
nsys = 0
525-
csysvar_each = TCanvas("csysvar_%s_%s" % (suffix2, suffix), "systematic variations" + suffix2 + suffix)
537+
csysvar_each = TCanvas(f"csysvar_{suffix2}_{suffix}", "systematic variations" + suffix2 + suffix)
526538
setup_canvas(csysvar_each)
527539
csysvar_each.SetRightMargin(0.25)
528540
leg_sysvar_each = TLegend(0.77, 0.2, 0.95, 0.85, self.systematic_catlabels[sys_cat]) # Rg
@@ -554,7 +566,7 @@ def do_jet_systematics(self, var: str):
554566
)
555567
input_histograms_sys[iptjet][sys_cat][sys_var].Draw("same")
556568
nsys = nsys + 1
557-
latex_text = "%g #leq %s < %g GeV/#it{c}" % (
569+
latex_text = "{:g} #leq {} < {:g} GeV/#it{{c}}".format(
558570
self.edges_ptjet_gen_min[iptjet],
559571
self.latex_ptjet,
560572
self.edges_ptjet_gen_max[iptjet],
@@ -571,9 +583,7 @@ def do_jet_systematics(self, var: str):
571583
# plot ratios to the default
572584

573585
nsys = 0
574-
csysvar_ratio = TCanvas(
575-
"csysvar_ratio_%s_%s" % (suffix2, suffix), "systematic variations" + suffix2 + suffix
576-
)
586+
csysvar_ratio = TCanvas(f"csysvar_ratio_{suffix2}_{suffix}", "systematic variations" + suffix2 + suffix)
577587
setup_canvas(csysvar_ratio)
578588
csysvar_ratio.SetRightMargin(0.25)
579589
leg_sysvar_ratio = TLegend(0.77, 0.2, 0.95, 0.85, self.systematic_catlabels[sys_cat]) # Rg
@@ -655,9 +665,7 @@ def do_jet_systematics(self, var: str):
655665

656666
# Plot efficiency variations
657667

658-
csysvar_eff = TCanvas(
659-
"csysvar_eff_%s_%s" % (suffix2, suffix), "systematic variations" + suffix2 + suffix
660-
)
668+
csysvar_eff = TCanvas(f"csysvar_eff_{suffix2}_{suffix}", "systematic variations" + suffix2 + suffix)
661669
setup_canvas(csysvar_eff)
662670
csysvar_eff.SetRightMargin(0.25)
663671
leg_sysvar_eff = TLegend(
@@ -715,7 +723,7 @@ def do_jet_systematics(self, var: str):
715723
# Plot ratios of efficiency variations to the default efficiency
716724

717725
csysvar_eff_ratio = TCanvas(
718-
"csysvar_eff_ratio_%s_%s" % (suffix2, suffix), "systematic variations" + suffix2 + suffix
726+
f"csysvar_eff_ratio_{suffix2}_{suffix}", "systematic variations" + suffix2 + suffix
719727
)
720728
setup_canvas(csysvar_eff_ratio)
721729
csysvar_eff_ratio.SetRightMargin(0.25)

0 commit comments

Comments
 (0)