further renaming

(cherry picked from commit c311777)
cms-sw · Aug 30, 2022 · ae056a1 · ae056a1
1 parent 5e0ff75
commit ae056a1
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 28 deletions.
diff --git 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
@@ -17,7 +17,7 @@
 from ..modules.simOmtfDigis_cfi import *
 from ..modules.simTwinMuxDigis_cfi import *
 
-l1tReconstructionTask = cms.Task(
+L1TReconstructionTask = cms.Task(
     l1tEGammaClusterEmuProducer,
     l1tEGammaEEProducer,
     l1tNNTauProducerPuppi,

diff --git 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,

diff --git a/L1Trigger/L1CaloTrigger/python/L1CaloJets_cff.py b/L1Trigger/L1CaloTrigger/python/L1CaloJets_cff.py
@@ -40,7 +40,7 @@
 
 
 
-l1CaloJetsSequence = cms.Sequence( 
+L1TCaloJetsSequence = cms.Sequence( 
         l1tEGammaClusterEmuProducer *
         l1tTowerCalibrationProducer *
         l1tCaloJetProducer *

diff --git a/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_9x9_cff.py b/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_9x9_cff.py
@@ -18,7 +18,7 @@
   inputJetCollectionTag = ("Phase1L1TJetCalibrator9x9", "Phase1L1TJetFromPfCandidates"),
 )
 
-l1tPhase1JetsSequence9x9 = cms.Sequence(
+L1TPhase1JetsSequence9x9 = cms.Sequence(
   l1tPhase1JetProducer9x9 +
   l1tPhase1JetCalibrator9x9 + 
   l1tPhase1JetSumsProducer9x9

diff --git a/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_9x9trimmed_cff.py b/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_9x9trimmed_cff.py
@@ -20,7 +20,7 @@
   inputJetCollectionTag = ("l1tPhase1JetCalibrator9x9trimmed", "Phase1L1TJetFromPfCandidates"),
 )
 
-l1tPhase1JetsSequence9x9trimmed = cms.Sequence(
+L1TPhase1JetsSequence9x9trimmed = cms.Sequence(
   l1tPhase1JetProducer9x9trimmed +
   l1tPhase1JetCalibrator9x9trimmed + 
   l1tPhase1JetSumsProducer9x9trimmed

diff --git a/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_cff.py b/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_cff.py
@@ -4,7 +4,7 @@
 from L1Trigger.L1CaloTrigger.Phase1L1TJetCalibrator_cfi import l1tPhase1JetCalibrator
 from L1Trigger.L1CaloTrigger.Phase1L1TJetSumsProducer_cfi import l1tPhase1JetSumsProducer
 
-l1tPhase1JetsSequence = cms.Sequence(
+L1TPhase1JetsSequence = cms.Sequence(
   l1tPhase1JetProducer +
   l1tPhase1JetCalibrator +
   l1tPhase1JetSumsProducer

diff --git 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(l1tEGammaClusterEmuProducer)
+L1TEgammaStaProducers = cms.Sequence(l1tEGammaClusterEmuProducer)
 
-l1EgammaStaProducersEB = cms.Sequence(l1tEGammaClusterEmuProducer)
+L1TEgammaStaProducersEB = cms.Sequence(l1tEGammaClusterEmuProducer)
diff --git 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)
 
 
 

diff --git a/L1Trigger/L1CaloTrigger/test/test_Phase1L1TJets_cfg.py b/L1Trigger/L1CaloTrigger/test/test_Phase1L1TJets_cfg.py
@@ -29,7 +29,7 @@
 
 # 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",
@@ -46,6 +46,6 @@
   ),
 )
 
-process.p = cms.Path(process.l1tPhase1JetsSequence * process.l1tPhase1JetsSequence9x9 * process.l1tPhase1JetsSequence9x9trimmed * 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/L1TrackSelectionProducer_cfi.py b/L1Trigger/L1TTrackMatch/python/L1TrackSelectionProducer_cfi.py
@@ -29,21 +29,21 @@
 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/Phase2L1Taus/python/l1emulator_cff.py b/L1Trigger/Phase2L1Taus/python/l1emulator_cff.py
@@ -37,5 +37,5 @@
 l1emulator += l1tParticleFlow
 
 from L1Trigger.L1CaloTrigger.Phase1L1TJets_cff import *
-l1emulator += l1tPhase1JetsSequence
+l1emulator += L1TPhase1JetsSequence