diff --git a/DQMOffline/L1Trigger/python/L1TPhase2MuonOffline_cfi.py b/DQMOffline/L1Trigger/python/L1TPhase2MuonOffline_cfi.py index 994e1f48587dd..6ccc686a49fd2 100644 --- a/DQMOffline/L1Trigger/python/L1TPhase2MuonOffline_cfi.py +++ b/DQMOffline/L1Trigger/python/L1TPhase2MuonOffline_cfi.py @@ -40,8 +40,8 @@ useL1AtVtxCoord = cms.untracked.bool(False), genParticlesInputTag = cms.untracked.InputTag("genParticles"), - gmtMuonToken = cms.InputTag("L1SAMuonsGmt", "promptSAMuons"), - gmtTkMuonToken = cms.InputTag("L1TkMuonsGmt",""), + gmtMuonToken = cms.InputTag("l1tSAMuonsGmt", "promptSAMuons"), + gmtTkMuonToken = cms.InputTag("l1tTkMuonsGmt",""), efficiencyVsPtBins = cms.untracked.vdouble(effVsPtBins), efficiencyVsPhiBins = cms.untracked.vdouble(effVsPhiBins), diff --git a/DQMOffline/L1Trigger/python/L1TPhase2Offline_cfi.py b/DQMOffline/L1Trigger/python/L1TPhase2Offline_cfi.py index dfd9ba626ffaf..31e6dd1438793 100644 --- a/DQMOffline/L1Trigger/python/L1TPhase2Offline_cfi.py +++ b/DQMOffline/L1Trigger/python/L1TPhase2Offline_cfi.py @@ -93,9 +93,9 @@ genParticlesInputTag = cms.untracked.InputTag("genParticles"), isParticleGun = cms.bool(False), objects = cms.PSet( - L1PF = cms.VInputTag("l1ctLayer1:PF",), + L1PF = cms.VInputTag("l1tLayer1:PF",), L1PF_sel = cms.string("pt > 0"), - L1Puppi = cms.VInputTag("l1ctLayer1:Puppi",), + L1Puppi = cms.VInputTag("l1tLayer1:Puppi",), L1Puppi_sel = cms.string("pt > 0"), ), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/L1EGammaClusterEmuProducer_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/L1EGammaClusterEmuProducer_cfi.py index 5cad5f2714b43..41170a823896f 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/L1EGammaClusterEmuProducer_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/L1EGammaClusterEmuProducer_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -L1EGammaClusterEmuProducer = cms.EDProducer("L1EGCrystalClusterEmulatorProducer", +l1tEGammaClusterEmuProducer = cms.EDProducer("L1EGCrystalClusterEmulatorProducer", calib = cms.PSet( etaBins = cms.vdouble( 0.087, 0.174, 0.261, 0.348, 0.435, diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkEleDouble12Filter_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkEleDouble12Filter_cfi.py index f6e8446d24393..8ccde44b7a170 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkEleDouble12Filter_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkEleDouble12Filter_cfi.py @@ -17,7 +17,7 @@ endcap = cms.vdouble(0.453144, 1.26205, 0.0) ), TrkIsolation = cms.vdouble(99999.0, 99999.0), - inputTag1 = cms.InputTag("l1ctLayer1EG","L1TkEleEB"), - inputTag2 = cms.InputTag("l1ctLayer1EG","L1TkEleEE"), + inputTag1 = cms.InputTag("l1tLayer1EG","L1TkEleEB"), + inputTag2 = cms.InputTag("l1tLayer1EG","L1TkEleEE"), saveTags = cms.bool(True) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkEleSingle25Filter_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkEleSingle25Filter_cfi.py index 54bfce10a4ad0..d665e272d559d 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkEleSingle25Filter_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkEleSingle25Filter_cfi.py @@ -17,7 +17,7 @@ endcap = cms.vdouble(0.453144, 1.26205, 0.0) ), TrkIsolation = cms.vdouble(99999.0, 99999.0), - inputTag1 = cms.InputTag("l1ctLayer1EG","L1TkEleEB"), - inputTag2 = cms.InputTag("l1ctLayer1EG","L1TkEleEE"), + inputTag1 = cms.InputTag("l1tLayer1EG","L1TkEleEB"), + inputTag2 = cms.InputTag("l1tLayer1EG","L1TkEleEE"), saveTags = cms.bool(True) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkEleSingle36Filter_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkEleSingle36Filter_cfi.py index ff8a821138455..6da10ecd3ab1f 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkEleSingle36Filter_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkEleSingle36Filter_cfi.py @@ -17,7 +17,7 @@ endcap = cms.vdouble(0.453144, 1.26205, 0.0) ), TrkIsolation = cms.vdouble(99999.0, 99999.0), - inputTag1 = cms.InputTag("l1ctLayer1EG","L1TkEleEB"), - inputTag2 = cms.InputTag("l1ctLayer1EG","L1TkEleEE"), + inputTag1 = cms.InputTag("l1tLayer1EG","L1TkEleEB"), + inputTag2 = cms.InputTag("l1tLayer1EG","L1TkEleEE"), saveTags = cms.bool(True) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkEmDouble12Filter_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkEmDouble12Filter_cfi.py index 80f5e3692ae28..6a2d524ef1672 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkEmDouble12Filter_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkEmDouble12Filter_cfi.py @@ -17,7 +17,7 @@ endcap = cms.vdouble(3.17445, 1.13219, 0.0) ), TrkIsolation = cms.vdouble(99999.0, 99999.0), - inputTag1 = cms.InputTag("l1ctLayer1EG","L1TkEmEB"), - inputTag2 = cms.InputTag("l1ctLayer1EG","L1TkEmEE"), + inputTag1 = cms.InputTag("l1tLayer1EG","L1TkEmEB"), + inputTag2 = cms.InputTag("l1tLayer1EG","L1TkEmEE"), saveTags = cms.bool(True) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkEmDouble24Filter_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkEmDouble24Filter_cfi.py index 5125aed26da02..0516e13cf9672 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkEmDouble24Filter_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkEmDouble24Filter_cfi.py @@ -17,7 +17,7 @@ endcap = cms.vdouble(3.17445, 1.13219, 0.0) ), TrkIsolation = cms.vdouble(99999.0, 99999.0), - inputTag1 = cms.InputTag("l1ctLayer1EG","L1TkEmEB"), - inputTag2 = cms.InputTag("l1ctLayer1EG","L1TkEmEE"), + inputTag1 = cms.InputTag("l1tLayer1EG","L1TkEmEB"), + inputTag2 = cms.InputTag("l1tLayer1EG","L1TkEmEE"), saveTags = cms.bool(True) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkEmSingle37Filter_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkEmSingle37Filter_cfi.py index 970431ea7bcc7..1c8483b70c105 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkEmSingle37Filter_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkEmSingle37Filter_cfi.py @@ -17,7 +17,7 @@ endcap = cms.vdouble(3.17445, 1.13219, 0.0) ), TrkIsolation = cms.vdouble(99999.0, 99999.0), - inputTag1 = cms.InputTag("l1ctLayer1EG","L1TkEmEB"), - inputTag2 = cms.InputTag("l1ctLayer1EG","L1TkEmEE"), + inputTag1 = cms.InputTag("l1tLayer1EG","L1TkEmEB"), + inputTag2 = cms.InputTag("l1tLayer1EG","L1TkEmEE"), saveTags = cms.bool(True) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkEmSingle51Filter_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkEmSingle51Filter_cfi.py index ea2245bd859cc..7afb7987365a7 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkEmSingle51Filter_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkEmSingle51Filter_cfi.py @@ -17,7 +17,7 @@ endcap = cms.vdouble(3.17445, 1.13219, 0.0) ), TrkIsolation = cms.vdouble(99999.0, 99999.0), - inputTag1 = cms.InputTag("l1ctLayer1EG","L1TkEmEB"), - inputTag2 = cms.InputTag("l1ctLayer1EG","L1TkEmEE"), + inputTag1 = cms.InputTag("l1tLayer1EG","L1TkEmEB"), + inputTag2 = cms.InputTag("l1tLayer1EG","L1TkEmEE"), saveTags = cms.bool(True) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkIsoEleSingle22Filter_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkIsoEleSingle22Filter_cfi.py index 32a9a3165b72e..8b9f69c41c2b4 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkIsoEleSingle22Filter_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkIsoEleSingle22Filter_cfi.py @@ -17,7 +17,7 @@ endcap = cms.vdouble(0.266186, 1.25976, 0.0) ), TrkIsolation = cms.vdouble(0.12, 0.2), - inputTag1 = cms.InputTag("l1ctLayer1EG","L1TkEleEB"), - inputTag2 = cms.InputTag("l1ctLayer1EG","L1TkEleEE"), + inputTag1 = cms.InputTag("l1tLayer1EG","L1TkEleEB"), + inputTag2 = cms.InputTag("l1tLayer1EG","L1TkEleEE"), saveTags = cms.bool(True) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkIsoEleSingle28Filter_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkIsoEleSingle28Filter_cfi.py index decc0dce01619..3d2c7f347c668 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkIsoEleSingle28Filter_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkIsoEleSingle28Filter_cfi.py @@ -17,7 +17,7 @@ endcap = cms.vdouble(0.266186, 1.25976, 0.0) ), TrkIsolation = cms.vdouble(0.12, 0.2), - inputTag1 = cms.InputTag("l1ctLayer1EG","L1TkEleEB"), - inputTag2 = cms.InputTag("l1ctLayer1EG","L1TkEleEE"), + inputTag1 = cms.InputTag("l1tLayer1EG","L1TkEleEB"), + inputTag2 = cms.InputTag("l1tLayer1EG","L1TkEleEE"), saveTags = cms.bool(True) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkIsoEmDouble12Filter_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkIsoEmDouble12Filter_cfi.py index 8fc8ea5c3e488..1a6ac46c525a8 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkIsoEmDouble12Filter_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkIsoEmDouble12Filter_cfi.py @@ -17,7 +17,7 @@ endcap = cms.vdouble(2.11186, 1.15524, 0.0) ), TrkIsolation = cms.vdouble(0.35, 0.28), - inputTag1 = cms.InputTag("l1ctLayer1EG","L1TkEmEB"), - inputTag2 = cms.InputTag("l1ctLayer1EG","L1TkEmEE"), + inputTag1 = cms.InputTag("l1tLayer1EG","L1TkEmEB"), + inputTag2 = cms.InputTag("l1tLayer1EG","L1TkEmEE"), saveTags = cms.bool(True) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkIsoEmSingle22Filter_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkIsoEmSingle22Filter_cfi.py index e68b839b68e15..d2e5a4f974397 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkIsoEmSingle22Filter_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkIsoEmSingle22Filter_cfi.py @@ -17,7 +17,7 @@ endcap = cms.vdouble(2.11186, 1.15524, 0.0) ), TrkIsolation = cms.vdouble(0.35, 0.28), - inputTag1 = cms.InputTag("l1ctLayer1EG","L1TkEmEB"), - inputTag2 = cms.InputTag("l1ctLayer1EG","L1TkEmEE"), + inputTag1 = cms.InputTag("l1tLayer1EG","L1TkEmEB"), + inputTag2 = cms.InputTag("l1tLayer1EG","L1TkEmEE"), saveTags = cms.bool(True) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkIsoEmSingle36Filter_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkIsoEmSingle36Filter_cfi.py index 69df435e49c1d..224a5ae6ae872 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkIsoEmSingle36Filter_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkIsoEmSingle36Filter_cfi.py @@ -17,7 +17,7 @@ endcap = cms.vdouble(2.11186, 1.15524, 0.0) ), TrkIsolation = cms.vdouble(0.35, 0.28), - inputTag1 = cms.InputTag("l1ctLayer1EG","L1TkEmEB"), - inputTag2 = cms.InputTag("l1ctLayer1EG","L1TkEmEE"), + inputTag1 = cms.InputTag("l1tLayer1EG","L1TkEmEB"), + inputTag2 = cms.InputTag("l1tLayer1EG","L1TkEmEE"), saveTags = cms.bool(True) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltDoubleMuon7DZ1p0_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltDoubleMuon7DZ1p0_cfi.py index 11f8e64440b97..7316191ec7a58 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltDoubleMuon7DZ1p0_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltDoubleMuon7DZ1p0_cfi.py @@ -8,8 +8,8 @@ checkSC = cms.bool(False), inputTag1 = cms.InputTag("hltL1TkDoubleMuFiltered7"), inputTag2 = cms.InputTag("hltL1TkDoubleMuFiltered7"), - originTag1 = cms.VInputTag("L1TkMuonsGmt"), - originTag2 = cms.VInputTag("L1TkMuonsGmt"), + originTag1 = cms.VInputTag("l1tTkMuonsGmt"), + originTag2 = cms.VInputTag("l1tTkMuonsGmt"), saveTags = cms.bool(True), triggerType1 = cms.int32(-114), triggerType2 = cms.int32(-114) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1DoubleNNTau52_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1DoubleNNTau52_cfi.py index a1630e004db15..00214845b20be 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1DoubleNNTau52_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1DoubleNNTau52_cfi.py @@ -10,6 +10,6 @@ barrel = cms.vdouble(-9.54135, 1.73403, 0), endcap = cms.vdouble(-36.157, 3.83749, 0) ), - inputTag = cms.InputTag("l1NNTauProducerPuppi","L1PFTausNN"), + inputTag = cms.InputTag("l1tNNTauProducerPuppi","L1PFTausNN"), saveTags = cms.bool(True) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1SingleMuFiltered5_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1SingleMuFiltered5_cfi.py index d1bce20ec2006..54a69bef13358 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1SingleMuFiltered5_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1SingleMuFiltered5_cfi.py @@ -10,6 +10,6 @@ endcap = cms.vdouble(0.864715, 1.03215, 0.0), overlap = cms.vdouble(0.920897, 1.03712, 0.0) ), - inputTag = cms.InputTag("L1TkMuonsGmt"), + inputTag = cms.InputTag("l1tTkMuonsGmt"), saveTags = cms.bool(True) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1SingleNNTau150_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1SingleNNTau150_cfi.py index 79e652ffb55e8..b7dd9639ac1b7 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1SingleNNTau150_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1SingleNNTau150_cfi.py @@ -10,6 +10,6 @@ barrel = cms.vdouble(-9.54135, 1.73403, 0), endcap = cms.vdouble(-36.157, 3.83749, 0) ), - inputTag = cms.InputTag("l1NNTauProducerPuppi","L1PFTausNN"), + inputTag = cms.InputTag("l1tNNTauProducerPuppi","L1PFTausNN"), saveTags = cms.bool(True) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TEGammaFilteredCollectionProducer_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TEGammaFilteredCollectionProducer_cfi.py index 96a1b097aea0f..d5e879d3ac051 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TEGammaFilteredCollectionProducer_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TEGammaFilteredCollectionProducer_cfi.py @@ -2,7 +2,7 @@ hltL1TEGammaFilteredCollectionProducer = cms.EDProducer("L1TEGammaFilteredCollectionProducer", applyQual = cms.bool(True), - inputTag = cms.InputTag("L1EGammaClusterEmuProducer"), + inputTag = cms.InputTag("l1tEGammaClusterEmuProducer"), maxBX = cms.int32(1), minBX = cms.int32(-1), minPt = cms.double(5.0), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TEGammaHGCFilteredCollectionProducer_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TEGammaHGCFilteredCollectionProducer_cfi.py index 8c3afbada49d6..6b2fbf378f3b6 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TEGammaHGCFilteredCollectionProducer_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TEGammaHGCFilteredCollectionProducer_cfi.py @@ -2,7 +2,7 @@ hltL1TEGammaHGCFilteredCollectionProducer = cms.EDProducer("L1TEGammaFilteredCollectionProducer", applyQual = cms.bool(True), - inputTag = cms.InputTag("l1ctLayer1EG","L1EgEE"), + inputTag = cms.InputTag("l1tLayer1EG","L1EgEE"), maxBX = cms.int32(1), minBX = cms.int32(-1), minPt = cms.double(5.0), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TkDoubleMuFiltered7_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TkDoubleMuFiltered7_cfi.py index 7acf98ae3655c..7ecbf2a021efd 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TkDoubleMuFiltered7_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TkDoubleMuFiltered7_cfi.py @@ -10,6 +10,6 @@ endcap = cms.vdouble(0.864715, 1.03215, 0.0), overlap = cms.vdouble(0.920897, 1.03712, 0.0) ), - inputTag = cms.InputTag("L1TkMuonsGmt"), + inputTag = cms.InputTag("l1tTkMuonsGmt"), saveTags = cms.bool(True) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TkElectronsEllipticMatchCrystal_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TkElectronsEllipticMatchCrystal_cfi.py index a425c664b572d..acbcc6e589276 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TkElectronsEllipticMatchCrystal_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TkElectronsEllipticMatchCrystal_cfi.py @@ -6,7 +6,7 @@ DeltaZ = cms.double(0.6), ETmin = cms.double(-1.0), IsoCut = cms.double(-0.1), - L1EGammaInputTag = cms.InputTag("L1EGammaClusterEmuProducer"), + L1EGammaInputTag = cms.InputTag("l1tEGammaClusterEmuProducer"), L1TrackInputTag = cms.InputTag("TTTracksFromTrackletEmulation","Level1TTTracks"), PTMINTRA = cms.double(2.0), RelativeIsolation = cms.bool(True), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TkElectronsEllipticMatchHGC_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TkElectronsEllipticMatchHGC_cfi.py index 7dcb725884025..6c8538209a106 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TkElectronsEllipticMatchHGC_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TkElectronsEllipticMatchHGC_cfi.py @@ -6,7 +6,7 @@ DeltaZ = cms.double(0.6), ETmin = cms.double(-1.0), IsoCut = cms.double(-0.1), - L1EGammaInputTag = cms.InputTag("l1EGammaEEProducer","L1EGammaCollectionBXVWithCuts"), + L1EGammaInputTag = cms.InputTag("l1tEGammaEEProducer","L1EGammaCollectionBXVWithCuts"), L1TrackInputTag = cms.InputTag("TTTracksFromTrackletEmulation","Level1TTTracks"), PTMINTRA = cms.double(2.0), RelativeIsolation = cms.bool(True), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TkPhotonsCrystal_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TkPhotonsCrystal_cfi.py index 93cd0e769ddba..7b1617a89ac37 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TkPhotonsCrystal_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TkPhotonsCrystal_cfi.py @@ -7,9 +7,9 @@ DeltaZMax = cms.double(0.6), ETmin = cms.double(-1), IsoCut = cms.double(-0.1), - L1EGammaInputTag = cms.InputTag("L1EGammaClusterEmuProducer"), + L1EGammaInputTag = cms.InputTag("l1tEGammaClusterEmuProducer"), L1TrackInputTag = cms.InputTag("TTTracksFromTrackletEmulation","Level1TTTracks"), - L1VertexInputTag = cms.InputTag("L1TkPrimaryVertex"), + L1VertexInputTag = cms.InputTag("l1tTkPrimaryVertex"), PTMINTRA = cms.double(2.0), PrimaryVtxConstrain = cms.bool(False), RelativeIsolation = cms.bool(True), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TkPhotonsHGC_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TkPhotonsHGC_cfi.py index 0bce40b1b652f..8314804206401 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TkPhotonsHGC_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TkPhotonsHGC_cfi.py @@ -7,9 +7,9 @@ DeltaZMax = cms.double(0.6), ETmin = cms.double(-1), IsoCut = cms.double(-0.1), - L1EGammaInputTag = cms.InputTag("l1EGammaEEProducer","L1EGammaCollectionBXVWithCuts"), + L1EGammaInputTag = cms.InputTag("l1tEGammaEEProducer","L1EGammaCollectionBXVWithCuts"), L1TrackInputTag = cms.InputTag("TTTracksFromTrackletEmulation","Level1TTTracks"), - L1VertexInputTag = cms.InputTag("L1TkPrimaryVertex"), + L1VertexInputTag = cms.InputTag("l1tTkPrimaryVertex"), PTMINTRA = cms.double(2.0), PrimaryVtxConstrain = cms.bool(False), RelativeIsolation = cms.bool(True), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TkSingleMuFiltered15_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TkSingleMuFiltered15_cfi.py index f8862e10f50e5..52a2c4198f3a9 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TkSingleMuFiltered15_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TkSingleMuFiltered15_cfi.py @@ -10,6 +10,6 @@ endcap = cms.vdouble(0.864715, 1.03215, 0.0), overlap = cms.vdouble(0.920897, 1.03712, 0.0) ), - inputTag = cms.InputTag("L1TkMuonsGmt"), + inputTag = cms.InputTag("l1tTkMuonsGmt"), saveTags = cms.bool(True) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TkSingleMuFiltered22_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TkSingleMuFiltered22_cfi.py index 99108cb17273d..ebbd6ef0b8bdf 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TkSingleMuFiltered22_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TkSingleMuFiltered22_cfi.py @@ -10,6 +10,6 @@ endcap = cms.vdouble(0.864715, 1.03215, 0.0), overlap = cms.vdouble(0.920897, 1.03712, 0.0) ), - inputTag = cms.InputTag("L1TkMuonsGmt"), + inputTag = cms.InputTag("l1tTkMuonsGmt"), saveTags = cms.bool(True) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TripleMuFiltered3_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TripleMuFiltered3_cfi.py index 3d1718f2cd993..f1ec9e218d8ff 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TripleMuFiltered3_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TripleMuFiltered3_cfi.py @@ -10,6 +10,6 @@ endcap = cms.vdouble(0.864715, 1.03215, 0.0), overlap = cms.vdouble(0.920897, 1.03712, 0.0) ), - inputTag = cms.InputTag("L1TkMuonsGmt"), + inputTag = cms.InputTag("l1tTkMuonsGmt"), saveTags = cms.bool(True) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL2MuonSeedsFromL1TkMuon_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL2MuonSeedsFromL1TkMuon_cfi.py index ff8be9e59bbfc..bfe3b7bfef6a8 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL2MuonSeedsFromL1TkMuon_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL2MuonSeedsFromL1TkMuon_cfi.py @@ -2,7 +2,7 @@ hltL2MuonSeedsFromL1TkMuon = cms.EDProducer("L2MuonSeedGeneratorFromL1TkMu", EtaMatchingBins = cms.vdouble(0.0, 2.5), - InputObjects = cms.InputTag("L1TkMuonsGmt"), + InputObjects = cms.InputTag("l1tTkMuonsGmt"), L1MaxEta = cms.double(2.5), L1MinPt = cms.double(0.0), MatchDR = cms.vdouble(0.3), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3FromL1TkMuonPixelTracksTrackingRegions_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3FromL1TkMuonPixelTracksTrackingRegions_cfi.py index 0205710351542..3ba415530b19e 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3FromL1TkMuonPixelTracksTrackingRegions_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3FromL1TkMuonPixelTracksTrackingRegions_cfi.py @@ -5,7 +5,7 @@ beamSpot = cms.InputTag("offlineBeamSpot"), deltaEta = cms.double(0.035), deltaPhi = cms.double(0.02), - input = cms.InputTag("L1TkMuonsGmt"), + input = cms.InputTag("l1tTkMuonsGmt"), maxNRegions = cms.int32(10000), maxNVertices = cms.int32(1), measurementTrackerName = cms.InputTag(""), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltTriggerSummaryAOD_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTriggerSummaryAOD_cfi.py index 53e10468205a3..ff84885755457 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltTriggerSummaryAOD_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTriggerSummaryAOD_cfi.py @@ -2,7 +2,7 @@ hltTriggerSummaryAOD = cms.EDProducer( "TriggerSummaryProducerAOD", throw = cms.bool( False ), - processName = cms.string( "HLT" ), - moduleLabelPatternsToMatch = cms.vstring( 'hlt*','L1Tk*'), + processName = cms.string( "*" ), + moduleLabelPatternsToMatch = cms.vstring( 'hlt*','l1t*' ), moduleLabelPatternsToSkip = cms.vstring( ) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltTripleMuon3DR0_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTripleMuon3DR0_cfi.py index 0bc8dd735d208..5d74daf3fd93e 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltTripleMuon3DR0_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTripleMuon3DR0_cfi.py @@ -5,7 +5,7 @@ MinN = cms.int32(3), inputTag1 = cms.InputTag("hltL1TripleMuFiltered3"), inputTag2 = cms.InputTag("hltL1TripleMuFiltered3"), - originTag1 = cms.VInputTag("L1TkMuonsGmt"), - originTag2 = cms.VInputTag("L1TkMuonsGmt"), + originTag1 = cms.VInputTag("l1tTkMuonsGmt"), + originTag2 = cms.VInputTag("l1tTkMuonsGmt"), saveTags = cms.bool(True) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltTripleMuon3DZ1p0_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTripleMuon3DZ1p0_cfi.py index 28c78d10bf16e..8e78052144f53 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltTripleMuon3DZ1p0_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTripleMuon3DZ1p0_cfi.py @@ -8,8 +8,8 @@ checkSC = cms.bool(False), inputTag1 = cms.InputTag("hltL1TripleMuFiltered3"), inputTag2 = cms.InputTag("hltL1TripleMuFiltered3"), - originTag1 = cms.VInputTag("L1TkMuonsGmt"), - originTag2 = cms.VInputTag("L1TkMuonsGmt"), + originTag1 = cms.VInputTag("l1tTkMuonsGmt"), + originTag2 = cms.VInputTag("l1tTkMuonsGmt"), saveTags = cms.bool(True), triggerType1 = cms.int32(-114), triggerType2 = cms.int32(-114) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/l1EGammaEEProducer_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/l1EGammaEEProducer_cfi.py index e9754069de1dc..f55b53c208a59 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/l1EGammaEEProducer_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/l1EGammaEEProducer_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -l1EGammaEEProducer = cms.EDProducer("L1EGammaEEProducer", +l1tEGammaEEProducer = cms.EDProducer("L1EGammaEEProducer", Multiclusters = cms.InputTag("hgcalBackEndLayer2Producer","HGCalBackendLayer2Processor3DClustering"), calibrationConfig = cms.PSet( calibrationFile = cms.FileInPath('L1Trigger/L1TCalorimeter/data/calib_ee_v1.json') diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/l1NNTauProducerPuppi_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/l1NNTauProducerPuppi_cfi.py index 6e57309d845fb..31ea955c44b44 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/l1NNTauProducerPuppi_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/l1NNTauProducerPuppi_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -l1NNTauProducerPuppi = cms.EDProducer("L1NNTauProducer", +l1tNNTauProducerPuppi = cms.EDProducer("L1NNTauProducer", L1PFObjects = cms.InputTag("l1pfCandidates","Puppi"), NNFileName = cms.string('L1Trigger/Phase2L1ParticleFlow/data/tau_3layer_puppi.pb'), conesize = cms.double(0.4), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/l1pfProducerBarrel_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/l1pfProducerBarrel_cfi.py index 924acbbe4b455..3328e52e09b8c 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/l1pfProducerBarrel_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/l1pfProducerBarrel_cfi.py @@ -63,7 +63,7 @@ phiExtra = cms.double(0.0), phiSlices = cms.uint32(1) )), - tkMuons = cms.InputTag("L1TkMuonsGmt"), + tkMuons = cms.InputTag("l1tTkMuonsGmt"), trackRegionMode = cms.string('atCalo'), tracks = cms.InputTag("pfTracksFromL1TracksBarrel"), trkMaxChi2 = cms.double(15), @@ -74,7 +74,7 @@ useTrackerMuons = cms.bool(False), vtxAdaptiveCut = cms.bool(True), vtxAlgo = cms.string('external'), - vtxCollection = cms.InputTag("L1TkPrimaryVertex"), + vtxCollection = cms.InputTag("l1tTkPrimaryVertex"), vtxFormat = cms.string('TkPrimaryVertex'), vtxRes = cms.double(0.333) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/l1pfProducerHF_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/l1pfProducerHF_cfi.py index ffcea8722ab6f..e35b4e6a39c74 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/l1pfProducerHF_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/l1pfProducerHF_cfi.py @@ -71,7 +71,7 @@ phiSlices = cms.uint32(1) ) ), - tkMuons = cms.InputTag("L1TkMuonsGmt"), + tkMuons = cms.InputTag("l1tTkMuonsGmt"), trackRegionMode = cms.string('atCalo'), tracks = cms.InputTag(""), trkMaxChi2 = cms.double(15), @@ -82,7 +82,7 @@ useTrackerMuons = cms.bool(False), vtxAdaptiveCut = cms.bool(True), vtxAlgo = cms.string('external'), - vtxCollection = cms.InputTag("L1TkPrimaryVertex"), + vtxCollection = cms.InputTag("l1tTkPrimaryVertex"), vtxFormat = cms.string('TkPrimaryVertex'), vtxRes = cms.double(0.333) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/l1pfProducerHGCalNoTK_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/l1pfProducerHGCalNoTK_cfi.py index d742988b72480..4588a75659413 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/l1pfProducerHGCalNoTK_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/l1pfProducerHGCalNoTK_cfi.py @@ -71,7 +71,7 @@ phiSlices = cms.uint32(1) ) ), - tkMuons = cms.InputTag("L1TkMuonsGmt"), + tkMuons = cms.InputTag("l1tTkMuonsGmt"), trackRegionMode = cms.string('atCalo'), tracks = cms.InputTag("pfTracksFromL1TracksHGCal"), trkMaxChi2 = cms.double(15), @@ -82,7 +82,7 @@ useTrackerMuons = cms.bool(False), vtxAdaptiveCut = cms.bool(True), vtxAlgo = cms.string('external'), - vtxCollection = cms.InputTag("L1TkPrimaryVertex"), + vtxCollection = cms.InputTag("l1tTkPrimaryVertex"), vtxFormat = cms.string('TkPrimaryVertex'), vtxRes = cms.double(0.333) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/l1pfProducerHGCal_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/l1pfProducerHGCal_cfi.py index b38c9969aeb98..bd8b7047eb361 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/l1pfProducerHGCal_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/l1pfProducerHGCal_cfi.py @@ -71,7 +71,7 @@ phiSlices = cms.uint32(1) ) ), - tkMuons = cms.InputTag("L1TkMuonsGmt"), + tkMuons = cms.InputTag("l1tTkMuonsGmt"), trackRegionMode = cms.string('atCalo'), tracks = cms.InputTag("pfTracksFromL1TracksHGCal"), trkMaxChi2 = cms.double(15), @@ -82,7 +82,7 @@ useTrackerMuons = cms.bool(False), vtxAdaptiveCut = cms.bool(True), vtxAlgo = cms.string('external'), - vtxCollection = cms.InputTag("L1TkPrimaryVertex"), + vtxCollection = cms.InputTag("l1tTkPrimaryVertex"), vtxFormat = cms.string('TkPrimaryVertex'), vtxRes = cms.double(0.333) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/l1t1PFPuppiJet70offMaxEta2p4_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/l1t1PFPuppiJet70offMaxEta2p4_cfi.py index 9a7a7bdb67b21..3eeda4877538e 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/l1t1PFPuppiJet70offMaxEta2p4_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/l1t1PFPuppiJet70offMaxEta2p4_cfi.py @@ -10,5 +10,5 @@ endcap = cms.vdouble(42.4039, 1.33052, 0), overlap = cms.vdouble(24.8375, 1.4152, 0) ), - inputTag = cms.InputTag("Phase1L1TJetCalibrator9x9","Phase1L1TJetFromPfCandidates") + inputTag = cms.InputTag("l1tPhase1JetCalibrator9x9","Phase1L1TJetFromPfCandidates") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/l1t2PFPuppiJet55offMaxEta2p4_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/l1t2PFPuppiJet55offMaxEta2p4_cfi.py index 2c741a531f2c5..9d17f392e98a7 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/l1t2PFPuppiJet55offMaxEta2p4_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/l1t2PFPuppiJet55offMaxEta2p4_cfi.py @@ -10,5 +10,5 @@ endcap = cms.vdouble(42.4039, 1.33052, 0), overlap = cms.vdouble(24.8375, 1.4152, 0) ), - inputTag = cms.InputTag("Phase1L1TJetCalibrator9x9","Phase1L1TJetFromPfCandidates") + inputTag = cms.InputTag("l1tPhase1JetCalibrator9x9","Phase1L1TJetFromPfCandidates") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/l1t4PFPuppiJet25OnlineMaxEta2p4_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/l1t4PFPuppiJet25OnlineMaxEta2p4_cfi.py index c6ddea3b521af..77cf6d8138274 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/l1t4PFPuppiJet25OnlineMaxEta2p4_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/l1t4PFPuppiJet25OnlineMaxEta2p4_cfi.py @@ -5,5 +5,5 @@ MinEta = cms.double(-2.4), MinN = cms.int32(4), MinPt = cms.double(25.0), - inputTag = cms.InputTag("Phase1L1TJetCalibrator9x9","Phase1L1TJetFromPfCandidates") + inputTag = cms.InputTag("l1tPhase1JetCalibrator9x9","Phase1L1TJetFromPfCandidates") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/l1t4PFPuppiJet40offMaxEta2p4_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/l1t4PFPuppiJet40offMaxEta2p4_cfi.py index fc72d7d58ba39..9e0c55b29708a 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/l1t4PFPuppiJet40offMaxEta2p4_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/l1t4PFPuppiJet40offMaxEta2p4_cfi.py @@ -10,5 +10,5 @@ endcap = cms.vdouble(42.4039, 1.33052, 0), overlap = cms.vdouble(24.8375, 1.4152, 0) ), - inputTag = cms.InputTag("Phase1L1TJetCalibrator9x9","Phase1L1TJetFromPfCandidates") + inputTag = cms.InputTag("l1tPhase1JetCalibrator9x9","Phase1L1TJetFromPfCandidates") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/l1tDoublePFPuppiJet112offMaxEta2p4_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/l1tDoublePFPuppiJet112offMaxEta2p4_cfi.py index f77d0d3f63c5b..8bc28b6c44b02 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/l1tDoublePFPuppiJet112offMaxEta2p4_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/l1tDoublePFPuppiJet112offMaxEta2p4_cfi.py @@ -10,6 +10,6 @@ endcap = cms.vdouble(42.4039, 1.33052, 0), overlap = cms.vdouble(24.8375, 1.4152, 0) ), - inputTag = cms.InputTag("Phase1L1TJetCalibrator9x9","Phase1L1TJetFromPfCandidates"), + inputTag = cms.InputTag("l1tPhase1JetCalibrator9x9","Phase1L1TJetFromPfCandidates"), saveTags = cms.bool(True) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/l1tDoublePFPuppiJets112offMaxDeta1p6_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/l1tDoublePFPuppiJets112offMaxDeta1p6_cfi.py index 421ba21cbb501..f8c6ea593444d 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/l1tDoublePFPuppiJets112offMaxDeta1p6_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/l1tDoublePFPuppiJets112offMaxDeta1p6_cfi.py @@ -14,8 +14,8 @@ MinPt = cms.double(0.0), inputTag1 = cms.InputTag("l1tDoublePFPuppiJet112offMaxEta2p4"), inputTag2 = cms.InputTag("l1tDoublePFPuppiJet112offMaxEta2p4"), - originTag1 = cms.VInputTag(cms.InputTag("Phase1L1TJetCalibrator9x9","Phase1L1TJetFromPfCandidates")), - originTag2 = cms.VInputTag(cms.InputTag("Phase1L1TJetCalibrator9x9","Phase1L1TJetFromPfCandidates")), + originTag1 = cms.VInputTag(cms.InputTag("l1tPhase1JetCalibrator9x9","Phase1L1TJetFromPfCandidates")), + originTag2 = cms.VInputTag(cms.InputTag("l1tPhase1JetCalibrator9x9","Phase1L1TJetFromPfCandidates")), saveTags = cms.bool(True), triggerType1 = cms.int32(-116), triggerType2 = cms.int32(-116) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/l1tPFPuppiHT400offMaxEta2p4_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/l1tPFPuppiHT400offMaxEta2p4_cfi.py index f3920c390c004..648da465f075f 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/l1tPFPuppiHT400offMaxEta2p4_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/l1tPFPuppiHT400offMaxEta2p4_cfi.py @@ -6,5 +6,5 @@ theScalings = cms.vdouble(50.0182, 1.0961, 0) ), TypeOfSum = cms.string('HT'), - inputTag = cms.InputTag("Phase1L1TJetSumsProducer","Sums") + inputTag = cms.InputTag("l1tPhase1JetSumsProducer","Sums") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/l1tPFPuppiHT450off_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/l1tPFPuppiHT450off_cfi.py index f77ed4f39945d..090b3d17a160b 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/l1tPFPuppiHT450off_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/l1tPFPuppiHT450off_cfi.py @@ -6,5 +6,5 @@ theScalings = cms.vdouble(50.0182, 1.0961, 0) ), TypeOfSum = cms.string('HT'), - inputTag = cms.InputTag("Phase1L1TJetSumsProducer","Sums") + inputTag = cms.InputTag("l1tPhase1JetSumsProducer","Sums") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/l1tPFPuppiHT_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/l1tPFPuppiHT_cfi.py index c4d9f7f815dd9..0f7a28e9ea4d9 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/l1tPFPuppiHT_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/l1tPFPuppiHT_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms l1tPFPuppiHT = cms.EDProducer("HLTHtMhtProducer", - jetsLabel = cms.InputTag("Phase1L1TJetCalibrator9x9","Phase1L1TJetFromPfCandidates"), + jetsLabel = cms.InputTag("l1tPhase1JetCalibrator9x9","Phase1L1TJetFromPfCandidates"), maxEtaJetHt = cms.double(2.4), minPtJetHt = cms.double(30.0) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/l1tPFPuppiMET220off_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/l1tPFPuppiMET220off_cfi.py index 20c890015f049..a4dacc3132867 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/l1tPFPuppiMET220off_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/l1tPFPuppiMET220off_cfi.py @@ -6,5 +6,5 @@ theScalings = cms.vdouble(54.2859, 1.39739, 0) ), TypeOfSum = cms.string('MET'), - inputTag = cms.InputTag("L1MetPfProducer") + inputTag = cms.InputTag("l1tMETPFProducer") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/l1tSinglePFPuppiJet230off_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/l1tSinglePFPuppiJet230off_cfi.py index ac745f4f67fa0..27463576e938a 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/l1tSinglePFPuppiJet230off_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/l1tSinglePFPuppiJet230off_cfi.py @@ -10,5 +10,5 @@ endcap = cms.vdouble(42.4039, 1.33052, 0), overlap = cms.vdouble(24.8375, 1.4152, 0) ), - inputTag = cms.InputTag("Phase1L1TJetCalibrator9x9","Phase1L1TJetFromPfCandidates") + inputTag = cms.InputTag("l1tPhase1JetCalibrator9x9","Phase1L1TJetFromPfCandidates") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/pfClustersFromCombinedCaloHCal_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/pfClustersFromCombinedCaloHCal_cfi.py index df50aa28ed7da..02baa5f9830bc 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/pfClustersFromCombinedCaloHCal_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/pfClustersFromCombinedCaloHCal_cfi.py @@ -43,7 +43,7 @@ seedEt = cms.double(1.0), zsEt = cms.double(0.0) ), - phase2barrelCaloTowers = cms.VInputTag(cms.InputTag("L1EGammaClusterEmuProducer")), + phase2barrelCaloTowers = cms.VInputTag(cms.InputTag("l1tEGammaClusterEmuProducer")), resol = cms.PSet( etaBins = cms.vdouble(0.7, 1.2, 1.6), kind = cms.string('calo'), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/pfClustersFromL1EGClusters_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/pfClustersFromL1EGClusters_cfi.py index 72b39b0b35553..b61e7226f5c6f 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/pfClustersFromL1EGClusters_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/pfClustersFromL1EGClusters_cfi.py @@ -9,5 +9,5 @@ offset = cms.vdouble(0.838, 0.924, 1.101), scale = cms.vdouble(0.012, 0.017, 0.018) ), - src = cms.InputTag("L1EGammaClusterEmuProducer") + src = cms.InputTag("l1tEGammaClusterEmuProducer") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/ticlSeedingL1_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/ticlSeedingL1_cfi.py index a4d98ad5715ca..823c32c25c324 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/ticlSeedingL1_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/ticlSeedingL1_cfi.py @@ -4,7 +4,7 @@ seedingPSet = cms.PSet( algo_verbosity = cms.int32(0), endcapScalings = cms.vdouble(3.17445, 1.13219, 0.0), - l1TkEmColl = cms.InputTag("l1ctLayer1EG","L1TkEmEE"), + l1TkEmColl = cms.InputTag("l1tLayer1EG","L1TkEmEE"), maxAbsEta = cms.double(4.0), minAbsEta = cms.double(1.3), minPt = cms.double(5.0), diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/l1tReconstructionPath_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/l1tReconstructionPath_cfi.py index 77a3ceb8c3ca7..207cb58d8abb4 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/l1tReconstructionPath_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/l1tReconstructionPath_cfi.py @@ -2,6 +2,6 @@ from ..tasks.l1tReconstructionTask_cfi import * -l1tReconstructionPath = cms.Path( - l1tReconstructionTask +L1TReconstructionPath = cms.Path( + L1TReconstructionTask ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/tasks/l1tReconstructionTask_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/tasks/l1tReconstructionTask_cfi.py index 9dbe93bc599ef..08511decb48e6 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/tasks/l1tReconstructionTask_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/tasks/l1tReconstructionTask_cfi.py @@ -17,10 +17,10 @@ from ..modules.simOmtfDigis_cfi import * from ..modules.simTwinMuxDigis_cfi import * -l1tReconstructionTask = cms.Task( - L1EGammaClusterEmuProducer, - l1EGammaEEProducer, - l1NNTauProducerPuppi, +L1TReconstructionTask = cms.Task( + l1tEGammaClusterEmuProducer, + l1tEGammaEEProducer, + l1tNNTauProducerPuppi, simCaloStage2Layer1Digis, simCscTriggerPrimitiveDigis, simDtTriggerPrimitiveDigis, diff --git a/HLTrigger/Configuration/python/HLT_75e33_cff.py b/HLTrigger/Configuration/python/HLT_75e33_cff.py index 01462352f3032..bc280670a1ad2 100644 --- a/HLTrigger/Configuration/python/HLT_75e33_cff.py +++ b/HLTrigger/Configuration/python/HLT_75e33_cff.py @@ -238,7 +238,7 @@ fragment.load("HLTrigger/Configuration/HLT_75e33/paths/HLTAnalyzerEndpath_cff") fragment.schedule = cms.Schedule(*[ - fragment.l1tReconstructionPath, + fragment.L1TReconstructionPath, fragment.L1T_SinglePFPuppiJet230off, fragment.L1T_PFPuppiHT450off, @@ -317,15 +317,15 @@ del fragment.me0RecHits del fragment.me0Segments -del fragment.L1EGammaClusterEmuProducer +del fragment.l1tEGammaClusterEmuProducer #del fragment.L1TkElectronsEllipticMatchCrystal #del fragment.L1TkElectronsEllipticMatchHGC #del fragment.L1TkMuons #del fragment.L1TkPhotonsCrystal #del fragment.L1TkPhotonsHGC #del fragment.L1TkPrimaryVertex -del fragment.l1EGammaEEProducer -del fragment.l1NNTauProducerPuppi +del fragment.l1tEGammaEEProducer +del fragment.l1tNNTauProducerPuppi #del fragment.l1PFMetPuppi #del fragment.l1pfCandidates #del fragment.l1pfProducerBarrel diff --git a/L1Trigger/Configuration/python/L1Trigger_EventContent_cff.py b/L1Trigger/Configuration/python/L1Trigger_EventContent_cff.py index 70cc49a0a6ec2..6cfe507a38dff 100644 --- a/L1Trigger/Configuration/python/L1Trigger_EventContent_cff.py +++ b/L1Trigger/Configuration/python/L1Trigger_EventContent_cff.py @@ -175,41 +175,41 @@ def _appendPhase2Digis(obj): 'keep *_hgcalBackEndLayer2Producer_*_*', 'keep *_hgcalTowerMapProducer_*_*', 'keep *_hgcalTowerProducer_*_*', - 'keep *_L1EGammaClusterEmuProducer_*_*', - 'keep *_L1VertexFinder_*_*', - 'keep *_L1VertexFinderEmulator_*_*', - 'keep *_L1TowerCalibration_*_*', - 'keep *_L1CaloJet_*_*', - 'keep *_L1CaloJetHTT_*_*', + 'keep *_l1tEGammaClusterEmuProducer_*_*', + 'keep *_l1tVertexFinder_*_*', + 'keep *_l1tVertexFinderEmulator_*_*', + 'keep *_l1tTowerCalibration_*_*', + 'keep *_l1tCaloJet_*_*', + 'keep *_l1tCaloJetHTT_*_*', 'keep *_pfClustersFromL1EGClusters_*_*', 'keep *_pfClustersFromCombinedCaloHCal_*_*', 'keep *_pfClustersFromCombinedCaloHF_*_*', 'keep *_pfClustersFromHGC3DClusters_*_*', 'keep *_pfTracksFromL1TracksBarrel_*_*', 'keep *_pfTracksFromL1TracksHGCal_*_*', - 'keep *_scPFL1PF_*_*', - 'keep *_scPFL1Puppi_*_*', - 'keep *_scPFL1PuppiCorrectedEmulator_*_*', - 'keep *_scPFL1PuppiCorrectedEmulatorMHT_*_*', - 'keep *_Phase1L1TJetProducer_*_*', - 'keep *_Phase1L1TJetCalibrator_*_*', - 'keep *_Phase1L1TJetSumsProducer_*_*', - 'keep *_l1ctLayer1Barrel_*_*', - 'keep *_l1ctLayer1HGCal_*_*', - 'keep *_l1ctLayer1HGCalNoTK_*_*', - 'keep *_l1ctLayer1HF_*_*', - 'keep *_l1ctLayer1_*_*', - 'keep *_l1ctLayer1EG_*_*', - 'keep *_L1MetPfProducer_*_*', - 'keep *_l1NNTauProducer_*_*', - 'keep *_l1NNTauProducerPuppi_*_*', + 'keep *_l1tSCPFL1PF_*_*', + 'keep *_l1tSCPFL1Puppi_*_*', + 'keep *_l1tSCPFL1PuppiCorrectedEmulator_*_*', + 'keep *_l1tSCPFL1PuppiCorrectedEmulatorMHT_*_*', + 'keep *_l1tPhase1JetProducer_*_*', + 'keep *_l1tPhase1JetCalibrator_*_*', + 'keep *_l1tPhase1JetSumsProducer_*_*', + 'keep *_l1tLayer1Barrel_*_*', + 'keep *_l1tLayer1HGCal_*_*', + 'keep *_l1tLayer1HGCalNoTK_*_*', + 'keep *_l1tLayer1HF_*_*', + 'keep *_l1tLayer1_*_*', + 'keep *_l1tLayer1EG_*_*', + 'keep *_l1tMETPFProducer_*_*', + 'keep *_l1tNNTauProducer_*_*', + 'keep *_l1tNNTauProducerPuppi_*_*', 'keep *_TTStubsFromPhase2TrackerDigis_*_*', 'keep *_TTClustersFromPhase2TrackerDigis_*_*', 'keep *_TTTracksFromExtendedTrackletEmulation_*_*', 'keep *_TTTracksFromTrackletEmulation_*_*', - 'keep *_L1TkStubsGmt_*_*', - 'keep *_L1TkMuonsGmt_*_*', - 'keep *_L1SAMuonsGmt_*_*', + 'keep *_l1tTkStubsGmt_*_*', + 'keep *_l1tTkMuonsGmt_*_*', + 'keep *_l1tSAMuonsGmt_*_*', ] obj.outputCommands += l1Phase2Digis diff --git a/L1Trigger/Configuration/python/SimL1Emulator_cff.py b/L1Trigger/Configuration/python/SimL1Emulator_cff.py index 77b0179775f7d..cd08a45369443 100644 --- a/L1Trigger/Configuration/python/SimL1Emulator_cff.py +++ b/L1Trigger/Configuration/python/SimL1Emulator_cff.py @@ -90,58 +90,58 @@ # ######################################################################## from L1Trigger.L1CaloTrigger.L1EGammaCrystalsEmulatorProducer_cfi import * -_phase2_siml1emulator.add(L1EGammaClusterEmuProducer) +_phase2_siml1emulator.add(l1tEGammaClusterEmuProducer) # Barrel and EndCap CaloJet/HT # ######################################################################## # ---- Produce the calibrated tower collection combining Barrel, HGCal, HF from L1Trigger.L1CaloTrigger.L1TowerCalibrationProducer_cfi import * -L1TowerCalibration = L1TowerCalibrationProducer.clone( +l1tTowerCalibration = l1tTowerCalibrationProducer.clone( L1HgcalTowersInputTag = ("hgcalTowerProducer","HGCalTowerProcessor",""), - l1CaloTowers = ("L1EGammaClusterEmuProducer","L1CaloTowerCollection","") + l1CaloTowers = ("l1tEGammaClusterEmuProducer","L1CaloTowerCollection","") ) # ---- Produce the L1CaloJets from L1Trigger.L1CaloTrigger.L1CaloJetProducer_cfi import * -L1CaloJet = L1CaloJetProducer.clone ( - l1CaloTowers = ("L1TowerCalibration","L1CaloTowerCalibratedCollection",""), - L1CrystalClustersInputTag = ("L1EGammaClusterEmuProducer", "","") +l1tCaloJet = l1tCaloJetProducer.clone ( + l1CaloTowers = ("l1tTowerCalibration","L1CaloTowerCalibratedCollection",""), + L1CrystalClustersInputTag = ("l1tEGammaClusterEmuProducer", "","") ) # ---- Produce the CaloJet HTT Sums from L1Trigger.L1CaloTrigger.L1CaloJetHTTProducer_cfi import * -L1CaloJetHTT = L1CaloJetHTTProducer.clone( +l1tCaloJetHTT = l1tCaloJetHTTProducer.clone( BXVCaloJetsInputTag = ("L1CaloJet", "CaloJets") ) -_phase2_siml1emulator.add(L1TowerCalibration) -_phase2_siml1emulator.add(L1CaloJet) -_phase2_siml1emulator.add(L1CaloJetHTT) +_phase2_siml1emulator.add(l1tTowerCalibration) +_phase2_siml1emulator.add(l1tCaloJet) +_phase2_siml1emulator.add(l1tCaloJetHTT) # ######################################################################## # Phase-2 L1T - TrackTrigger dependent modules # ######################################################################## from L1Trigger.L1TTrackMatch.L1GTTInputProducer_cfi import * from L1Trigger.VertexFinder.VertexProducer_cff import * -L1VertexFinder = VertexProducer.clone() -L1VertexFinderEmulator = VertexProducer.clone() -L1VertexFinderEmulator.VertexReconstruction.Algorithm = "fastHistoEmulation" -L1VertexFinderEmulator.l1TracksInputTag = ("L1GTTInputProducer","Level1TTTracksConverted") -_phase2_siml1emulator.add(L1VertexFinder) -_phase2_siml1emulator.add(L1GTTInputProducer) -_phase2_siml1emulator.add(L1GTTInputProducerExtended) -_phase2_siml1emulator.add(L1VertexFinderEmulator) +l1tVertexFinder = l1tVertexProducer.clone() +l1tVertexFinderEmulator = l1tVertexProducer.clone() +l1tVertexFinderEmulator.VertexReconstruction.Algorithm = "fastHistoEmulation" +l1tVertexFinderEmulator.l1TracksInputTag = ("l1tGTTInputProducer","Level1TTTracksConverted") +_phase2_siml1emulator.add(l1tVertexFinder) +_phase2_siml1emulator.add(l1tGTTInputProducer) +_phase2_siml1emulator.add(l1tGTTInputProducerExtended) +_phase2_siml1emulator.add(l1tVertexFinderEmulator) # Emulated GMT Muons (Tk + Stub, Tk + MuonTFT, StandaloneMuon) # ######################################################################## from L1Trigger.Phase2L1GMT.gmt_cfi import * -L1TkStubsGmt = gmtStubs.clone() -L1TkMuonsGmt = gmtMuons.clone( - srcStubs = 'L1TkStubsGmt' +l1tTkStubsGmt = l1tGMTStubs.clone() +l1tTkMuonsGmt = l1tGMTMuons.clone( + srcStubs = 'l1tTkStubsGmt' ) -L1SAMuonsGmt = standaloneMuons.clone() -_phase2_siml1emulator.add( L1TkStubsGmt ) -_phase2_siml1emulator.add( L1TkMuonsGmt ) -_phase2_siml1emulator.add( L1SAMuonsGmt ) +l1tSAMuonsGmt = l1tStandaloneMuons.clone() +_phase2_siml1emulator.add( l1tTkStubsGmt ) +_phase2_siml1emulator.add( l1tTkMuonsGmt ) +_phase2_siml1emulator.add( l1tSAMuonsGmt ) # Tracker Objects # ######################################################################## @@ -150,68 +150,68 @@ from L1Trigger.L1TTrackMatch.L1TrackerEtMissProducer_cfi import * from L1Trigger.L1TTrackMatch.L1TkHTMissProducer_cfi import * # make the input tags consistent with the choice L1VertexFinder above -L1TrackJets.L1PVertexCollection = ("L1VertexFinder", L1VertexFinder.l1VertexCollectionName.value()) -L1TrackJetsExtended.L1PVertexCollection = ("L1VertexFinder", L1VertexFinder.l1VertexCollectionName.value()) +l1tTrackJets.L1PVertexCollection = ("L1VertexFinder", l1tVertexFinder.l1VertexCollectionName.value()) +l1tTrackJetsExtended.L1PVertexCollection = ("L1VertexFinder", l1tVertexFinder.l1VertexCollectionName.value()) #L1TrackerEtMiss.L1VertexInputTag = ("L1VertexFinder", L1VertexFinder.l1VertexCollectionName.value()) #L1TrackerEtMissExtended.L1VertexInputTag = ("L1VertexFinder", L1VertexFinder.l1VertexCollectionName.value()) -_phase2_siml1emulator.add(L1TrackJets) -_phase2_siml1emulator.add(L1TrackJetsExtended) -_phase2_siml1emulator.add(L1TrackFastJets) +_phase2_siml1emulator.add(l1tTrackJets) +_phase2_siml1emulator.add(l1tTrackJetsExtended) +_phase2_siml1emulator.add(l1tTrackFastJets) -_phase2_siml1emulator.add(L1TrackerEtMiss) -_phase2_siml1emulator.add(L1TrackerHTMiss) +_phase2_siml1emulator.add(l1tTrackerEtMiss) +_phase2_siml1emulator.add(l1tTrackerHTMiss) #Emulated tracker objects from L1Trigger.L1TTrackMatch.L1TrackJetEmulationProducer_cfi import * -_phase2_siml1emulator.add(L1TrackJetsEmulation) -_phase2_siml1emulator.add(L1TrackJetsExtendedEmulation) +_phase2_siml1emulator.add(l1tTrackJetsEmulation) +_phase2_siml1emulator.add(l1tTrackJetsExtendedEmulation) from L1Trigger.L1TTrackMatch.L1TrackerEtMissEmulatorProducer_cfi import * -L1TrackerEmuEtMiss.L1VertexInputTag = ("L1VertexFinderEmulator","l1verticesEmulation") -_phase2_siml1emulator.add(L1TrackerEmuEtMiss) +l1tTrackerEmuEtMiss.L1VertexInputTag = ("L1VertexFinderEmulator","l1verticesEmulation") +_phase2_siml1emulator.add(l1tTrackerEmuEtMiss) from L1Trigger.L1TTrackMatch.L1TkHTMissEmulatorProducer_cfi import * -_phase2_siml1emulator.add(L1TrackerEmuHTMiss) -_phase2_siml1emulator.add(L1TrackerEmuHTMissExtended) +_phase2_siml1emulator.add(l1tTrackerEmuHTMiss) +_phase2_siml1emulator.add(l1tTrackerEmuHTMissExtended) # PF Candidates # ######################################################################## from L1Trigger.Phase2L1ParticleFlow.l1ctLayer1_cff import * from L1Trigger.Phase2L1ParticleFlow.l1ctLayer2EG_cff import * -_phase2_siml1emulator.add(l1ctLayer1TaskInputsTask, l1ctLayer1Task, l1ctLayer2EGTask) +_phase2_siml1emulator.add(L1TLayer1TaskInputsTask, L1TLayer1Task, L1TLayer2EGTask) # PF Jet # ######################################################################## from L1Trigger.L1CaloTrigger.Phase1L1TJets_cff import * # Describe here l1PFJets_a_la_Phase1 Task # ############################### -l1PFJetsPhase1Task = cms.Task(Phase1L1TJetProducer , Phase1L1TJetCalibrator, Phase1L1TJetSumsProducer) -_phase2_siml1emulator.add(l1PFJetsPhase1Task) +L1TPFJetsPhase1Task = cms.Task(l1tPhase1JetProducer , l1tPhase1JetCalibrator, l1tPhase1JetSumsProducer) +_phase2_siml1emulator.add(L1TPFJetsPhase1Task) from L1Trigger.Phase2L1Taus.HPSPFTauProducerPF_cfi import * -_phase2_siml1emulator.add(HPSPFTauProducerPF) +_phase2_siml1emulator.add(l1tHPSPFTauProducerPF) from L1Trigger.Phase2L1Taus.HPSPFTauProducerPuppi_cfi import * -_phase2_siml1emulator.add(HPSPFTauProducerPuppi) +_phase2_siml1emulator.add(l1tHPSPFTauProducerPuppi) from L1Trigger.L1CaloTrigger.Phase1L1TJets_9x9_cff import * -l1PFJetsPhase1Task_9x9 = cms.Task( Phase1L1TJetProducer9x9, Phase1L1TJetCalibrator9x9, Phase1L1TJetSumsProducer9x9) -_phase2_siml1emulator.add(l1PFJetsPhase1Task_9x9) +L1TPFJetsPhase1Task_9x9 = cms.Task( l1tPhase1JetProducer9x9, l1tPhase1JetCalibrator9x9, l1tPhase1JetSumsProducer9x9) +_phase2_siml1emulator.add(L1TPFJetsPhase1Task_9x9) # PF MET # ######################################################################## from L1Trigger.Phase2L1ParticleFlow.l1pfJetMet_cff import * -_phase2_siml1emulator.add(l1PFJetsTask) +_phase2_siml1emulator.add(L1TPFJetsTask) from L1Trigger.Phase2L1ParticleFlow.L1MetPfProducer_cfi import * -_phase2_siml1emulator.add(L1MetPfProducer) +_phase2_siml1emulator.add(l1tMETPFProducer) # NNTaus # ######################################################################## from L1Trigger.Phase2L1ParticleFlow.L1NNTauProducer_cff import * -_phase2_siml1emulator.add(L1NNTauProducerPuppi) +_phase2_siml1emulator.add(l1tNNTauProducerPuppi) # --> add modules from Configuration.Eras.Modifier_phase2_trigger_cff import phase2_trigger diff --git a/L1Trigger/L1CaloTrigger/plugins/Phase1L1TJetCalibrator.cc b/L1Trigger/L1CaloTrigger/plugins/Phase1L1TJetCalibrator.cc index e002457c7870d..36d9b2368bbfb 100644 --- a/L1Trigger/L1CaloTrigger/plugins/Phase1L1TJetCalibrator.cc +++ b/L1Trigger/L1CaloTrigger/plugins/Phase1L1TJetCalibrator.cc @@ -169,7 +169,7 @@ void Phase1L1TJetCalibrator::produce(edm::Event& iEvent, const edm::EventSetup& void Phase1L1TJetCalibrator::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; desc.add("inputCollectionTag", - edm::InputTag("Phase1L1TJetProducer", "UncalibratedPhase1L1TJetFromPfCandidates")); + edm::InputTag("l1tPhase1JetProducer", "UncalibratedPhase1L1TJetFromPfCandidates")); desc.add>("absEtaBinning"); std::vector vDefaults; edm::ParameterSetDescription validator; diff --git a/L1Trigger/L1CaloTrigger/python/L1CaloJetHTTProducer_cfi.py b/L1Trigger/L1CaloTrigger/python/L1CaloJetHTTProducer_cfi.py index 11650c362daf3..63b8fd3358321 100644 --- a/L1Trigger/L1CaloTrigger/python/L1CaloJetHTTProducer_cfi.py +++ b/L1Trigger/L1CaloTrigger/python/L1CaloJetHTTProducer_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -L1CaloJetHTTProducer = cms.EDProducer("L1CaloJetHTTProducer", +l1tCaloJetHTTProducer = cms.EDProducer("L1CaloJetHTTProducer", EtaMax = cms.double(2.4), PtMin = cms.double(30.0), BXVCaloJetsInputTag = cms.InputTag("L1CaloJetProducer","L1CaloJetCollectionBXV"), diff --git a/L1Trigger/L1CaloTrigger/python/L1CaloJetProducer_cfi.py b/L1Trigger/L1CaloTrigger/python/L1CaloJetProducer_cfi.py index 88be72570b512..3563a39ebb3bb 100644 --- a/L1Trigger/L1CaloTrigger/python/L1CaloJetProducer_cfi.py +++ b/L1Trigger/L1CaloTrigger/python/L1CaloJetProducer_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -L1CaloJetProducer = cms.EDProducer("L1CaloJetProducer", +l1tCaloJetProducer = cms.EDProducer("L1CaloJetProducer", debug = cms.bool(False), HcalTpEtMin = cms.double(0.5), EcalTpEtMin = cms.double(0.5), @@ -10,8 +10,8 @@ EtMinForSeedHit = cms.double(2.5), EtMinForCollection = cms.double(10), EtMinForTauCollection = cms.double(10), - l1CaloTowers = cms.InputTag("L1TowerCalibrationProducer","L1CaloTowerCalibratedCollection"), - L1CrystalClustersInputTag = cms.InputTag("L1EGammaClusterEmuProducer", "L1EGXtalClusterEmulator"), + l1CaloTowers = cms.InputTag("l1tTowerCalibrationProducer","L1CaloTowerCalibratedCollection"), + L1CrystalClustersInputTag = cms.InputTag("l1tEGammaClusterEmuProducer", "L1EGXtalClusterEmulator"), #L1HgcalTowersInputTag = cms.InputTag("hgcalTriggerPrimitiveDigiProducer","tower"), #hcalDigis = cms.InputTag("simHcalTriggerPrimitiveDigis"), diff --git a/L1Trigger/L1CaloTrigger/python/L1CaloJets_cff.py b/L1Trigger/L1CaloTrigger/python/L1CaloJets_cff.py index a138f4093e7f4..3fdb1270c2267 100644 --- a/L1Trigger/L1CaloTrigger/python/L1CaloJets_cff.py +++ b/L1Trigger/L1CaloTrigger/python/L1CaloJets_cff.py @@ -9,7 +9,7 @@ # ---- Produce the L1EGCrystal clusters using Emulator from L1Trigger.L1CaloTrigger.L1EGammaCrystalsEmulatorProducer_cfi import * -L1EGammaClusterEmuProducer.ecalTPEB = cms.InputTag("simEcalEBTriggerPrimitiveDigis","","") +l1tEGammaClusterEmuProducer.ecalTPEB = cms.InputTag("simEcalEBTriggerPrimitiveDigis","","") # -------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ from L1Trigger.L1CaloTrigger.L1TowerCalibrationProducer_cfi import * L1TowerCalibrationProducer.L1HgcalTowersInputTag = cms.InputTag("hgcalTowerProducer","HGCalTowerProcessor","") -L1TowerCalibrationProducer.l1CaloTowers = cms.InputTag("L1EGammaClusterEmuProducer","L1CaloTowerCollection","") +L1TowerCalibrationProducer.l1CaloTowers = cms.InputTag("l1tEGammaClusterEmuProducer","L1CaloTowerCollection","") @@ -28,7 +28,7 @@ from L1Trigger.L1CaloTrigger.L1CaloJetProducer_cfi import * L1CaloJetProducer.l1CaloTowers = cms.InputTag("L1TowerCalibrationProducer","L1CaloTowerCalibratedCollection","") -L1CaloJetProducer.L1CrystalClustersInputTag = cms.InputTag("L1EGammaClusterEmuProducer", "L1EGXtalClusterEmulator","") +L1CaloJetProducer.L1CrystalClustersInputTag = cms.InputTag("l1tEGammaClusterEmuProducer", "L1EGXtalClusterEmulator","") @@ -40,9 +40,9 @@ -l1CaloJetsSequence = cms.Sequence( - L1EGammaClusterEmuProducer * - L1TowerCalibrationProducer * - L1CaloJetProducer * - L1CaloJetHTTProducer +L1TCaloJetsSequence = cms.Sequence( + l1tEGammaClusterEmuProducer * + l1tTowerCalibrationProducer * + l1tCaloJetProducer * + l1tCaloJetHTTProducer ) diff --git a/L1Trigger/L1CaloTrigger/python/L1EGammaCrystalsEmulatorProducer_cfi.py b/L1Trigger/L1CaloTrigger/python/L1EGammaCrystalsEmulatorProducer_cfi.py index db89b3ec76d5e..c03183d2a2e02 100644 --- a/L1Trigger/L1CaloTrigger/python/L1EGammaCrystalsEmulatorProducer_cfi.py +++ b/L1Trigger/L1CaloTrigger/python/L1EGammaCrystalsEmulatorProducer_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -L1EGammaClusterEmuProducer = cms.EDProducer("L1EGCrystalClusterEmulatorProducer", +l1tEGammaClusterEmuProducer = cms.EDProducer("L1EGCrystalClusterEmulatorProducer", ecalTPEB = cms.InputTag("simEcalEBTriggerPrimitiveDigis"), hcalTP = cms.InputTag("simHcalTriggerPrimitiveDigis"), calib = cms.PSet( @@ -29,7 +29,7 @@ ) from Configuration.ProcessModifiers.premix_stage2_cff import premix_stage2 -premix_stage2.toModify(L1EGammaClusterEmuProducer, +premix_stage2.toModify(l1tEGammaClusterEmuProducer, ecalTPEB = cms.InputTag("DMEcalEBTriggerPrimitiveDigis"), hcalTP = cms.InputTag("DMHcalTriggerPrimitiveDigis"), ) diff --git a/L1Trigger/L1CaloTrigger/python/L1TowerCalibrationProducer_cfi.py b/L1Trigger/L1CaloTrigger/python/L1TowerCalibrationProducer_cfi.py index 89a131a539afe..563c27c6776a5 100644 --- a/L1Trigger/L1CaloTrigger/python/L1TowerCalibrationProducer_cfi.py +++ b/L1Trigger/L1CaloTrigger/python/L1TowerCalibrationProducer_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -L1TowerCalibrationProducer = cms.EDProducer("L1TowerCalibrator", +l1tTowerCalibrationProducer = cms.EDProducer("L1TowerCalibrator", # Choosen settings 6 March 2019, 10_3_X MTD samples HcalTpEtMin = cms.double(0.5), EcalTpEtMin = cms.double(0.5), @@ -28,7 +28,7 @@ hfSF = cms.double(1.0), debug = cms.bool(False), skipCalibrations = cms.bool(False), - l1CaloTowers = cms.InputTag("L1EGammaClusterEmuProducer","L1CaloTowerCollection",""), + l1CaloTowers = cms.InputTag("l1tEGammaClusterEmuProducer","L1CaloTowerCollection",""), L1HgcalTowersInputTag = cms.InputTag("hgcalTowerProducer:HGCalTowerProcessor"), hcalDigis = cms.InputTag("simHcalTriggerPrimitiveDigis"), nHits_to_nvtx_params = cms.VPSet( # Parameters derived on 6 March 2019 on 10_3_X MTD samples diff --git a/L1Trigger/L1CaloTrigger/python/Phase1L1TJetCalibrator_9x9Jets_cfi.py b/L1Trigger/L1CaloTrigger/python/Phase1L1TJetCalibrator_9x9Jets_cfi.py index be648700b1369..8f1aa7167ae62 100644 --- a/L1Trigger/L1CaloTrigger/python/Phase1L1TJetCalibrator_9x9Jets_cfi.py +++ b/L1Trigger/L1CaloTrigger/python/Phase1L1TJetCalibrator_9x9Jets_cfi.py @@ -182,8 +182,8 @@ ) ) -Phase1L1TJetCalibrator = cms.EDProducer('Phase1L1TJetCalibrator', - inputCollectionTag = cms.InputTag("Phase1L1TJetProducer", "UncalibratedPhase1L1TJetFromPfCandidates", ""), +l1tPhase1JetCalibrator = cms.EDProducer('Phase1L1TJetCalibrator', + inputCollectionTag = cms.InputTag("l1tPhase1JetProducer", "UncalibratedPhase1L1TJetFromPfCandidates", ""), absEtaBinning = cms.vdouble([p.etaMin.value() for p in calibration] + [calibration[-1].etaMax.value()]), calibration = calibration, outputCollectionName = cms.string("Phase1L1TJetFromPfCandidates") diff --git a/L1Trigger/L1CaloTrigger/python/Phase1L1TJetCalibrator_9x9trimmedJets_cfi.py b/L1Trigger/L1CaloTrigger/python/Phase1L1TJetCalibrator_9x9trimmedJets_cfi.py index d152906bf2fdc..921b79f7480ef 100644 --- a/L1Trigger/L1CaloTrigger/python/Phase1L1TJetCalibrator_9x9trimmedJets_cfi.py +++ b/L1Trigger/L1CaloTrigger/python/Phase1L1TJetCalibrator_9x9trimmedJets_cfi.py @@ -182,9 +182,9 @@ ) ) -Phase1L1TJetCalibrator = cms.EDProducer('Phase1L1TJetCalibrator', - inputCollectionTag = cms.InputTag("Phase1L1TJetProducer", "UncalibratedPhase1L1TJetFromPfCandidates", ""), +l1tPhase1JetCalibrator = cms.EDProducer('Phase1L1TJetCalibrator', + inputCollectionTag = cms.InputTag("l1tPhase1JetProducer", "UncalibratedPhase1L1TJetFromPfCandidates", ""), absEtaBinning = cms.vdouble([p.etaMin.value() for p in calibration] + [calibration[-1].etaMax.value()]), calibration = calibration, outputCollectionName = cms.string("Phase1L1TJetFromPfCandidates") -) \ No newline at end of file +) diff --git a/L1Trigger/L1CaloTrigger/python/Phase1L1TJetCalibrator_cfi.py b/L1Trigger/L1CaloTrigger/python/Phase1L1TJetCalibrator_cfi.py index 68caed01e6aca..8c66907ce8a57 100644 --- a/L1Trigger/L1CaloTrigger/python/Phase1L1TJetCalibrator_cfi.py +++ b/L1Trigger/L1CaloTrigger/python/Phase1L1TJetCalibrator_cfi.py @@ -182,9 +182,9 @@ ) ) -Phase1L1TJetCalibrator = cms.EDProducer('Phase1L1TJetCalibrator', - inputCollectionTag = cms.InputTag("Phase1L1TJetProducer", "UncalibratedPhase1L1TJetFromPfCandidates", ""), +l1tPhase1JetCalibrator = cms.EDProducer('Phase1L1TJetCalibrator', + inputCollectionTag = cms.InputTag("l1tPhase1JetProducer", "UncalibratedPhase1L1TJetFromPfCandidates", ""), absEtaBinning = cms.vdouble([p.etaMin.value() for p in calibration] + [calibration[-1].etaMax.value()]), calibration = calibration, outputCollectionName = cms.string("Phase1L1TJetFromPfCandidates") -) \ No newline at end of file +) diff --git a/L1Trigger/L1CaloTrigger/python/Phase1L1TJetProducer_cfi.py b/L1Trigger/L1CaloTrigger/python/Phase1L1TJetProducer_cfi.py index c9c91248f9343..318ce07897bdf 100644 --- a/L1Trigger/L1CaloTrigger/python/Phase1L1TJetProducer_cfi.py +++ b/L1Trigger/L1CaloTrigger/python/Phase1L1TJetProducer_cfi.py @@ -17,8 +17,8 @@ 3.0, 3.083, 3.167, 3.25, 3.333, 3.417, 3.5, 3.583, 3.667, 3.75, 3.833, 3.917, 4.0, 4.083, 4.167, 4.25, 4.333, 4.417, 4.5, 4.583, 4.667, 4.75, 4.833, 4.917, 5.0) -Phase1L1TJetProducer = cms.EDProducer('Phase1L1TJetProducer', - inputCollectionTag = cms.InputTag("l1ctLayer1", "Puppi"), +l1tPhase1JetProducer = cms.EDProducer('Phase1L1TJetProducer', + inputCollectionTag = cms.InputTag("l1tLayer1", "Puppi"), etaBinning = caloEtaSegmentation, nBinsPhi = cms.uint32(72), phiLow = cms.double(-pi), diff --git a/L1Trigger/L1CaloTrigger/python/Phase1L1TJetSumsProducer_cfi.py b/L1Trigger/L1CaloTrigger/python/Phase1L1TJetSumsProducer_cfi.py index 719fc53d4047c..543ac2a18f308 100644 --- a/L1Trigger/L1CaloTrigger/python/Phase1L1TJetSumsProducer_cfi.py +++ b/L1Trigger/L1CaloTrigger/python/Phase1L1TJetSumsProducer_cfi.py @@ -3,8 +3,8 @@ from L1Trigger.L1CaloTrigger.Phase1L1TJets_sincosLUT_cff import sinPhi, cosPhi -Phase1L1TJetSumsProducer = cms.EDProducer('Phase1L1TJetSumsProducer', - inputJetCollectionTag = cms.InputTag("Phase1L1TJetCalibrator", "Phase1L1TJetFromPfCandidates"), +l1tPhase1JetSumsProducer = cms.EDProducer('Phase1L1TJetSumsProducer', + inputJetCollectionTag = cms.InputTag("l1tPhase1JetCalibrator", "Phase1L1TJetFromPfCandidates"), nBinsPhi = cms.uint32(72), phiLow = cms.double(-pi), phiUp = cms.double(pi), diff --git a/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_9x9_cff.py b/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_9x9_cff.py index c8cb52e17bfab..e9d3322a9eb84 100644 --- a/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_9x9_cff.py +++ b/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_9x9_cff.py @@ -1,25 +1,25 @@ import FWCore.ParameterSet.Config as cms from math import pi -from L1Trigger.L1CaloTrigger.Phase1L1TJetProducer_cfi import Phase1L1TJetProducer -from L1Trigger.L1CaloTrigger.Phase1L1TJetCalibrator_9x9Jets_cfi import Phase1L1TJetCalibrator as Phase1L1TJetCalibrator9x9 -from L1Trigger.L1CaloTrigger.Phase1L1TJetSumsProducer_cfi import Phase1L1TJetSumsProducer +from L1Trigger.L1CaloTrigger.Phase1L1TJetProducer_cfi import l1tPhase1JetProducer +from L1Trigger.L1CaloTrigger.Phase1L1TJetCalibrator_9x9Jets_cfi import l1tPhase1JetCalibrator as l1tPhase1JetCalibrator9x9 +from L1Trigger.L1CaloTrigger.Phase1L1TJetSumsProducer_cfi import l1tPhase1JetSumsProducer -Phase1L1TJetProducer9x9 = Phase1L1TJetProducer.clone( +l1tPhase1JetProducer9x9 = l1tPhase1JetProducer.clone( jetIEtaSize = 9, jetIPhiSize = 9, outputCollectionName = "UncalibratedPhase1L1TJetFromPfCandidates" ) -Phase1L1TJetCalibrator9x9.inputCollectionTag = ("Phase1L1TJetProducer9x9", "UncalibratedPhase1L1TJetFromPfCandidates", "") -Phase1L1TJetCalibrator9x9.outputCollectionName = ("Phase1L1TJetFromPfCandidates") +l1tPhase1JetCalibrator9x9.inputCollectionTag = ("l1tPhase1JetProducer9x9", "UncalibratedPhase1L1TJetFromPfCandidates", "") +l1tPhase1JetCalibrator9x9.outputCollectionName = ("Phase1L1TJetFromPfCandidates") -Phase1L1TJetSumsProducer9x9 = Phase1L1TJetSumsProducer.clone( +l1tPhase1JetSumsProducer9x9 = l1tPhase1JetSumsProducer.clone( inputJetCollectionTag = ("Phase1L1TJetCalibrator9x9", "Phase1L1TJetFromPfCandidates"), ) -Phase1L1TJetsSequence9x9 = cms.Sequence( - Phase1L1TJetProducer9x9 + - Phase1L1TJetCalibrator9x9 + - Phase1L1TJetSumsProducer9x9 -) \ No newline at end of file +L1TPhase1JetsSequence9x9 = cms.Sequence( + l1tPhase1JetProducer9x9 + + l1tPhase1JetCalibrator9x9 + + l1tPhase1JetSumsProducer9x9 +) diff --git a/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_9x9trimmed_cff.py b/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_9x9trimmed_cff.py index b5669680cb315..d881c897d63ac 100644 --- a/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_9x9trimmed_cff.py +++ b/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_9x9trimmed_cff.py @@ -1,27 +1,27 @@ import FWCore.ParameterSet.Config as cms from math import pi -from L1Trigger.L1CaloTrigger.Phase1L1TJetProducer_cfi import Phase1L1TJetProducer -from L1Trigger.L1CaloTrigger.Phase1L1TJetCalibrator_9x9trimmedJets_cfi import Phase1L1TJetCalibrator as Phase1L1TJetCalibrator9x9trimmed -from L1Trigger.L1CaloTrigger.Phase1L1TJetSumsProducer_cfi import Phase1L1TJetSumsProducer +from L1Trigger.L1CaloTrigger.Phase1L1TJetProducer_cfi import l1tPhase1JetProducer +from L1Trigger.L1CaloTrigger.Phase1L1TJetCalibrator_9x9trimmedJets_cfi import l1tPhase1JetCalibrator as Phase1L1TJetCalibrator9x9trimmed +from L1Trigger.L1CaloTrigger.Phase1L1TJetSumsProducer_cfi import l1tPhase1JetSumsProducer -Phase1L1TJetProducer9x9trimmed = Phase1L1TJetProducer.clone( +l1tPhase1JetProducer9x9trimmed = l1tPhase1JetProducer.clone( jetIEtaSize = 9, jetIPhiSize = 9, trimmedGrid = True, outputCollectionName = "UncalibratedPhase1L1TJetFromPfCandidates" ) -Phase1L1TJetCalibrator9x9trimmed.inputCollectionTag = ("Phase1L1TJetProducer9x9trimmed", "UncalibratedPhase1L1TJetFromPfCandidates", "") -Phase1L1TJetCalibrator9x9trimmed.outputCollectionName = ("Phase1L1TJetFromPfCandidates") +l1tPhase1JetCalibrator9x9trimmed.inputCollectionTag = ("l1tPhase1JetProducer9x9trimmed", "UncalibratedPhase1L1TJetFromPfCandidates", "") +l1tPhase1JetCalibrator9x9trimmed.outputCollectionName = ("Phase1L1TJetFromPfCandidates") -Phase1L1TJetSumsProducer9x9trimmed = Phase1L1TJetSumsProducer.clone( - inputJetCollectionTag = ("Phase1L1TJetCalibrator9x9trimmed", "Phase1L1TJetFromPfCandidates"), +l1tPhase1JetSumsProducer9x9trimmed = l1tPhase1JetSumsProducer.clone( + inputJetCollectionTag = ("l1tPhase1JetCalibrator9x9trimmed", "Phase1L1TJetFromPfCandidates"), ) -Phase1L1TJetsSequence9x9trimmed = cms.Sequence( - Phase1L1TJetProducer9x9trimmed + - Phase1L1TJetCalibrator9x9trimmed + - Phase1L1TJetSumsProducer9x9trimmed +L1TPhase1JetsSequence9x9trimmed = cms.Sequence( + l1tPhase1JetProducer9x9trimmed + + l1tPhase1JetCalibrator9x9trimmed + + l1tPhase1JetSumsProducer9x9trimmed ) diff --git a/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_cff.py b/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_cff.py index cc6bed4bd06ab..45f93a48601e8 100644 --- a/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_cff.py +++ b/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_cff.py @@ -1,11 +1,11 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.L1CaloTrigger.Phase1L1TJetProducer_cfi import Phase1L1TJetProducer -from L1Trigger.L1CaloTrigger.Phase1L1TJetCalibrator_cfi import Phase1L1TJetCalibrator -from L1Trigger.L1CaloTrigger.Phase1L1TJetSumsProducer_cfi import Phase1L1TJetSumsProducer +from L1Trigger.L1CaloTrigger.Phase1L1TJetProducer_cfi import l1tPhase1JetProducer +from L1Trigger.L1CaloTrigger.Phase1L1TJetCalibrator_cfi import l1tPhase1JetCalibrator +from L1Trigger.L1CaloTrigger.Phase1L1TJetSumsProducer_cfi import l1tPhase1JetSumsProducer -Phase1L1TJetsSequence = cms.Sequence( - Phase1L1TJetProducer + - Phase1L1TJetCalibrator + - Phase1L1TJetSumsProducer +L1TPhase1JetsSequence = cms.Sequence( + l1tPhase1JetProducer + + l1tPhase1JetCalibrator + + l1tPhase1JetSumsProducer ) diff --git a/L1Trigger/L1CaloTrigger/python/l1EgammaStaProducers_cff.py b/L1Trigger/L1CaloTrigger/python/l1EgammaStaProducers_cff.py index 46dec1ae4ed00..9da1269b8242a 100644 --- a/L1Trigger/L1CaloTrigger/python/l1EgammaStaProducers_cff.py +++ b/L1Trigger/L1CaloTrigger/python/l1EgammaStaProducers_cff.py @@ -2,6 +2,6 @@ from L1Trigger.L1CaloTrigger.L1EGammaCrystalsEmulatorProducer_cfi import * -l1EgammaStaProducers = cms.Sequence(L1EGammaClusterEmuProducer) +L1TEgammaStaProducers = cms.Sequence(l1tEGammaClusterEmuProducer) -l1EgammaStaProducersEB = cms.Sequence(L1EGammaClusterEmuProducer) +L1TEgammaStaProducersEB = cms.Sequence(l1tEGammaClusterEmuProducer) diff --git a/L1Trigger/L1CaloTrigger/python/test_L1EGCrystalClusterEmulator_cfg.py b/L1Trigger/L1CaloTrigger/python/test_L1EGCrystalClusterEmulator_cfg.py index b5e480ae9fda2..01d4daee06824 100644 --- a/L1Trigger/L1CaloTrigger/python/test_L1EGCrystalClusterEmulator_cfg.py +++ b/L1Trigger/L1CaloTrigger/python/test_L1EGCrystalClusterEmulator_cfg.py @@ -50,7 +50,7 @@ process.load('L1Trigger.L1CaloTrigger.L1EGammaCrystalsEmulatorProducer_cfi') -process.pL1EG = cms.Path( process.L1EGammaClusterEmuProducer ) +process.pL1EG = cms.Path( process.l1tEGammaClusterEmuProducer ) @@ -59,7 +59,7 @@ fileName = cms.untracked.string( "l1egCrystalTest.root" ), fastCloning = cms.untracked.bool( False ), outputCommands = cms.untracked.vstring( - "keep *_L1EGammaClusterEmuProducer_*_*", + "keep *_l1tEGammaClusterEmuProducer_*_*", "keep *_TriggerResults_*_*", "keep *_simHcalTriggerPrimitiveDigis_*_*", "keep *_EcalEBTrigPrimProducer_*_*" diff --git a/L1Trigger/L1CaloTrigger/test/test_L1CaloJets_cfg.py b/L1Trigger/L1CaloTrigger/test/test_L1CaloJets_cfg.py index 498aa095642cc..af473d91eedca 100644 --- a/L1Trigger/L1CaloTrigger/test/test_L1CaloJets_cfg.py +++ b/L1Trigger/L1CaloTrigger/test/test_L1CaloJets_cfg.py @@ -74,7 +74,7 @@ # ---- Load the L1CaloJet sequence designed to accompany process named "REPR" process.load('L1Trigger.L1CaloTrigger.L1CaloJets_cff') -process.l1CaloJets = cms.Path(process.l1CaloJetsSequence) +process.l1CaloJets = cms.Path(process.L1TCaloJetsSequence) @@ -82,9 +82,9 @@ fileName = cms.untracked.string( "l1caloJetTest.root" ), fastCloning = cms.untracked.bool( False ), outputCommands = cms.untracked.vstring( - "keep *_L1EGammaClusterEmuProducer_*_*", - "keep *_L1CaloJetProducer_*_*", - "keep *_L1CaloJetHTTProducer_*_*", + "keep *_l1tEGammaClusterEmuProducer_*_*", + "keep *_l1tCaloJetProducer_*_*", + "keep *_l1tCaloJetHTTProducer_*_*", "keep *_TriggerResults_*_*", "keep *_simHcalTriggerPrimitiveDigis_*_*", "keep *_EcalEBTrigPrimProducer_*_*", diff --git a/L1Trigger/L1CaloTrigger/test/test_Phase1L1TJets_cfg.py b/L1Trigger/L1CaloTrigger/test/test_Phase1L1TJets_cfg.py index 8e606b032564a..6d1885d0eb2fa 100644 --- a/L1Trigger/L1CaloTrigger/test/test_Phase1L1TJets_cfg.py +++ b/L1Trigger/L1CaloTrigger/test/test_Phase1L1TJets_cfg.py @@ -29,23 +29,23 @@ # AK4 PF jets process.load('L1Trigger.Phase2L1ParticleFlow.l1pfJetMet_cff') -process.l1PFJets = cms.Sequence( process.ak4PFL1Puppi + process.ak4PFL1PuppiCorrected ) +process.L1TPFJets = cms.Sequence( process.ak4PFL1Puppi + process.ak4PFL1PuppiCorrected ) process.out = cms.OutputModule("PoolOutputModule", fileName = cms.untracked.string('myOutputFile.root'), outputCommands = cms.untracked.vstring( "drop *", - "keep *_Phase1L1TJetProducer*_*_*", - "keep *_Phase1L1TJetSumsProducer*_*_*", + "keep *_l1tPhase1JetProducer*_*_*", + "keep *_l1tPhase1JetSumsProducer*_*_*", "keep *_ak4GenJetsNoNu_*_*", - "keep *_Phase1L1TJetCalibrator*_*_*", + "keep *_l1tPhase1JetCalibrator*_*_*", "keep *_ak4PFL1Puppi*_*_*", "keep *_l1PFMetPuppi*_*_*", "keep *_genMetTrue_*_*" ), ) -process.p = cms.Path(process.Phase1L1TJetsSequence * process.Phase1L1TJetsSequence9x9 * process.Phase1L1TJetsSequence9x9trimmed * process.l1PFJets * process.l1PFMetPuppi ) +process.p = cms.Path(process.L1TPhase1JetsSequence * process.L1TPhase1JetsSequence9x9 * process.L1TPhase1JetsSequence9x9trimmed * process.L1TPFJets * process.l1PFMetPuppi ) process.e = cms.EndPath(process.out) diff --git a/L1Trigger/L1TTrackMatch/python/L1FastTrackingJetProducer_cfi.py b/L1Trigger/L1TTrackMatch/python/L1FastTrackingJetProducer_cfi.py index ffea31f70368b..1118ef5362034 100644 --- a/L1Trigger/L1TTrackMatch/python/L1FastTrackingJetProducer_cfi.py +++ b/L1Trigger/L1TTrackMatch/python/L1FastTrackingJetProducer_cfi.py @@ -1,10 +1,10 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.VertexFinder.VertexProducer_cff import VertexProducer +from L1Trigger.VertexFinder.VertexProducer_cff import l1tVertexProducer -L1FastTrackingJets = cms.EDProducer("L1FastTrackingJetProducer", +l1tFastTrackingJets = cms.EDProducer("L1FastTrackingJetProducer", L1TrackInputTag = cms.InputTag("TTTracksFromTrackletEmulation", "Level1TTTracks"), - L1PrimaryVertexTag=cms.InputTag("VertexProducer", VertexProducer.l1VertexCollectionName.value()), + L1PrimaryVertexTag=cms.InputTag("l1tVertexProducer", l1tVertexProducer.l1VertexCollectionName.value()), GenInfo = cms.InputTag("TTTrackAssociatorFromPixelDigis", "Level1TTTracks"), trk_zMax = cms.double(15.), # max track z0 [cm] trk_chi2dofMax = cms.double(10.), # max track chi2/dof @@ -24,9 +24,9 @@ selectTrkMatchGenOrPU=cms.bool(False) ) -L1FastTrackingJetsExtended = cms.EDProducer("L1FastTrackingJetProducer", +l1tFastTrackingJetsExtended = cms.EDProducer("L1FastTrackingJetProducer", L1TrackInputTag = cms.InputTag("TTTracksFromExtendedTrackletEmulation", "Level1TTTracks"), - L1PrimaryVertexTag=cms.InputTag("VertexProducer", VertexProducer.l1VertexCollectionName.value()), + L1PrimaryVertexTag=cms.InputTag("l1tVertexProducer", l1tVertexProducer.l1VertexCollectionName.value()), GenInfo = cms.InputTag("TTTrackAssociatorFromPixelDigisExtended", "Level1TTTracks"), trk_zMax = cms.double(15.), # max track z0 [cm] trk_chi2dofMax = cms.double(40.), # max track chi2 for extended tracks diff --git a/L1Trigger/L1TTrackMatch/python/L1GTTInputProducer_cfi.py b/L1Trigger/L1TTrackMatch/python/L1GTTInputProducer_cfi.py index e01a70d531391..96ec77fafe4c0 100644 --- a/L1Trigger/L1TTrackMatch/python/L1GTTInputProducer_cfi.py +++ b/L1Trigger/L1TTrackMatch/python/L1GTTInputProducer_cfi.py @@ -1,12 +1,12 @@ import FWCore.ParameterSet.Config as cms -L1GTTInputProducer = cms.EDProducer('L1GTTInputProducer', +l1tGTTInputProducer = cms.EDProducer('L1GTTInputProducer', l1TracksInputTag = cms.InputTag("TTTracksFromTrackletEmulation", "Level1TTTracks"), outputCollectionName = cms.string("Level1TTTracksConverted"), debug = cms.int32(0) # Verbosity levels: 0, 1, 2, 3 ) -L1GTTInputProducerExtended = cms.EDProducer('L1GTTInputProducer', +l1tGTTInputProducerExtended = cms.EDProducer('L1GTTInputProducer', l1TracksInputTag = cms.InputTag("TTTracksFromExtendedTrackletEmulation", "Level1TTTracks"), outputCollectionName = cms.string("Level1TTTracksExtendedConverted"), debug = cms.int32(0) # Verbosity levels: 0, 1, 2, 3 diff --git a/L1Trigger/L1TTrackMatch/python/L1TkHTMissEmulatorProducer_cfi.py b/L1Trigger/L1TTrackMatch/python/L1TkHTMissEmulatorProducer_cfi.py index a2cf212512dd0..5f419457efabd 100644 --- a/L1Trigger/L1TTrackMatch/python/L1TkHTMissEmulatorProducer_cfi.py +++ b/L1Trigger/L1TTrackMatch/python/L1TkHTMissEmulatorProducer_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -L1TrackerEmuHTMiss = cms.EDProducer("L1TkHTMissEmulatorProducer", +l1tTrackerEmuHTMiss = cms.EDProducer("L1TkHTMissEmulatorProducer", L1TkJetEmulationInputTag = cms.InputTag("L1TrackJetsEmulation", "L1TrackJets"), L1MHTCollectionName = cms.string("L1TrackerEmuHTMiss"), jet_maxEta = cms.double(2.4), @@ -11,7 +11,7 @@ displaced = cms.bool(False) ) -L1TrackerEmuHTMissExtended = cms.EDProducer("L1TkHTMissEmulatorProducer", +l1tTrackerEmuHTMissExtended = cms.EDProducer("L1TkHTMissEmulatorProducer", L1TkJetEmulationInputTag = cms.InputTag("L1TrackJetsExtendedEmulation", "L1TrackJetsExtended"), L1MHTCollectionName = cms.string("L1TrackerEmuHTMissExtended"), jet_maxEta = cms.double(2.4), diff --git a/L1Trigger/L1TTrackMatch/python/L1TkHTMissProducer_cfi.py b/L1Trigger/L1TTrackMatch/python/L1TkHTMissProducer_cfi.py index bdf7c5cb669c5..fb81bce1c3f37 100644 --- a/L1Trigger/L1TTrackMatch/python/L1TkHTMissProducer_cfi.py +++ b/L1Trigger/L1TTrackMatch/python/L1TkHTMissProducer_cfi.py @@ -1,9 +1,9 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.VertexFinder.VertexProducer_cff import VertexProducer +from L1Trigger.VertexFinder.VertexProducer_cff import l1tVertexProducer -L1TkCaloHTMiss = cms.EDProducer("L1TkHTMissProducer", +l1tTkCaloHTMiss = cms.EDProducer("L1TkHTMissProducer", L1TkJetInputTag = cms.InputTag("L1TkCaloJets", "L1TkCaloJets"), - L1VertexInputTag = cms.InputTag("VertexProducer", VertexProducer.l1VertexCollectionName.value()), + L1VertexInputTag = cms.InputTag("VertexProducer", l1tVertexProducer.l1VertexCollectionName.value()), jet_maxEta = cms.double(2.2), # maximum eta of jets for HT jet_minPt = cms.double(15.0), # minimum pt of jets for HT [GeV] jet_minNtracksHighPt=cms.int32(0), #Add track jet quality criteria pT>100 @@ -17,12 +17,12 @@ displaced = cms.bool(False) #Run with prompt/displaced jets - only useful for track jets ) -L1TkCaloHTMissVtx = L1TkCaloHTMiss.clone() -L1TkCaloHTMiss.doVtxConstrain = cms.bool(True) +l1tTkCaloHTMissVtx = l1tTkCaloHTMiss.clone() +l1tTkCaloHTMiss.doVtxConstrain = cms.bool(True) -L1TrackerHTMiss = cms.EDProducer("L1TkHTMissProducer", +l1tTrackerHTMiss = cms.EDProducer("L1TkHTMissProducer", L1TkJetInputTag = cms.InputTag("L1TrackJets", "L1TrackJets"), - L1VertexInputTag = cms.InputTag("VertexProducer", VertexProducer.l1VertexCollectionName.value()), + L1VertexInputTag = cms.InputTag("VertexProducer", l1tVertexProducer.l1VertexCollectionName.value()), jet_maxEta = cms.double(2.4), jet_minPt = cms.double(5.0), jet_minNtracksLowPt=cms.int32(2), @@ -36,9 +36,9 @@ displaced = cms.bool(False) # Run with prompt/displaced jets ) -L1TrackerHTMissExtended = cms.EDProducer("L1TkHTMissProducer", +l1tTrackerHTMissExtended = cms.EDProducer("L1TkHTMissProducer", L1TkJetInputTag = cms.InputTag("L1TrackJetsExtended", "L1TrackJetsExtended"), - L1VertexInputTag = cms.InputTag("VertexProducer", VertexProducer.l1VertexCollectionName.value()), + L1VertexInputTag = cms.InputTag("VertexProducer", l1tVertexProducer.l1VertexCollectionName.value()), jet_maxEta = cms.double(2.4), jet_minPt = cms.double(5.0), jet_minNtracksLowPt=cms.int32(2), diff --git a/L1Trigger/L1TTrackMatch/python/L1TkObjectProducers_cff.py b/L1Trigger/L1TTrackMatch/python/L1TkObjectProducers_cff.py index 3515445e92bc9..1236a6298a61d 100644 --- a/L1Trigger/L1TTrackMatch/python/L1TkObjectProducers_cff.py +++ b/L1Trigger/L1TTrackMatch/python/L1TkObjectProducers_cff.py @@ -50,11 +50,11 @@ # from L1Trigger.L1TTrackMatch.L1TkCaloJetProducer_cfi import L1TkCaloJets # pL1TkCaloJets = cms.Path( L1TkCaloJets) -from L1Trigger.VertexFinder.VertexProducer_cff import VertexProducer -pVertexProducer = cms.Path( VertexProducer ) +from L1Trigger.VertexFinder.VertexProducer_cff import l1tVertexProducer +pVertexProducer = cms.Path( l1tVertexProducer ) -from L1Trigger.VertexFinder.VertexProducer_cff import VertexProducer -pVertexProducer = cms.Path( VertexProducer ) +from L1Trigger.VertexFinder.VertexProducer_cff import l1VertexProducer +pVertexProducer = cms.Path( l1tVertexProducer ) # from L1Trigger.L1TTrackMatch.L1TrackerEtMissProducer_cfi import L1TrackerEtMiss # pL1TrkMET = cms.Path( L1TrackerEtMiss ) diff --git a/L1Trigger/L1TTrackMatch/python/L1TrackFastJetProducer_cfi.py b/L1Trigger/L1TTrackMatch/python/L1TrackFastJetProducer_cfi.py index 4eaaf1c5bfe86..74bba283cfd55 100644 --- a/L1Trigger/L1TTrackMatch/python/L1TrackFastJetProducer_cfi.py +++ b/L1Trigger/L1TTrackMatch/python/L1TrackFastJetProducer_cfi.py @@ -1,9 +1,9 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.VertexFinder.VertexProducer_cff import VertexProducer +from L1Trigger.VertexFinder.VertexProducer_cff import l1tVertexProducer -L1TrackFastJets = cms.EDProducer("L1TrackFastJetProducer", +l1tTrackFastJets = cms.EDProducer("L1TrackFastJetProducer", L1TrackInputTag = cms.InputTag("TTTracksFromTrackletEmulation", "Level1TTTracks"), - L1PrimaryVertexTag=cms.InputTag("VertexProducer", VertexProducer.l1VertexCollectionName.value()), + L1PrimaryVertexTag=cms.InputTag("l1tVertexProducer", l1tVertexProducer.l1VertexCollectionName.value()), trk_zMax = cms.double(15.), # max track z0 [cm] trk_chi2dofMax = cms.double(10.), # max track chi2/dof trk_bendChi2Max = cms.double(2.2),# max bendChi2 cut @@ -19,9 +19,9 @@ displaced = cms.bool(False) # use prompt/displaced tracks ) -L1TrackFastJetsExtended = cms.EDProducer("L1TrackFastJetProducer", +l1tTrackFastJetsExtended = cms.EDProducer("L1TrackFastJetProducer", L1TrackInputTag = cms.InputTag("TTTracksFromExtendedTrackletEmulation", "Level1TTTracks"), - L1PrimaryVertexTag=cms.InputTag("VertexProducer", VertexProducer.l1VertexCollectionName.value()), + L1PrimaryVertexTag=cms.InputTag("l1tVertexProducer", l1tVertexProducer.l1VertexCollectionName.value()), trk_zMax = cms.double(15.), # max track z0 [cm] trk_chi2dofMax = cms.double(40.), # max track chi2 for extended tracks trk_bendChi2Max = cms.double(2.4),#Bendchi2 cut for extended tracks diff --git a/L1Trigger/L1TTrackMatch/python/L1TrackJetEmulationProducer_cfi.py b/L1Trigger/L1TTrackMatch/python/L1TrackJetEmulationProducer_cfi.py index b7be59d0cae1b..7494d117143e6 100644 --- a/L1Trigger/L1TTrackMatch/python/L1TrackJetEmulationProducer_cfi.py +++ b/L1Trigger/L1TTrackMatch/python/L1TrackJetEmulationProducer_cfi.py @@ -1,9 +1,9 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.VertexFinder.VertexProducer_cff import VertexProducer +from L1Trigger.VertexFinder.VertexProducer_cff import l1tVertexProducer -L1TrackJetsEmulation = cms.EDProducer('L1TrackJetEmulationProducer', - L1TrackInputTag= cms.InputTag("L1GTTInputProducer", "Level1TTTracksConverted"), - VertexInputTag=cms.InputTag("L1VertexFinderEmulator", "l1verticesEmulation"), +l1tTrackJetsEmulation = cms.EDProducer('L1TrackJetEmulationProducer', + L1TrackInputTag= cms.InputTag("l1tGTTInputProducer", "Level1TTTracksConverted"), + VertexInputTag=cms.InputTag("l1tVertexFinderEmulator", "l1verticesEmulation"), MaxDzTrackPV = cms.double(0.5), trk_zMax = cms.double (15.) , # maximum track z trk_ptMax = cms.double(200.), # maximumum track pT before saturation [GeV] @@ -30,9 +30,9 @@ nDisplacedTracks=cms.int32(2) #Number of displaced tracks required per jet ) -L1TrackJetsExtendedEmulation = cms.EDProducer('L1TrackJetEmulationProducer', - L1TrackInputTag= cms.InputTag("L1GTTInputProducerExtended", "Level1TTTracksExtendedConverted"), - VertexInputTag=cms.InputTag("L1VertexFinderEmulator", "l1verticesEmulation"), +l1tTrackJetsExtendedEmulation = cms.EDProducer('L1TrackJetEmulationProducer', + L1TrackInputTag= cms.InputTag("l1tGTTInputProducerExtended", "Level1TTTracksExtendedConverted"), + VertexInputTag=cms.InputTag("l1tVertexFinderEmulator", "l1verticesEmulation"), MaxDzTrackPV = cms.double(4.0), trk_zMax = cms.double (15.) , # maximum track z trk_ptMax = cms.double(200.), # maximumum track pT before saturation [GeV] diff --git a/L1Trigger/L1TTrackMatch/python/L1TrackJetProducer_cfi.py b/L1Trigger/L1TTrackMatch/python/L1TrackJetProducer_cfi.py index c5c80bd22e69b..1f8ae328c76ac 100644 --- a/L1Trigger/L1TTrackMatch/python/L1TrackJetProducer_cfi.py +++ b/L1Trigger/L1TTrackMatch/python/L1TrackJetProducer_cfi.py @@ -1,10 +1,10 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.VertexFinder.VertexProducer_cff import VertexProducer +from L1Trigger.VertexFinder.VertexProducer_cff import l1tVertexProducer -L1TrackJets = cms.EDProducer('L1TrackJetProducer', +l1tTrackJets = cms.EDProducer('L1TrackJetProducer', L1TrackInputTag= cms.InputTag("TTTracksFromTrackletEmulation", "Level1TTTracks"), - L1PVertexCollection = cms.InputTag("VertexProducer", VertexProducer.l1VertexCollectionName.value()), + L1PVertexCollection = cms.InputTag("l1tVertexProducer", l1tVertexProducer.l1VertexCollectionName.value()), MaxDzTrackPV = cms.double( 0.5 ), trk_zMax = cms.double (15.) , # maximum track z trk_ptMax = cms.double(200.), # maximumum track pT before saturation [GeV] @@ -31,9 +31,9 @@ nDisplacedTracks=cms.int32(2) #Number of displaced tracks required per jet ) -L1TrackJetsExtended = cms.EDProducer('L1TrackJetProducer', +l1tTrackJetsExtended = cms.EDProducer('L1TrackJetProducer', L1TrackInputTag= cms.InputTag("TTTracksFromExtendedTrackletEmulation", "Level1TTTracks"), - L1PVertexCollection = cms.InputTag("VertexProducer", VertexProducer.l1VertexCollectionName.value()), + L1PVertexCollection = cms.InputTag("l1tVertexProducer", l1tVertexProducer.l1VertexCollectionName.value()), MaxDzTrackPV = cms.double( 4.0 ), # tracks with dz(trk,PV)>cut excluded trk_zMax = cms.double (15.) , # max track z trk_ptMax = cms.double(200.), # maxi track pT before saturation diff --git a/L1Trigger/L1TTrackMatch/python/L1TrackSelectionProducer_cfi.py b/L1Trigger/L1TTrackMatch/python/L1TrackSelectionProducer_cfi.py index 823a998f85c08..f588c3fb37ccd 100644 --- a/L1Trigger/L1TTrackMatch/python/L1TrackSelectionProducer_cfi.py +++ b/L1Trigger/L1TTrackMatch/python/L1TrackSelectionProducer_cfi.py @@ -1,10 +1,10 @@ import FWCore.ParameterSet.Config as cms -L1TrackSelectionProducer = cms.EDProducer('L1TrackSelectionProducer', - l1TracksInputTag = cms.InputTag("L1GTTInputProducer","Level1TTTracksConverted"), +l1tTrackSelectionProducer = cms.EDProducer('L1TrackSelectionProducer', + l1TracksInputTag = cms.InputTag("l1tGTTInputProducer","Level1TTTracksConverted"), # If no vertex collection is provided, then the DeltaZ cuts will not be run - l1VerticesInputTag = cms.InputTag("L1VertexFinder", "l1vertices"), - l1VerticesEmulationInputTag = cms.InputTag("L1VertexFinderEmulator", "l1verticesEmulation"), + l1VerticesInputTag = cms.InputTag("l1tVertexFinder", "l1vertices"), + l1VerticesEmulationInputTag = cms.InputTag("l1tVertexFinderEmulator", "l1verticesEmulation"), outputCollectionName = cms.string("Level1TTTracksSelected"), cutSet = cms.PSet( ptMin = cms.double(2.0), # pt must be greater than this value, [GeV] @@ -26,24 +26,24 @@ debug = cms.int32(0) # Verbosity levels: 0, 1, 2, 3, 4 ) -L1TrackSelectionProducerExtended = L1TrackSelectionProducer.clone( - l1TracksInputTag = ("L1GTTInputProducerExtended","Level1TTTracksExtendedConverted"), +l1tTrackSelectionProducerExtended = l1tTrackSelectionProducer.clone( + l1TracksInputTag = ("l1tGTTInputProducerExtended","Level1TTTracksExtendedConverted"), outputCollectionName = "Level1TTTracksExtendedSelected", - cutSet = cms.PSet( - ptMin = cms.double(3.0), # pt must be greater than this value, [GeV] - absEtaMax = cms.double(2.4), # absolute value of eta must be less than this value - absZ0Max = cms.double(15.0), # z0 must be less than this value, [cm] - nStubsMin = cms.int32(4), # number of stubs must be greater than or equal to this value - nPSStubsMin = cms.int32(0), # the number of stubs in the PS Modules must be greater than or equal to this value - - reducedBendChi2Max = cms.double(2.4), # bend chi2 must be less than this value - reducedChi2RZMax = cms.double(10.0), # chi2rz/dof must be less than this value - reducedChi2RPhiMax = cms.double(40.0), # chi2rphi/dof must be less than this value - - deltaZMaxEtaBounds = cms.vdouble(0.0, 0.7, 1.0, 1.2, 1.6, 2.0, 2.4), # these values define the bin boundaries in |eta| - deltaZMax = cms.vdouble(3.0, 3.0, 3.0, 3.0, 3.0, 3.0), # delta z must be less than these values, there will be one less value here than in deltaZMaxEtaBounds, [cm] + cutSet = dict( + ptMin = 3.0, # pt must be greater than this value, [GeV] + absEtaMax = 2.4, # absolute value of eta must be less than this value + absZ0Max = 15.0, # z0 must be less than this value, [cm] + nStubsMin = 4, # number of stubs must be greater than or equal to this value + nPSStubsMin = 0, # the number of stubs in the PS Modules must be greater than or equal to this value + + reducedBendChi2Max = 2.4, # bend chi2 must be less than this value + reducedChi2RZMax = 10.0, # chi2rz/dof must be less than this value + reducedChi2RPhiMax = 40.0, # chi2rphi/dof must be less than this value + + deltaZMaxEtaBounds = [0.0, 0.7, 1.0, 1.2, 1.6, 2.0, 2.4], # these values define the bin boundaries in |eta| + deltaZMax = [3.0, 3.0, 3.0, 3.0, 3.0, 3.0], # delta z must be less than these values, there will be one less value here than in deltaZMaxEtaBounds, [cm] ), - useDisplacedTracksDeltaZOverride = cms.double(3.0), # Use promt/displaced tracks + useDisplacedTracksDeltaZOverride = 3.0, # Use promt/displaced tracks ) diff --git a/L1Trigger/L1TTrackMatch/python/L1TrackerEtMissEmulatorProducer_cfi.py b/L1Trigger/L1TTrackMatch/python/L1TrackerEtMissEmulatorProducer_cfi.py index 445f9580d671a..908f542100737 100644 --- a/L1Trigger/L1TTrackMatch/python/L1TrackerEtMissEmulatorProducer_cfi.py +++ b/L1Trigger/L1TTrackMatch/python/L1TrackerEtMissEmulatorProducer_cfi.py @@ -1,13 +1,13 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.VertexFinder.VertexProducer_cff import VertexProducer -from L1Trigger.L1TTrackMatch.L1TrackSelectionProducer_cfi import L1TrackSelectionProducer +from L1Trigger.VertexFinder.VertexProducer_cff import l1tVertexProducer +from L1Trigger.L1TTrackMatch.L1TrackSelectionProducer_cfi import l1tTrackSelectionProducer -L1TrackerEmuEtMiss = cms.EDProducer('L1TrackerEtMissEmulatorProducer', - L1TrackInputTag = cms.InputTag("L1TrackSelectionProducer", L1TrackSelectionProducer.outputCollectionName.value() + "Emulation"), - L1TrackAssociatedInputTag = cms.InputTag("L1TrackSelectionProducer", L1TrackSelectionProducer.outputCollectionName.value() + "AssociatedEmulation"), +l1tTrackerEmuEtMiss = cms.EDProducer('L1TrackerEtMissEmulatorProducer', + L1TrackInputTag = cms.InputTag("l1tTrackSelectionProducer", l1tTrackSelectionProducer.outputCollectionName.value() + "Emulation"), + L1TrackAssociatedInputTag = cms.InputTag("l1tTrackSelectionProducer", l1tTrackSelectionProducer.outputCollectionName.value() + "AssociatedEmulation"), # To bypass GTT input module use cms.InputTag("TTTracksFromTrackletEmulation", "Level1TTTracks") # and set useGTTinput to false - L1VertexInputTag = cms.InputTag("VertexProducer", VertexProducer.l1VertexCollectionName.value()), + L1VertexInputTag = cms.InputTag("l1tVertexProducer", l1tVertexProducer.l1VertexCollectionName.value()), # This will use the vertex algorithm as specified in VertexProducer_cff, if using emulated vertex # set useVertexEmulator to true L1MetCollectionName = cms.string("L1TrackerEmuEtMiss"), diff --git a/L1Trigger/L1TTrackMatch/python/L1TrackerEtMissProducer_cfi.py b/L1Trigger/L1TTrackMatch/python/L1TrackerEtMissProducer_cfi.py index 288fe91848569..ca05c1cabc2dd 100644 --- a/L1Trigger/L1TTrackMatch/python/L1TrackerEtMissProducer_cfi.py +++ b/L1Trigger/L1TTrackMatch/python/L1TrackerEtMissProducer_cfi.py @@ -1,10 +1,10 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.VertexFinder.VertexProducer_cff import VertexProducer -from L1Trigger.L1TTrackMatch.L1TrackSelectionProducer_cfi import L1TrackSelectionProducer, L1TrackSelectionProducerExtended +from L1Trigger.VertexFinder.VertexProducer_cff import l1tVertexProducer +from L1Trigger.L1TTrackMatch.L1TrackSelectionProducer_cfi import l1tTrackSelectionProducer, l1tTrackSelectionProducerExtended -L1TrackerEtMiss = cms.EDProducer('L1TrackerEtMissProducer', - L1TrackInputTag = cms.InputTag("L1TrackSelectionProducer", L1TrackSelectionProducer.outputCollectionName.value()), - L1TrackAssociatedInputTag = cms.InputTag("L1TrackSelectionProducer", L1TrackSelectionProducer.outputCollectionName.value() + "Associated"), +l1tTrackerEtMiss = cms.EDProducer('L1TrackerEtMissProducer', + L1TrackInputTag = cms.InputTag("L1TrackSelectionProducer", l1tTrackSelectionProducer.outputCollectionName.value()), + L1TrackAssociatedInputTag = cms.InputTag("L1TrackSelectionProducer", l1tTrackSelectionProducer.outputCollectionName.value() + "Associated"), L1MetCollectionName = cms.string("L1TrackerEtMiss"), maxPt = cms.double(-10.) , # in GeV. When maxPt > 0, tracks with PT above maxPt are considered as # mismeasured and are treated according to highPtTracks below. @@ -15,8 +15,8 @@ debug = cms.bool(False) ) -L1TrackerEtMissExtended = L1TrackerEtMiss.clone( #NOT OPTIMIZED, STUDIED, OR USED - L1TrackInputTag = ("L1TrackSelectionProducerExtended", L1TrackSelectionProducerExtended.outputCollectionName.value()), - L1TrackAssociatedInputTag = ("L1TrackSelectionProducerExtended", L1TrackSelectionProducerExtended.outputCollectionName.value() + "Associated"), +l1tTrackerEtMissExtended = l1tTrackerEtMiss.clone( #NOT OPTIMIZED, STUDIED, OR USED + L1TrackInputTag = ("L1TrackSelectionProducerExtended", l1tTrackSelectionProducerExtended.outputCollectionName.value()), + L1TrackAssociatedInputTag = ("L1TrackSelectionProducerExtended", l1tTrackSelectionProducerExtended.outputCollectionName.value() + "Associated"), L1MetCollectionName = "L1TrackerExtendedEtMiss", ) diff --git a/L1Trigger/L1TTrackMatch/test/L1TrackMET_cfg.py b/L1Trigger/L1TTrackMatch/test/L1TrackMET_cfg.py index ca73009d2f861..78b65e76a662c 100644 --- a/L1Trigger/L1TTrackMatch/test/L1TrackMET_cfg.py +++ b/L1Trigger/L1TTrackMatch/test/L1TrackMET_cfg.py @@ -72,14 +72,14 @@ ############################################################ process.load('L1Trigger.VertexFinder.VertexProducer_cff') -process.VertexProducer.l1TracksInputTag = cms.InputTag("TTTracksFromTrackletEmulation", "Level1TTTracks") +process.l1tVertexProducer.l1TracksInputTag = cms.InputTag("TTTracksFromTrackletEmulation", "Level1TTTracks") -producerSum += process.VertexProducer +producerSum += process.l1tVertexProducer producerName = 'VertexProducer{0}'.format("fastHisto") producerName = producerName.replace(".","p") # legalize the name -producer = process.VertexProducer.clone() +producer = process.l1tVertexProducer.clone() producer.VertexReconstruction.Algorithm = cms.string("fastHisto") process.L1TrackerEtMiss.L1VertexInputTag = cms.InputTag(producerName,"l1vertices") @@ -91,18 +91,18 @@ process.L1TrackerEmuEtMiss.useGTTinput = GTTInput if GTTInput: - process.L1TrackerEmuEtMiss.L1TrackInputTag = cms.InputTag("L1GTTInputProducer","Level1TTTracksConverted") + process.L1TrackerEmuEtMiss.L1TrackInputTag = cms.InputTag("l1tGTTInputProducer","Level1TTTracksConverted") else: process.L1TrackerEmuEtMiss.L1TrackInputTag = cms.InputTag("TTTracksFromTrackletEmulation", "Level1TTTracks") EmuproducerName = 'VertexProducer{0}'.format("fastHistoEmulation") EmuproducerName = EmuproducerName.replace(".","p") # legalize the name -Emuproducer = process.VertexProducer.clone() +Emuproducer = process.l1tVertexProducer.clone() Emuproducer.VertexReconstruction.Algorithm = cms.string("fastHistoEmulation") process.L1TrackerEmuEtMiss.L1VertexInputTag = cms.InputTag(EmuproducerName,"l1verticesEmulation") if GTTInput: - Emuproducer.l1TracksInputTag = cms.InputTag("L1GTTInputProducer","Level1TTTracksConverted") + Emuproducer.l1TracksInputTag = cms.InputTag("l1tGTTInputProducer","Level1TTTracksConverted") else: Emuproducer.l1TracksInputTag = cms.InputTag("TTTracksFromTrackletEmulation", "Level1TTTracks") diff --git a/L1Trigger/L1TTrackMatch/test/L1TrackObjectNtupleMaker_cfg.py b/L1Trigger/L1TTrackMatch/test/L1TrackObjectNtupleMaker_cfg.py index 4e3396cbed916..5d4b2b48668e3 100644 --- a/L1Trigger/L1TTrackMatch/test/L1TrackObjectNtupleMaker_cfg.py +++ b/L1Trigger/L1TTrackMatch/test/L1TrackObjectNtupleMaker_cfg.py @@ -106,7 +106,7 @@ process.pPV = cms.Path(process.L1VertexFinder) process.L1VertexFinderEmulator = process.VertexProducer.clone() process.L1VertexFinderEmulator.VertexReconstruction.Algorithm = "fastHistoEmulation" -process.L1VertexFinderEmulator.l1TracksInputTag = cms.InputTag("L1GTTInputProducer","Level1TTTracksConverted") +process.L1VertexFinderEmulator.l1TracksInputTag = cms.InputTag("l1tGTTInputProducer","Level1TTTracksConverted") process.pPVemu = cms.Path(process.L1VertexFinderEmulator) process.L1TrackFastJets.L1PrimaryVertexTag = cms.InputTag("L1VertexFinder", "l1vertices") @@ -194,12 +194,12 @@ L1TrackExtendedInputTag = cms.InputTag("TTTracksFromExtendedTrackletEmulation", "Level1TTTracks"), # TTTracks, extended MCTruthTrackInputTag = cms.InputTag("TTTrackAssociatorFromPixelDigis", "Level1TTTracks"), # MCTruth track, prompt MCTruthTrackExtendedInputTag = cms.InputTag("TTTrackAssociatorFromPixelDigisExtended", "Level1TTTracks"), # MCTruth track, extended - L1TrackGTTInputTag = cms.InputTag("L1GTTInputProducer","Level1TTTracksConverted"), # TTTracks, prompt, GTT converted - L1TrackExtendedGTTInputTag = cms.InputTag("L1GTTInputProducerExtended","Level1TTTracksExtendedConverted"), # TTTracks, extended, GTT converted - L1TrackSelectedInputTag = cms.InputTag("L1TrackSelectionProducer", "Level1TTTracksSelected"), # TTTracks, prompt, selected - L1TrackSelectedEmulationInputTag = cms.InputTag("L1TrackSelectionProducer", "Level1TTTracksSelectedEmulation"), # TTTracks, prompt, emulation, selected - L1TrackExtendedSelectedInputTag = cms.InputTag("L1TrackSelectionProducerExtended", "Level1TTTracksExtendedSelected"), # TTTracks, extended, selected - L1TrackExtendedSelectedEmulationInputTag = cms.InputTag("L1TrackSelectionProducerExtended", "Level1TTTracksExtendedSelectedEmulation"), # TTTracks, extended, emulation, selected + L1TrackGTTInputTag = cms.InputTag("l1tGTTInputProducer","Level1TTTracksConverted"), # TTTracks, prompt, GTT converted + L1TrackExtendedGTTInputTag = cms.InputTag("l1tGTTInputProducerExtended","Level1TTTracksExtendedConverted"), # TTTracks, extended, GTT converted + L1TrackSelectedInputTag = cms.InputTag("l1tTrackSelectionProducer", "Level1TTTracksSelected"), # TTTracks, prompt, selected + L1TrackSelectedEmulationInputTag = cms.InputTag("l1tTrackSelectionProducer", "Level1TTTracksSelectedEmulation"), # TTTracks, prompt, emulation, selected + L1TrackExtendedSelectedInputTag = cms.InputTag("l1tTrackSelectionProducerExtended", "Level1TTTracksExtendedSelected"), # TTTracks, extended, selected + L1TrackExtendedSelectedEmulationInputTag = cms.InputTag("l1tTrackSelectionProducerExtended", "Level1TTTracksExtendedSelectedEmulation"), # TTTracks, extended, emulation, selected L1StubInputTag = cms.InputTag("TTStubsFromPhase2TrackerDigis","StubAccepted"), MCTruthClusterInputTag = cms.InputTag("TTClusterAssociatorFromPixelDigis", "ClusterAccepted"), MCTruthStubInputTag = cms.InputTag("TTStubAssociatorFromPixelDigis", "StubAccepted"), diff --git a/L1Trigger/Phase2L1GMT/python/gmt_cfi.py b/L1Trigger/Phase2L1GMT/python/gmt_cfi.py index 858005d14881b..22326d8b71ed1 100644 --- a/L1Trigger/Phase2L1GMT/python/gmt_cfi.py +++ b/L1Trigger/Phase2L1GMT/python/gmt_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -gmtStubs = cms.EDProducer("Phase2L1TGMTStubProducer", +l1tGMTStubs = cms.EDProducer("Phase2L1TGMTStubProducer", verbose = cms.int32(0), srcCSC = cms.InputTag("simCscTriggerPrimitiveDigis"), srcDT = cms.InputTag("dtTriggerPhase2PrimitiveDigis"), @@ -43,7 +43,7 @@ -gmtMuons = cms.EDProducer('Phase2L1TGMTProducer', +l1tGMTMuons = cms.EDProducer('Phase2L1TGMTProducer', srcTracks = cms.InputTag("TTTracksFromTrackletEmulation:Level1TTTracks"), srcStubs = cms.InputTag('gmtStubs'), srcBMTF = cms.InputTag('simBmtfDigis','BMTF'), @@ -76,7 +76,7 @@ ) -standaloneMuons = cms.EDProducer('Phase2L1TGMTSAMuonProducer', +l1tStandaloneMuons = cms.EDProducer('Phase2L1TGMTSAMuonProducer', muonToken = cms.InputTag('simGmtStage2Digis'), Nprompt = cms.uint32(12), Ndisplaced = cms.uint32(12) diff --git a/L1Trigger/Phase2L1ParticleFlow/python/DeregionizerProducer_cfi.py b/L1Trigger/Phase2L1ParticleFlow/python/DeregionizerProducer_cfi.py index d010a5cd6de33..2ac0b378a0f13 100644 --- a/L1Trigger/Phase2L1ParticleFlow/python/DeregionizerProducer_cfi.py +++ b/L1Trigger/Phase2L1ParticleFlow/python/DeregionizerProducer_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -DeregionizerProducer = cms.EDProducer("DeregionizerProducer", - RegionalPuppiCands = cms.InputTag("l1ctLayer1","PuppiRegional"), +l1tDeregionizerProducer = cms.EDProducer("DeregionizerProducer", + RegionalPuppiCands = cms.InputTag("l1tLayer1","PuppiRegional"), nPuppiFinalBuffer = cms.uint32(128), nPuppiPerClk = cms.uint32(6), nPuppiFirstBuffers = cms.uint32(12), diff --git a/L1Trigger/Phase2L1ParticleFlow/python/L1MetPfProducer_cfi.py b/L1Trigger/Phase2L1ParticleFlow/python/L1MetPfProducer_cfi.py index 7687521ed327a..52e45f324d441 100644 --- a/L1Trigger/Phase2L1ParticleFlow/python/L1MetPfProducer_cfi.py +++ b/L1Trigger/Phase2L1ParticleFlow/python/L1MetPfProducer_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -L1MetPfProducer = cms.EDProducer("L1MetPfProducer", - L1PFObjects = cms.InputTag("l1ctLayer1","Puppi"), +l1tMETPFProducer = cms.EDProducer("L1MetPfProducer", + L1PFObjects = cms.InputTag("l1tLayer1","Puppi"), maxCands = cms.int32(128), ) diff --git a/L1Trigger/Phase2L1ParticleFlow/python/L1MhtPfProducer_cfi.py b/L1Trigger/Phase2L1ParticleFlow/python/L1MhtPfProducer_cfi.py index d6799b3adbb24..31e3f57591c9e 100644 --- a/L1Trigger/Phase2L1ParticleFlow/python/L1MhtPfProducer_cfi.py +++ b/L1Trigger/Phase2L1ParticleFlow/python/L1MhtPfProducer_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -L1MhtPfProducer = cms.EDProducer("L1MhtPfProducer", - jets = cms.InputTag("scPFL1PuppiEmulator"), +l1tMHTPFProducer = cms.EDProducer("L1MhtPfProducer", + jets = cms.InputTag("l1tSCPFL1PuppiEmulator"), minJetPt = cms.double(30.0), maxJetEta = cms.double(2.4) ) diff --git a/L1Trigger/Phase2L1ParticleFlow/python/L1NNTauProducer_cff.py b/L1Trigger/Phase2L1ParticleFlow/python/L1NNTauProducer_cff.py index 5a8e969bc8512..64083f6fa7931 100644 --- a/L1Trigger/Phase2L1ParticleFlow/python/L1NNTauProducer_cff.py +++ b/L1Trigger/Phase2L1ParticleFlow/python/L1NNTauProducer_cff.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.Phase2L1ParticleFlow.l1ctLayer1_cff import l1ctLayer1Barrel,l1ctLayer1HGCal,l1ctLayer1 +from L1Trigger.Phase2L1ParticleFlow.l1ctLayer1_cff import l1tLayer1Barrel,l1tLayer1HGCal,l1tLayer1 #from L1Trigger.Phase2L1ParticleFlow.L1NNTauProducer_cfi import * @@ -9,23 +9,23 @@ # ) -L1NNTauProducerPuppi = cms.EDProducer("L1NNTauProducer", +l1tNNTauProducerPuppi = cms.EDProducer("L1NNTauProducer", seedpt = cms.double(10), conesize = cms.double(0.4), tausize = cms.double(0.1), maxtaus = cms.int32(5), nparticles = cms.int32(10), - L1PFObjects = cms.InputTag("l1ctLayer1:Puppi"), #1pfCandidates:Puppi"),#l1pfCandidates + L1PFObjects = cms.InputTag("l1tLayer1:Puppi"), #1pfCandidates:Puppi"),#l1pfCandidates NNFileName = cms.string("L1Trigger/Phase2L1ParticleFlow/data/tau_3layer_puppi.pb") ) -L1NNTauProducerPF = cms.EDProducer("L1NNTauProducer", +l1tNNTauProducerPF = cms.EDProducer("L1NNTauProducer", seedpt = cms.double(10), conesize = cms.double(0.4), tausize = cms.double(0.1), maxtaus = cms.int32(5), nparticles = cms.int32(10), - L1PFObjects = cms.InputTag("l1ctLayer1:PF"),#l1pfCandidates + L1PFObjects = cms.InputTag("l1tLayer1:PF"),#l1pfCandidates NNFileName = cms.string("L1Trigger/Phase2L1ParticleFlow/data/tau_3layer.pb") ) diff --git a/L1Trigger/Phase2L1ParticleFlow/python/L1SeedConePFJetProducer_cfi.py b/L1Trigger/Phase2L1ParticleFlow/python/L1SeedConePFJetProducer_cfi.py index de92d4bb7d383..6f1aa6083a33e 100644 --- a/L1Trigger/Phase2L1ParticleFlow/python/L1SeedConePFJetProducer_cfi.py +++ b/L1Trigger/Phase2L1ParticleFlow/python/L1SeedConePFJetProducer_cfi.py @@ -1,12 +1,12 @@ import FWCore.ParameterSet.Config as cms -L1SeedConePFJetProducer = cms.EDProducer("L1SeedConePFJetProducer", - L1PFObjects = cms.InputTag("l1ctLayer1","Puppi"), +l1tSeedConePFJetProducer = cms.EDProducer("L1SeedConePFJetProducer", + L1PFObjects = cms.InputTag("l1tLayer1","Puppi"), nJets = cms.uint32(10), coneSize = cms.double(0.4), HW = cms.bool(False), debug = cms.bool(False) ) -L1SeedConePFJetEmulatorProducer = L1SeedConePFJetProducer.clone(HW = True) +l1tSeedConePFJetEmulatorProducer = l1tSeedConePFJetProducer.clone(HW = True) diff --git a/L1Trigger/Phase2L1ParticleFlow/python/l1ctJetFileWriter_cfi.py b/L1Trigger/Phase2L1ParticleFlow/python/l1ctJetFileWriter_cfi.py index 226bc381ac4d8..3d1dbe877ebaf 100644 --- a/L1Trigger/Phase2L1ParticleFlow/python/l1ctJetFileWriter_cfi.py +++ b/L1Trigger/Phase2L1ParticleFlow/python/l1ctJetFileWriter_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -l1ctSeededConeJetFileWriter = cms.EDAnalyzer('L1CTJetFileWriter', - jets = cms.InputTag("scPFL1PuppiEmulator"), +l1tSeededConeJetFileWriter = cms.EDAnalyzer('L1CTJetFileWriter', + jets = cms.InputTag("l1tSCPFL1PuppiEmulator"), nJets = cms.uint32(12), nFramesPerBX = cms.uint32(9), # 360 MHz clock or 25 Gb/s link TMUX = cms.uint32(6), diff --git a/L1Trigger/Phase2L1ParticleFlow/python/l1ctLayer1_cff.py b/L1Trigger/Phase2L1ParticleFlow/python/l1ctLayer1_cff.py index f554065241f29..37a3bcab5b874 100644 --- a/L1Trigger/Phase2L1ParticleFlow/python/l1ctLayer1_cff.py +++ b/L1Trigger/Phase2L1ParticleFlow/python/l1ctLayer1_cff.py @@ -14,12 +14,12 @@ dxyScale = cms.double(3.85) ) -l1ctLayer1Barrel = cms.EDProducer("L1TCorrelatorLayer1Producer", +l1tLayer1Barrel = cms.EDProducer("L1TCorrelatorLayer1Producer", tracks = cms.InputTag('pfTracksFromL1Tracks'), - muons = cms.InputTag('L1SAMuonsGmt','promptSAMuons'), + muons = cms.InputTag('l1tSAMuonsGmt','promptSAMuons'), emClusters = cms.VInputTag(cms.InputTag('pfClustersFromL1EGClusters')), hadClusters = cms.VInputTag(cms.InputTag('pfClustersFromCombinedCaloHCal:calibrated')), - vtxCollection = cms.InputTag("L1VertexFinderEmulator","l1verticesEmulation"), + vtxCollection = cms.InputTag("l1tVertexFinderEmulator","l1verticesEmulation"), vtxCollectionEmulation = cms.bool(True), emPtCut = cms.double(0.5), hadPtCut = cms.double(1.0), @@ -151,12 +151,12 @@ ) -l1ctLayer1HGCal = cms.EDProducer("L1TCorrelatorLayer1Producer", +l1tLayer1HGCal = cms.EDProducer("L1TCorrelatorLayer1Producer", tracks = cms.InputTag('pfTracksFromL1Tracks'), - muons = cms.InputTag('L1SAMuonsGmt','promptSAMuons'), + muons = cms.InputTag('l1tSAMuonsGmt','promptSAMuons'), emClusters = cms.VInputTag(cms.InputTag('pfClustersFromHGC3DClusters:egamma')), # used only for E/gamma hadClusters = cms.VInputTag(cms.InputTag('pfClustersFromHGC3DClusters')), - vtxCollection = cms.InputTag("L1VertexFinderEmulator","l1verticesEmulation"), + vtxCollection = cms.InputTag("l1tVertexFinderEmulator","l1verticesEmulation"), vtxCollectionEmulation = cms.bool(True), nVtx = cms.int32(1), emPtCut = cms.double(0.5), @@ -286,12 +286,12 @@ ) -l1ctLayer1HGCalNoTK = cms.EDProducer("L1TCorrelatorLayer1Producer", +l1tLayer1HGCalNoTK = cms.EDProducer("L1TCorrelatorLayer1Producer", tracks = cms.InputTag(''), - muons = cms.InputTag('L1SAMuonsGmt','promptSAMuons'), + muons = cms.InputTag('l1tSAMuonsGmt','promptSAMuons'), emClusters = cms.VInputTag(cms.InputTag('pfClustersFromHGC3DClusters:egamma')), # used only for E/gamma hadClusters = cms.VInputTag(cms.InputTag('pfClustersFromHGC3DClusters')), - vtxCollection = cms.InputTag("L1VertexFinderEmulator","l1verticesEmulation"), + vtxCollection = cms.InputTag("l1tVertexFinderEmulator","l1verticesEmulation"), vtxCollectionEmulation = cms.bool(True), nVtx = cms.int32(1), emPtCut = cms.double(0.5), @@ -368,14 +368,14 @@ writeRawHgcalCluster = cms.untracked.bool(True) ) -l1ctLayer1HF = cms.EDProducer("L1TCorrelatorLayer1Producer", +l1tLayer1HF = cms.EDProducer("L1TCorrelatorLayer1Producer", tracks = cms.InputTag(''), - muons = cms.InputTag('L1SAMuonsGmt','promptSAMuons'), + muons = cms.InputTag('l1tSAMuonsGmt','promptSAMuons'), useStandaloneMuons = cms.bool(False), useTrackerMuons = cms.bool(False), emClusters = cms.VInputTag(), hadClusters = cms.VInputTag(cms.InputTag('pfClustersFromCombinedCaloHF:calibrated')), - vtxCollection = cms.InputTag("L1VertexFinderEmulator","l1verticesEmulation"), + vtxCollection = cms.InputTag("l1tVertexFinderEmulator","l1verticesEmulation"), vtxCollectionEmulation = cms.bool(True), nVtx = cms.int32(1), emPtCut = cms.double(0.5), @@ -456,30 +456,30 @@ ) -l1ctLayer1 = cms.EDProducer("L1TPFCandMultiMerger", +l1tLayer1 = cms.EDProducer("L1TPFCandMultiMerger", pfProducers = cms.VInputTag( - cms.InputTag("l1ctLayer1Barrel"), - cms.InputTag("l1ctLayer1HGCal"), - cms.InputTag("l1ctLayer1HGCalNoTK"), - cms.InputTag("l1ctLayer1HF") + cms.InputTag("l1tLayer1Barrel"), + cms.InputTag("l1tLayer1HGCal"), + cms.InputTag("l1tLayer1HGCalNoTK"), + cms.InputTag("l1tLayer1HF") ), labelsToMerge = cms.vstring("PF", "Puppi", "Calo", "TK"), regionalLabelsToMerge = cms.vstring("Puppi"), ) -l1ctLayer1EG = cms.EDProducer( +l1tLayer1EG = cms.EDProducer( "L1TEGMultiMerger", tkElectrons=cms.VPSet( cms.PSet( instance=cms.string("L1TkEleEE"), pfProducers=cms.VInputTag( - cms.InputTag("l1ctLayer1HGCal", 'L1TkEle') + cms.InputTag("l1tLayer1HGCal", 'L1TkEle') ) ), cms.PSet( instance=cms.string("L1TkEleEB"), pfProducers=cms.VInputTag( - cms.InputTag("l1ctLayer1Barrel", 'L1TkEle') + cms.InputTag("l1tLayer1Barrel", 'L1TkEle') ) ) ), @@ -487,14 +487,14 @@ cms.PSet( instance=cms.string("L1TkEmEE"), pfProducers=cms.VInputTag( - cms.InputTag("l1ctLayer1HGCal", 'L1TkEm'), - cms.InputTag("l1ctLayer1HGCalNoTK", 'L1TkEm') + cms.InputTag("l1tLayer1HGCal", 'L1TkEm'), + cms.InputTag("l1tLayer1HGCalNoTK", 'L1TkEm') ) ), cms.PSet( instance=cms.string("L1TkEmEB"), pfProducers=cms.VInputTag( - cms.InputTag("l1ctLayer1Barrel", 'L1TkEm') + cms.InputTag("l1tLayer1Barrel", 'L1TkEm') ) ) ), @@ -502,14 +502,14 @@ cms.PSet( instance=cms.string("L1EgEE"), pfProducers=cms.VInputTag( - cms.InputTag("l1ctLayer1HGCal", 'L1Eg'), - cms.InputTag("l1ctLayer1HGCalNoTK", 'L1Eg') + cms.InputTag("l1tLayer1HGCal", 'L1Eg'), + cms.InputTag("l1tLayer1HGCalNoTK", 'L1Eg') ) ) ) ) -l1ctLayer1TaskInputsTask = cms.Task( +L1TLayer1TaskInputsTask = cms.Task( pfClustersFromL1EGClusters, pfClustersFromCombinedCaloHCal, pfClustersFromCombinedCaloHF, @@ -517,11 +517,11 @@ pfTracksFromL1Tracks ) -l1ctLayer1Task = cms.Task( - l1ctLayer1Barrel, - l1ctLayer1HGCal, - l1ctLayer1HGCalNoTK, - l1ctLayer1HF, - l1ctLayer1, - l1ctLayer1EG +L1TLayer1Task = cms.Task( + l1tLayer1Barrel, + l1tLayer1HGCal, + l1tLayer1HGCalNoTK, + l1tLayer1HF, + l1tLayer1, + l1tLayer1EG ) diff --git a/L1Trigger/Phase2L1ParticleFlow/python/l1ctLayer2EG_cff.py b/L1Trigger/Phase2L1ParticleFlow/python/l1ctLayer2EG_cff.py index af063d32cce49..56e93b10e5957 100644 --- a/L1Trigger/Phase2L1ParticleFlow/python/l1ctLayer2EG_cff.py +++ b/L1Trigger/Phase2L1ParticleFlow/python/l1ctLayer2EG_cff.py @@ -1,38 +1,38 @@ import FWCore.ParameterSet.Config as cms -l1ctLayer2EG = cms.EDProducer( +l1tLayer2EG = cms.EDProducer( "L1TCtL2EgProducer", tkElectrons=cms.VPSet( cms.PSet( - pfProducer=cms.InputTag("l1ctLayer1HGCal", 'L1TkElePerBoard'), + pfProducer=cms.InputTag("l1tLayer1HGCal", 'L1TkElePerBoard'), channels=cms.vint32(3, 4) ), cms.PSet( - pfProducer=cms.InputTag("l1ctLayer1Barrel", 'L1TkElePerBoard'), + pfProducer=cms.InputTag("l1tLayer1Barrel", 'L1TkElePerBoard'), channels=cms.vint32(0, 1, 2) ), ), tkEms=cms.VPSet( cms.PSet( - pfProducer=cms.InputTag("l1ctLayer1HGCal", 'L1TkEmPerBoard'), + pfProducer=cms.InputTag("l1tLayer1HGCal", 'L1TkEmPerBoard'), channels=cms.vint32(3, 4) ), cms.PSet( - pfProducer=cms.InputTag("l1ctLayer1HGCalNoTK", 'L1TkEmPerBoard'), + pfProducer=cms.InputTag("l1tLayer1HGCalNoTK", 'L1TkEmPerBoard'), channels=cms.vint32(-1) ), cms.PSet( - pfProducer=cms.InputTag("l1ctLayer1Barrel", 'L1TkEmPerBoard'), + pfProducer=cms.InputTag("l1tLayer1Barrel", 'L1TkEmPerBoard'), channels=cms.vint32(0, 1, 2) ), ), tkEgs=cms.VPSet( cms.PSet( - pfProducer=cms.InputTag("l1ctLayer1HGCal", 'L1Eg'), + pfProducer=cms.InputTag("l1tLayer1HGCal", 'L1Eg'), channels=cms.vint32(-1) ), cms.PSet( - pfProducer=cms.InputTag("l1ctLayer1HGCalNoTK", 'L1Eg'), + pfProducer=cms.InputTag("l1tLayer1HGCalNoTK", 'L1Eg'), channels=cms.vint32(-1) ), ), @@ -132,6 +132,6 @@ ) -l1ctLayer2EGTask = cms.Task( - l1ctLayer2EG +L1TLayer2EGTask = cms.Task( + l1tLayer2EG ) diff --git a/L1Trigger/Phase2L1ParticleFlow/python/l1pfJetMet_cff.py b/L1Trigger/Phase2L1ParticleFlow/python/l1pfJetMet_cff.py index 19287245d4686..dbc8b35b125fd 100644 --- a/L1Trigger/Phase2L1ParticleFlow/python/l1pfJetMet_cff.py +++ b/L1Trigger/Phase2L1ParticleFlow/python/l1pfJetMet_cff.py @@ -1,10 +1,10 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.Phase2L1ParticleFlow.L1SeedConePFJetProducer_cfi import L1SeedConePFJetProducer, L1SeedConePFJetEmulatorProducer -from L1Trigger.Phase2L1ParticleFlow.DeregionizerProducer_cfi import DeregionizerProducer as l1ctLayer2Deregionizer -scPFL1PF = L1SeedConePFJetProducer.clone(L1PFObjects = 'l1ctLayer1:PF') -scPFL1Puppi = L1SeedConePFJetProducer.clone() -scPFL1PuppiEmulator = L1SeedConePFJetEmulatorProducer.clone(L1PFObject = cms.InputTag('l1ctLayer2Deregionizer:Puppi')) +from L1Trigger.Phase2L1ParticleFlow.L1SeedConePFJetProducer_cfi import l1tSeedConePFJetProducer, l1tSeedConePFJetEmulatorProducer +from L1Trigger.Phase2L1ParticleFlow.DeregionizerProducer_cfi import l1tDeregionizerProducer as l1tLayer2Deregionizer +l1tSCPFL1PF = l1tSeedConePFJetProducer.clone(L1PFObjects = 'l1tLayer1:PF') +l1tSCPFL1Puppi = l1tSeedConePFJetProducer.clone() +l1tSCPFL1PuppiEmulator = l1tSeedConePFJetEmulatorProducer.clone(L1PFObject = cms.InputTag('l1tLayer2Deregionizer:Puppi')) _correctedJets = cms.EDProducer("L1TCorrectedPFJetProducer", jets = cms.InputTag("_tag_"), @@ -17,13 +17,13 @@ from Configuration.Eras.Modifier_phase2_hgcalV11_cff import phase2_hgcalV11 phase2_hgcalV11.toModify(_correctedJets, correctorFile = "L1Trigger/Phase2L1ParticleFlow/data/jecs/jecs.PU200_110X.root") -scPFL1PuppiCorrectedEmulator = _correctedJets.clone(jets = 'scPFL1PuppiEmulator', correctorDir = 'L1PuppiSC4EmuDeregJets') +l1tSCPFL1PuppiCorrectedEmulator = _correctedJets.clone(jets = 'l1tSCPFL1PuppiEmulator', correctorDir = 'L1PuppiSC4EmuDeregJets') -from L1Trigger.Phase2L1ParticleFlow.L1MhtPfProducer_cfi import L1MhtPfProducer -scPFL1PuppiCorrectedEmulatorMHT = L1MhtPfProducer.clone() +from L1Trigger.Phase2L1ParticleFlow.L1MhtPfProducer_cfi import l1tMHTPFProducer +l1tSCPFL1PuppiCorrectedEmulatorMHT = l1tMHTPFProducer.clone() -l1PFJetsTask = cms.Task( - l1ctLayer2Deregionizer, scPFL1PF, scPFL1Puppi, scPFL1PuppiEmulator, scPFL1PuppiCorrectedEmulator, scPFL1PuppiCorrectedEmulatorMHT +L1TPFJetsTask = cms.Task( + l1tLayer2Deregionizer, l1tSCPFL1PF, l1tSCPFL1Puppi, l1tSCPFL1PuppiEmulator, l1tSCPFL1PuppiCorrectedEmulator, l1tSCPFL1PuppiCorrectedEmulatorMHT ) diff --git a/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromCombinedCalo_cfi.py b/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromCombinedCalo_cfi.py index 15cbb2308957f..3d26a07faaa70 100644 --- a/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromCombinedCalo_cfi.py +++ b/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromCombinedCalo_cfi.py @@ -6,7 +6,7 @@ hcalDigis = cms.VInputTag(cms.InputTag('simHcalTriggerPrimitiveDigis')), hcalDigisBarrel = cms.bool(False), hcalDigisHF = cms.bool(True), - phase2barrelCaloTowers = cms.VInputTag(cms.InputTag("L1EGammaClusterEmuProducer","L1CaloTowerCollection","")), + phase2barrelCaloTowers = cms.VInputTag(cms.InputTag("l1tEGammaClusterEmuProducer","L1CaloTowerCollection","")), hcalHGCTowers = cms.VInputTag(cms.InputTag("hgcalTowerProducer:HGCalTowerProcessor") ), hcalHGCTowersHadOnly = cms.bool(False), # take also EM part from towers emCorrector = cms.string(""), # no need to correct further diff --git a/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromL1EGClusters_cfi.py b/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromL1EGClusters_cfi.py index ff4e72aa7ec17..317813082842c 100644 --- a/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromL1EGClusters_cfi.py +++ b/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromL1EGClusters_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms pfClustersFromL1EGClusters = cms.EDProducer("PFClusterProducerFromL1EGClusters", - src = cms.InputTag("L1EGammaClusterEmuProducer",), + src = cms.InputTag("l1tEGammaClusterEmuProducer",), etMin = cms.double(0.5), corrector = cms.string("L1Trigger/Phase2L1ParticleFlow/data/emcorr_barrel.root"), resol = cms.PSet( diff --git a/L1Trigger/Phase2L1ParticleFlow/test/make_l1ctLayer1_dumpFiles_cfg.py b/L1Trigger/Phase2L1ParticleFlow/test/make_l1ctLayer1_dumpFiles_cfg.py index 536f8b9391c93..31ea87a5cd751 100644 --- a/L1Trigger/Phase2L1ParticleFlow/test/make_l1ctLayer1_dumpFiles_cfg.py +++ b/L1Trigger/Phase2L1ParticleFlow/test/make_l1ctLayer1_dumpFiles_cfg.py @@ -36,13 +36,13 @@ process.load('L1Trigger.VertexFinder.VertexProducer_cff') process.L1VertexFinderEmulator = process.VertexProducer.clone() process.L1VertexFinderEmulator.VertexReconstruction.Algorithm = "fastHistoEmulation" -process.L1VertexFinderEmulator.l1TracksInputTag = cms.InputTag("L1GTTInputProducer", "Level1TTTracksConverted") -from L1Trigger.Phase2L1GMT.gmt_cfi import standaloneMuons -process.L1SAMuonsGmt = standaloneMuons.clone() +process.L1VertexFinderEmulator.l1TracksInputTag = cms.InputTag("l1tGTTInputProducer", "Level1TTTracksConverted") +from L1Trigger.Phase2L1GMT.gmt_cfi import l1tStandaloneMuons +process.l1tSAMuonsGmt = l1tStandaloneMuons.clone() -process.l1ctLayer1Barrel9 = process.l1ctLayer1Barrel.clone() -process.l1ctLayer1Barrel9.regions[0].etaBoundaries = [ -1.5, -0.5, 0.5, 1.5 ] -process.l1ctLayer1Barrel9.boards=cms.VPSet( +process.l1tLayer1Barrel9 = process.l1tLayer1Barrel.clone() +process.l1tLayer1Barrel9.regions[0].etaBoundaries = [ -1.5, -0.5, 0.5, 1.5 ] +process.l1tLayer1Barrel9.boards=cms.VPSet( cms.PSet( regions=cms.vuint32(list(range(0, 3)) + [x+9 for x in range(0, 3)] + [x+18 for x in range(0, 3)])), cms.PSet( @@ -52,28 +52,28 @@ ) process.runPF = cms.Path( - process.L1SAMuonsGmt + - process.L1GTTInputProducer + - process.L1VertexFinderEmulator + + process.l1tSAMuonsGmt + + process.l1tGTTInputProducer + + process.l1tVertexFinderEmulator + process.pfTracksFromL1Tracks + - process.l1ParticleFlow_calo + - process.l1ctLayer1Barrel + - process.l1ctLayer1Barrel9 + - process.l1ctLayer1HGCal + - process.l1ctLayer1HGCalNoTK + - process.l1ctLayer1HF + - process.l1ctLayer1 + - process.l1ctLayer2EG + process.l1tParticleFlow_calo + + process.l1tLayer1Barrel + + process.l1tLayer1Barrel9 + + process.l1tLayer1HGCal + + process.l1tLayer1HGCalNoTK + + process.l1tLayer1HF + + process.l1tLayer1 + + process.l1tLayer2EG ) if produceEGStage2Pattern: - process.l1ctLayer2EG.writeInPattern = True - process.l1ctLayer2EG.writeOutPattern = True + process.l1tLayer2EG.writeInPattern = True + process.l1tLayer2EG.writeOutPattern = True process.source.fileNames = [ '/store/cmst3/group/l1tr/gpetrucc/11_1_0/NewInputs110X/110121.done/TTbar_PU200/inputs110X_%d.root' % i for i in (1,3,7,8,9) ] -process.pfClustersFromCombinedCaloHCal.phase2barrelCaloTowers = [cms.InputTag("L1EGammaClusterEmuProducer",)] +process.pfClustersFromCombinedCaloHCal.phase2barrelCaloTowers = [cms.InputTag("l1tEGammaClusterEmuProducer",)] for det in "Barrel", "Barrel9", "HGCal", "HGCalNoTK", "HF": - l1pf = getattr(process, 'l1ctLayer1'+det) + l1pf = getattr(process, 'l1tLayer1'+det) l1pf.dumpFileName = cms.untracked.string("TTbar_PU200_110X_"+det+".dump") diff --git a/L1Trigger/Phase2L1ParticleFlow/test/make_l1ctLayer1_patternFiles_fromRAW_cfg.py b/L1Trigger/Phase2L1ParticleFlow/test/make_l1ctLayer1_patternFiles_fromRAW_cfg.py index abb2f14b3ccc5..582db20023eba 100644 --- a/L1Trigger/Phase2L1ParticleFlow/test/make_l1ctLayer1_patternFiles_fromRAW_cfg.py +++ b/L1Trigger/Phase2L1ParticleFlow/test/make_l1ctLayer1_patternFiles_fromRAW_cfg.py @@ -37,10 +37,10 @@ process.load("L1Trigger.TrackerDTC.ProducerED_cff") process.load("RecoVertex.BeamSpotProducer.BeamSpot_cfi") -process.l1ctLayer1Barrel9 = process.l1ctLayer1Barrel.clone() -process.l1ctLayer1Barrel9.puAlgo.nFinalSort = 32 -process.l1ctLayer1Barrel9.regions[0].etaBoundaries = [ -1.5, -0.5, 0.5, 1.5 ] -process.l1ctLayer1Barrel9.boards=cms.VPSet( +process.l1tLayer1Barrel9 = process.l1tLayer1Barrel.clone() +process.l1tLayer1Barrel9.puAlgo.nFinalSort = 32 +process.l1tLayer1Barrel9.regions[0].etaBoundaries = [ -1.5, -0.5, 0.5, 1.5 ] +process.l1tLayer1Barrel9.boards=cms.VPSet( cms.PSet( regions=cms.vuint32(*[0+9*ie+i for ie in range(3) for i in range(3)])), cms.PSet( @@ -49,7 +49,7 @@ regions=cms.vuint32(*[6+9*ie+i for ie in range(3) for i in range(3)])), ) -process.pfInputsTask = cms.Task( +process.PFInputsTask = cms.Task( process.TTClustersFromPhase2TrackerDigis, process.TTStubsFromPhase2TrackerDigis, process.TrackerDTCProducer, @@ -57,17 +57,17 @@ process.TTTracksFromTrackletEmulation, process.SimL1EmulatorTask ) -process.runPF = cms.Path( - process.l1ctLayer1Barrel + - process.l1ctLayer1Barrel9 + - process.l1ctLayer1HGCal + - process.l1ctLayer1HGCalNoTK + - process.l1ctLayer1HF +process.RunPF = cms.Path( + process.l1tLayer1Barrel + + process.l1tLayer1Barrel9 + + process.l1tLayer1HGCal + + process.l1tLayer1HGCalNoTK + + process.l1tLayer1HF ) -process.runPF.associate(process.pfInputsTask) -process.schedule = cms.Schedule(process.runPF) +process.RunPF.associate(process.PFInputsTask) +process.schedule = cms.Schedule(process.RunPF) for det in "Barrel", "Barrel9", "HGCal", "HGCalNoTK", "HF": - l1pf = getattr(process, 'l1ctLayer1'+det) + l1pf = getattr(process, 'l1tLayer1'+det) l1pf.dumpFileName = cms.untracked.string("TTbar_PU200_123X_"+det+".dump") diff --git a/L1Trigger/Phase2L1Taus/plugins/HPSPFTauProducer.cc b/L1Trigger/Phase2L1Taus/plugins/HPSPFTauProducer.cc index e76c245d9c74f..a95f1a62a7120 100644 --- a/L1Trigger/Phase2L1Taus/plugins/HPSPFTauProducer.cc +++ b/L1Trigger/Phase2L1Taus/plugins/HPSPFTauProducer.cc @@ -269,7 +269,7 @@ void HPSPFTauProducer::fillDescriptions(edm::ConfigurationDescriptions& descript desc.add("maxSeedJetEta", 2.4); desc.add("signalConeSize", "2.8/max(1., pt)"); desc.add("srcL1Jets", - edm::InputTag("Phase1L1TJetProducer", "UncalibratedPhase1L1TJetFromPfCandidates")); + edm::InputTag("l1tPhase1JetProducer", "UncalibratedPhase1L1TJetFromPfCandidates")); desc.addUntracked("debug", false); desc.add("maxPFTauEta", 2.4); desc.add("maxSignalConeSize", 0.1); diff --git a/L1Trigger/Phase2L1Taus/python/HPSPFTauProducerPF_cfi.py b/L1Trigger/Phase2L1Taus/python/HPSPFTauProducerPF_cfi.py index 6c2014f36ddbf..5d56492cdce72 100644 --- a/L1Trigger/Phase2L1Taus/python/HPSPFTauProducerPF_cfi.py +++ b/L1Trigger/Phase2L1Taus/python/HPSPFTauProducerPF_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms from L1Trigger.Phase2L1Taus.hpspfTauProducer_cfi import hpspfTauProducer as _hpspfTauProducer -HPSPFTauProducerPF = _hpspfTauProducer.clone( - srcL1PFCands = "l1ctLayer1:PF", +l1tHPSPFTauProducerPF = _hpspfTauProducer.clone( + srcL1PFCands = "l1tLayer1:PF", ) diff --git a/L1Trigger/Phase2L1Taus/python/HPSPFTauProducerPuppi_cfi.py b/L1Trigger/Phase2L1Taus/python/HPSPFTauProducerPuppi_cfi.py index 383a8bd9da523..d516f4384a825 100644 --- a/L1Trigger/Phase2L1Taus/python/HPSPFTauProducerPuppi_cfi.py +++ b/L1Trigger/Phase2L1Taus/python/HPSPFTauProducerPuppi_cfi.py @@ -1,8 +1,8 @@ import FWCore.ParameterSet.Config as cms from L1Trigger.Phase2L1Taus.hpspfTauProducer_cfi import hpspfTauProducer as _hpspfTauProducer -HPSPFTauProducerPuppi = _hpspfTauProducer.clone( - srcL1PFCands = "l1ctLayer1:Puppi", +l1tHPSPFTauProducerPuppi = _hpspfTauProducer.clone( + srcL1PFCands = "l1tLayer1:Puppi", signalQualityCuts = dict( chargedHadron = dict( maxDz = 1.e+3 diff --git a/L1Trigger/Phase2L1Taus/python/l1emulator_cff.py b/L1Trigger/Phase2L1Taus/python/l1emulator_cff.py index 836be424a691b..06d7487bd820a 100644 --- a/L1Trigger/Phase2L1Taus/python/l1emulator_cff.py +++ b/L1Trigger/Phase2L1Taus/python/l1emulator_cff.py @@ -25,7 +25,7 @@ l1emulator += TrackTriggerAssociatorTracks from L1Trigger.VertexFinder.VertexProducer_cff import * -l1emulator += VertexProducer +l1emulator += l1tVertexProducer from Configuration.StandardSequences.SimL1Emulator_cff import * l1emulator += SimL1Emulator @@ -34,14 +34,8 @@ l1emulator += pfTracksFromL1Tracks from L1Trigger.Phase2L1ParticleFlow.l1ParticleFlow_cff import * -l1emulator += l1ParticleFlow +l1emulator += l1tParticleFlow from L1Trigger.L1CaloTrigger.Phase1L1TJets_cff import * -l1emulator += Phase1L1TJetsSequence - - - - - - +l1emulator += L1TPhase1JetsSequence diff --git a/L1Trigger/Phase2L1Taus/test/produceHPSPFTaus_cfg.py b/L1Trigger/Phase2L1Taus/test/produceHPSPFTaus_cfg.py index 2b9b572b15d85..0181a1cff674c 100644 --- a/L1Trigger/Phase2L1Taus/test/produceHPSPFTaus_cfg.py +++ b/L1Trigger/Phase2L1Taus/test/produceHPSPFTaus_cfg.py @@ -124,8 +124,8 @@ ), outputCommands = cms.untracked.vstring( 'drop *_*_*_*', - 'keep *_l1ctLayer1_PF_*', - 'keep *_l1ctLayer1_Puppi_*', + 'keep *_l1tLayer1_PF_*', + 'keep *_l1tLayer1_Puppi_*', #'keep *_l1pfCandidates_PF_*', #'keep *_l1pfCandidates_Puppi_*', 'keep *_l1pfProducer*_z0_*', diff --git a/L1Trigger/VertexFinder/python/InputDataProducer_cff.py b/L1Trigger/VertexFinder/python/InputDataProducer_cff.py index 7710bb04070fc..362bb3a47a1cf 100644 --- a/L1Trigger/VertexFinder/python/InputDataProducer_cff.py +++ b/L1Trigger/VertexFinder/python/InputDataProducer_cff.py @@ -1,22 +1,22 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.VertexFinder.VertexNTupler_cff import L1TVertexNTupler -from L1Trigger.VertexFinder.VertexProducer_cff import VertexProducer +from L1Trigger.VertexFinder.VertexNTupler_cff import l1tVertexNTupler +from L1Trigger.VertexFinder.VertexProducer_cff import l1tVertexProducer InputDataProducer = cms.EDProducer('InputDataProducer', #=== The name of the output collection outputCollectionName = cms.string("InputData"), #=== Cuts on MC truth particles (i.e., tracking particles) used for tracking efficiency measurements. - GenCuts = L1TVertexNTupler.GenCuts, + GenCuts = l1tVertexNTupler.GenCuts, #=== Rules for deciding when the track finding has found an L1 track candidate - L1TrackDef = L1TVertexNTupler.L1TrackDef, + L1TrackDef = l1tVertexNTupler.L1TrackDef, #=== Rules for deciding when a reconstructed L1 track matches a MC truth particle (i.e. tracking particle). - TrackMatchDef = L1TVertexNTupler.TrackMatchDef, + TrackMatchDef = l1tVertexNTupler.TrackMatchDef, #=== Vertex Reconstruction configuration - VertexReconstruction = VertexProducer.VertexReconstruction, + VertexReconstruction = l1tVertexProducer.VertexReconstruction, #=== Input collections hepMCInputTag = cms.InputTag("generatorSmeared","","SIM"), @@ -26,5 +26,5 @@ stubInputTag = cms.InputTag("TTStubsFromPhase2TrackerDigis", "StubAccepted"), #=== Debug printout - debug = L1TVertexNTupler.debug, -) \ No newline at end of file + debug = l1tVertexNTupler.debug, +) diff --git a/L1Trigger/VertexFinder/python/TPStubValueMapProducer_cff.py b/L1Trigger/VertexFinder/python/TPStubValueMapProducer_cff.py index d184dfbdcd74e..1141d0471c3ac 100644 --- a/L1Trigger/VertexFinder/python/TPStubValueMapProducer_cff.py +++ b/L1Trigger/VertexFinder/python/TPStubValueMapProducer_cff.py @@ -1,22 +1,22 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.VertexFinder.VertexNTupler_cff import L1TVertexNTupler -from L1Trigger.VertexFinder.VertexProducer_cff import VertexProducer +from L1Trigger.VertexFinder.VertexNTupler_cff import l1tVertexNTupler +from L1Trigger.VertexFinder.VertexProducer_cff import l1tVertexProducer TPStubValueMapProducer = cms.EDProducer('TPStubValueMapProducer', #=== The name of the output collection outputCollectionNames = cms.vstring("TPs","TPsUse","allMatchedTPs"), #=== Cuts on MC truth particles (i.e., tracking particles) used for tracking efficiency measurements. - GenCuts = L1TVertexNTupler.GenCuts, + GenCuts = l1tVertexNTupler.GenCuts, #=== Rules for deciding when the track finding has found an L1 track candidate - L1TrackDef = L1TVertexNTupler.L1TrackDef, + L1TrackDef = l1tVertexNTupler.L1TrackDef, #=== Rules for deciding when a reconstructed L1 track matches a MC truth particle (i.e. tracking particle). - TrackMatchDef = L1TVertexNTupler.TrackMatchDef, + TrackMatchDef = l1tVertexNTupler.TrackMatchDef, #=== Vertex Reconstruction configuration - VertexReconstruction = VertexProducer.VertexReconstruction, + VertexReconstruction = l1tVertexProducer.VertexReconstruction, #=== Input collections l1TracksTruthMapInputTags = cms.InputTag("TTTrackAssociatorFromPixelDigis", "Level1TTTracks"), @@ -26,5 +26,5 @@ clusterTruthInputTag = cms.InputTag("TTClusterAssociatorFromPixelDigis", "ClusterAccepted"), #=== Debug printout - debug = L1TVertexNTupler.debug, -) \ No newline at end of file + debug = l1tVertexNTupler.debug, +) diff --git a/L1Trigger/VertexFinder/python/VertexNTupler_cff.py b/L1Trigger/VertexFinder/python/VertexNTupler_cff.py index 185fa67d775d4..a80f3aa0a2625 100644 --- a/L1Trigger/VertexFinder/python/VertexNTupler_cff.py +++ b/L1Trigger/VertexFinder/python/VertexNTupler_cff.py @@ -1,15 +1,15 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.VertexFinder.VertexProducer_cff import VertexProducer +from L1Trigger.VertexFinder.VertexProducer_cff import l1tVertexProducer -L1TVertexNTupler = cms.EDAnalyzer('VertexNTupler', +l1tVertexNTupler = cms.EDAnalyzer('VertexNTupler', inputDataInputTag = cms.InputTag("InputDataProducer","InputData"), genParticleInputTag = cms.InputTag("genParticles",""), - l1TracksInputTags = cms.VInputTag( VertexProducer.l1TracksInputTag ), + l1TracksInputTags = cms.VInputTag( l1tVertexProducer.l1TracksInputTag ), l1TracksTruthMapInputTags = cms.VInputTag( cms.InputTag("TTTrackAssociatorFromPixelDigis", "Level1TTTracks") ), l1TracksTPInputTags = cms.InputTag("TPStubValueMapProducer:allMatchedTPs"), l1TracksTPValueMapInputTags = cms.InputTag("TPStubValueMapProducer:TPs"), l1TracksBranchNames = cms.vstring('hybrid'), - l1VertexInputTags = cms.VInputTag( cms.InputTag("VertexProducer", VertexProducer.l1VertexCollectionName.value()) ), + l1VertexInputTags = cms.VInputTag( cms.InputTag("l1tVertexProducer", l1tVertexProducer.l1VertexCollectionName.value()) ), l1VertexTrackInputs = cms.vstring('hybrid'), l1VertexBranchNames = cms.vstring('fastHisto'), emulationVertexInputTags = cms.VInputTag(), @@ -59,9 +59,9 @@ # === Vertex Reconstruction configuration - VertexReconstruction = VertexProducer.VertexReconstruction, + VertexReconstruction = l1tVertexProducer.VertexReconstruction, # Debug printout - debug = VertexProducer.debug, + debug = l1tVertexProducer.debug, printResults = cms.bool(False) ) diff --git a/L1Trigger/VertexFinder/python/VertexProducer_cff.py b/L1Trigger/VertexFinder/python/VertexProducer_cff.py index e2aa8641a4148..68e81fe020e98 100644 --- a/L1Trigger/VertexFinder/python/VertexProducer_cff.py +++ b/L1Trigger/VertexFinder/python/VertexProducer_cff.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -VertexProducer = cms.EDProducer('VertexProducer', +l1tVertexProducer = cms.EDProducer('VertexProducer', l1TracksInputTag = cms.InputTag("TTTracksFromTrackletEmulation", "Level1TTTracks"), diff --git a/L1Trigger/VertexFinder/test/vertexFinder_cfg.py b/L1Trigger/VertexFinder/test/vertexFinder_cfg.py index 687f406d7f0bc..4e83b0a8ec5fc 100644 --- a/L1Trigger/VertexFinder/test/vertexFinder_cfg.py +++ b/L1Trigger/VertexFinder/test/vertexFinder_cfg.py @@ -71,19 +71,19 @@ #--- Load config fragment that configures vertex producer process.load('L1Trigger.VertexFinder.VertexProducer_cff') -process.VertexProducer.l1TracksInputTag = l1TracksTag +process.l1tVertexProducer.l1TracksInputTag = l1TracksTag #--- Load config fragment that configures vertex analyzer process.load('L1Trigger.VertexFinder.VertexAnalyzer_cff') -process.L1TVertexAnalyzer.l1TracksInputTag = l1TracksTag +process.l1tVertexAnalyzer.l1TracksInputTag = l1TracksTag -if process.L1TVertexAnalyzer.debug == 0: +if process.l1tVertexAnalyzer.debug == 0: process.MessageLogger.cerr.FwkReport.reportEvery = 50 if (options.analysis): - process.p = cms.Path(process.VertexProducer + process.L1TVertexAnalyzer) + process.p = cms.Path(process.l1tVertexProducer + process.l1tVertexAnalyzer) else: - process.p = cms.Path(process.VertexProducer) + process.p = cms.Path(process.l1tVertexProducer) # process.e = cms.EndPath(process.out) diff --git a/L1Trigger/VertexFinder/test/vertexNTupler_cfg.py b/L1Trigger/VertexFinder/test/vertexNTupler_cfg.py index d2e5bf974395a..692a6357c96b8 100644 --- a/L1Trigger/VertexFinder/test/vertexNTupler_cfg.py +++ b/L1Trigger/VertexFinder/test/vertexNTupler_cfg.py @@ -80,7 +80,7 @@ ) process.load('L1Trigger.VertexFinder.VertexProducer_cff') -process.VertexProducer.l1TracksInputTag = l1TracksTag +process.l1tVertexProducer.l1TracksInputTag = l1TracksTag process.load('L1Trigger.VertexFinder.TPStubValueMapProducer_cff') process.load('L1Trigger.VertexFinder.InputDataProducer_cff') @@ -92,19 +92,19 @@ process.MessageLogger.cerr.FwkReport.reportEvery = 50 process.Timing = cms.Service("Timing", summaryOnly = cms.untracked.bool(True)) -producerSum = process.VertexProducer +producerSum = process.l1tVertexProducer additionalProducerAlgorithms = ["fastHistoEmulation", "fastHistoLooseAssociation", "DBSCAN"] for algo in additionalProducerAlgorithms: producerName = 'VertexProducer{0}'.format(algo) producerName = producerName.replace(".","p") # legalize the name - producer = process.VertexProducer.clone() + producer = process.l1tVertexProducer.clone() producer.VertexReconstruction.Algorithm = cms.string(algo) if "Emulation" in algo: if "L1GTTInputProducer" not in process.producerNames(): process.load('L1Trigger.L1TTrackMatch.L1GTTInputProducer_cfi') - producer.l1TracksInputTag = cms.InputTag("L1GTTInputProducer","Level1TTTracksConverted") + producer.l1TracksInputTag = cms.InputTag("l1tGTTInputProducer","Level1TTTracksConverted") producerSum = process.L1GTTInputProducer + producerSum process.L1TVertexNTupler.emulationVertexInputTags.append( cms.InputTag(producerName, 'l1verticesEmulation') ) @@ -134,7 +134,7 @@ print "minDensity =", minDensity print "seedTrkPt =", seedTrackPt - producer = process.VertexProducer.clone() + producer = process.l1tVertexProducer.clone() producer.VertexReconstruction.VertexDistance = cms.double(dist) producer.VertexReconstruction.VxMinTrackPt = cms.double(minPt) producer.VertexReconstruction.DBSCANMinDensityTracks = cms.uint32(minDensity)