upper case Tasks, switch l1ct to l1t

(cherry picked from commit cb38413)
cms-sw · Aug 30, 2022 · fb952d7 · fb952d7
1 parent 118b1a3
commit fb952d7
Show file tree

Hide file tree

Showing 47 changed files with 186 additions and 192 deletions.
diff --git 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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...r/Configuration/python/HLT_75e33/modules/hltL1TEGammaHGCFilteredCollectionProducer_cfi.py b/...r/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/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/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/L1Trigger/Configuration/python/L1Trigger_EventContent_cff.py b/L1Trigger/Configuration/python/L1Trigger_EventContent_cff.py
@@ -194,12 +194,12 @@ def _appendPhase2Digis(obj):
         'keep *_l1tPhase1JetProducer_*_*', 
         'keep *_l1tPhase1JetCalibrator_*_*',
         'keep *_l1tPhase1JetSumsProducer_*_*',
-        'keep *_l1ctLayer1Barrel_*_*',
-        'keep *_l1ctLayer1HGCal_*_*',
-        'keep *_l1ctLayer1HGCalNoTK_*_*',
-        'keep *_l1ctLayer1HF_*_*',
-        'keep *_l1ctLayer1_*_*',
-        'keep *_l1ctLayer1EG_*_*',
+        'keep *_l1tLayer1Barrel_*_*',
+        'keep *_l1tLayer1HGCal_*_*',
+        'keep *_l1tLayer1HGCalNoTK_*_*',
+        'keep *_l1tLayer1HF_*_*',
+        'keep *_l1tLayer1_*_*',
+        'keep *_l1tLayer1EG_*_*',
         'keep *_l1tMETPFProducer_*_*',
         'keep *_l1tNNTauProducer_*_*',
         'keep *_l1tNNTauProducerPuppi_*_*',

diff --git a/L1Trigger/Configuration/python/SimL1Emulator_cff.py b/L1Trigger/Configuration/python/SimL1Emulator_cff.py
@@ -178,15 +178,15 @@
 # ########################################################################
 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
 # ###############################
-l1tPFJetsPhase1Task = cms.Task(l1tPhase1JetProducer , l1tPhase1JetCalibrator, l1tPhase1JetSumsProducer)
-_phase2_siml1emulator.add(l1tPFJetsPhase1Task)
+L1TPFJetsPhase1Task = cms.Task(l1tPhase1JetProducer , l1tPhase1JetCalibrator, l1tPhase1JetSumsProducer)
+_phase2_siml1emulator.add(L1TPFJetsPhase1Task)
 
 from L1Trigger.Phase2L1Taus.HPSPFTauProducerPF_cfi import *
 _phase2_siml1emulator.add(l1tHPSPFTauProducerPF)
@@ -195,14 +195,14 @@
 _phase2_siml1emulator.add(l1tHPSPFTauProducerPuppi)
 
 from L1Trigger.L1CaloTrigger.Phase1L1TJets_9x9_cff import *
-l1tPFJetsPhase1Task_9x9 = cms.Task(  l1tPhase1JetProducer9x9, l1tPhase1JetCalibrator9x9, l1tPhase1JetSumsProducer9x9)
-_phase2_siml1emulator.add(l1tPFJetsPhase1Task_9x9)
+L1TPFJetsPhase1Task_9x9 = cms.Task(  l1tPhase1JetProducer9x9, l1tPhase1JetCalibrator9x9, l1tPhase1JetSumsProducer9x9)
+_phase2_siml1emulator.add(L1TPFJetsPhase1Task_9x9)
 
 
 # PF MET
 # ########################################################################
 from L1Trigger.Phase2L1ParticleFlow.l1pfJetMet_cff import *
-_phase2_siml1emulator.add(l1tPFJetsTask)
+_phase2_siml1emulator.add(L1TPFJetsTask)
 
 from L1Trigger.Phase2L1ParticleFlow.L1MetPfProducer_cfi import *
 _phase2_siml1emulator.add(l1tMETPFProducer)

diff --git a/L1Trigger/L1CaloTrigger/python/L1CaloJetProducer_cfi.py b/L1Trigger/L1CaloTrigger/python/L1CaloJetProducer_cfi.py
@@ -10,7 +10,7 @@
     EtMinForSeedHit = cms.double(2.5), 
     EtMinForCollection = cms.double(10),
     EtMinForTauCollection = cms.double(10),
