minor fixes to l1t renaming

(cherry picked from commit 65f532c)
cms-sw · Sep 9, 2022 · 33b765a · 33b765a
1 parent 443ad71
commit 33b765a
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 18 deletions.
diff --git a/L1Trigger/L1THGCalUtilities/python/caloTruthCellsNtuples_cff.py b/L1Trigger/L1THGCalUtilities/python/caloTruthCellsNtuples_cff.py
@@ -7,7 +7,7 @@
     Multiclusters = cms.InputTag('l1tCaloTruthCellsProducer'),
     Prefix = cms.untracked.string('cl3dfulltruth')
 )
-L1THGCalTriggerNtuplizer.Ntuples.append(ntuple_multiclusters_fulltruth)
+l1tHGCalTriggerNtuplizer.Ntuples.append(ntuple_multiclusters_fulltruth)
 
 # If caloTruthCellsProducer.makeCellsCollection is True, can run the clustering algorithm over output cells too
 
@@ -39,6 +39,6 @@
         Prefix = cms.untracked.string('towertruth')
     )
 
-    L1THGCalTriggerNtuplizer.Ntuples.append(ntuple_triggercells_truth)
-    L1THGCalTriggerNtuplizer.Ntuples.append(ntuple_multiclusters_truth)
-    L1THGCalTriggerNtuplizer.Ntuples.append(ntuple_towers_truth)
+    l1tHGCalTriggerNtuplizer.Ntuples.append(ntuple_triggercells_truth)
+    l1tHGCalTriggerNtuplizer.Ntuples.append(ntuple_multiclusters_truth)
+    l1tHGCalTriggerNtuplizer.Ntuples.append(ntuple_towers_truth)
diff --git a/L1Trigger/L1THGCalUtilities/python/customNtuples.py b/L1Trigger/L1THGCalUtilities/python/customNtuples.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
 def custom_ntuples_layer1_truncation(process):
-    ntuples = process.L1THGCalTriggerNtuplizer.Ntuples
+    ntuples = process.l1tHGCalTriggerNtuplizer.Ntuples
     for ntuple in ntuples:
         if ntuple.NtupleName=='HGCalTriggerNtupleHGCClusters' or \
            ntuple.NtupleName=='HGCalTriggerNtupleHGCTriggerCells' or \
@@ -10,7 +10,7 @@ def custom_ntuples_layer1_truncation(process):
     return process
 
 def custom_ntuples_stage1_truncation(process):
-    ntuples = process.L1THGCalTriggerNtuplizer.Ntuples
+    ntuples = process.l1tHGCalTriggerNtuplizer.Ntuples
     for ntuple in ntuples:
         if ntuple.NtupleName=='HGCalTriggerNtupleHGCClusters' or \
            ntuple.NtupleName=='HGCalTriggerNtupleHGCTriggerCells' or \
@@ -20,7 +20,7 @@ def custom_ntuples_stage1_truncation(process):
     return process
 
 def custom_ntuples_standalone_clustering(process):
-    ntuples = process.L1THGCalTriggerNtuplizer.Ntuples
+    ntuples = process.l1tHGCalTriggerNtuplizer.Ntuples
     for ntuple in ntuples:
         if ntuple.NtupleName=='HGCalTriggerNtupleHGCTriggerCells' or \
            ntuple.NtupleName=='HGCalTriggerNtupleHGCClusters' or \
@@ -30,7 +30,7 @@ def custom_ntuples_standalone_clustering(process):
 
 
 def custom_ntuples_standalone_tower(process):
-    ntuples = process.L1THGCalTriggerNtuplizer.Ntuples
+    ntuples = process.l1tHGCalTriggerNtuplizer.Ntuples
     for ntuple in ntuples:
         if ntuple.NtupleName=='HGCalTriggerNtupleHGCTowers':
             ntuple.Towers = cms.InputTag('l1tHGCalTowerProducer:HGCalTowerProcessorSA')
@@ -62,6 +62,6 @@ def __call__(self, process, inputs):
             elif ntuple=='multiclusters':
                 pset.Multiclusters = cms.InputTag(inputs[2])
             vpset.append(pset)
-        ntuplizer = process.L1THGCalTriggerNtuplizer.clone()
+        ntuplizer = process.l1tHGCalTriggerNtuplizer.clone()
         ntuplizer.Ntuples = cms.VPSet(vpset)
         return ntuplizer
diff --git a/L1Trigger/L1THGCalUtilities/python/hgcalTriggerNtuples_cfi.py b/L1Trigger/L1THGCalUtilities/python/hgcalTriggerNtuples_cfi.py
@@ -101,7 +101,7 @@
     Towers = cms.InputTag('l1tHGCalTowerProducer:HGCalTowerProcessor')
 )
 
