From f43ec7093eabcc291b427d659bc48f4037ffed13 Mon Sep 17 00:00:00 2001
From: Michael William O'Keefe <michael.william.o'keefe@cern.ch>
Date: Mon, 10 Feb 2020 12:05:31 +0100
Subject: [PATCH] Further removing commented out code
---
.../ZLumiScripts/scripts/dqt_zlumi_BCID_eff.py | 12 ++----------
.../ZLumiScripts/scripts/dqt_zlumi_BCID_mass.py | 2 --
.../ZLumiScripts/scripts/dqt_zlumi_alleff_HIST.py | 1 -
3 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/DataQuality/ZLumiScripts/scripts/dqt_zlumi_BCID_eff.py b/DataQuality/ZLumiScripts/scripts/dqt_zlumi_BCID_eff.py
index b6388d0faa778..ec85e292b3465 100755
--- a/DataQuality/ZLumiScripts/scripts/dqt_zlumi_BCID_eff.py
+++ b/DataQuality/ZLumiScripts/scripts/dqt_zlumi_BCID_eff.py
@@ -78,11 +78,6 @@ def plot_efficiency(histos, draw_options, legends, y_title, channel_label, filen
else:
leg.AddEntry(histos[legends.index(legend)], legend, draw_options[legends.index(legend)])
- #calculate_chi2(h_reco_eff_full, h_reco_eff_0_mu_50)
- #calculate_chi2(h_reco_eff_full, h_reco_eff_51_mu_100)
- #calculate_chi2(h_reco_eff_full, h_reco_eff_101_mu_150)
- #calculate_chi2(h_reco_eff_full, h_reco_eff_151_mu_200)
-
c1 = TCanvas()
histos[0].Draw("hist, " + draw_options[0])
for x in range(1, len(histos)):
@@ -143,8 +138,6 @@ def plot_2D_eff(hnz, htr, hmo, hms, hno, hns, h_2D, channel):
eff = (1 - (1 - trigeff)**2) * recoeff**2
err = ((recoeff**2*2*(1-trigeff)*trigerr)**2 + (2*recoeff*(1-(1-trigeff)**2)*recoerr)**2)**0.5
- #print bin_bcid, bin_pileup, eff, err
-
h_2D.SetBinContent(bin_bcid, bin_pileup, eff)
h_2D.SetBinError(bin_bcid, bin_pileup, err)
@@ -332,7 +325,6 @@ def BCID_trig_tag_and_probe(h, lower_z_bin, upper_z_bin, histo):
histo.SetBinContent(bin_bcid, eff)
histo.SetBinError(bin_bcid, err)
- #print eff, err
return
@@ -346,8 +338,8 @@ def BCID_template_method(hmo, hms, hno, hns, hto, hts, lower_z_bin, upper_z_bin,
tbin4 = hmo.GetXaxis().FindBin(250000)
for bin_bcid in range(1, 49):
- #scale_os = 1 if hto.Integral(tbin3, tbin4) == 0 else hno.Integral(tbin3, tbin4)/hto.Integral(tbin3, tbin4)
- #scale_ss = 1 if hts.Integral(tbin3, tbin4) == 0 else hns.Integral(tbin3, tbin4)/hts.Integral(tbin3, tbin4)
+ scale_os = 1 if hto.Integral(tbin3, tbin4) == 0 else hno.Integral(tbin3, tbin4)/hto.Integral(tbin3, tbin4)
+ scale_ss = 1 if hts.Integral(tbin3, tbin4) == 0 else hns.Integral(tbin3, tbin4)/hts.Integral(tbin3, tbin4)
if doScale == True:
hto.Scale(scale_os)
diff --git a/DataQuality/ZLumiScripts/scripts/dqt_zlumi_BCID_mass.py b/DataQuality/ZLumiScripts/scripts/dqt_zlumi_BCID_mass.py
index 95eb73fcf34a7..0178b345b9115 100755
--- a/DataQuality/ZLumiScripts/scripts/dqt_zlumi_BCID_mass.py
+++ b/DataQuality/ZLumiScripts/scripts/dqt_zlumi_BCID_mass.py
@@ -129,7 +129,6 @@ def main():
c1 = R.TCanvas()
h_BCID1.Draw("ep")
- #h_BCID1.Fit("gaus")
R.gPad.SetLogy()
drawAtlasLabel(0.17, 0.85, "Work in progess")
drawText(0.17, 0.78, "BCID 1")
@@ -137,7 +136,6 @@ def main():
c1 = R.TCanvas()
h_BCID2t48.Draw("ep")
- #h_BCID2t48.Fit("gaus")
R.gPad.SetLogy()
drawAtlasLabel(0.17, 0.85, "Work in progess")
drawText(0.17, 0.78, "BCID 2-48")
diff --git a/DataQuality/ZLumiScripts/scripts/dqt_zlumi_alleff_HIST.py b/DataQuality/ZLumiScripts/scripts/dqt_zlumi_alleff_HIST.py
index ace932dc28162..394ee65771edb 100755
--- a/DataQuality/ZLumiScripts/scripts/dqt_zlumi_alleff_HIST.py
+++ b/DataQuality/ZLumiScripts/scripts/dqt_zlumi_alleff_HIST.py
@@ -359,7 +359,6 @@ for lb in sorted(lbdirs):
reco_tag_and_probe(hmo, hms, hno, hns, effcyr)
elif runmode == "Zee":
template_method(hmo, hms, hno, hns, hto, hts, effcyr)
- #container_efficiency(hphoton, hpass, hto, hts)
o_ae[0] = ACCEPTANCE*(1-(1-o_trigeff[0])**2)*(o_recoeff[0])**2
o_aestat[0] = ACCEPTANCE*((o_recoeff[0]**2*2*(1-o_trigeff[0])*o_trigeffstat[0])**2+(2*o_recoeff[0]*(1-(1-o_trigeff[0])**2)*o_recoeffstat[0])**2)**.5
--
GitLab