-    l1CaloTowers = cms.InputTag("L1TowerCalibrationProducer","L1CaloTowerCalibratedCollection"),
+    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
@@ -42,7 +42,7 @@
 
 l1CaloJetsSequence = cms.Sequence( 
         l1tEGammaClusterEmuProducer *
-        L1TowerCalibrationProducer *
-        L1CaloJetProducer *
-        L1CaloJetHTTProducer
+        l1tTowerCalibrationProducer *
+        l1tCaloJetProducer *
+        l1tCaloJetHTTProducer
 )
diff --git a/L1Trigger/L1CaloTrigger/python/Phase1L1TJetProducer_cfi.py b/L1Trigger/L1CaloTrigger/python/Phase1L1TJetProducer_cfi.py
@@ -18,7 +18,7 @@
   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)
 
 l1tPhase1JetProducer = cms.EDProducer('Phase1L1TJetProducer',
-  inputCollectionTag = cms.InputTag("l1ctLayer1", "Puppi"),
+  inputCollectionTag = cms.InputTag("l1tLayer1", "Puppi"),
   etaBinning = caloEtaSegmentation,
   nBinsPhi = cms.uint32(72),
   phiLow = cms.double(-pi),

diff --git a/L1Trigger/L1CaloTrigger/test/test_Phase1L1TJets_cfg.py b/L1Trigger/L1CaloTrigger/test/test_Phase1L1TJets_cfg.py
@@ -36,16 +36,16 @@
   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.l1PFJets * process.l1PFMetPuppi )
 
 process.e = cms.EndPath(process.out)
diff --git 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
 
 
 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
@@ -26,7 +26,7 @@
 
 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/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
@@ -3,7 +3,7 @@
 
 l1tTrackFastJets = cms.EDProducer("L1TrackFastJetProducer",
     L1TrackInputTag = cms.InputTag("TTTracksFromTrackletEmulation", "Level1TTTracks"),
-    L1PrimaryVertexTag=cms.InputTag("VertexProducer", l1tVertexProducer.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
@@ -21,7 +21,7 @@
 
 l1tTrackFastJetsExtended = cms.EDProducer("L1TrackFastJetProducer",
     L1TrackInputTag = cms.InputTag("TTTracksFromExtendedTrackletEmulation", "Level1TTTracks"),
-    L1PrimaryVertexTag=cms.InputTag("VertexProducer", l1tVertexProducer.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/L1TrackJetProducer_cfi.py b/L1Trigger/L1TTrackMatch/python/L1TrackJetProducer_cfi.py
@@ -4,7 +4,7 @@
 
 l1tTrackJets = cms.EDProducer('L1TrackJetProducer',
 	L1TrackInputTag= cms.InputTag("TTTracksFromTrackletEmulation", "Level1TTTracks"),
-	L1PVertexCollection = cms.InputTag("VertexProducer", l1tVertexProducer.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]
@@ -33,7 +33,7 @@
 
 l1tTrackJetsExtended = cms.EDProducer('L1TrackJetProducer',
 	L1TrackInputTag= cms.InputTag("TTTracksFromExtendedTrackletEmulation", "Level1TTTracks"),
-	L1PVertexCollection = cms.InputTag("VertexProducer", l1tVertexProducer.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/L1TrackerEtMissEmulatorProducer_cfi.py b/L1Trigger/L1TTrackMatch/python/L1TrackerEtMissEmulatorProducer_cfi.py
@@ -3,11 +3,11 @@
 from L1Trigger.L1TTrackMatch.L1TrackSelectionProducer_cfi import l1tTrackSelectionProducer
 
 l1tTrackerEmuEtMiss = cms.EDProducer('L1TrackerEtMissEmulatorProducer',
-    L1TrackInputTag = cms.InputTag("L1TrackSelectionProducer", l1tTrackSelectionProducer.outputCollectionName.value() + "Emulation"),
-    L1TrackAssociatedInputTag = cms.InputTag("L1TrackSelectionProducer", l1tTrackSelectionProducer.outputCollectionName.value() + "AssociatedEmulation"),
+    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", l1tVertexProducer.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/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")
 
@@ -97,7 +97,7 @@
 
 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")
 

diff --git a/L1Trigger/Phase2L1ParticleFlow/python/DeregionizerProducer_cfi.py b/L1Trigger/Phase2L1ParticleFlow/python/DeregionizerProducer_cfi.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
 l1tDeregionizerProducer = cms.EDProducer("DeregionizerProducer",
-                           RegionalPuppiCands  = cms.InputTag("l1ctLayer1","PuppiRegional"),
+                           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
@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
 l1tMETPFProducer = cms.EDProducer("L1MetPfProducer",
-                                 L1PFObjects = cms.InputTag("l1ctLayer1","Puppi"),
+                                 L1PFObjects = cms.InputTag("l1tLayer1","Puppi"),
                                  maxCands = cms.int32(128),
 )