From 5916a9334cc3ed85e3ca1bac2e71b4882993a19d Mon Sep 17 00:00:00 2001
From: Michael William O'Keefe <michael.william.o'keefe@cern.ch>
Date: Fri, 7 Feb 2020 15:31:22 +0100
Subject: [PATCH] Removing comments
---
DataQuality/ZLumiScripts/scripts/dqt_zlumi_BCID_eff.py | 3 ---
.../ZLumiScripts/scripts/dqt_zlumi_alleff_HIST.py | 5 -----
.../ZLumiScripts/scripts/dqt_zlumi_combine_lumi.py | 5 -----
.../ZLumiScripts/scripts/dqt_zlumi_compute_lumi.py | 10 +++++-----
.../ZLumiScripts/scripts/dqt_zlumi_display_z_rate.py | 1 -
5 files changed, 5 insertions(+), 19 deletions(-)
diff --git a/DataQuality/ZLumiScripts/scripts/dqt_zlumi_BCID_eff.py b/DataQuality/ZLumiScripts/scripts/dqt_zlumi_BCID_eff.py
index e2a1c0294c264..b6388d0faa778 100755
--- a/DataQuality/ZLumiScripts/scripts/dqt_zlumi_BCID_eff.py
+++ b/DataQuality/ZLumiScripts/scripts/dqt_zlumi_BCID_eff.py
@@ -42,14 +42,11 @@ def calculate_chi2(histo1, histo2):
x2 = histo2.GetBinContent(mybin)
numer = (x1 - x2)**2
- #denom = (histo2.GetBinError(mybin))**2# + (histo1.GetBinError(mybin))**2
covariance = (x1 - mean_x1)*(x2 - mean_x2)/(N-1)
denom = (histo2.GetBinError(mybin))**2 + (histo1.GetBinError(mybin))**2 - 2*covariance
if (denom != 0 and numer !=0):
chi += numer/denom
NDF += 1
- #print x1, x2, histo2.GetBinError(mybin), numer, denom, numer/denom
-
NDF -= 1
diff --git a/DataQuality/ZLumiScripts/scripts/dqt_zlumi_alleff_HIST.py b/DataQuality/ZLumiScripts/scripts/dqt_zlumi_alleff_HIST.py
index 1772924fad5f7..ace932dc28162 100755
--- a/DataQuality/ZLumiScripts/scripts/dqt_zlumi_alleff_HIST.py
+++ b/DataQuality/ZLumiScripts/scripts/dqt_zlumi_alleff_HIST.py
@@ -438,8 +438,3 @@ if sumweights:
effcyrat.Draw('PE')
effcyrat.Fit('pol1')
c1.Print(os.path.join(args.plotdir, '%s_tp_correction.eps' % runname[4:]))
-
-
-
-
-
diff --git a/DataQuality/ZLumiScripts/scripts/dqt_zlumi_combine_lumi.py b/DataQuality/ZLumiScripts/scripts/dqt_zlumi_combine_lumi.py
index bbad99784328e..8c84311a28353 100755
--- a/DataQuality/ZLumiScripts/scripts/dqt_zlumi_combine_lumi.py
+++ b/DataQuality/ZLumiScripts/scripts/dqt_zlumi_combine_lumi.py
@@ -40,11 +40,6 @@ def correction(mu):
if campaign == "mc16d":
return 8.74735e-01 - 1.64286e-04*mu - 7.32040e-06*mu*mu
if campaign == "mc16e":
- # old method
- #return 8.74217e-01 - 1.66188e-04*mu - 7.75133e-06*mu*mu
- # template method - OS = OS+SS
- #return 9.32014e-01 + 1.49928e-06*mu - 5.28293e-06*mu*mu
- # template method - OS = OS
return 9.02495e-01 + 2.15661e-05*mu - 7.04916e-06*mu*mu
if runmode == "Zmumu":
diff --git a/DataQuality/ZLumiScripts/scripts/dqt_zlumi_compute_lumi.py b/DataQuality/ZLumiScripts/scripts/dqt_zlumi_compute_lumi.py
index 91780985a4e6f..7bc303ab97be5 100755
--- a/DataQuality/ZLumiScripts/scripts/dqt_zlumi_compute_lumi.py
+++ b/DataQuality/ZLumiScripts/scripts/dqt_zlumi_compute_lumi.py
@@ -146,23 +146,24 @@ from DQUtils import fetch_iovs
from DQUtils.iov_arrangement import inverse_lblb
lblb = fetch_iovs("LBLB", runs=int(runname[4:]))
lbtime = inverse_lblb(lblb)
-#print list(lbtime)
+
iovs_acct = fetch_iovs('COOLOFL_TRIGGER::/TRIGGER/OFLLUMI/LumiAccounting', lbtime.first.since, lbtime.last.until, tag=args.tag)
if args.useofficial:
iovs_lum = fetch_iovs('COOLOFL_TRIGGER::%s' % args.lumifolder, lblb.first.since, lblb.last.until, tag=args.lumitag, channels=[0])
- #print list(iovs_lum)
+
lb_start_end = {}
-lb_lhcfill = {}
+lb_lhcfill = {}
for iov in lblb:
lb_start_end[iov.since & 0xffffffff] = (iov.StartTime/1e9, iov.EndTime/1e9)
for iov in iovs_acct:
if not lbmin < iov.LumiBlock < lbmax:
continue
+
lb_lhcfill[iov.LumiBlock] = iov.FillNumber
if args.dblivetime:
livetime.Fill(iov.LumiBlock, iov.LiveFraction)
- #print iov.InstLumi, iovs_lum[iov.LumiBlock-1].LBAvInstLumi
+
if not args.useofficial:
official_lum_zero.Fill(iov.LumiBlock, iov.InstLumi/1e3)
official_lum.Fill(iov.LumiBlock, iov.InstLumi*iov.LBTime*iov.LiveFraction/1e3)
@@ -232,7 +233,6 @@ for ibin in xrange(1, int(lbmax-lbmin)+1):
# fill tree
if t:
- #print ibin, lumiplot_raw_m.GetBinCenter(ibin)
o_lb[0] = int(lumiplot_raw_m.GetBinCenter(ibin))
o_lbwhen[0] = lb_start_end[o_lb[0]][0]
o_lbwhen[1] = lb_start_end[o_lb[0]][1]
diff --git a/DataQuality/ZLumiScripts/scripts/dqt_zlumi_display_z_rate.py b/DataQuality/ZLumiScripts/scripts/dqt_zlumi_display_z_rate.py
index b3764dfc8bf26..7aa4da0d5a6c6 100755
--- a/DataQuality/ZLumiScripts/scripts/dqt_zlumi_display_z_rate.py
+++ b/DataQuality/ZLumiScripts/scripts/dqt_zlumi_display_z_rate.py
@@ -106,4 +106,3 @@ if lumitree.GetSelectedRows() > 0:
gr3.GetHistogram().SetYTitle('Z Counting/Official Lumi')
c1.Print(os.path.join(args.plotdir, '%s_lumicompratio.eps' % runnum))
f.WriteTObject(c1, 'lumicompratio_canvas')
-
--
GitLab