diff --git a/DQMOffline/L1Trigger/python/L1TCommon.py b/DQMOffline/L1Trigger/python/L1TCommon.py index 9a16761308150..51d2f8f0d4880 100644 --- a/DQMOffline/L1Trigger/python/L1TCommon.py +++ b/DQMOffline/L1Trigger/python/L1TCommon.py @@ -1,8 +1,10 @@ +import six + def generateEfficiencyStrings(variables, plots): stringTemplate = "{plot} " + \ "'{var} efficiency; Offline E_{{T}}^{{miss}} (GeV); {var} efficiency'" + \ " {num_path} {den_path}" - for variable, thresholds in variables.iteritems(): + for variable, thresholds in six.iteritems(variables): for plot in plots[variable]: for threshold in thresholds: plotName = '{0}_threshold_{1}'.format(plot, threshold) diff --git a/DQMOffline/L1Trigger/python/L1TEGammaOffline_cfi.py b/DQMOffline/L1Trigger/python/L1TEGammaOffline_cfi.py index f44552d1e7de7..d36a1476ccfb0 100644 --- a/DQMOffline/L1Trigger/python/L1TEGammaOffline_cfi.py +++ b/DQMOffline/L1Trigger/python/L1TEGammaOffline_cfi.py @@ -1,14 +1,15 @@ +from builtins import range import FWCore.ParameterSet.Config as cms from DQMOffline.L1Trigger.L1THistDefinitions_cff import histDefinitions electronEfficiencyThresholds = [34, 36, 38, 40, 42] electronEfficiencyBins = [] -electronEfficiencyBins.extend(list(xrange(2, 42, 2))) -electronEfficiencyBins.extend(list(xrange(42, 45, 3))) -electronEfficiencyBins.extend(list(xrange(45, 50, 5))) -electronEfficiencyBins.extend(list(xrange(50, 70, 10))) -electronEfficiencyBins.extend(list(xrange(70, 101, 30))) +electronEfficiencyBins.extend(list(range(2, 42, 2))) +electronEfficiencyBins.extend(list(range(42, 45, 3))) +electronEfficiencyBins.extend(list(range(45, 50, 5))) +electronEfficiencyBins.extend(list(range(50, 70, 10))) +electronEfficiencyBins.extend(list(range(70, 101, 30))) # additional efficiency vs eta, phi and # vertices plots will # be created for the following probe electron pT thresholds @@ -67,12 +68,12 @@ deepInspectionElectronThresholds_HI = [15] electronEfficiencyBins_HI = [] -electronEfficiencyBins_HI.extend(list(xrange(1, 26, 1))) -electronEfficiencyBins_HI.extend(list(xrange(26, 42, 2))) -electronEfficiencyBins_HI.extend(list(xrange(42, 45, 3))) -electronEfficiencyBins_HI.extend(list(xrange(45, 50, 5))) -electronEfficiencyBins_HI.extend(list(xrange(50, 70, 10))) -electronEfficiencyBins_HI.extend(list(xrange(70, 101, 30))) +electronEfficiencyBins_HI.extend(list(range(1, 26, 1))) +electronEfficiencyBins_HI.extend(list(range(26, 42, 2))) +electronEfficiencyBins_HI.extend(list(range(42, 45, 3))) +electronEfficiencyBins_HI.extend(list(range(45, 50, 5))) +electronEfficiencyBins_HI.extend(list(range(50, 70, 10))) +electronEfficiencyBins_HI.extend(list(range(70, 101, 30))) photonEfficiencyThresholds_HI = electronEfficiencyThresholds_HI photonEfficiencyBins_HI = electronEfficiencyBins_HI diff --git a/DQMOffline/L1Trigger/python/L1TEtSumJetOffline_cfi.py b/DQMOffline/L1Trigger/python/L1TEtSumJetOffline_cfi.py index 3563ccaf20f55..2987074da24e0 100644 --- a/DQMOffline/L1Trigger/python/L1TEtSumJetOffline_cfi.py +++ b/DQMOffline/L1Trigger/python/L1TEtSumJetOffline_cfi.py @@ -1,3 +1,4 @@ +from builtins import range import FWCore.ParameterSet.Config as cms from DQMOffline.L1Trigger.L1THistDefinitions_cff import histDefinitions @@ -8,38 +9,38 @@ httEfficiencyThresholds = [120, 160, 200, 240, 280] jetEfficiencyBins = [] -jetEfficiencyBins.extend(list(xrange(0, 120, 10))) -jetEfficiencyBins.extend(list(xrange(120, 180, 20))) -jetEfficiencyBins.extend(list(xrange(180, 300, 40))) -jetEfficiencyBins.extend(list(xrange(300, 401, 100))) +jetEfficiencyBins.extend(list(range(0, 120, 10))) +jetEfficiencyBins.extend(list(range(120, 180, 20))) +jetEfficiencyBins.extend(list(range(180, 300, 40))) +jetEfficiencyBins.extend(list(range(300, 401, 100))) metEfficiencyBins = [] -metEfficiencyBins.extend(list(xrange(0, 40, 4))) -metEfficiencyBins.extend(list(xrange(40, 70, 2))) -metEfficiencyBins.extend(list(xrange(70, 100, 5))) -metEfficiencyBins.extend(list(xrange(100, 160, 10))) -metEfficiencyBins.extend(list(xrange(160, 261, 20))) +metEfficiencyBins.extend(list(range(0, 40, 4))) +metEfficiencyBins.extend(list(range(40, 70, 2))) +metEfficiencyBins.extend(list(range(70, 100, 5))) +metEfficiencyBins.extend(list(range(100, 160, 10))) +metEfficiencyBins.extend(list(range(160, 261, 20))) mhtEfficiencyBins = [] -mhtEfficiencyBins.extend(list(xrange(30, 50, 1))) -mhtEfficiencyBins.extend(list(xrange(50, 80, 5))) -mhtEfficiencyBins.extend(list(xrange(80, 140, 10))) -mhtEfficiencyBins.extend(list(xrange(140, 200, 15))) -mhtEfficiencyBins.extend(list(xrange(200, 300, 20))) -mhtEfficiencyBins.extend(list(xrange(300, 401, 50))) +mhtEfficiencyBins.extend(list(range(30, 50, 1))) +mhtEfficiencyBins.extend(list(range(50, 80, 5))) +mhtEfficiencyBins.extend(list(range(80, 140, 10))) +mhtEfficiencyBins.extend(list(range(140, 200, 15))) +mhtEfficiencyBins.extend(list(range(200, 300, 20))) +mhtEfficiencyBins.extend(list(range(300, 401, 50))) ettEfficiencyBins = [] -ettEfficiencyBins.extend(list(xrange(0, 30, 30))) -ettEfficiencyBins.extend(list(xrange(30, 50, 10))) -ettEfficiencyBins.extend(list(xrange(50, 90, 5))) -ettEfficiencyBins.extend(list(xrange(90, 141, 2))) +ettEfficiencyBins.extend(list(range(0, 30, 30))) +ettEfficiencyBins.extend(list(range(30, 50, 10))) +ettEfficiencyBins.extend(list(range(50, 90, 5))) +ettEfficiencyBins.extend(list(range(90, 141, 2))) httEfficiencyBins = [] -httEfficiencyBins.extend(list(xrange(0, 100, 5))) -httEfficiencyBins.extend(list(xrange(100, 200, 10))) -httEfficiencyBins.extend(list(xrange(200, 400, 20))) -httEfficiencyBins.extend(list(xrange(400, 500, 50))) -httEfficiencyBins.extend(list(xrange(500, 601, 10))) +httEfficiencyBins.extend(list(range(0, 100, 5))) +httEfficiencyBins.extend(list(range(100, 200, 10))) +httEfficiencyBins.extend(list(range(200, 400, 20))) +httEfficiencyBins.extend(list(range(400, 500, 50))) +httEfficiencyBins.extend(list(range(500, 601, 10))) # from https://twiki.cern.ch/twiki/bin/view/CMS/JetID13TeVRun2017 centralJetSelection = [ @@ -149,12 +150,12 @@ # modifications for the pp reference run jetEfficiencyThresholds_HI = [8, 16, 24, 44, 60, 80, 90] jetEfficiencyBins_HI = [] -jetEfficiencyBins_HI.extend(list(xrange(0, 60, 2))) -jetEfficiencyBins_HI.extend(list(xrange(60, 90, 5))) -jetEfficiencyBins_HI.extend(list(xrange(90, 120, 10))) -jetEfficiencyBins_HI.extend(list(xrange(120, 180, 20))) -jetEfficiencyBins_HI.extend(list(xrange(180, 300, 40))) -jetEfficiencyBins_HI.extend(list(xrange(300, 401, 100))) +jetEfficiencyBins_HI.extend(list(range(0, 60, 2))) +jetEfficiencyBins_HI.extend(list(range(60, 90, 5))) +jetEfficiencyBins_HI.extend(list(range(90, 120, 10))) +jetEfficiencyBins_HI.extend(list(range(120, 180, 20))) +jetEfficiencyBins_HI.extend(list(range(180, 300, 40))) +jetEfficiencyBins_HI.extend(list(range(300, 401, 100))) from Configuration.Eras.Modifier_ppRef_2017_cff import ppRef_2017 ppRef_2017.toModify( diff --git a/DQMOffline/L1Trigger/python/L1THistDefinitions_cff.py b/DQMOffline/L1Trigger/python/L1THistDefinitions_cff.py index 873e666d404be..729c2e9afcab4 100644 --- a/DQMOffline/L1Trigger/python/L1THistDefinitions_cff.py +++ b/DQMOffline/L1Trigger/python/L1THistDefinitions_cff.py @@ -1,10 +1,10 @@ - +from builtins import range import FWCore.ParameterSet.Config as cms et_vs_et_bins = [] -et_vs_et_bins.extend(list(xrange(0, 50, 1))) -et_vs_et_bins.extend(list(xrange(50, 150, 5))) -et_vs_et_bins.extend(list(xrange(150, 500, 50))) +et_vs_et_bins.extend(list(range(0, 50, 1))) +et_vs_et_bins.extend(list(range(50, 150, 5))) +et_vs_et_bins.extend(list(range(150, 500, 50))) histDefinitions = cms.PSet( nVertex=cms.PSet( diff --git a/DQMOffline/L1Trigger/python/L1TMuonDQMOffline_cfi.py b/DQMOffline/L1Trigger/python/L1TMuonDQMOffline_cfi.py index 3c7296969cd4e..79c705e8f5369 100644 --- a/DQMOffline/L1Trigger/python/L1TMuonDQMOffline_cfi.py +++ b/DQMOffline/L1Trigger/python/L1TMuonDQMOffline_cfi.py @@ -1,16 +1,14 @@ +from builtins import range import FWCore.ParameterSet.Config as cms # define binning for efficiency plots # pt -effVsPtBins = range(0, 30, 1) -effVsPtBins += range(30, 50, 2) -effVsPtBins += range(50, 70, 5) -effVsPtBins += range(70, 100, 10) -effVsPtBins += range(100, 200, 25) -effVsPtBins += range(200, 300, 50) -effVsPtBins += range(300, 500, 100) -effVsPtBins += range(500, 700, 200) -effVsPtBins += range(700, 1000, 300) +import itertools +effVsPtBins=list(itertools.chain(range(0, 30, 1), range(30, 50, 2), + range(50, 70, 5), range(70, 100, 10), + range(100, 200, 25), range(200, 300, 50), + range(300, 500, 100), range(500, 700, 200), + range(700, 1000, 300))) effVsPtBins.append(1000) # phi diff --git a/DQMOffline/L1Trigger/python/L1TTauOffline_cfi.py b/DQMOffline/L1Trigger/python/L1TTauOffline_cfi.py index f610c5a778e3c..4a956651878f6 100644 --- a/DQMOffline/L1Trigger/python/L1TTauOffline_cfi.py +++ b/DQMOffline/L1Trigger/python/L1TTauOffline_cfi.py @@ -4,14 +4,14 @@ tauEfficiencyThresholds = [28, 30, 32, 128, 176] tauEfficiencyBins = [] -tauEfficiencyBins.extend(list(xrange(0, 50, 1))) -tauEfficiencyBins.extend(list(xrange(50, 60, 2))) -tauEfficiencyBins.extend(list(xrange(60, 80, 5))) -tauEfficiencyBins.extend(list(xrange(80, 200, 10))) -tauEfficiencyBins.extend(list(xrange(200, 300, 20))) -tauEfficiencyBins.extend(list(xrange(300, 400, 50))) -tauEfficiencyBins.extend(list(xrange(400, 600, 100))) -tauEfficiencyBins.extend(list(xrange(600, 1200, 200))) +tauEfficiencyBins.extend(list(range(0, 50, 1))) +tauEfficiencyBins.extend(list(range(50, 60, 2))) +tauEfficiencyBins.extend(list(range(60, 80, 5))) +tauEfficiencyBins.extend(list(range(80, 200, 10))) +tauEfficiencyBins.extend(list(range(200, 300, 20))) +tauEfficiencyBins.extend(list(range(300, 400, 50))) +tauEfficiencyBins.extend(list(range(400, 600, 100))) +tauEfficiencyBins.extend(list(range(600, 1200, 200))) from DQMServices.Core.DQMEDAnalyzer import DQMEDAnalyzer l1tTauOfflineDQM = DQMEDAnalyzer( diff --git a/DQMOffline/Trigger/python/FSQHLTOfflineSource_cfi.py b/DQMOffline/Trigger/python/FSQHLTOfflineSource_cfi.py index c0c6a396f9f80..e2189d1b24d78 100644 --- a/DQMOffline/Trigger/python/FSQHLTOfflineSource_cfi.py +++ b/DQMOffline/Trigger/python/FSQHLTOfflineSource_cfi.py @@ -86,7 +86,7 @@ def getHighMultVPSet(): partialPathName = "HLT_PixelTracks_Multiplicity"+str(t)+"_v" tracksL = 0 tracksH = 200 - tracksBins = (tracksH-tracksL)/5 + tracksBins = (tracksH-tracksL)//5 tracksCount = cms.PSet( triggerSelection = cms.string(partialPathName+"*"), handlerType = cms.string("RecoTrackCounterWithVertexConstraint"), @@ -168,7 +168,7 @@ def getHighMultVPSet(): combinedObjectSortCriteria = cms.string("at(0).pt"), combinedObjectDimension = cms.int32(1), combinedObjectDrawables = cms.VPSet( - cms.PSet (name = cms.string("pt"), expression = cms.string("at(0).pt"), bins = cms.int32(256/4), min = cms.double(0), max = cms.double(256)), + cms.PSet (name = cms.string("pt"), expression = cms.string("at(0).pt"), bins = cms.int32(256//4), min = cms.double(0), max = cms.double(256)), ) ) ret.append(l1) @@ -195,7 +195,7 @@ def getPTAveVPSet(thresholds = [30, 60, 80, 100, 160, 220, 300], flavour="HFJEC" #partialPathName = "HLT_DiPFJetAve"+ str(t) +"_HFJEC_" partialPathName = "HLT_DiPFJetAve"+ str(t)+"_" + flavour + "_v" - ptBinLow = t/2 + ptBinLow = t//2 ptBinHigh = max(100, t*2) ptBins = min(100, ptBinHigh-ptBinLow) @@ -233,8 +233,8 @@ def getPTAveVPSet(thresholds = [30, 60, 80, 100, 160, 220, 300], flavour="HFJEC" combinedObjectSortCriteria = cms.string("at(0).pt"), combinedObjectDimension = cms.int32(1), combinedObjectDrawables = cms.VPSet( - cms.PSet (name = cms.string("pt"), expression = cms.string("at(0).pt"), bins = cms.int32(256/4), min = cms.double(0), max = cms.double(256)), - cms.PSet (name = cms.string("eta"), expression = cms.string("at(0).eta"), bins = cms.int32(104/4), min = cms.double(-5.2), max = cms.double(5.2)) + cms.PSet (name = cms.string("pt"), expression = cms.string("at(0).pt"), bins = cms.int32(256//4), min = cms.double(0), max = cms.double(256)), + cms.PSet (name = cms.string("eta"), expression = cms.string("at(0).eta"), bins = cms.int32(104//4), min = cms.double(-5.2), max = cms.double(5.2)) ) ) ret.append(l1) @@ -415,9 +415,9 @@ def getSinglePFJet(thresholds, flavour=None, etaMin=-1, srcType="genJets", parti partialPathNameLoc += flavour+"_" partialPathNameLoc += "v" - marginLow = max(t-t/2, 15) + marginLow = max(t-t//2, 15) ptBinLow = max(t-marginLow,0) - marginHigh = min(max(t/2, 20), 50) + marginHigh = min(max(t//2, 20), 50) ptBinHigh = t+marginHigh ptBins = min(100, ptBinHigh-ptBinLow) fromJets = cms.PSet( @@ -495,9 +495,9 @@ def getDoublePFJet(thresholds, flavour=None, etaMin=-1, srcType="genJets" ): partialPathName += flavour+"_" partialPathName += "v" - marginLow = max(t-t/2, 15) + marginLow = max(t-t//2, 15) ptBinLow = max(t-marginLow,0) - marginHigh = min(max(t/3, 15), 50) + marginHigh = min(max(t//3, 15), 50) ptBinHigh = t+marginHigh ptBins = min(100, ptBinHigh-ptBinLow) fromJets = cms.PSet(