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/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/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/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/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/L1Trigger/Configuration/python/L1Trigger_EventContent_cff.py b/L1Trigger/Configuration/python/L1Trigger_EventContent_cff.py index 2ff59e47cf0d8..f9db6edffafed 100644 --- 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 index 7227dad3a6829..cd08a45369443 100644 --- 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 index 61ae36b47b1b6..3563a39ebb3bb 100644 --- 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 index 991b2a32aca33..b40ee2a007b3e 100644 --- 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 index ca49f96cc2825..318ce07897bdf 100644 --- 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 index 8e606b032564a..152874e7506b3 100644 --- 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 index eb7494094f108..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 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 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 f6919820fe474..74bba283cfd55 100644 --- 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 index 836f82fd38599..1f8ae328c76ac 100644 --- 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 index e5106be81722a..908f542100737 100644 --- 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 index 35be8176848df..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") @@ -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 index aef283b22ec5d..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 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 index 719d20bf89cb5..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 l1tMETPFProducer = cms.EDProducer("L1MetPfProducer", - L1PFObjects = cms.InputTag("l1ctLayer1","Puppi"), + L1PFObjects = cms.InputTag("l1tLayer1","Puppi"), maxCands = cms.int32(128), ) diff --git a/L1Trigger/Phase2L1ParticleFlow/python/L1NNTauProducer_cff.py b/L1Trigger/Phase2L1ParticleFlow/python/L1NNTauProducer_cff.py index 791f6dffb7a3e..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 * @@ -15,7 +15,7 @@ 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") ) @@ -25,7 +25,7 @@ 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 da1d29acc955e..6f1aa6083a33e 100644 --- a/L1Trigger/Phase2L1ParticleFlow/python/L1SeedConePFJetProducer_cfi.py +++ b/L1Trigger/Phase2L1ParticleFlow/python/L1SeedConePFJetProducer_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms l1tSeedConePFJetProducer = cms.EDProducer("L1SeedConePFJetProducer", - L1PFObjects = cms.InputTag("l1ctLayer1","Puppi"), + L1PFObjects = cms.InputTag("l1tLayer1","Puppi"), nJets = cms.uint32(10), coneSize = cms.double(0.4), HW = cms.bool(False), diff --git a/L1Trigger/Phase2L1ParticleFlow/python/l1ctJetFileWriter_cfi.py b/L1Trigger/Phase2L1ParticleFlow/python/l1ctJetFileWriter_cfi.py index 226bc381ac4d8..d61afb204b328 100644 --- a/L1Trigger/Phase2L1ParticleFlow/python/l1ctJetFileWriter_cfi.py +++ b/L1Trigger/Phase2L1ParticleFlow/python/l1ctJetFileWriter_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -l1ctSeededConeJetFileWriter = cms.EDAnalyzer('L1CTJetFileWriter', +l1tSeededConeJetFileWriter = cms.EDAnalyzer('L1CTJetFileWriter', jets = cms.InputTag("scPFL1PuppiEmulator"), nJets = cms.uint32(12), nFramesPerBX = cms.uint32(9), # 360 MHz clock or 25 Gb/s link diff --git a/L1Trigger/Phase2L1ParticleFlow/python/l1ctLayer1_cff.py b/L1Trigger/Phase2L1ParticleFlow/python/l1ctLayer1_cff.py index 799b1ccdec953..37a3bcab5b874 100644 --- a/L1Trigger/Phase2L1ParticleFlow/python/l1ctLayer1_cff.py +++ b/L1Trigger/Phase2L1ParticleFlow/python/l1ctLayer1_cff.py @@ -14,7 +14,7 @@ dxyScale = cms.double(3.85) ) -l1ctLayer1Barrel = cms.EDProducer("L1TCorrelatorLayer1Producer", +l1tLayer1Barrel = cms.EDProducer("L1TCorrelatorLayer1Producer", tracks = cms.InputTag('pfTracksFromL1Tracks'), muons = cms.InputTag('l1tSAMuonsGmt','promptSAMuons'), emClusters = cms.VInputTag(cms.InputTag('pfClustersFromL1EGClusters')), @@ -151,7 +151,7 @@ ) -l1ctLayer1HGCal = cms.EDProducer("L1TCorrelatorLayer1Producer", +l1tLayer1HGCal = cms.EDProducer("L1TCorrelatorLayer1Producer", tracks = cms.InputTag('pfTracksFromL1Tracks'), muons = cms.InputTag('l1tSAMuonsGmt','promptSAMuons'), emClusters = cms.VInputTag(cms.InputTag('pfClustersFromHGC3DClusters:egamma')), # used only for E/gamma @@ -286,7 +286,7 @@ ) -l1ctLayer1HGCalNoTK = cms.EDProducer("L1TCorrelatorLayer1Producer", +l1tLayer1HGCalNoTK = cms.EDProducer("L1TCorrelatorLayer1Producer", tracks = cms.InputTag(''), muons = cms.InputTag('l1tSAMuonsGmt','promptSAMuons'), emClusters = cms.VInputTag(cms.InputTag('pfClustersFromHGC3DClusters:egamma')), # used only for E/gamma @@ -368,7 +368,7 @@ writeRawHgcalCluster = cms.untracked.bool(True) ) -l1ctLayer1HF = cms.EDProducer("L1TCorrelatorLayer1Producer", +l1tLayer1HF = cms.EDProducer("L1TCorrelatorLayer1Producer", tracks = cms.InputTag(''), muons = cms.InputTag('l1tSAMuonsGmt','promptSAMuons'), useStandaloneMuons = cms.bool(False), @@ -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 59c27f40d3bae..1e43098edf8cc 100644 --- a/L1Trigger/Phase2L1ParticleFlow/python/l1pfJetMet_cff.py +++ b/L1Trigger/Phase2L1ParticleFlow/python/l1pfJetMet_cff.py @@ -2,9 +2,9 @@ from L1Trigger.Phase2L1ParticleFlow.L1SeedConePFJetProducer_cfi import l1tSeedConePFJetProducer, l1tSeedConePFJetEmulatorProducer from L1Trigger.Phase2L1ParticleFlow.DeregionizerProducer_cfi import l1tDeregionizerProducer as l1tLayer2Deregionizer -scPFL1PF = l1tSeedConePFJetProducer.clone(L1PFObjects = 'l1ctLayer1:PF') +scPFL1PF = l1tSeedConePFJetProducer.clone(L1PFObjects = 'l1tLayer1:PF') scPFL1Puppi = l1tSeedConePFJetProducer.clone() -scPFL1PuppiEmulator = l1tSeedConePFJetEmulatorProducer.clone(L1PFObject = cms.InputTag('l1ctLayer2Deregionizer:Puppi')) +scPFL1PuppiEmulator = l1tSeedConePFJetEmulatorProducer.clone(L1PFObject = cms.InputTag('l1tLayer2Deregionizer:Puppi')) correctedJets = cms.EDProducer("L1TCorrectedPFJetProducer", jets = cms.InputTag("_tag_"), @@ -22,7 +22,7 @@ from L1Trigger.Phase2L1ParticleFlow.L1MhtPfProducer_cfi import l1tMHTPFProducer scPFL1PuppiCorrectedEmulatorMHT = l1tMHTPFProducer.clone() -l1tPFJetsTask = cms.Task( +L1TPFJetsTask = cms.Task( l1tLayer2Deregionizer, scPFL1PF, scPFL1Puppi, scPFL1PuppiEmulator, scPFL1PuppiCorrectedEmulator, scPFL1PuppiCorrectedEmulatorMHT ) diff --git a/L1Trigger/Phase2L1ParticleFlow/test/make_l1ctLayer1_dumpFiles_cfg.py b/L1Trigger/Phase2L1ParticleFlow/test/make_l1ctLayer1_dumpFiles_cfg.py index b34d183817ef9..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("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/python/HPSPFTauProducerPF_cfi.py b/L1Trigger/Phase2L1Taus/python/HPSPFTauProducerPF_cfi.py index 451eb331d0d0e..5d56492cdce72 100644 --- a/L1Trigger/Phase2L1Taus/python/HPSPFTauProducerPF_cfi.py +++ b/L1Trigger/Phase2L1Taus/python/HPSPFTauProducerPF_cfi.py @@ -2,5 +2,5 @@ from L1Trigger.Phase2L1Taus.hpspfTauProducer_cfi import hpspfTauProducer as _hpspfTauProducer l1tHPSPFTauProducerPF = _hpspfTauProducer.clone( - srcL1PFCands = "l1ctLayer1:PF", + srcL1PFCands = "l1tLayer1:PF", ) diff --git a/L1Trigger/Phase2L1Taus/python/HPSPFTauProducerPuppi_cfi.py b/L1Trigger/Phase2L1Taus/python/HPSPFTauProducerPuppi_cfi.py index 1d3f2879b905c..d516f4384a825 100644 --- a/L1Trigger/Phase2L1Taus/python/HPSPFTauProducerPuppi_cfi.py +++ b/L1Trigger/Phase2L1Taus/python/HPSPFTauProducerPuppi_cfi.py @@ -2,7 +2,7 @@ from L1Trigger.Phase2L1Taus.hpspfTauProducer_cfi import hpspfTauProducer as _hpspfTauProducer l1tHPSPFTauProducerPuppi = _hpspfTauProducer.clone( - srcL1PFCands = "l1ctLayer1:Puppi", + 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..d44c7c30b39a6 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/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 fcbb9bd5d6119..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,13 +92,13 @@ 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: @@ -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)