-L1THGCalTriggerNtuplizer = cms.EDAnalyzer(
+l1tHGCalTriggerNtuplizer = cms.EDAnalyzer(
     "HGCalTriggerNtupleManager",
     Ntuples = cms.VPSet(
         ntuple_event,

diff --git a/L1Trigger/L1TTrackMatch/python/L1TkMETAnalyser_cfi.py b/L1Trigger/L1TTrackMatch/python/L1TkMETAnalyser_cfi.py
@@ -1,10 +1,8 @@
 import FWCore.ParameterSet.Config as cms
-from L1Trigger.L1TTrackMatch.L1TrackerEtMissEmulatorProducer_cfi import l1tTrackerEmuEtMiss
-from L1Trigger.L1TTrackMatch.L1TrackerEtMissProducer_cfi import l1tTrackerEtMiss
 
 L1TkMETAnalyser = cms.EDAnalyzer('L1TkMETAnalyser',
-  TrackMETInputTag = cms.InputTag("l1tTrackerEtMiss",l1tTrackerEtMiss.L1MetCollectionName.value()),
-  TrackMETEmuInputTag = cms.InputTag("l1tTrackerEmuEtMiss",l1tTrackerEmuEtMiss.L1MetCollectionName.value()),
+  TrackMETInputTag = cms.InputTag("l1tTrackerEtMiss","l1tTrackerEtMiss"),
+  TrackMETEmuInputTag = cms.InputTag("l1tTrackerEmuEtMiss","L1TrackerEmuEtMiss"),
   TrackMETHWInputTag = cms.InputTag("GTTOutputFileReader"),
   HW_Analysis = cms.bool(False)
 )
diff --git a/L1Trigger/Phase2L1GMT/test/runGMT.py b/L1Trigger/Phase2L1GMT/test/runGMT.py
@@ -144,7 +144,7 @@
 process.FEVTDEBUGHLToutput_step = cms.EndPath(process.FEVTDEBUGHLToutput)
 
 # Schedule definition
-process.schedule = cms.Schedule(process.raw2digi_step,process.L1TTrackTrigger_step,process.testpath,process.endjob_step,process.FEVTDEBUGHLToutput_step)
+process.schedule = cms.Schedule(process.raw2digi_step,process.L1TrackTrigger_step,process.testpath,process.endjob_step,process.FEVTDEBUGHLToutput_step)
 from PhysicsTools.PatAlgos.tools.helpers import associatePatAlgosToolsTask
 associatePatAlgosToolsTask(process)
 

diff --git a/L1Trigger/VertexFinder/python/InputDataProducer_cff.py b/L1Trigger/VertexFinder/python/InputDataProducer_cff.py
@@ -1,5 +1,5 @@
 import FWCore.ParameterSet.Config as cms
-from L1Trigger.VertexFinder.VertexNTupler_cff import l1tVertexNTupler
+from L1Trigger.VertexFinder.VertexNTupler_cfi import l1tVertexNTupler
 from L1Trigger.VertexFinder.VertexProducer_cfi import l1tVertexProducer
 
 InputDataProducer = cms.EDProducer('InputDataProducer',

diff --git a/L1Trigger/VertexFinder/python/TPStubValueMapProducer_cff.py b/L1Trigger/VertexFinder/python/TPStubValueMapProducer_cff.py
@@ -1,5 +1,5 @@
 import FWCore.ParameterSet.Config as cms
-from L1Trigger.VertexFinder.VertexNTupler_cff import l1tVertexNTupler
+from L1Trigger.VertexFinder.VertexNTupler_cfi import l1tVertexNTupler
 from L1Trigger.VertexFinder.VertexProducer_cfi import l1tVertexProducer
 
 TPStubValueMapProducer = cms.EDProducer('TPStubValueMapProducer',

diff --git a/L1Trigger/VertexFinder/test/vertexNTupler_cfg.py b/L1Trigger/VertexFinder/test/vertexNTupler_cfg.py
@@ -85,7 +85,7 @@
 process.load('L1Trigger.VertexFinder.TPStubValueMapProducer_cff')
 process.load('L1Trigger.VertexFinder.InputDataProducer_cff')
 
-process.load('L1Trigger.VertexFinder.VertexNTupler_cff')
+process.load('L1Trigger.VertexFinder.VertexNTupler_cfi')
 process.L1TVertexNTupler.l1TracksInputTag = l1TracksTag
 
 if process.L1TVertexNTupler.debug == 0: