From eeb7cf49ac303955145945e7c7e2bb9441c13789 Mon Sep 17 00:00:00 2001 From: ccaillol Date: Mon, 29 Aug 2022 14:20:26 +0200 Subject: [PATCH 1/4] Rename L1T modules/sequences/tasks to follow conventions lower case l1 modules L1 module lower case in L1 packages l1t modules lower case upper case Tasks, switch l1ct to l1t Martins and Marinos comments further renaming further fixes further renaming change TTTracks to l1TTTracks remove outdated config further renaming rename hlt sequences hgcal renaming (cherry picked from commit e68eee3787a0e95ada3a05dbbb41bd8de7885e73) --- .../python/L1TrackTrigger_cff.py | 2 +- .../python/OuterTrackerMonitorTTTrack_cfi.py | 2 +- .../python/L1TPhase2MuonOffline_cfi.py | 4 +- .../L1Trigger/python/L1TPhase2Offline_cfi.py | 8 +- .../Configuration/python/CustomConfigs.py | 2 +- .../python/HLTPhase2TDR_EventContent_cff.py | 12 +- .../modules/L1EGammaClusterEmuProducer_cfi.py | 2 +- .../modules/L1TkEleDouble12Filter_cfi.py | 6 +- .../modules/L1TkEleSingle25Filter_cfi.py | 6 +- .../modules/L1TkEleSingle36Filter_cfi.py | 6 +- .../modules/L1TkEmDouble12Filter_cfi.py | 6 +- .../modules/L1TkEmDouble24Filter_cfi.py | 6 +- .../modules/L1TkEmSingle37Filter_cfi.py | 6 +- .../modules/L1TkEmSingle51Filter_cfi.py | 6 +- .../modules/L1TkIsoEleSingle22Filter_cfi.py | 6 +- .../modules/L1TkIsoEleSingle28Filter_cfi.py | 6 +- .../modules/L1TkIsoEmDouble12Filter_cfi.py | 6 +- .../modules/L1TkIsoEmSingle22Filter_cfi.py | 6 +- .../modules/L1TkIsoEmSingle36Filter_cfi.py | 6 +- .../modules/L1TkPrimaryVertex_cfi.py | 4 +- .../modules/hltDoubleMuon7DZ1p0_cfi.py | 4 +- .../hltEgammaEleL1TrkIsoL1Seeded_cfi.py | 2 +- .../hltEgammaEleL1TrkIsoUnseeded_cfi.py | 2 +- .../modules/hltL1DoubleNNTau52_cfi.py | 2 +- .../modules/hltL1SingleMuFiltered5_cfi.py | 2 +- .../modules/hltL1SingleNNTau150_cfi.py | 2 +- ...L1TEGammaFilteredCollectionProducer_cfi.py | 2 +- ...EGammaHGCFilteredCollectionProducer_cfi.py | 2 +- .../modules/hltL1TkDoubleMuFiltered7_cfi.py | 2 +- ...ltL1TkElectronsEllipticMatchCrystal_cfi.py | 4 +- .../hltL1TkElectronsEllipticMatchHGC_cfi.py | 4 +- .../modules/hltL1TkPhotonsCrystal_cfi.py | 6 +- .../modules/hltL1TkPhotonsHGC_cfi.py | 6 +- .../modules/hltL1TkSingleMuFiltered15_cfi.py | 2 +- .../modules/hltL1TkSingleMuFiltered22_cfi.py | 2 +- .../modules/hltL1TripleMuFiltered3_cfi.py | 2 +- .../modules/hltL2MuonSeedsFromL1TkMuon_cfi.py | 2 +- ...mL1TkMuonPixelTracksTrackingRegions_cfi.py | 2 +- .../modules/hltTriggerSummaryAOD_cfi.py | 4 +- .../modules/hltTripleMuon3DR0_cfi.py | 4 +- .../modules/hltTripleMuon3DZ1p0_cfi.py | 4 +- .../modules/l1EGammaEEProducer_cfi.py | 2 +- .../modules/l1NNTauProducerPuppi_cfi.py | 4 +- .../HLT_75e33/modules/l1PFMetPuppi_cfi.py | 2 +- .../HLT_75e33/modules/l1pfCandidates_cfi.py | 4 +- .../modules/l1pfProducerBarrel_cfi.py | 12 +- .../HLT_75e33/modules/l1pfProducerHF_cfi.py | 6 +- .../modules/l1pfProducerHGCalNoTK_cfi.py | 10 +- .../modules/l1pfProducerHGCal_cfi.py | 10 +- .../l1t1PFPuppiJet70offMaxEta2p4_cfi.py | 2 +- .../l1t2PFPuppiJet55offMaxEta2p4_cfi.py | 2 +- .../l1t4PFPuppiJet25OnlineMaxEta2p4_cfi.py | 2 +- .../l1t4PFPuppiJet40offMaxEta2p4_cfi.py | 2 +- .../l1tDoublePFPuppiJet112offMaxEta2p4_cfi.py | 2 +- ...1tDoublePFPuppiJets112offMaxDeta1p6_cfi.py | 4 +- .../l1tPFPuppiHT400offMaxEta2p4_cfi.py | 2 +- .../modules/l1tPFPuppiHT450off_cfi.py | 2 +- .../HLT_75e33/modules/l1tPFPuppiHT_cfi.py | 2 +- .../modules/l1tPFPuppiMET220off_cfi.py | 2 +- .../modules/l1tSinglePFPuppiJet230off_cfi.py | 2 +- .../modules/l1tSlwPFPuppiJetsCorrected_cfi.py | 2 +- .../modules/l1tSlwPFPuppiJets_cfi.py | 2 +- .../pfClustersFromCombinedCaloHCal_cfi.py | 2 +- .../modules/pfClustersFromL1EGClusters_cfi.py | 2 +- .../modules/pfTracksFromL1TracksBarrel_cfi.py | 4 +- .../modules/pfTracksFromL1TracksHGCal_cfi.py | 4 +- .../HLT_75e33/modules/ticlSeedingL1_cfi.py | 2 +- .../paths/l1tReconstructionPath_cfi.py | 4 +- .../HLTPhoton187L1SeededSequence_cfi.py | 2 +- .../HLTPhoton187UnseededSequence_cfi.py | 2 +- .../L1TTkEle25TkEle12Sequence_cfi.py | 4 +- .../sequences/L1TTkEle36Sequence_cfi.py | 2 +- .../sequences/L1TTkEm37TkEm24Sequence_cfi.py | 4 +- .../sequences/L1TTkEm51Sequence_cfi.py | 2 +- .../L1TTkIsoEle22TkEm12Sequence_cfi.py | 4 +- .../sequences/L1TTkIsoEle28Sequence_cfi.py | 2 +- .../L1TTkIsoEm22TkIsoEm12Sequence_cfi.py | 4 +- .../sequences/L1TTkIsoEm36Sequence_cfi.py | 2 +- .../tasks/l1tReconstructionTask_cfi.py | 8 +- .../Configuration/python/HLT_75e33_cff.py | 8 +- .../python/L1Trigger_EventContent_cff.py | 86 +++++------ .../Configuration/python/SimL1Emulator_cff.py | 106 ++++++------- .../python/customisePhase2TTNoMC.py | 2 +- .../plugins/GTTFileWriter.cc | 6 +- .../python/GTTFileWriter_cff.py | 8 +- .../plugins/Phase1L1TJetCalibrator.cc | 2 +- .../python/L1CaloJetHTTProducer_cfi.py | 6 +- .../python/L1CaloJetProducer_cfi.py | 6 +- .../L1CaloTrigger/python/L1CaloJets_cff.py | 20 +-- .../L1EGammaCrystalsEmulatorProducer_cfi.py | 4 +- .../python/L1TowerCalibrationProducer_cfi.py | 6 +- .../Phase1L1TJetCalibrator_9x9Jets_cfi.py | 4 +- ...ase1L1TJetCalibrator_9x9trimmedJets_cfi.py | 6 +- .../python/Phase1L1TJetCalibrator_cfi.py | 7 +- .../python/Phase1L1TJetProducer_cfi.py | 4 +- .../python/Phase1L1TJetSumsProducer_cfi.py | 4 +- .../python/Phase1L1TJets_9x9_cff.py | 27 ++-- .../python/Phase1L1TJets_9x9trimmed_cff.py | 28 ++-- .../L1CaloTrigger/python/Phase1L1TJets_cff.py | 14 +- .../python/l1EgammaStaProducers_cff.py | 4 +- .../test_L1EGCrystalClusterEmulator_cfg.py | 4 +- .../L1CaloTrigger/test/test_L1CaloJets_cfg.py | 12 +- .../test/test_Phase1L1TJets_cfg.py | 51 ------- .../L1THGCal/python/customCalibration.py | 4 +- L1Trigger/L1THGCal/python/customClustering.py | 28 ++-- .../L1THGCal/python/customHistoSeeding.py | 12 +- .../L1THGCal/python/customIdentification.py | 6 +- .../L1THGCal/python/customNewProcessors.py | 18 +-- L1Trigger/L1THGCal/python/customTowers.py | 12 +- .../python/customTriggerCellSelect.py | 14 +- .../L1THGCal/python/customTriggerGeometry.py | 36 ++--- .../L1THGCal/python/customTriggerSums.py | 16 +- L1Trigger/L1THGCal/python/customVFE.py | 4 +- .../python/hgcalBackEndLayer1Producer_cfi.py | 12 +- .../L1THGCal/python/hgcalBackEndLayer1_cff.py | 6 +- .../python/hgcalBackEndLayer2Producer_cfi.py | 12 +- .../L1THGCal/python/hgcalBackEndLayer2_cff.py | 6 +- .../python/hgcalConcentratorProducer_cfi.py | 12 +- .../L1THGCal/python/hgcalConcentrator_cff.py | 4 +- .../python/hgcalTowerMapProducer_cfi.py | 8 +- .../L1THGCal/python/hgcalTowerMap_cff.py | 4 +- .../L1THGCal/python/hgcalTowerProducer_cfi.py | 12 +- L1Trigger/L1THGCal/python/hgcalTower_cff.py | 4 +- .../hgcalTriggerGeometryESProducer_cfi.py | 2 +- .../python/hgcalTriggerPrimitivesNew_cff.py | 12 +- ...hgcalTriggerPrimitivesSimClustering_cff.py | 4 +- .../python/hgcalTriggerPrimitives_cff.py | 12 +- .../L1THGCal/python/hgcalVFEProducer_cfi.py | 4 +- L1Trigger/L1THGCal/python/hgcalVFE_cff.py | 4 +- .../test/testHGCalL1TGeometryV11Imp2_cfg.py | 4 +- .../test/testHGCalL1TGeometryV11Imp3_cfg.py | 4 +- .../testHGCalL1TGeometryV9Imp2_Nose_cfg.py | 14 +- .../HGC3DClusterGenMatchSelector_cff.py | 2 +- .../HGC3DClusterGenMatchSelector_cfi.py | 4 +- .../python/caloTruthCellsNtuples_cff.py | 26 ++-- .../python/caloTruthCellsProducer_cfi.py | 4 +- .../python/caloTruthCells_cff.py | 48 +++--- .../L1THGCalUtilities/python/clustering2d.py | 12 +- .../python/clustering2d_v2.py | 2 +- .../L1THGCalUtilities/python/clustering3d.py | 16 +- .../L1THGCalUtilities/python/concentrator.py | 14 +- .../L1THGCalUtilities/python/customNtuples.py | 20 +-- .../python/hgcalTriggerChains.py | 40 ++--- .../python/hgcalTriggerNtuples_cff.py | 2 +- .../python/hgcalTriggerNtuples_cfi.py | 18 +-- .../python/hgcalTriggerValidation_cff.py | 2 +- .../L1THGCalUtilities/python/selectors.py | 2 +- .../L1THGCalUtilities/python/truth_prod.py | 4 +- L1Trigger/L1THGCalUtilities/python/vfe.py | 2 +- .../test/testCustomHGCalL1T_RelValV11_cfg.py | 4 +- .../test/testHGCalL1T_RelValV11_cfg.py | 4 +- .../test/testHGCalL1T_multialgo_V11_cfg.py | 10 +- .../testHGCalL1T_multialgo_with_truth_cfg.py | 10 +- .../testHGCalL1T_newProcessors_V11_cfg.py | 4 +- .../testHGCalL1T_stage1Truncation_V11_cfg.py | 4 +- .../plugins/L1FastTrackingJetProducer.cc | 2 +- .../python/L1FastTrackingJetProducer_cfi.py | 14 +- .../python/L1GTTInputProducer_cfi.py | 8 +- .../python/L1TkHTMissEmulatorProducer_cfi.py | 8 +- .../python/L1TkHTMissProducer_cfi.py | 22 ++- .../python/L1TkMETAnalyser_cfi.py | 10 +- .../python/L1TkObjectProducers_cff.py | 7 +- .../python/L1TrackFastJetProducer_cfi.py | 13 +- .../python/L1TrackJetEmulationProducer_cfi.py | 13 +- .../python/L1TrackJetProducer_cfi.py | 14 +- .../python/L1TrackSelectionProducer_cfi.py | 40 ++--- .../L1TrackerEtMissEmulatorProducer_cfi.py | 12 +- .../python/L1TrackerEtMissProducer_cfi.py | 18 +-- .../L1TTrackMatch/test/L1TrackMET_cfg.py | 30 ++-- .../test/L1TrackObjectNtupleMaker_cfg.py | 140 +++++++++--------- L1Trigger/Phase2L1GMT/python/gmt_cff.py | 2 +- L1Trigger/Phase2L1GMT/python/gmt_cfi.py | 10 +- L1Trigger/Phase2L1GMT/test/gmtStudy.py | 6 +- L1Trigger/Phase2L1GMT/test/runGMT.py | 16 +- L1Trigger/Phase2L1GMT/test/test.py | 4 +- .../python/DeregionizerProducer_cfi.py | 4 +- .../python/L1MetPfProducer_cfi.py | 4 +- .../python/L1MhtPfProducer_cfi.py | 4 +- .../python/L1NNTauProducer_cff.py | 10 +- .../python/L1SeedConePFJetProducer_cfi.py | 6 +- .../python/l1ctJetFileWriter_cfi.py | 4 +- .../python/l1ctLayer1_cff.py | 102 ++++++------- .../python/l1ctLayer2EG_cff.py | 20 +-- .../python/l1pfJetMet_cff.py | 20 +-- .../python/pfClustersFromCombinedCalo_cff.py | 18 +-- .../python/pfClustersFromCombinedCalo_cfi.py | 8 +- .../python/pfClustersFromHGC3DClusters_cfi.py | 8 +- .../python/pfClustersFromL1EGClusters_cfi.py | 8 +- .../python/pfTracksFromL1Tracks_cfi.py | 4 +- .../test/make_l1ctLayer1_dumpFiles_cfg.py | 50 +++---- ...ake_l1ctLayer1_patternFiles_fromRAW_cfg.py | 30 ++-- .../Phase2L1Taus/plugins/HPSPFTauProducer.cc | 2 +- .../python/HPSPFTauProducerPF_cfi.py | 4 +- .../python/HPSPFTauProducerPuppi_cfi.py | 4 +- .../Phase2L1Taus/python/l1emulator_cff.py | 22 +-- .../Phase2L1Taus/test/produceHPSPFTaus_cfg.py | 26 ++-- .../python/L1HybridEmulationTracks_cff.py | 16 +- .../python/Tracklet_cfi.py | 4 +- .../test/HybridTracks_cfg.py | 12 +- .../test/L1TrackNtupleMaker_cfg.py | 18 +-- .../python/InputDataProducer_cff.py | 16 +- .../python/TPStubValueMapProducer_cff.py | 22 +-- ...texNTupler_cff.py => VertexNTupler_cfi.py} | 70 ++++++++- ...xProducer_cff.py => VertexProducer_cfi.py} | 4 +- .../VertexFinder/test/vertexFinder_cfg.py | 12 +- .../VertexFinder/test/vertexNTupler_cfg.py | 14 +- .../EgammaHLTEleL1TrackIsolProducer.cc | 2 +- .../plugins/EgammaHLTPhase2ExtraProducer.cc | 2 +- .../SeedGeneratorFromL1TTracksEDProducer.cc | 2 +- .../hgcalRunEmulatorValidationTPG_cff.py | 2 +- .../python/hgcalValidationTPG_cfi.py | 8 +- 211 files changed, 1104 insertions(+), 1118 deletions(-) delete mode 100644 L1Trigger/L1CaloTrigger/test/test_Phase1L1TJets_cfg.py rename L1Trigger/VertexFinder/python/{VertexNTupler_cff.py => VertexNTupler_cfi.py} (50%) rename L1Trigger/VertexFinder/python/{VertexProducer_cff.py => VertexProducer_cfi.py} (95%) diff --git a/Configuration/StandardSequences/python/L1TrackTrigger_cff.py b/Configuration/StandardSequences/python/L1TrackTrigger_cff.py index c6a5ef6925bf1..213f0c82c7c5e 100644 --- a/Configuration/StandardSequences/python/L1TrackTrigger_cff.py +++ b/Configuration/StandardSequences/python/L1TrackTrigger_cff.py @@ -9,7 +9,7 @@ # Customisation to enable TTTracks in geometry D41 and later (corresponding to phase2_trackerV14 or later). Includes the HGCAL L1 trigger _tttracks_l1tracktrigger = L1TrackTrigger.copy() -_tttracks_l1tracktrigger = cms.Sequence(_tttracks_l1tracktrigger + L1PromptExtendedHybridTracksWithAssociators) +_tttracks_l1tracktrigger = cms.Sequence(_tttracks_l1tracktrigger + L1TPromptExtendedHybridTracksWithAssociators) from Configuration.Eras.Modifier_phase2_trigger_cff import phase2_trigger phase2_trigger.toReplaceWith( L1TrackTrigger, _tttracks_l1tracktrigger ) diff --git a/DQM/SiOuterTracker/python/OuterTrackerMonitorTTTrack_cfi.py b/DQM/SiOuterTracker/python/OuterTrackerMonitorTTTrack_cfi.py index 6c3918900b1ce..db32b16b58f6e 100644 --- a/DQM/SiOuterTracker/python/OuterTrackerMonitorTTTrack_cfi.py +++ b/DQM/SiOuterTracker/python/OuterTrackerMonitorTTTrack_cfi.py @@ -3,7 +3,7 @@ from DQMServices.Core.DQMEDAnalyzer import DQMEDAnalyzer OuterTrackerMonitorTTTrack = DQMEDAnalyzer('OuterTrackerMonitorTTTrack', TopFolderName = cms.string('SiOuterTracker'), - TTTracksTag = cms.InputTag("TTTracksFromTrackletEmulation", "Level1TTTracks"), #tracks (currently from tracklet) + TTTracksTag = cms.InputTag("l1tTTTracksFromTrackletEmulation", "Level1TTTracks"), #tracks (currently from tracklet) HQNStubs = cms.int32(4), #cut for "high quality" tracks HQChi2dof = cms.double(10.0), #cut for "high quality" tracks HQBendChi2 = cms.double(2.2), #cut for "high quality" tracks 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..01ede6aaa5785 100644 --- a/DQMOffline/L1Trigger/python/L1TPhase2Offline_cfi.py +++ b/DQMOffline/L1Trigger/python/L1TPhase2Offline_cfi.py @@ -5,8 +5,8 @@ OuterTrackerTkMET = DQMEDAnalyzer('L1TPhase2OuterTrackerTkMET', TopFolderName = cms.string('L1T/L1TPhase2/'), - TTTracksTag = cms.InputTag("TTTracksFromTrackletEmulation", "Level1TTTracks"), - L1VertexInputTag = cms.InputTag("L1VertexFinderEmulator", "l1verticesEmulation"), + TTTracksTag = cms.InputTag("l1tTTTracksFromTrackletEmulation", "Level1TTTracks"), + L1VertexInputTag = cms.InputTag("l1tVertexFinderEmulator", "l1verticesEmulation"), maxZ0 = cms.double ( 15. ) , # in cm maxEta = cms.double ( 2.4 ) , chi2dofMax = cms.double( 10. ), @@ -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/CustomConfigs.py b/HLTrigger/Configuration/python/CustomConfigs.py index 95f715d68e6f0..fe223ba9133a0 100644 --- a/HLTrigger/Configuration/python/CustomConfigs.py +++ b/HLTrigger/Configuration/python/CustomConfigs.py @@ -202,7 +202,7 @@ def L1REPACK(process, sequence="Full"): # special L1T cleanup for obj in [ - 'hgcalTriggerGeometryESProducer', + 'l1tHGCalTriggerGeometryESProducer', ]: if hasattr(process, obj): delattr(process, obj) diff --git a/HLTrigger/Configuration/python/HLTPhase2TDR_EventContent_cff.py b/HLTrigger/Configuration/python/HLTPhase2TDR_EventContent_cff.py index afc064aa4a027..cbdca3973ad55 100644 --- a/HLTrigger/Configuration/python/HLTPhase2TDR_EventContent_cff.py +++ b/HLTrigger/Configuration/python/HLTPhase2TDR_EventContent_cff.py @@ -9,21 +9,21 @@ 'drop Phase2TrackerDigiedmDetSetVectorPhase2TrackerDigiPhase2TrackerDigiedmrefhelperFindForDetSetVectoredmRefTTClusterAssociationMap_TTClusterAssociatorFromPixelDigis_ClusterInclusive_*', 'drop Phase2TrackerDigiedmDetSetVectorPhase2TrackerDigiPhase2TrackerDigiedmrefhelperFindForDetSetVectoredmRefTTClusterAssociationMap_TTClusterAssociatorFromPixelDigis_ClusterAccepted_*', 'drop recoPFClusters_particleFlowClusterHGCal__*', - 'drop l1tHGCalTriggerCellBXVector_hgcalVFEProducer_HGCalVFEProcessorSums_*', + 'drop l1tHGCalTriggerCellBXVector_l1tHGCalVFEProducer_HGCalVFEProcessorSums_*', 'drop recoHGCalMultiClusters_ticlMultiClustersFromTrackstersMerge__*', 'drop recoHGCalMultiClusters_ticlMultiClustersFromTrackstersTrk__*', 'drop Phase2TrackerDigiedmDetSetVectorPhase2TrackerDigiPhase2TrackerDigiedmrefhelperFindForDetSetVectoredmRefTTClusteredmNewDetSetVector_TTClustersFromPhase2TrackerDigis_ClusterInclusive_HLT', 'drop recoHGCalMultiClusters_ticlMultiClustersFromTrackstersMIP__*', 'drop recoPFClusters_particleFlowClusterHGCalFromMultiCl__*', - 'drop l1tHGCalClusterBXVector_hgcalBackEndLayer1Producer_HGCalBackendLayer1Processor2DClustering_*', + 'drop l1tHGCalClusterBXVector_l1tHGCalBackEndLayer1Producer_HGCalBackendLayer1Processor2DClustering_*', 'drop Phase2TrackerDigiedmDetSetVectorPhase2TrackerDigiPhase2TrackerDigiedmrefhelperFindForDetSetVectoredmRefTTClusterAssociationMap_TTClusterAssociatorFromPixelDigis_ClusterInclusive_HLT', - 'drop l1tHGCalTowerMapBXVector_hgcalTowerMapProducer_HGCalTowerMapProcessor_*', + 'drop l1tHGCalTowerMapBXVector_l1tHGCalTowerMapProducer_HGCalTowerMapProcessor_*', 'drop recoGsfTrackExtras_electronGsfTracks__*', 'drop recoCaloClusters_particleFlowSuperClusterHGCal__*', - 'drop l1tHGCalTriggerCellBXVector_hgcalConcentratorProducer_HGCalConcentratorProcessorSelection_*', + 'drop l1tHGCalTriggerCellBXVector_l1tHGcalConcentratorProducer_HGCalConcentratorProcessorSelection_*', 'drop recoSuperClusters_particleFlowSuperClusterHGCal__*', 'drop recoGsfTrackExtras_electronGsfTracksFromMultiCl__*', - 'drop recoHGCalMultiClusters_hgcalMultiClusters__*', + 'drop recoHGCalMultiClusters_l1tHGCalMultiClusters__*', 'drop recoGsfTrackExtras_electronGsfTracks__*', 'drop recoCaloClusters_particleFlowSuperClusterHGCalFromMultiCl__*', 'drop recoSuperClusters_particleFlowSuperClusterHGCalFromMultiCl__*', @@ -35,7 +35,7 @@ 'drop recoTrackExtras_electronGsfTracksFromMultiCl__*', 'drop Phase2TrackerDigiedmDetSetVectorPhase2TrackerDigiPhase2TrackerDigiedmrefhelperFindForDetSetVectoredmRefTTStubAssociationMap_TTStubAssociatorFromPixelDigis_StubAccepted_HLT', 'drop CaloTowersSorted_towerMaker__*', - 'drop l1tHGCalTowerBXVector_hgcalTowerProducer_HGCalTowerProcessor_*', + 'drop l1tHGCalTowerBXVector_l1tHGCalTowerProducer_HGCalTowerProcessor_*', 'drop TrackingRecHitsOwned_electronGsfTracks__*', 'drop recoHGCalMultiClusters_ticlMultiClustersFromTrackstersEM__*', 'drop *_hltGtStage2Digis_*_HLT', 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..6428983169a2d 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkEleDouble12Filter_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkEleDouble12Filter_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -L1TkEleDouble12Filter = cms.EDFilter("L1TTkEleFilter", +l1tTkEleDouble12Filter = cms.EDFilter("L1TTkEleFilter", ApplyQual1 = cms.bool(True), ApplyQual2 = cms.bool(True), EtaBinsForIsolation = cms.vdouble(0.0, 1.479, 2.4), @@ -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..e370ee752c71e 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkEleSingle25Filter_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkEleSingle25Filter_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -L1TkEleSingle25Filter = cms.EDFilter("L1TTkEleFilter", +l1tTkEleSingle25Filter = cms.EDFilter("L1TTkEleFilter", ApplyQual1 = cms.bool(True), ApplyQual2 = cms.bool(True), EtaBinsForIsolation = cms.vdouble(0.0, 1.479, 2.4), @@ -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..8f669adadb6be 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkEleSingle36Filter_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkEleSingle36Filter_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -L1TkEleSingle36Filter = cms.EDFilter("L1TTkEleFilter", +l1tTkEleSingle36Filter = cms.EDFilter("L1TTkEleFilter", ApplyQual1 = cms.bool(True), ApplyQual2 = cms.bool(True), EtaBinsForIsolation = cms.vdouble(0.0, 1.479, 2.4), @@ -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..433597840e163 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkEmDouble12Filter_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkEmDouble12Filter_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -L1TkEmDouble12Filter = cms.EDFilter("L1TTkEmFilter", +l1tTkEmDouble12Filter = cms.EDFilter("L1TTkEmFilter", ApplyQual1 = cms.bool(True), ApplyQual2 = cms.bool(True), EtaBinsForIsolation = cms.vdouble(0.0, 1.479, 2.4), @@ -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..24b3f29ed8533 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkEmDouble24Filter_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkEmDouble24Filter_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -L1TkEmDouble24Filter = cms.EDFilter("L1TTkEmFilter", +l1tTkEmDouble24Filter = cms.EDFilter("L1TTkEmFilter", ApplyQual1 = cms.bool(True), ApplyQual2 = cms.bool(True), EtaBinsForIsolation = cms.vdouble(0.0, 1.479, 2.4), @@ -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..84a17be6c1bb6 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkEmSingle37Filter_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkEmSingle37Filter_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -L1TkEmSingle37Filter = cms.EDFilter("L1TTkEmFilter", +l1tTkEmSingle37Filter = cms.EDFilter("L1TTkEmFilter", ApplyQual1 = cms.bool(True), ApplyQual2 = cms.bool(True), EtaBinsForIsolation = cms.vdouble(0.0, 1.479, 2.4), @@ -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..ffda34a8caacc 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkEmSingle51Filter_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkEmSingle51Filter_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -L1TkEmSingle51Filter = cms.EDFilter("L1TTkEmFilter", +l1tTkEmSingle51Filter = cms.EDFilter("L1TTkEmFilter", ApplyQual1 = cms.bool(True), ApplyQual2 = cms.bool(True), EtaBinsForIsolation = cms.vdouble(0.0, 1.479, 2.4), @@ -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..015bd18050890 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkIsoEleSingle22Filter_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkIsoEleSingle22Filter_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -L1TkIsoEleSingle22Filter = cms.EDFilter("L1TTkEleFilter", +l1tTkIsoEleSingle22Filter = cms.EDFilter("L1TTkEleFilter", ApplyQual1 = cms.bool(True), ApplyQual2 = cms.bool(True), EtaBinsForIsolation = cms.vdouble(0.0, 1.479, 2.4), @@ -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..2f2aa4f92922b 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkIsoEleSingle28Filter_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkIsoEleSingle28Filter_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -L1TkIsoEleSingle28Filter = cms.EDFilter("L1TTkEleFilter", +l1tTkIsoEleSingle28Filter = cms.EDFilter("L1TTkEleFilter", ApplyQual1 = cms.bool(True), ApplyQual2 = cms.bool(True), EtaBinsForIsolation = cms.vdouble(0.0, 1.479, 2.4), @@ -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..4a3e38edfae50 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkIsoEmDouble12Filter_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkIsoEmDouble12Filter_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -L1TkIsoEmDouble12Filter = cms.EDFilter("L1TTkEmFilter", +l1tTkIsoEmDouble12Filter = cms.EDFilter("L1TTkEmFilter", ApplyQual1 = cms.bool(True), ApplyQual2 = cms.bool(True), EtaBinsForIsolation = cms.vdouble(0.0, 1.479, 2.4), @@ -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..993cac6679f47 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkIsoEmSingle22Filter_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkIsoEmSingle22Filter_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -L1TkIsoEmSingle22Filter = cms.EDFilter("L1TTkEmFilter", +l1tTkIsoEmSingle22Filter = cms.EDFilter("L1TTkEmFilter", ApplyQual1 = cms.bool(True), ApplyQual2 = cms.bool(True), EtaBinsForIsolation = cms.vdouble(0.0, 1.479, 2.4), @@ -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..7d4c8efe0c18e 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkIsoEmSingle36Filter_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkIsoEmSingle36Filter_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -L1TkIsoEmSingle36Filter = cms.EDFilter("L1TTkEmFilter", +l1tTkIsoEmSingle36Filter = cms.EDFilter("L1TTkEmFilter", ApplyQual1 = cms.bool(True), ApplyQual2 = cms.bool(True), EtaBinsForIsolation = cms.vdouble(0.0, 1.479, 2.4), @@ -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/L1TkPrimaryVertex_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkPrimaryVertex_cfi.py index 526de4fa13508..4454ec33125f7 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkPrimaryVertex_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/L1TkPrimaryVertex_cfi.py @@ -1,11 +1,11 @@ import FWCore.ParameterSet.Config as cms -L1TkPrimaryVertex = cms.EDProducer("L1TkFastVertexProducer", +l1tTkPrimaryVertex = cms.EDProducer("L1TkFastVertexProducer", CHI2MAX = cms.double(100.0), GenParticleInputTag = cms.InputTag("genParticles"), HepMCInputTag = cms.InputTag("generator"), HighPtTracks = cms.int32(0), - L1TrackInputTag = cms.InputTag("TTTracksFromTrackletEmulation","Level1TTTracks"), + L1TrackInputTag = cms.InputTag("l1tTTTracksFromTrackletEmulation","Level1TTTracks"), MonteCarloVertex = cms.bool(False), PTMAX = cms.double(50.0), PTMINTRA = cms.double(2.0), 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/hltEgammaEleL1TrkIsoL1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaEleL1TrkIsoL1Seeded_cfi.py index aec33a299b9d9..3c2fb84b012eb 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaEleL1TrkIsoL1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaEleL1TrkIsoL1Seeded_cfi.py @@ -23,5 +23,5 @@ ), useAbsEta = cms.bool(True) ), - l1Tracks = cms.InputTag("TTTracksFromTrackletEmulation","Level1TTTracks") + l1Tracks = cms.InputTag("l1tTTTracksFromTrackletEmulation","Level1TTTracks") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaEleL1TrkIsoUnseeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaEleL1TrkIsoUnseeded_cfi.py index 685d020c01905..e7231154dfbc0 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaEleL1TrkIsoUnseeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaEleL1TrkIsoUnseeded_cfi.py @@ -23,5 +23,5 @@ ), useAbsEta = cms.bool(True) ), - l1Tracks = cms.InputTag("TTTracksFromTrackletEmulation","Level1TTTracks") + l1Tracks = cms.InputTag("l1tTTTracksFromTrackletEmulation","Level1TTTracks") ) 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..744d49f5f6a0b 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TkElectronsEllipticMatchCrystal_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TkElectronsEllipticMatchCrystal_cfi.py @@ -6,8 +6,8 @@ DeltaZ = cms.double(0.6), ETmin = cms.double(-1.0), IsoCut = cms.double(-0.1), - L1EGammaInputTag = cms.InputTag("L1EGammaClusterEmuProducer"), - L1TrackInputTag = cms.InputTag("TTTracksFromTrackletEmulation","Level1TTTracks"), + L1EGammaInputTag = cms.InputTag("l1tEGammaClusterEmuProducer"), + L1TrackInputTag = cms.InputTag("l1tTTTracksFromTrackletEmulation","Level1TTTracks"), PTMINTRA = cms.double(2.0), RelativeIsolation = cms.bool(True), TrackChi2 = cms.double(10000000000.0), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TkElectronsEllipticMatchHGC_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TkElectronsEllipticMatchHGC_cfi.py index 7dcb725884025..cd8ee37c9ccb7 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TkElectronsEllipticMatchHGC_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TkElectronsEllipticMatchHGC_cfi.py @@ -6,8 +6,8 @@ DeltaZ = cms.double(0.6), ETmin = cms.double(-1.0), IsoCut = cms.double(-0.1), - L1EGammaInputTag = cms.InputTag("l1EGammaEEProducer","L1EGammaCollectionBXVWithCuts"), - L1TrackInputTag = cms.InputTag("TTTracksFromTrackletEmulation","Level1TTTracks"), + L1EGammaInputTag = cms.InputTag("l1tEGammaEEProducer","L1EGammaCollectionBXVWithCuts"), + L1TrackInputTag = cms.InputTag("l1tTTTracksFromTrackletEmulation","Level1TTTracks"), PTMINTRA = cms.double(2.0), RelativeIsolation = cms.bool(True), TrackChi2 = cms.double(10000000000.0), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TkPhotonsCrystal_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TkPhotonsCrystal_cfi.py index 93cd0e769ddba..b73f383603d9c 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"), - L1TrackInputTag = cms.InputTag("TTTracksFromTrackletEmulation","Level1TTTracks"), - L1VertexInputTag = cms.InputTag("L1TkPrimaryVertex"), + L1EGammaInputTag = cms.InputTag("l1tEGammaClusterEmuProducer"), + L1TrackInputTag = cms.InputTag("l1tTTTracksFromTrackletEmulation","Level1TTTracks"), + 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..25effaf6549e2 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"), - L1TrackInputTag = cms.InputTag("TTTracksFromTrackletEmulation","Level1TTTracks"), - L1VertexInputTag = cms.InputTag("L1TkPrimaryVertex"), + L1EGammaInputTag = cms.InputTag("l1tEGammaEEProducer","L1EGammaCollectionBXVWithCuts"), + L1TrackInputTag = cms.InputTag("l1tTTTracksFromTrackletEmulation","Level1TTTracks"), + 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..4b68e9cb1c5cb 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/l1NNTauProducerPuppi_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/l1NNTauProducerPuppi_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -l1NNTauProducerPuppi = cms.EDProducer("L1NNTauProducer", - L1PFObjects = cms.InputTag("l1pfCandidates","Puppi"), +l1tNNTauProducerPuppi = cms.EDProducer("L1NNTauProducer", + L1PFObjects = cms.InputTag("l1tPFCandidates","Puppi"), NNFileName = cms.string('L1Trigger/Phase2L1ParticleFlow/data/tau_3layer_puppi.pb'), conesize = cms.double(0.4), maxtaus = cms.int32(5), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/l1PFMetPuppi_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/l1PFMetPuppi_cfi.py index 67eaf6a331963..231001a771d68 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/l1PFMetPuppi_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/l1PFMetPuppi_cfi.py @@ -9,7 +9,7 @@ parameters = cms.PSet( ), - src = cms.InputTag("l1pfCandidates","Puppi"), + src = cms.InputTag("l1tPFCandidates","Puppi"), srcJetResPhi = cms.optional.string, srcJetResPt = cms.optional.string, srcJetSF = cms.optional.string, diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/l1pfCandidates_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/l1pfCandidates_cfi.py index 8a7226deade8c..cf529b19941e2 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/l1pfCandidates_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/l1pfCandidates_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -l1pfCandidates = cms.EDProducer("L1TPFCandMultiMerger", +l1tPFCandidates = cms.EDProducer("L1TPFCandMultiMerger", labelsToMerge = cms.vstring( 'Calo', 'TK', @@ -8,5 +8,5 @@ 'PF', 'Puppi' ), - pfProducers = cms.VInputTag(cms.InputTag("l1pfProducerBarrel"), cms.InputTag("l1pfProducerHGCal"), cms.InputTag("l1pfProducerHGCalNoTK"), cms.InputTag("l1pfProducerHF")) + pfProducers = cms.VInputTag(cms.InputTag("l1tPFProducerBarrel"), cms.InputTag("l1tPFProducerHGCal"), cms.InputTag("l1tPFProducerHGCalNoTK"), cms.InputTag("l1tPFProducerHF")) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/l1pfProducerBarrel_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/l1pfProducerBarrel_cfi.py index 924acbbe4b455..f3e4791a65265 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/l1pfProducerBarrel_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/l1pfProducerBarrel_cfi.py @@ -1,11 +1,11 @@ import FWCore.ParameterSet.Config as cms -l1pfProducerBarrel = cms.EDProducer("L1TPFProducer", +l1tPFProducerBarrel = cms.EDProducer("L1TPFProducer", debug = cms.untracked.int32(0), - emClusters = cms.VInputTag(cms.InputTag("pfClustersFromL1EGClusters")), + emClusters = cms.VInputTag(cms.InputTag("l1tPFClustersFromL1EGClusters")), emPtCut = cms.double(0.5), etaCharged = cms.double(2.5), - hadClusters = cms.VInputTag(cms.InputTag("pfClustersFromCombinedCaloHCal","calibrated")), + hadClusters = cms.VInputTag(cms.InputTag("l1tPFClustersFromCombinedCaloHCal","calibrated")), hadPtCut = cms.double(1.0), linking = cms.PSet( caloEmPtMinFrac = cms.double(0.5), @@ -63,9 +63,9 @@ 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"), + tracks = cms.InputTag("l1tPFTracksFromL1TracksBarrel"), trkMaxChi2 = cms.double(15), trkMinStubs = cms.uint32(4), trkPtCut = cms.double(2.0), @@ -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..8cf80d4784fb0 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/l1pfProducerHF_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/l1pfProducerHF_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -l1pfProducerHF = cms.EDProducer("L1TPFProducer", +l1tPFProducerHF = cms.EDProducer("L1TPFProducer", debug = cms.untracked.int32(0), emClusters = cms.VInputTag(), emPtCut = cms.double(0.5), @@ -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..7be1a841e97f1 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/l1pfProducerHGCalNoTK_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/l1pfProducerHGCalNoTK_cfi.py @@ -1,11 +1,11 @@ import FWCore.ParameterSet.Config as cms -l1pfProducerHGCalNoTK = cms.EDProducer("L1TPFProducer", +l1tPFProducerHGCalNoTK = cms.EDProducer("L1TPFProducer", debug = cms.untracked.int32(0), emClusters = cms.VInputTag(), emPtCut = cms.double(0.5), etaCharged = cms.double(2.5), - hadClusters = cms.VInputTag(cms.InputTag("pfClustersFromHGC3DClusters")), + hadClusters = cms.VInputTag(cms.InputTag("l1tPFClustersFromHGC3DClusters")), hadPtCut = cms.double(1.0), linking = cms.PSet( caloEmPtMinFrac = cms.double(0.5), @@ -71,9 +71,9 @@ phiSlices = cms.uint32(1) ) ), - tkMuons = cms.InputTag("L1TkMuonsGmt"), + tkMuons = cms.InputTag("l1tTkMuonsGmt"), trackRegionMode = cms.string('atCalo'), - tracks = cms.InputTag("pfTracksFromL1TracksHGCal"), + tracks = cms.InputTag("l1tPFTracksFromL1TracksHGCal"), trkMaxChi2 = cms.double(15), trkMinStubs = cms.uint32(4), trkPtCut = cms.double(2.0), @@ -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..d53b27043aef7 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/l1pfProducerHGCal_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/l1pfProducerHGCal_cfi.py @@ -1,11 +1,11 @@ import FWCore.ParameterSet.Config as cms -l1pfProducerHGCal = cms.EDProducer("L1TPFProducer", +l1tPFProducerHGCal = cms.EDProducer("L1TPFProducer", debug = cms.untracked.int32(0), emClusters = cms.VInputTag(), emPtCut = cms.double(0.5), etaCharged = cms.double(2.5), - hadClusters = cms.VInputTag(cms.InputTag("pfClustersFromHGC3DClusters")), + hadClusters = cms.VInputTag(cms.InputTag("l1tPFClustersFromHGC3DClusters")), hadPtCut = cms.double(1.0), linking = cms.PSet( caloEmPtMinFrac = cms.double(0.5), @@ -71,9 +71,9 @@ phiSlices = cms.uint32(1) ) ), - tkMuons = cms.InputTag("L1TkMuonsGmt"), + tkMuons = cms.InputTag("l1tTkMuonsGmt"), trackRegionMode = cms.string('atCalo'), - tracks = cms.InputTag("pfTracksFromL1TracksHGCal"), + tracks = cms.InputTag("l1tPFTracksFromL1TracksHGCal"), trkMaxChi2 = cms.double(15), trkMinStubs = cms.uint32(4), trkPtCut = cms.double(2.0), @@ -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/l1tSlwPFPuppiJetsCorrected_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/l1tSlwPFPuppiJetsCorrected_cfi.py index a40b89082ec87..f97effb3675bb 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/l1tSlwPFPuppiJetsCorrected_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/l1tSlwPFPuppiJetsCorrected_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -Phase1L1TJetCalibrator9x9 = cms.EDProducer("Phase1L1TJetCalibrator", +l1tPhase1JetCalibrator9x9 = cms.EDProducer("Phase1L1TJetCalibrator", absEtaBinning = cms.vdouble( 0, 0.435, 0.783, 1.131, 1.305, 1.479, 1.653, 1.83, 1.93, 2.043, diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/l1tSlwPFPuppiJets_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/l1tSlwPFPuppiJets_cfi.py index 8bbc5b5cd472d..cfd8451996f62 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/l1tSlwPFPuppiJets_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/l1tSlwPFPuppiJets_cfi.py @@ -49,7 +49,7 @@ 5.0 ), etaRegions = cms.vdouble(-1.5, -0.75, 0, 0.75, 1.5), - inputCollectionTag = cms.InputTag("l1pfCandidates","Puppi"), + inputCollectionTag = cms.InputTag("l1tPFCandidates","Puppi"), jetIEtaSize = cms.uint32(7), jetIPhiSize = cms.uint32(7), nBinsPhi = cms.uint32(72), 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/pfTracksFromL1TracksBarrel_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/pfTracksFromL1TracksBarrel_cfi.py index fe4ae5860d832..702976b73acba 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/pfTracksFromL1TracksBarrel_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/pfTracksFromL1TracksBarrel_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -pfTracksFromL1TracksBarrel = cms.EDProducer("PFTrackProducerFromL1Tracks", - L1TrackTag = cms.InputTag("TTTracksFromTrackletEmulation","Level1TTTracks"), +l1tPFTracksFromL1TracksBarrel = cms.EDProducer("PFTrackProducerFromL1Tracks", + L1TrackTag = cms.InputTag("l1tTTTracksFromTrackletEmulation","Level1TTTracks"), nParam = cms.uint32(4), resolCalo = cms.PSet( etaBins = cms.vdouble(0.7, 1.2, 1.6), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/pfTracksFromL1TracksHGCal_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/pfTracksFromL1TracksHGCal_cfi.py index 13fa6fa3ed613..59add2703e9a9 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/pfTracksFromL1TracksHGCal_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/pfTracksFromL1TracksHGCal_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -pfTracksFromL1TracksHGCal = cms.EDProducer("PFTrackProducerFromL1Tracks", - L1TrackTag = cms.InputTag("TTTracksFromTrackletEmulation","Level1TTTracks"), +l1tPFTracksFromL1TracksHGCal = cms.EDProducer("PFTrackProducerFromL1Tracks", + L1TrackTag = cms.InputTag("l1tTTTracksFromTrackletEmulation","Level1TTTracks"), nParam = cms.uint32(4), resolCalo = cms.PSet( etaBins = cms.vdouble( 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/sequences/HLTPhoton187L1SeededSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPhoton187L1SeededSequence_cfi.py index 15412ff0a6cf9..243d7ee03e700 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPhoton187L1SeededSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPhoton187L1SeededSequence_cfi.py @@ -15,7 +15,7 @@ HLTPhoton187L1SeededSequence = cms.Sequence( HLTL1Sequence + - L1TkEmSingle51Filter + + l1tTkEmSingle51Filter + HLTDoFullUnpackingEgammaEcalL1SeededSequence + HLTPFClusteringForEgammaL1Seeded + HLTHgcalTiclPFClusteringForEgammaL1Seeded + diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPhoton187UnseededSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPhoton187UnseededSequence_cfi.py index 61c3bd06ab36d..708f6a5ee4cd3 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPhoton187UnseededSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPhoton187UnseededSequence_cfi.py @@ -15,7 +15,7 @@ HLTPhoton187UnseededSequence = cms.Sequence( HLTL1Sequence + - L1TkEmSingle51Filter + + l1tTkEmSingle51Filter + HLTDoFullUnpackingEgammaEcalSequence + HLTPFClusteringForEgammaUnseeded + HLTHgcalTiclPFClusteringForEgammaUnseeded + diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/L1TTkEle25TkEle12Sequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/L1TTkEle25TkEle12Sequence_cfi.py index 6c3345d7dd68d..f8e9fbc00e87c 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/L1TTkEle25TkEle12Sequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/L1TTkEle25TkEle12Sequence_cfi.py @@ -6,6 +6,6 @@ L1TTkEle25TkEle12Sequence = cms.Sequence( HLTL1Sequence + - L1TkEleSingle25Filter + - L1TkEleDouble12Filter + l1tTkEleSingle25Filter + + l1tTkEleDouble12Filter ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/L1TTkEle36Sequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/L1TTkEle36Sequence_cfi.py index c9db3be534c9c..88184fa66feac 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/L1TTkEle36Sequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/L1TTkEle36Sequence_cfi.py @@ -5,5 +5,5 @@ L1TTkEle36Sequence = cms.Sequence( HLTL1Sequence + - L1TkEleSingle36Filter + l1tTkEleSingle36Filter ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/L1TTkEm37TkEm24Sequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/L1TTkEm37TkEm24Sequence_cfi.py index 0d4ebd965cab9..d0f3c2114b4db 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/L1TTkEm37TkEm24Sequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/L1TTkEm37TkEm24Sequence_cfi.py @@ -6,6 +6,6 @@ L1TTkEm37TkEm24Sequence = cms.Sequence( HLTL1Sequence + - L1TkEmSingle37Filter + - L1TkEmDouble24Filter + l1tTkEmSingle37Filter + + l1tTkEmDouble24Filter ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/L1TTkEm51Sequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/L1TTkEm51Sequence_cfi.py index c3ba3ceba1ea1..432fc4bfba606 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/L1TTkEm51Sequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/L1TTkEm51Sequence_cfi.py @@ -5,5 +5,5 @@ L1TTkEm51Sequence = cms.Sequence( HLTL1Sequence + - L1TkEmSingle51Filter + l1tTkEmSingle51Filter ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/L1TTkIsoEle22TkEm12Sequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/L1TTkIsoEle22TkEm12Sequence_cfi.py index 0d13ec6cc9545..15ea5ca69d1ac 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/L1TTkIsoEle22TkEm12Sequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/L1TTkIsoEle22TkEm12Sequence_cfi.py @@ -6,6 +6,6 @@ L1TTkIsoEle22TkEm12Sequence = cms.Sequence( HLTL1Sequence + - L1TkIsoEleSingle22Filter + - L1TkEmDouble12Filter + l1tTkIsoEleSingle22Filter + + l1tTkEmDouble12Filter ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/L1TTkIsoEle28Sequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/L1TTkIsoEle28Sequence_cfi.py index fa9b0ba185322..3f1a9438fa99a 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/L1TTkIsoEle28Sequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/L1TTkIsoEle28Sequence_cfi.py @@ -5,5 +5,5 @@ L1TTkIsoEle28Sequence = cms.Sequence( HLTL1Sequence + - L1TkIsoEleSingle28Filter + l1tTkIsoEleSingle28Filter ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/L1TTkIsoEm22TkIsoEm12Sequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/L1TTkIsoEm22TkIsoEm12Sequence_cfi.py index cb36a740930b3..c86a8071f6027 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/L1TTkIsoEm22TkIsoEm12Sequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/L1TTkIsoEm22TkIsoEm12Sequence_cfi.py @@ -6,6 +6,6 @@ L1TTkIsoEm22TkIsoEm12Sequence = cms.Sequence( HLTL1Sequence + - L1TkIsoEmSingle22Filter + - L1TkIsoEmDouble12Filter + l1tTkIsoEmSingle22Filter + + l1tTkIsoEmDouble12Filter ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/L1TTkIsoEm36Sequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/L1TTkIsoEm36Sequence_cfi.py index 10a063d6f7ddc..515503749c182 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/L1TTkIsoEm36Sequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/L1TTkIsoEm36Sequence_cfi.py @@ -5,5 +5,5 @@ L1TTkIsoEm36Sequence = cms.Sequence( HLTL1Sequence + - L1TkIsoEmSingle36Filter + l1tTkIsoEmSingle36Filter ) 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..f2c5c54f439c9 100644 --- a/L1Trigger/Configuration/python/L1Trigger_EventContent_cff.py +++ b/L1Trigger/Configuration/python/L1Trigger_EventContent_cff.py @@ -129,11 +129,11 @@ def _appendRun3ShowerDigis(obj): # adding HGCal L1 trigger digis def _appendHGCalDigis(obj): l1HGCalDigis = [ - 'keep l1tHGCalTriggerCellBXVector_hgcalVFEProducer_*_*', - 'keep l1tHGCalTriggerCellBXVector_hgcalConcentratorProducer_*_*', - 'keep l1tHGCalTowerBXVector_hgcalTowerProducer_*_*', - 'keep l1tHGCalClusterBXVector_hgcalBackEndLayer1Producer_*_*', - 'keep l1tHGCalMulticlusterBXVector_hgcalBackEndLayer2Producer_*_*' + 'keep l1tHGCalTriggerCellBXVector_l1tHGCalVFEProducer_*_*', + 'keep l1tHGCalTriggerCellBXVector_l1tHGCalConcentratorProducer_*_*', + 'keep l1tHGCalTowerBXVector_l1tHGCalTowerProducer_*_*', + 'keep l1tHGCalClusterBXVector_l1tHGCalBackEndLayer1Producer_*_*', + 'keep l1tHGCalMulticlusterBXVector_l1tHGCalBackEndLayer2Producer_*_*' ] obj.outputCommands += l1HGCalDigis @@ -170,46 +170,46 @@ def _appendME0Digis(obj): def _appendPhase2Digis(obj): l1Phase2Digis = [ "keep *_simKBmtfDigis_*_*", - 'keep *_hgcalVFEProducerhgcalConcentratorProducer_*_*', - 'keep *_hgcalBackEndLayer1Producer_*_*', - 'keep *_hgcalBackEndLayer2Producer_*_*', - 'keep *_hgcalTowerMapProducer_*_*', - 'keep *_hgcalTowerProducer_*_*', - 'keep *_L1EGammaClusterEmuProducer_*_*', - 'keep *_L1VertexFinder_*_*', - 'keep *_L1VertexFinderEmulator_*_*', - 'keep *_L1TowerCalibration_*_*', - 'keep *_L1CaloJet_*_*', - 'keep *_L1CaloJetHTT_*_*', - '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 *_l1tHGCalVFEProducerhgcalConcentratorProducer_*_*', + 'keep *_l1tHGCalBackEndLayer1Producer_*_*', + 'keep *_l1tHGCalBackEndLayer2Producer_*_*', + 'keep *_l1tHGCalTowerMapProducer_*_*', + 'keep *_l1tHGCalTowerProducer_*_*', + 'keep *_l1tEGammaClusterEmuProducer_*_*', + 'keep *_l1tVertexFinder_*_*', + 'keep *_l1tVertexFinderEmulator_*_*', + 'keep *_l1tTowerCalibration_*_*', + 'keep *_l1tCaloJet_*_*', + 'keep *_l1tCaloJetHTT_*_*', + 'keep *_l1tPFClustersFromL1EGClusters_*_*', + 'keep *_l1tPFClustersFromCombinedCaloHCal_*_*', + 'keep *_l1tPFClustersFromCombinedCaloHF_*_*', + 'keep *_l1tPFClustersFromHGC3DClusters_*_*', + 'keep *_l1tPFTracksFromL1TracksBarrel_*_*', + 'keep *_l1tPFTracksFromL1TracksHGCal_*_*', + '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 *_l1tTTTracksFromExtendedTrackletEmulation_*_*', + 'keep *_l1tTTTracksFromTrackletEmulation_*_*', + '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..dc501e8ee3c99 100644 --- a/L1Trigger/Configuration/python/SimL1Emulator_cff.py +++ b/L1Trigger/Configuration/python/SimL1Emulator_cff.py @@ -80,7 +80,7 @@ # HGCAL TP # ######################################################################## from L1Trigger.L1THGCal.hgcalTriggerPrimitives_cff import * -_phase2_siml1emulator.add(hgcalTriggerPrimitivesTask) +_phase2_siml1emulator.add(L1THGCalTriggerPrimitivesTask) # ######################################################################## # Phase 2 L1T @@ -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( - L1HgcalTowersInputTag = ("hgcalTowerProducer","HGCalTowerProcessor",""), - l1CaloTowers = ("L1EGammaClusterEmuProducer","L1CaloTowerCollection","") +l1tTowerCalibration = l1tTowerCalibrationProducer.clone( + L1HgcalTowersInputTag = ("l1tHGCalTowerProducer","HGCalTowerProcessor",""), + 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) +from L1Trigger.VertexFinder.VertexProducer_cfi import * +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()) -#L1TrackerEtMiss.L1VertexInputTag = ("L1VertexFinder", L1VertexFinder.l1VertexCollectionName.value()) -#L1TrackerEtMissExtended.L1VertexInputTag = ("L1VertexFinder", L1VertexFinder.l1VertexCollectionName.value()) -_phase2_siml1emulator.add(L1TrackJets) -_phase2_siml1emulator.add(L1TrackJetsExtended) -_phase2_siml1emulator.add(L1TrackFastJets) +l1tTrackJets.L1PVertexCollection = ("L1VertexFinder", "l1vertices") +l1tTrackJetsExtended.L1PVertexCollection = ("L1VertexFinder", "l1vertices") +#L1TrackerEtMiss.L1VertexInputTag = ("L1VertexFinder", "l1vertices") +#L1TrackerEtMissExtended.L1VertexInputTag = ("L1VertexFinder", "l1vertices") +_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/Configuration/python/customisePhase2TTNoMC.py b/L1Trigger/Configuration/python/customisePhase2TTNoMC.py index 66e84b7921e3d..822286e31506e 100644 --- a/L1Trigger/Configuration/python/customisePhase2TTNoMC.py +++ b/L1Trigger/Configuration/python/customisePhase2TTNoMC.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms def customisePhase2TTNoMC(process): - process.L1TrackTrigger.replace(process.L1PromptExtendedHybridTracksWithAssociators, process.L1PromptExtendedHybridTracks) + process.L1TrackTrigger.replace(process.L1TPromptExtendedHybridTracksWithAssociators, process.L1TPromptExtendedHybridTracks) process.L1TrackTrigger.remove(process.TrackTriggerAssociatorClustersStubs) process.load('SimCalorimetry.HcalTrigPrimProducers.hcaltpdigi_cff') diff --git a/L1Trigger/DemonstratorTools/plugins/GTTFileWriter.cc b/L1Trigger/DemonstratorTools/plugins/GTTFileWriter.cc index 510bcd518313a..146c9bf37c087 100644 --- a/L1Trigger/DemonstratorTools/plugins/GTTFileWriter.cc +++ b/L1Trigger/DemonstratorTools/plugins/GTTFileWriter.cc @@ -176,9 +176,9 @@ void GTTFileWriter::endJob() { void GTTFileWriter::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { // GTTFileWriter edm::ParameterSetDescription desc; - desc.addUntracked("tracks", edm::InputTag("TTTracksFromTrackletEmulation", "Level1TTTracks")); - desc.addUntracked("convertedTracks", edm::InputTag("L1GTTInputProducer", "Level1TTTracksConverted")); - desc.addUntracked("vertices", edm::InputTag("VertexProducer", "l1verticesEmulation")); + desc.addUntracked("tracks", edm::InputTag("l1tTTTracksFromTrackletEmulation", "Level1TTTracks")); + desc.addUntracked("convertedTracks", edm::InputTag("l1tGTTInputProducer", "Level1TTTracksConverted")); + desc.addUntracked("vertices", edm::InputTag("l1tVertexProducer", "l1verticesEmulation")); desc.addUntracked("inputFilename", "L1GTTInputFile"); desc.addUntracked("inputConvertedFilename", "L1GTTInputConvertedFile"); desc.addUntracked("outputFilename", "L1GTTOutputToCorrelatorFile"); diff --git a/L1Trigger/DemonstratorTools/python/GTTFileWriter_cff.py b/L1Trigger/DemonstratorTools/python/GTTFileWriter_cff.py index 8ae60fa5c0666..fe5cec7b7e005 100644 --- a/L1Trigger/DemonstratorTools/python/GTTFileWriter_cff.py +++ b/L1Trigger/DemonstratorTools/python/GTTFileWriter_cff.py @@ -1,11 +1,11 @@ import FWCore.ParameterSet.Config as cms GTTFileWriter = cms.EDAnalyzer('GTTFileWriter', - tracks = cms.untracked.InputTag("TTTracksFromTrackletEmulation", "Level1TTTracks"), - convertedTracks = cms.untracked.InputTag("L1GTTInputProducer","Level1TTTracksConverted"), - vertices = cms.untracked.InputTag("VertexProducer", "l1verticesEmulation"), + tracks = cms.untracked.InputTag("l1tTTTracksFromTrackletEmulation", "Level1TTTracks"), + convertedTracks = cms.untracked.InputTag("l1tGTTInputProducer","Level1TTTracksConverted"), + vertices = cms.untracked.InputTag("l1tVertexProducer", "l1verticesEmulation"), inputFilename = cms.untracked.string("L1GTTInputFile"), inputConvertedFilename = cms.untracked.string("L1GTTInputConvertedFile"), outputFilename = cms.untracked.string("L1GTTOutputToCorrelatorFile"), format = cms.untracked.string("APx") -) \ No newline at end of file +) 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..117629256c0ec 100644 --- a/L1Trigger/L1CaloTrigger/python/L1CaloJetHTTProducer_cfi.py +++ b/L1Trigger/L1CaloTrigger/python/L1CaloJetHTTProducer_cfi.py @@ -1,10 +1,10 @@ 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"), - genJets = cms.InputTag("ak4GenJetsNoNu", "", "HLT"), + BXVCaloJetsInputTag = cms.InputTag("l1tCaloJetProducer","L1CaloJetCollectionBXV"), + genJets = cms.InputTag("ak4GenJetsNoNu"), debug = cms.bool(False), use_gen_jets = cms.bool(False), ) 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..d0647b0a36188 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","","") # -------------------------------------------------------------------------------------------- @@ -17,8 +17,8 @@ # ---- Produce the calibrated tower collection combining Barrel, HGCal, HF from L1Trigger.L1CaloTrigger.L1TowerCalibrationProducer_cfi import * -L1TowerCalibrationProducer.L1HgcalTowersInputTag = cms.InputTag("hgcalTowerProducer","HGCalTowerProcessor","") -L1TowerCalibrationProducer.l1CaloTowers = cms.InputTag("L1EGammaClusterEmuProducer","L1CaloTowerCollection","") +l1tTowerCalibrationProducer.L1HgcalTowersInputTag = cms.InputTag("l1tHGCalTowerProducer","HGCalTowerProcessor","") +l1tTowerCalibrationProducer.l1CaloTowers = cms.InputTag("l1tEGammaClusterEmuProducer","L1CaloTowerCollection","") @@ -27,8 +27,8 @@ # ---- Produce the L1CaloJets from L1Trigger.L1CaloTrigger.L1CaloJetProducer_cfi import * -L1CaloJetProducer.l1CaloTowers = cms.InputTag("L1TowerCalibrationProducer","L1CaloTowerCalibratedCollection","") -L1CaloJetProducer.L1CrystalClustersInputTag = cms.InputTag("L1EGammaClusterEmuProducer", "L1EGXtalClusterEmulator","") +l1tCaloJetProducer.l1CaloTowers = cms.InputTag("l1tTowerCalibrationProducer","L1CaloTowerCalibratedCollection","") +l1tCaloJetProducer.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..5522a0a0f9c9e 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,8 +28,8 @@ hfSF = cms.double(1.0), debug = cms.bool(False), skipCalibrations = cms.bool(False), - l1CaloTowers = cms.InputTag("L1EGammaClusterEmuProducer","L1CaloTowerCollection",""), - L1HgcalTowersInputTag = cms.InputTag("hgcalTowerProducer:HGCalTowerProcessor"), + l1CaloTowers = cms.InputTag("l1tEGammaClusterEmuProducer","L1CaloTowerCollection",""), + L1HgcalTowersInputTag = cms.InputTag("l1tHGCalTowerProducer:HGCalTowerProcessor"), hcalDigis = cms.InputTag("simHcalTriggerPrimitiveDigis"), nHits_to_nvtx_params = cms.VPSet( # Parameters derived on 6 March 2019 on 10_3_X MTD samples cms.PSet( diff --git a/L1Trigger/L1CaloTrigger/python/Phase1L1TJetCalibrator_9x9Jets_cfi.py b/L1Trigger/L1CaloTrigger/python/Phase1L1TJetCalibrator_9x9Jets_cfi.py index be648700b1369..77925acbe7d35 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", ""), +l1tPhase1JetCalibrator9 = 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..1dcb947c7d6a7 100644 --- a/L1Trigger/L1CaloTrigger/python/Phase1L1TJetCalibrator_cfi.py +++ b/L1Trigger/L1CaloTrigger/python/Phase1L1TJetCalibrator_cfi.py @@ -182,9 +182,10 @@ ) ) -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..e09084fd75b17 100644 --- a/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_9x9_cff.py +++ b/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_9x9_cff.py @@ -1,25 +1,26 @@ 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 l1tPhase1JetCalibrator9 +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 = l1tPhase1JetCalibrator9.clone( + inputCollectionTag = ("l1tPhase1JetProducer9x9", "UncalibratedPhase1L1TJetFromPfCandidates", ""), + 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..91bf65b1996de 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 +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 = l1tPhase1JetCalibrator.clone( + inputCollectionTag = ("l1tPhase1JetProducer9x9trimmed", "UncalibratedPhase1L1TJetFromPfCandidates", ""), + 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..c9f852eeeb29e 100644 --- a/L1Trigger/L1CaloTrigger/test/test_L1CaloJets_cfg.py +++ b/L1Trigger/L1CaloTrigger/test/test_L1CaloJets_cfg.py @@ -64,7 +64,7 @@ ### from L1Trigger.Configuration.customiseUtils import L1TrackTriggerTracklet ### process = L1TrackTriggerTracklet(process) process.load('L1Trigger.TrackFindingTracklet.L1HybridEmulationTracks_cff') -process.L1TrackTriggerTracklet_step = cms.Path(process.L1HybridTracksWithAssociators) +process.L1TrackTriggerTracklet_step = cms.Path(process.L1THybridTracksWithAssociators) @@ -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,13 +82,13 @@ 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_*_*", - "keep *_hgcalTowerProducer_*_*" + "keep *_l1tHGCalTowerProducer_*_*" ) ) diff --git a/L1Trigger/L1CaloTrigger/test/test_Phase1L1TJets_cfg.py b/L1Trigger/L1CaloTrigger/test/test_Phase1L1TJets_cfg.py deleted file mode 100644 index 8e606b032564a..0000000000000 --- a/L1Trigger/L1CaloTrigger/test/test_Phase1L1TJets_cfg.py +++ /dev/null @@ -1,51 +0,0 @@ -import FWCore.ParameterSet.Config as cms -import FWCore.Utilities.FileUtils as FileUtils # ADDED - -process = cms.Process("TEST") - -process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.cerr.FwkReport.reportEvery = 1 - -process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(15000) ) - -fileList = FileUtils.loadListFromFile('ttbar.list') -readFiles = cms.untracked.vstring(*fileList) - -process.source = process.source = cms.Source("PoolSource", - fileNames = readFiles, - #fileNames = cms.untracked.vstring( - # "file:pf500.root", - #) -) - -# Loads 7x7 sequence -process.load('L1Trigger.L1CaloTrigger.Phase1L1TJets_cff') - -# Load 9x9 sequence -process.load('L1Trigger.L1CaloTrigger.Phase1L1TJets_9x9_cff') - -# Load trimmed 9x9 sequence -process.load('L1Trigger.L1CaloTrigger.Phase1L1TJets_9x9trimmed_cff') - -# AK4 PF jets -process.load('L1Trigger.Phase2L1ParticleFlow.l1pfJetMet_cff') -process.l1PFJets = 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 *_ak4GenJetsNoNu_*_*", - "keep *_Phase1L1TJetCalibrator*_*_*", - "keep *_ak4PFL1Puppi*_*_*", - "keep *_l1PFMetPuppi*_*_*", - "keep *_genMetTrue_*_*" - ), -) - -process.p = cms.Path(process.Phase1L1TJetsSequence * process.Phase1L1TJetsSequence9x9 * process.Phase1L1TJetsSequence9x9trimmed * process.l1PFJets * process.l1PFMetPuppi ) - -process.e = cms.EndPath(process.out) diff --git a/L1Trigger/L1THGCal/python/customCalibration.py b/L1Trigger/L1THGCal/python/customCalibration.py index a775e9ebc612e..5c6311ef1d609 100644 --- a/L1Trigger/L1THGCal/python/customCalibration.py +++ b/L1Trigger/L1THGCal/python/customCalibration.py @@ -6,7 +6,7 @@ def custom_cluster_calibration_global(process, factor=1.084 ): - parameters_c2d = process.hgcalBackEndLayer1Producer.ProcessorParameters.C2d_parameters + parameters_c2d = process.l1tHGCalBackEndLayer1Producer.ProcessorParameters.C2d_parameters parameters_c2d.calibSF_cluster = cms.double(factor) parameters_c2d.applyLayerCalibration = cms.bool(False) return process @@ -15,7 +15,7 @@ def custom_cluster_calibration_global(process, def custom_cluster_calibration_layers(process, weights=layercalibparam.TrgLayer_weights ): - parameters_c2d = process.hgcalBackEndLayer1Producer.ProcessorParameters.C2d_parameters + parameters_c2d = process.l1tHGCalBackEndLayer1Producer.ProcessorParameters.C2d_parameters parameters_c2d.layerWeights = weights parameters_c2d.applyLayerCalibration = cms.bool(True) return process diff --git a/L1Trigger/L1THGCal/python/customClustering.py b/L1Trigger/L1THGCal/python/customClustering.py index 86a1646df60fb..5734e2f0b509d 100644 --- a/L1Trigger/L1THGCal/python/customClustering.py +++ b/L1Trigger/L1THGCal/python/customClustering.py @@ -32,7 +32,7 @@ def custom_2dclustering_distance(process, ): parameters_c2d = distance_C2d_params.clone(dR_cluster = distance) set_threshold_params(parameters_c2d, seed_threshold, cluster_threshold) - process.hgcalBackEndLayer1Producer.ProcessorParameters.C2d_parameters = parameters_c2d + process.l1tHGCalBackEndLayer1Producer.ProcessorParameters.C2d_parameters = parameters_c2d return process @@ -42,7 +42,7 @@ def custom_2dclustering_topological(process, ): parameters_c2d = topological_C2d_params.clone() set_threshold_params(parameters_c2d, seed_threshold, cluster_threshold) - process.hgcalBackEndLayer1Producer.ProcessorParameters.C2d_parameters = parameters_c2d + process.l1tHGCalBackEndLayer1Producer.ProcessorParameters.C2d_parameters = parameters_c2d return process @@ -53,12 +53,12 @@ def custom_2dclustering_constrainedtopological(process, ): parameters_c2d = constrTopological_C2d_params.clone(dR_cluster = distance) set_threshold_params(parameters_c2d, seed_threshold, cluster_threshold) - process.hgcalBackEndLayer1Producer.ProcessorParameters.C2d_parameters = parameters_c2d + process.l1tHGCalBackEndLayer1Producer.ProcessorParameters.C2d_parameters = parameters_c2d return process def custom_2dclustering_dummy(process): - process.hgcalBackEndLayer1Producer.ProcessorParameters.C2d_parameters = dummy_C2d_params.clone() + process.l1tHGCalBackEndLayer1Producer.ProcessorParameters.C2d_parameters = dummy_C2d_params.clone() return process @@ -66,7 +66,7 @@ def custom_3dclustering_distance(process, distance=distance_C3d_params.dR_multicluster ): parameters_c3d = distance_C3d_params.clone(dR_multicluster = distance) - process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters = parameters_c3d + process.l1tHGCalBackEndLayer2Producer.ProcessorParameters.C3d_parameters = parameters_c3d return process @@ -78,7 +78,7 @@ def custom_3dclustering_dbscan(process, dist_dbscan_multicluster = distance, minN_dbscan_multicluster = min_points ) - process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters = parameters_c3d + process.l1tHGCalBackEndLayer2Producer.ProcessorParameters.C3d_parameters = parameters_c3d return process @@ -99,7 +99,7 @@ def custom_3dclustering_fixedRadius(process, ): parameters_c3d = histoMax_C3d_clustering_params.clone() set_histomax_clustering_params(parameters_c3d, distance, shape_threshold, shape_distance) - process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters.histoMax_C3d_clustering_parameters = parameters_c3d + process.l1tHGCalBackEndLayer2Producer.ProcessorParameters.C3d_parameters.histoMax_C3d_clustering_parameters = parameters_c3d return process @@ -111,14 +111,14 @@ def custom_3dclustering_variableDr(process, distances=histoMaxVariableDR_C3d_par dR_multicluster_byLayer_coefficientA = cms.vdouble(distances) ) set_histomax_clustering_params(parameters_c3d, 0, shape_threshold, shape_distance) - process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters.histoMax_C3d_clustering_parameters = parameters_c3d + process.l1tHGCalBackEndLayer2Producer.ProcessorParameters.C3d_parameters.histoMax_C3d_clustering_parameters = parameters_c3d return process def custom_3dclustering_clusteringRadiusLayerbyLayerVariableEta(process, distance_coefficientA=dr_layerbylayer, distance_coefficientB=dr_layerbylayer_Bcoefficient): - parameters_c3d = process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters.histoMax_C3d_clustering_parameters + parameters_c3d = process.l1tHGCalBackEndLayer2Producer.ProcessorParameters.C3d_parameters.histoMax_C3d_clustering_parameters parameters_c3d.dR_multicluster_byLayer_coefficientA = distance_coefficientA parameters_c3d.dR_multicluster_byLayer_coefficientB = distance_coefficientB return process @@ -126,14 +126,14 @@ def custom_3dclustering_clusteringRadiusLayerbyLayerVariableEta(process, def custom_3dclustering_clusteringRadiusLayerbyLayerFixedEta(process, distance_coefficientA=dr_layerbylayer): - parameters_c3d = process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters.histoMax_C3d_clustering_parameters + parameters_c3d = process.l1tHGCalBackEndLayer2Producer.ProcessorParameters.C3d_parameters.histoMax_C3d_clustering_parameters parameters_c3d.dR_multicluster_byLayer_coefficientA = distance_coefficientA parameters_c3d.dR_multicluster_byLayer_coefficientB = cms.vdouble( [0]*(MAX_LAYERS+1) ) return process def custom_3dclustering_clusteringRadiusNoLayerDependenceFixedEta(process, distance_coefficientA=0.03): - parameters_c3d = process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters.histoMax_C3d_clustering_parameters + parameters_c3d = process.l1tHGCalBackEndLayer2Producer.ProcessorParameters.C3d_parameters.histoMax_C3d_clustering_parameters parameters_c3d.dR_multicluster_byLayer_coefficientA = cms.vdouble( [distance_coefficientA]*(MAX_LAYERS+1) ) parameters_c3d.dR_multicluster_byLayer_coefficientB = cms.vdouble( [0]*(MAX_LAYERS+1) ) return process @@ -141,20 +141,20 @@ def custom_3dclustering_clusteringRadiusNoLayerDependenceFixedEta(process, def custom_3dclustering_clusteringRadiusNoLayerDependenceVariableEta(process, distance_coefficientA=0.03, distance_coefficientB=0.02): - parameters_c3d = process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters.histoMax_C3d_clustering_parameters + parameters_c3d = process.l1tHGCalBackEndLayer2Producer.ProcessorParameters.C3d_parameters.histoMax_C3d_clustering_parameters parameters_c3d.dR_multicluster_byLayer_coefficientA = cms.vdouble( [distance_coefficientA]*(MAX_LAYERS+1) ) parameters_c3d.dR_multicluster_byLayer_coefficientB = cms.vdouble( [distance_coefficientB]*(MAX_LAYERS+1) ) return process def custom_3dclustering_nearestNeighbourAssociation(process): - parameters_c3d = process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters.histoMax_C3d_clustering_parameters + parameters_c3d = process.l1tHGCalBackEndLayer2Producer.ProcessorParameters.C3d_parameters.histoMax_C3d_clustering_parameters parameters_c3d.cluster_association = cms.string('NearestNeighbour') return process def custom_3dclustering_EnergySplitAssociation(process): - parameters_c3d = process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters.histoMax_C3d_clustering_parameters + parameters_c3d = process.l1tHGCalBackEndLayer2Producer.ProcessorParameters.C3d_parameters.histoMax_C3d_clustering_parameters parameters_c3d.cluster_association = cms.string('EnergySplit') return process diff --git a/L1Trigger/L1THGCal/python/customHistoSeeding.py b/L1Trigger/L1THGCal/python/customHistoSeeding.py index 04f3b1924c3ad..d1c59ae781e79 100644 --- a/L1Trigger/L1THGCal/python/customHistoSeeding.py +++ b/L1Trigger/L1THGCal/python/customHistoSeeding.py @@ -31,7 +31,7 @@ def custom_3dclustering_histoMax(process, parameters_c3d = histoMax_C3d_seeding_params.clone() set_histomax_seeding_params(parameters_c3d, nBins_X1, nBins_X2, binSumsHisto, seed_threshold) - process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters.histoMax_C3d_seeding_parameters = parameters_c3d + process.l1tHGCalBackEndLayer2Producer.ProcessorParameters.C3d_parameters.histoMax_C3d_seeding_parameters = parameters_c3d return process def custom_3dclustering_histoSecondaryMax(process, @@ -43,7 +43,7 @@ def custom_3dclustering_histoSecondaryMax(process, parameters_c3d = histoSecondaryMax_C3d_params.clone() set_histomax_seeding_params(parameters_c3d, nBins_X1, nBins_X2, binSumsHisto, threshold) - process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters.histoMax_C3d_seeding_parameters = parameters_c3d + process.l1tHGCalBackEndLayer2Producer.ProcessorParameters.C3d_parameters.histoMax_C3d_seeding_parameters = parameters_c3d return process @@ -58,7 +58,7 @@ def custom_3dclustering_histoInterpolatedMax1stOrder(process, ) set_histomax_seeding_params(parameters_c3d, nBins_X1, nBins_X2, binSumsHisto, seed_threshold) - process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters.histoMax_C3d_seeding_parameters = parameters_c3d + process.l1tHGCalBackEndLayer2Producer.ProcessorParameters.C3d_parameters.histoMax_C3d_seeding_parameters = parameters_c3d return process @@ -73,7 +73,7 @@ def custom_3dclustering_histoInterpolatedMax2ndOrder(process, ) set_histomax_seeding_params(parameters_c3d, nBins_X1, nBins_X2, binSumsHisto, seed_threshold) - process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters.histoMax_C3d_seeding_parameters = parameters_c3d + process.l1tHGCalBackEndLayer2Producer.ProcessorParameters.C3d_parameters.histoMax_C3d_seeding_parameters = parameters_c3d return process @@ -86,7 +86,7 @@ def custom_3dclustering_histoThreshold(process, parameters_c3d = histoThreshold_C3d_params.clone() set_histomax_seeding_params(parameters_c3d, nBins_X1, nBins_X2, binSumsHisto, seed_threshold) - process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters.histoMax_C3d_seeding_parameters = parameters_c3d + process.l1tHGCalBackEndLayer2Producer.ProcessorParameters.C3d_parameters.histoMax_C3d_seeding_parameters = parameters_c3d return process @@ -99,6 +99,6 @@ def custom_3dclustering_XYHistoMax(process, parameters_c3d = histoMaxXYVariableDR_C3d_params.clone() set_histomax_seeding_params(parameters_c3d, nBins_X1, nBins_X2, histoMaxXYVariableDR_C3d_params.binSumsHisto,seed_threshold) - process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters.histoMax_C3d_seeding_parameters = parameters_c3d + process.l1tHGCalBackEndLayer2Producer.ProcessorParameters.C3d_parameters.histoMax_C3d_seeding_parameters = parameters_c3d return process diff --git a/L1Trigger/L1THGCal/python/customIdentification.py b/L1Trigger/L1THGCal/python/customIdentification.py index 6712da949e9d2..c3887f9070a02 100644 --- a/L1Trigger/L1THGCal/python/customIdentification.py +++ b/L1Trigger/L1THGCal/python/customIdentification.py @@ -11,7 +11,7 @@ def custom_identification_drnn_cone(process, for wp,cat in zip(working_points,working_points_drnn_cone): if not wp in cat: raise KeyError('HGC TPG ID: Cannot find a cut corresponding to the working point {}'.format(wp)) - parameters_c3d = process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters + parameters_c3d = process.l1tHGCalBackEndLayer2Producer.ProcessorParameters.C3d_parameters identification = egamma_identification_drnn_cone.clone( WorkingPoints = cms.vdouble( [wps[eff] for wps,eff in zip(working_points_drnn_cone,working_points)] @@ -30,7 +30,7 @@ def custom_identification_drnn_dbscan(process, for wp,cat in zip(working_points,working_points_drnn_dbscan): if not wp in cat: raise KeyError('HGC TPG ID: Cannot find a cut corresponding to the working point {}'.format(wp)) - parameters_c3d = process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters + parameters_c3d = process.l1tHGCalBackEndLayer2Producer.ProcessorParameters.C3d_parameters identification = egamma_identification_drnn_dbscan.clone( WorkingPoints = cms.vdouble( [wps[eff] for wps,eff in zip(working_points_drnn_dbscan,working_points)] @@ -49,7 +49,7 @@ def custom_identification_histomax(process, for wp,cat in zip(working_points,working_points_drnn_dbscan): if not wp in cat: raise KeyError('HGC TPG ID: Cannot find a cut corresponding to the working point {}'.format(wp)) - parameters_c3d = process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters + parameters_c3d = process.l1tHGCalBackEndLayer2Producer.ProcessorParameters.C3d_parameters identification = egamma_identification_histomax.clone( WorkingPoints = cms.vdouble( [wps[eff] for wps,eff in zip(working_points_histomax,working_points)] diff --git a/L1Trigger/L1THGCal/python/customNewProcessors.py b/L1Trigger/L1THGCal/python/customNewProcessors.py index 1568e789ee3cb..de6e3408ef379 100644 --- a/L1Trigger/L1THGCal/python/customNewProcessors.py +++ b/L1Trigger/L1THGCal/python/customNewProcessors.py @@ -5,23 +5,23 @@ def custom_layer1_truncation(process): parameters = layer1truncation_proc.clone() - process.hgcalBackEndLayer1Producer.ProcessorParameters = parameters - process.hgcalBackEndLayer2Producer.InputCluster = cms.InputTag('hgcalBackEndLayer1Producer:HGCalBackendLayer1Processor') - process.hgcalTowerProducer.InputTriggerCells = cms.InputTag('hgcalBackEndLayer1Producer:HGCalBackendLayer1Processor') + process.l1tHGCalBackEndLayer1Producer.ProcessorParameters = parameters + process.l1tHGCalBackEndLayer2Producer.InputCluster = cms.InputTag('l1tHGCalBackEndLayer1Producer:HGCalBackendLayer1Processor') + process.l1tHGCalTowerProducer.InputTriggerCells = cms.InputTag('l1tHGCalBackEndLayer1Producer:HGCalBackendLayer1Processor') return process def custom_stage1_truncation(process): parameters = stage1truncation_proc.clone() - process.hgcalBackEndLayer1Producer.ProcessorParameters = parameters - process.hgcalBackEndLayer2Producer.InputCluster = cms.InputTag('hgcalBackEndStage1Producer:HGCalBackendStage1Processor') - process.hgcalTowerProducer.InputTriggerCells = cms.InputTag('hgcalBackEndStage1Producer:HGCalBackendStage1Processor') + process.l1tHGCalBackEndLayer1Producer.ProcessorParameters = parameters + process.l1tHGcalBackEndLayer2Producer.InputCluster = cms.InputTag('l1tHGCalBackEndStage1Producer:HGCalBackendStage1Processor') + process.l1tHGCalTowerProducer.InputTriggerCells = cms.InputTag('l1tHGCalBackEndStage1Producer:HGCalBackendStage1Processor') return process def custom_clustering_standalone(process): - process.hgcalBackEndLayer2Producer.ProcessorParameters.ProcessorName = cms.string('HGCalBackendLayer2Processor3DClusteringSA') - process.hgcalBackEndLayer2Producer.ProcessorParameters.DistributionParameters = truncation_params + process.l1tHGCalBackEndLayer2Producer.ProcessorParameters.ProcessorName = cms.string('HGCalBackendLayer2Processor3DClusteringSA') + process.l1tHGCalBackEndLayer2Producer.ProcessorParameters.DistributionParameters = truncation_params return process def custom_tower_standalone(process): - process.hgcalTowerProducer.ProcessorParameters.ProcessorName = cms.string('HGCalTowerProcessorSA') + process.l1tHGCalTowerProducer.ProcessorParameters.ProcessorName = cms.string('HGCalTowerProcessorSA') return process diff --git a/L1Trigger/L1THGCal/python/customTowers.py b/L1Trigger/L1THGCal/python/customTowers.py index ff52cd7437867..02a7ce0fa27a5 100644 --- a/L1Trigger/L1THGCal/python/customTowers.py +++ b/L1Trigger/L1THGCal/python/customTowers.py @@ -2,14 +2,14 @@ import math def custom_towers_unclustered_tc(process): - process.hgcalTowerProducer.InputTriggerCells = cms.InputTag('hgcalBackEndLayer2Producer:HGCalBackendLayer2Processor3DClusteringUnclustered') - process.hgcalTowerProducerHFNose.InputTriggerCells = cms.InputTag('hgcalBackEndLayer2ProducerHFNose:HGCalBackendLayer2Processor3DClusteringUnclustered') + process.l1tHGCalTowerProducer.InputTriggerCells = cms.InputTag('l1tHGCalBackEndLayer2Producer:HGCalBackendLayer2Processor3DClusteringUnclustered') + process.l1tHGCalTowerProducerHFNose.InputTriggerCells = cms.InputTag('l1tHGCalBackEndLayer2ProducerHFNose:HGCalBackendLayer2Processor3DClusteringUnclustered') return process def custom_towers_all_tc(process): - process.hgcalTowerProducer.InputTriggerCells = cms.InputTag('hgcalBackEndLayer1Producer:HGCalBackendLayer1Processor2DClustering') - process.hgcalTowerProducerHFNose.InputTriggerCells = cms.InputTag('hgcalBackEndLayer1ProducerHFNose:HGCalBackendLayer1Processor2DClustering') + process.l1tHGCalTowerProducer.InputTriggerCells = cms.InputTag('l1tHGCalBackEndLayer1Producer:HGCalBackendLayer1Processor2DClustering') + process.l1tHGCalTowerProducerHFNose.InputTriggerCells = cms.InputTag('l1tHGCalBackEndLayer1ProducerHFNose:HGCalBackendLayer1Processor2DClustering') return process @@ -23,7 +23,7 @@ def custom_towers_etaphi(process, binsEta=[], binsPhi=[] ): - parameters_towers_2d = process.hgcalTowerMapProducer.ProcessorParameters.towermap_parameters + parameters_towers_2d = process.l1tHGCalTowerMapProducer.ProcessorParameters.towermap_parameters parameters_towers_2d.L1TTriggerTowerConfig.readMappingFile = cms.bool(False) parameters_towers_2d.L1TTriggerTowerConfig.minEta = cms.double(minEta) parameters_towers_2d.L1TTriggerTowerConfig.maxEta = cms.double(maxEta) @@ -45,7 +45,7 @@ def custom_towers_map(process, nBinsEta=18, nBinsPhi=72 ): - parameters_towers_2d = process.hgcalTowerMapProducer.ProcessorParameters.towermap_parameters + parameters_towers_2d = process.l1tHGCalTowerMapProducer.ProcessorParameters.towermap_parameters parameters_towers_2d.L1TTriggerTowerConfig.readMappingFile = cms.bool(True) parameters_towers_2d.L1TTriggerTowerConfig.L1TTriggerTowerMapping = cms.FileInPath(towermapping) parameters_towers_2d.L1TTriggerTowerConfig.minEta = cms.double(minEta) diff --git a/L1Trigger/L1THGCal/python/customTriggerCellSelect.py b/L1Trigger/L1THGCal/python/customTriggerCellSelect.py index adbc46f04dbb1..65b766b6b4e47 100644 --- a/L1Trigger/L1THGCal/python/customTriggerCellSelect.py +++ b/L1Trigger/L1THGCal/python/customTriggerCellSelect.py @@ -11,7 +11,7 @@ def custom_triggercellselect_supertriggercell(process, type_energy_division = type_energy_division, fixedDataSizePerHGCROC = fixedDataSizePerHGCROC ) - process.hgcalConcentratorProducer.ProcessorParameters = parameters + process.l1tHGCalConcentratorProducer.ProcessorParameters = parameters return process @@ -25,7 +25,7 @@ def custom_triggercellselect_threshold(process, threshold_scintillator = threshold_scintillator, coarsenTriggerCells = coarsenTriggerCells ) - process.hgcalConcentratorProducer.ProcessorParameters = parameters + process.l1tHGCalConcentratorProducer.ProcessorParameters = parameters return process @@ -33,7 +33,7 @@ def custom_triggercellselect_bestchoice(process, triggercells=best_conc_proc.NData ): parameters = best_conc_proc.clone(NData = triggercells) - process.hgcalConcentratorProducer.ProcessorParameters = parameters + process.l1tHGCalConcentratorProducer.ProcessorParameters = parameters return process @@ -55,7 +55,7 @@ def custom_coarsetc_onebitfraction(process, oneBitFractionLowValue = oneBitFractionLowValue, oneBitFractionHighValue = oneBitFractionHighValue, ) - process.hgcalConcentratorProducer.ProcessorParameters = parameters + process.l1tHGCalConcentratorProducer.ProcessorParameters = parameters return process @@ -69,7 +69,7 @@ def custom_coarsetc_equalshare(process, stcSize = stcSize, fixedDataSizePerHGCROC = fixedDataSizePerHGCROC, ) - process.hgcalConcentratorProducer.ProcessorParameters = parameters + process.l1tHGCalConcentratorProducer.ProcessorParameters = parameters return process def custom_triggercellselect_mixedBestChoiceSuperTriggerCell(process, @@ -84,7 +84,7 @@ def custom_triggercellselect_mixedBestChoiceSuperTriggerCell(process, NData=triggercells, Method = cms.vstring('bestChoiceSelect','superTriggerCellSelect','superTriggerCellSelect'), ) - process.hgcalConcentratorProducer.ProcessorParameters = parameters + process.l1tHGCalConcentratorProducer.ProcessorParameters = parameters return process def custom_triggercellselect_mixedBestChoiceSuperTriggerCell_decentralized(process): @@ -116,5 +116,5 @@ def custom_triggercellselect_autoencoder(process, preserveModuleSum = preserveModuleSum, Method = cms.vstring(['autoEncoder','autoEncoder', scintillatorMethod]), ) - process.hgcalConcentratorProducer.ProcessorParameters = parameters + process.l1tHGCalConcentratorProducer.ProcessorParameters = parameters return process diff --git a/L1Trigger/L1THGCal/python/customTriggerGeometry.py b/L1Trigger/L1THGCal/python/customTriggerGeometry.py index 6cb15cf017e66..e484d31e15120 100644 --- a/L1Trigger/L1THGCal/python/customTriggerGeometry.py +++ b/L1Trigger/L1THGCal/python/customTriggerGeometry.py @@ -1,30 +1,30 @@ import FWCore.ParameterSet.Config as cms def custom_geometry_V11_Imp3(process, stage1links=120): - process.hgcalTriggerGeometryESProducer.TriggerGeometry.TriggerGeometryName = cms.string('HGCalTriggerGeometryV9Imp3') - process.hgcalTriggerGeometryESProducer.TriggerGeometry.ScintillatorTriggerCellSize = cms.uint32(2) + process.l1tHGCalTriggerGeometryESProducer.TriggerGeometry.TriggerGeometryName = cms.string('HGCalTriggerGeometryV9Imp3') + process.l1tHGCalTriggerGeometryESProducer.TriggerGeometry.ScintillatorTriggerCellSize = cms.uint32(2) if stage1links==120: - process.hgcalTriggerGeometryESProducer.TriggerGeometry.JsonMappingFile = cms.FileInPath("L1Trigger/L1THGCal/data/hgcal_trigger_link_mapping_120links_v1.json") + process.l1tHGCalTriggerGeometryESProducer.TriggerGeometry.JsonMappingFile = cms.FileInPath("L1Trigger/L1THGCal/data/hgcal_trigger_link_mapping_120links_v1.json") elif stage1links==72: - process.hgcalTriggerGeometryESProducer.TriggerGeometry.JsonMappingFile = cms.FileInPath("L1Trigger/L1THGCal/data/hgcal_trigger_link_mapping_72links_v2.json") + process.l1tHGCalTriggerGeometryESProducer.TriggerGeometry.JsonMappingFile = cms.FileInPath("L1Trigger/L1THGCal/data/hgcal_trigger_link_mapping_72links_v2.json") else: raise RuntimeError('{} Stage 1 input links is not supported. Supported options are 72 or 120 links'.format(stage1links)) return process def custom_geometry_V11_Imp2(process, links='signaldriven'): - process.hgcalTriggerGeometryESProducer.TriggerGeometry.TriggerGeometryName = cms.string('HGCalTriggerGeometryV9Imp2') + process.l1tHGCalTriggerGeometryESProducer.TriggerGeometry.TriggerGeometryName = cms.string('HGCalTriggerGeometryV9Imp2') if links=='signaldriven': links_mapping = 'L1Trigger/L1THGCal/data/links_mapping_V11_decentralized_signaldriven_0.txt' elif links=='pudriven': links_mapping = 'L1Trigger/L1THGCal/data/links_mapping_V11_decentralized_march20_0.txt' else: raise RuntimeError('Unknown links mapping "{}". Options are "signaldriven" or "pudriven".'.format(links)) - process.hgcalTriggerGeometryESProducer.TriggerGeometry.ScintillatorTriggerCellSize = cms.uint32(2) - process.hgcalTriggerGeometryESProducer.TriggerGeometry.ScintillatorModuleSize = cms.uint32(6) - process.hgcalTriggerGeometryESProducer.TriggerGeometry.L1TModulesMapping = cms.FileInPath("L1Trigger/L1THGCal/data/panel_mapping_V11_decentralized_march20_2.txt") - process.hgcalTriggerGeometryESProducer.TriggerGeometry.L1TLinksMapping = cms.FileInPath(links_mapping) - process.hgcalTriggerGeometryESProducer.TriggerGeometry.DisconnectedModules = cms.vuint32(0) - process.hgcalTriggerGeometryESProducer.TriggerGeometry.ScintillatorLinksPerModule = cms.uint32(2) + process.l1tHGCalTriggerGeometryESProducer.TriggerGeometry.ScintillatorTriggerCellSize = cms.uint32(2) + process.l1tHGCalTriggerGeometryESProducer.TriggerGeometry.ScintillatorModuleSize = cms.uint32(6) + process.l1tHGCalTriggerGeometryESProducer.TriggerGeometry.L1TModulesMapping = cms.FileInPath("L1Trigger/L1THGCal/data/panel_mapping_V11_decentralized_march20_2.txt") + process.l1tHGCalTriggerGeometryESProducer.TriggerGeometry.L1TLinksMapping = cms.FileInPath(links_mapping) + process.l1tHGCalTriggerGeometryESProducer.TriggerGeometry.DisconnectedModules = cms.vuint32(0) + process.l1tHGCalTriggerGeometryESProducer.TriggerGeometry.ScintillatorLinksPerModule = cms.uint32(2) return process @@ -35,12 +35,12 @@ def custom_geometry_V10(process, links='signaldriven'): links_mapping = 'L1Trigger/L1THGCal/data/links_mapping_decentralized_jun19_0.txt' else: raise RuntimeError('Unknown links mapping "{}". Options are "signaldriven" or "pudriven".'.format(links)) - process.hgcalTriggerGeometryESProducer.TriggerGeometry.TriggerGeometryName = cms.string('HGCalTriggerGeometryV9Imp2') - process.hgcalTriggerGeometryESProducer.TriggerGeometry.ScintillatorTriggerCellSize = cms.uint32(2) - process.hgcalTriggerGeometryESProducer.TriggerGeometry.ScintillatorModuleSize = cms.uint32(6) - process.hgcalTriggerGeometryESProducer.TriggerGeometry.L1TModulesMapping = cms.FileInPath("L1Trigger/L1THGCal/data/panel_mapping_V9_decentralized_jun19_0.txt") - process.hgcalTriggerGeometryESProducer.TriggerGeometry.L1TLinksMapping = cms.FileInPath(links_mapping) - process.hgcalTriggerGeometryESProducer.TriggerGeometry.DisconnectedModules = cms.vuint32(0) - process.hgcalTriggerGeometryESProducer.TriggerGeometry.ScintillatorLinksPerModule = cms.uint32(2) + process.l1tHGCalTriggerGeometryESProducer.TriggerGeometry.TriggerGeometryName = cms.string('HGCalTriggerGeometryV9Imp2') + process.l1tHGCalTriggerGeometryESProducer.TriggerGeometry.ScintillatorTriggerCellSize = cms.uint32(2) + process.l1tHGCalTriggerGeometryESProducer.TriggerGeometry.ScintillatorModuleSize = cms.uint32(6) + process.l1tHGCalTriggerGeometryESProducer.TriggerGeometry.L1TModulesMapping = cms.FileInPath("L1Trigger/L1THGCal/data/panel_mapping_V9_decentralized_jun19_0.txt") + process.l1tHGCalTriggerGeometryESProducer.TriggerGeometry.L1TLinksMapping = cms.FileInPath(links_mapping) + process.l1tHGCalTriggerGeometryESProducer.TriggerGeometry.DisconnectedModules = cms.vuint32(0) + process.l1tHGCalTriggerGeometryESProducer.TriggerGeometry.ScintillatorLinksPerModule = cms.uint32(2) return process diff --git a/L1Trigger/L1THGCal/python/customTriggerSums.py b/L1Trigger/L1THGCal/python/customTriggerSums.py index 52945d1e9e2c7..05311a50f72c6 100644 --- a/L1Trigger/L1THGCal/python/customTriggerSums.py +++ b/L1Trigger/L1THGCal/python/customTriggerSums.py @@ -2,8 +2,8 @@ def custom_partial_trigger_sums(process): process.tower.includeTrigCells = cms.bool(True) - process.hgcalTowerProducer.ProcessorParameters.includeTrigCells = cms.bool(True) - process.hgcalTowerProducerHFNose.ProcessorParameters.includeTrigCells = cms.bool(True) + process.l1tHGCalTowerProducer.ProcessorParameters.includeTrigCells = cms.bool(True) + process.l1tHGCalTowerProducerHFNose.ProcessorParameters.includeTrigCells = cms.bool(True) process.threshold_conc_proc.allTrigCellsInTrigSums = cms.bool(False) process.best_conc_proc.allTrigCellsInTrigSums = cms.bool(False) process.supertc_conc_proc.allTrigCellsInTrigSums = cms.bool(False) @@ -11,14 +11,14 @@ def custom_partial_trigger_sums(process): process.coarsetc_onebitfraction_proc.allTrigCellsInTrigSums = cms.bool(False) process.coarsetc_equalshare_proc.allTrigCellsInTrigSums = cms.bool(False) process.autoEncoder_conc_proc.allTrigCellsInTrigSums = cms.bool(False) - process.hgcalConcentratorProducer.ProcessorParameters.allTrigCellsInTrigSums = cms.bool(False) - process.hgcalConcentratorProducerHFNose.ProcessorParameters.allTrigCellsInTrigSums = cms.bool(False) + process.l1tHGCalConcentratorProducer.ProcessorParameters.allTrigCellsInTrigSums = cms.bool(False) + process.l1tHGCalConcentratorProducerHFNose.ProcessorParameters.allTrigCellsInTrigSums = cms.bool(False) return process def custom_full_trigger_sums(process): process.tower.includeTrigCells = cms.bool(False) - process.hgcalTowerProducer.ProcessorParameters.includeTrigCells = cms.bool(False) - process.hgcalTowerProducerHFNose.ProcessorParameters.includeTrigCells = cms.bool(False) + process.l1tHGCalTowerProducer.ProcessorParameters.includeTrigCells = cms.bool(False) + process.l1tHGCalTowerProducerHFNose.ProcessorParameters.includeTrigCells = cms.bool(False) process.threshold_conc_proc.allTrigCellsInTrigSums = cms.bool(True) process.best_conc_proc.allTrigCellsInTrigSums = cms.bool(True) process.supertc_conc_proc.allTrigCellsInTrigSums = cms.bool(True) @@ -26,6 +26,6 @@ def custom_full_trigger_sums(process): process.coarsetc_onebitfraction_proc.allTrigCellsInTrigSums = cms.bool(True) process.coarsetc_equalshare_proc.allTrigCellsInTrigSums = cms.bool(True) process.autoEncoder_conc_proc.allTrigCellsInTrigSums = cms.bool(True) - process.hgcalConcentratorProducer.ProcessorParameters.allTrigCellsInTrigSums = cms.bool(True) - process.hgcalConcentratorProducerHFNose.ProcessorParameters.allTrigCellsInTrigSums = cms.bool(True) + process.l1tHGCalConcentratorProducer.ProcessorParameters.allTrigCellsInTrigSums = cms.bool(True) + process.l1tHGCalConcentratorProducerHFNose.ProcessorParameters.allTrigCellsInTrigSums = cms.bool(True) return process diff --git a/L1Trigger/L1THGCal/python/customVFE.py b/L1Trigger/L1THGCal/python/customVFE.py index ee68173b36675..e513c682d8f2f 100644 --- a/L1Trigger/L1THGCal/python/customVFE.py +++ b/L1Trigger/L1THGCal/python/customVFE.py @@ -7,7 +7,7 @@ def custom_hgcroc_oot(process, linearizationCfg_si = vfe_proc.linearizationCfg_si.clone(oot_coefficients=oot_coefficients), linearizationCfg_sc = vfe_proc.linearizationCfg_sc.clone(oot_coefficients=oot_coefficients), ) - process.hgcalVFEProducer.ProcessorParameters = parameters + process.l1tHGCalVFEProducer.ProcessorParameters = parameters return process @@ -32,5 +32,5 @@ def custom_hgcroc_compression(process, rounding=rounding, ), ) - process.hgcalVFEProducer.ProcessorParameters = parameters + process.l1tHGCalVFEProducer.ProcessorParameters = parameters return process diff --git a/L1Trigger/L1THGCal/python/hgcalBackEndLayer1Producer_cfi.py b/L1Trigger/L1THGCal/python/hgcalBackEndLayer1Producer_cfi.py index 93eaf40780a27..1bef6460c6ae8 100644 --- a/L1Trigger/L1THGCal/python/hgcalBackEndLayer1Producer_cfi.py +++ b/L1Trigger/L1THGCal/python/hgcalBackEndLayer1Producer_cfi.py @@ -98,19 +98,19 @@ C2d_parameters = dummy_C2d_params.clone() ) -hgcalBackEndLayer1Producer = cms.EDProducer( +l1tHGCalBackEndLayer1Producer = cms.EDProducer( "HGCalBackendLayer1Producer", - InputTriggerCells = cms.InputTag('hgcalConcentratorProducer:HGCalConcentratorProcessorSelection'), + InputTriggerCells = cms.InputTag('l1tHGCalConcentratorProducer:HGCalConcentratorProcessorSelection'), ProcessorParameters = be_proc.clone() ) -hgcalBackEndStage1Producer = cms.EDProducer( +l1tHGCalBackEndStage1Producer = cms.EDProducer( "HGCalBackendStage1Producer", - InputTriggerCells = cms.InputTag('hgcalConcentratorProducer:HGCalConcentratorProcessorSelection'), + InputTriggerCells = cms.InputTag('l1tHGCalConcentratorProducer:HGCalConcentratorProcessorSelection'), C2d_parameters = dummy_C2d_params.clone(), ProcessorParameters = stage1truncation_proc.clone() ) -hgcalBackEndLayer1ProducerHFNose = hgcalBackEndLayer1Producer.clone( - InputTriggerCells = 'hgcalConcentratorProducerHFNose:HGCalConcentratorProcessorSelection' +l1tHGCalBackEndLayer1ProducerHFNose = l1tHGCalBackEndLayer1Producer.clone( + InputTriggerCells = 'l1tHGCalConcentratorProducerHFNose:HGCalConcentratorProcessorSelection' ) diff --git a/L1Trigger/L1THGCal/python/hgcalBackEndLayer1_cff.py b/L1Trigger/L1THGCal/python/hgcalBackEndLayer1_cff.py index 9cd175f3ab68f..bb8c7e67345aa 100644 --- a/L1Trigger/L1THGCal/python/hgcalBackEndLayer1_cff.py +++ b/L1Trigger/L1THGCal/python/hgcalBackEndLayer1_cff.py @@ -4,7 +4,7 @@ from L1Trigger.L1THGCal.hgcalBackEndLayer1Producer_cfi import * -hgcalBackEndLayer1 = cms.Task(hgcalBackEndLayer1Producer) -hgcalBackEndStage1 = cms.Task(hgcalBackEndStage1Producer) +L1THGCalBackEndLayer1 = cms.Task(l1tHGCalBackEndLayer1Producer) +L1THGCalBackEndStage1 = cms.Task(l1tHGCalBackEndStage1Producer) -hgcalBackEndLayer1HFNose = cms.Task(hgcalBackEndLayer1ProducerHFNose) +L1THGCalBackEndLayer1HFNose = cms.Task(l1tHGCalBackEndLayer1ProducerHFNose) diff --git a/L1Trigger/L1THGCal/python/hgcalBackEndLayer2Producer_cfi.py b/L1Trigger/L1THGCal/python/hgcalBackEndLayer2Producer_cfi.py index f8433bd54b50d..5c87c6e35ad82 100644 --- a/L1Trigger/L1THGCal/python/hgcalBackEndLayer2Producer_cfi.py +++ b/L1Trigger/L1THGCal/python/hgcalBackEndLayer2Producer_cfi.py @@ -173,20 +173,20 @@ energy_interpretations = energy_interpretations ) -hgcalBackEndLayer2Producer = cms.EDProducer( +l1tHGCalBackEndLayer2Producer = cms.EDProducer( "HGCalBackendLayer2Producer", - InputCluster = cms.InputTag('hgcalBackEndLayer1Producer:HGCalBackendLayer1Processor2DClustering'), + InputCluster = cms.InputTag('l1tHGCalBackEndLayer1Producer:HGCalBackendLayer1Processor2DClustering'), ProcessorParameters = be_proc.clone() ) -hgcalBackEndStage2Producer = cms.EDProducer( +l1tHGCalBackEndStage2Producer = cms.EDProducer( "HGCalBackendLayer2Producer", - InputCluster = cms.InputTag('hgcalBackEndStage1Producer:HGCalBackendStage1Processor'), + InputCluster = cms.InputTag('l1tHGCalBackEndStage1Producer:HGCalBackendStage1Processor'), ProcessorParameters = be_proc.clone() ) -hgcalBackEndLayer2ProducerHFNose = hgcalBackEndLayer2Producer.clone( - InputCluster = cms.InputTag('hgcalBackEndLayer1ProducerHFNose:HGCalBackendLayer1Processor2DClustering'), +l1tHGCalBackEndLayer2ProducerHFNose = l1tHGCalBackEndLayer2Producer.clone( + InputCluster = cms.InputTag('l1tHGCalBackEndLayer1ProducerHFNose:HGCalBackendLayer1Processor2DClustering'), ProcessorParameters = dict( C3d_parameters = dict( histoMax_C3d_seeding_parameters = dict( diff --git a/L1Trigger/L1THGCal/python/hgcalBackEndLayer2_cff.py b/L1Trigger/L1THGCal/python/hgcalBackEndLayer2_cff.py index fb2439229a26b..a268a09d6c080 100644 --- a/L1Trigger/L1THGCal/python/hgcalBackEndLayer2_cff.py +++ b/L1Trigger/L1THGCal/python/hgcalBackEndLayer2_cff.py @@ -4,7 +4,7 @@ from L1Trigger.L1THGCal.hgcalBackEndLayer2Producer_cfi import * -hgcalBackEndLayer2 = cms.Task(hgcalBackEndLayer2Producer) -hgcalBackEndStage2 = cms.Task(hgcalBackEndStage2Producer) +L1THGCalBackEndLayer2 = cms.Task(l1tHGCalBackEndLayer2Producer) +L1THGCalBackEndStage2 = cms.Task(l1tHGCalBackEndStage2Producer) -hgcalBackEndLayer2HFNose = cms.Task(hgcalBackEndLayer2ProducerHFNose) +L1THGCalBackEndLayer2HFNose = cms.Task(l1tHGCalBackEndLayer2ProducerHFNose) diff --git a/L1Trigger/L1THGCal/python/hgcalConcentratorProducer_cfi.py b/L1Trigger/L1THGCal/python/hgcalConcentratorProducer_cfi.py index e7721b35ebcfe..58c85c70af1c6 100644 --- a/L1Trigger/L1THGCal/python/hgcalConcentratorProducer_cfi.py +++ b/L1Trigger/L1THGCal/python/hgcalConcentratorProducer_cfi.py @@ -239,16 +239,16 @@ ) -hgcalConcentratorProducer = cms.EDProducer( +l1tHGCalConcentratorProducer = cms.EDProducer( "HGCalConcentratorProducer", - InputTriggerCells = cms.InputTag('hgcalVFEProducer:HGCalVFEProcessorSums'), - InputTriggerSums = cms.InputTag('hgcalVFEProducer:HGCalVFEProcessorSums'), + InputTriggerCells = cms.InputTag('l1tHGCalVFEProducer:HGCalVFEProcessorSums'), + InputTriggerSums = cms.InputTag('l1tHGCalVFEProducer:HGCalVFEProcessorSums'), ProcessorParameters = threshold_conc_proc.clone() ) -hgcalConcentratorProducerHFNose = hgcalConcentratorProducer.clone( - InputTriggerCells = cms.InputTag('hfnoseVFEProducer:HGCalVFEProcessorSums'), - InputTriggerSums = cms.InputTag('hfnoseVFEProducer:HGCalVFEProcessorSums') +l1tHGCalConcentratorProducerHFNose = l1tHGCalConcentratorProducer.clone( + InputTriggerCells = cms.InputTag('l1tHFnoseVFEProducer:HGCalVFEProcessorSums'), + InputTriggerSums = cms.InputTag('l1tHFnoseVFEProducer:HGCalVFEProcessorSums') ) diff --git a/L1Trigger/L1THGCal/python/hgcalConcentrator_cff.py b/L1Trigger/L1THGCal/python/hgcalConcentrator_cff.py index 26c25bc79d125..38cb407a15230 100644 --- a/L1Trigger/L1THGCal/python/hgcalConcentrator_cff.py +++ b/L1Trigger/L1THGCal/python/hgcalConcentrator_cff.py @@ -4,6 +4,6 @@ from L1Trigger.L1THGCal.hgcalConcentratorProducer_cfi import * -hgcalConcentrator = cms.Task(hgcalConcentratorProducer) -hgcalConcentratorHFNose = cms.Task(hgcalConcentratorProducerHFNose) +L1THGCalConcentrator = cms.Task(l1tHGCalConcentratorProducer) +L1THGCalConcentratorHFNose = cms.Task(l1tHGCalConcentratorProducerHFNose) diff --git a/L1Trigger/L1THGCal/python/hgcalTowerMapProducer_cfi.py b/L1Trigger/L1THGCal/python/hgcalTowerMapProducer_cfi.py index 3f209e3ab7afd..c75f29115ba81 100644 --- a/L1Trigger/L1THGCal/python/hgcalTowerMapProducer_cfi.py +++ b/L1Trigger/L1THGCal/python/hgcalTowerMapProducer_cfi.py @@ -22,9 +22,9 @@ towermap_parameters = towerMap2D_parValues.clone() ) -hgcalTowerMapProducer = cms.EDProducer( +l1tHGCalTowerMapProducer = cms.EDProducer( "HGCalTowerMapProducer", - InputTriggerSums = cms.InputTag('hgcalConcentratorProducer:HGCalConcentratorProcessorSelection'), + InputTriggerSums = cms.InputTag('l1tHGCalConcentratorProducer:HGCalConcentratorProcessorSelection'), ProcessorParameters = tower_map.clone() ) @@ -42,7 +42,7 @@ towermap_parameters = towerMap2DHFNose_parValues.clone() ) -hgcalTowerMapProducerHFNose = hgcalTowerMapProducer.clone( - InputTriggerSums = cms.InputTag('hgcalConcentratorProducerHFNose:HGCalConcentratorProcessorSelection'), +l1tHGCalTowerMapProducerHFNose = l1tHGCalTowerMapProducer.clone( + InputTriggerSums = cms.InputTag('l1tHGCalConcentratorProducerHFNose:HGCalConcentratorProcessorSelection'), ProcessorParameters = towerHFNose_map.clone() ) diff --git a/L1Trigger/L1THGCal/python/hgcalTowerMap_cff.py b/L1Trigger/L1THGCal/python/hgcalTowerMap_cff.py index 4c377ceeb4f77..c0675abd54f65 100644 --- a/L1Trigger/L1THGCal/python/hgcalTowerMap_cff.py +++ b/L1Trigger/L1THGCal/python/hgcalTowerMap_cff.py @@ -4,7 +4,7 @@ from L1Trigger.L1THGCal.hgcalTowerMapProducer_cfi import * -hgcalTowerMap = cms.Task(hgcalTowerMapProducer) +L1THGCalTowerMap = cms.Task(l1tHGCalTowerMapProducer) -hgcalTowerMapHFNose = cms.Task(hgcalTowerMapProducerHFNose) +L1THGCalTowerMapHFNose = cms.Task(l1tHGCalTowerMapProducerHFNose) diff --git a/L1Trigger/L1THGCal/python/hgcalTowerProducer_cfi.py b/L1Trigger/L1THGCal/python/hgcalTowerProducer_cfi.py index d4503936c4d87..17291264dd6d2 100644 --- a/L1Trigger/L1THGCal/python/hgcalTowerProducer_cfi.py +++ b/L1Trigger/L1THGCal/python/hgcalTowerProducer_cfi.py @@ -6,10 +6,10 @@ towermap_parameters = hgcalTowerMapProducer_cfi.towerMap2D_parValues.clone() ) -hgcalTowerProducer = cms.EDProducer( +l1tHGCalTowerProducer = cms.EDProducer( "HGCalTowerProducer", - InputTowerMaps = cms.InputTag('hgcalTowerMapProducer:HGCalTowerMapProcessor'), - InputTriggerCells = cms.InputTag('hgcalBackEndLayer1Producer:HGCalBackendLayer1Processor2DClustering'), + InputTowerMaps = cms.InputTag('l1tHGCalTowerMapProducer:HGCalTowerMapProcessor'), + InputTriggerCells = cms.InputTag('l1tHGCalBackEndLayer1Producer:HGCalBackendLayer1Processor2DClustering'), ProcessorParameters = tower.clone(), ) @@ -17,9 +17,9 @@ towermap_parameters = hgcalTowerMapProducer_cfi.towerMap2DHFNose_parValues.clone() ) -hgcalTowerProducerHFNose = hgcalTowerProducer.clone( - InputTowerMaps = cms.InputTag('hgcalTowerMapProducerHFNose:HGCalTowerMapProcessor'), - InputTriggerCells = cms.InputTag('hgcalBackEndLayer1ProducerHFNose:HGCalBackendLayer1Processor2DClustering'), +l1tHGCalTowerProducerHFNose = l1tHGCalTowerProducer.clone( + InputTowerMaps = cms.InputTag('l1tHGCalTowerMapProducerHFNose:HGCalTowerMapProcessor'), + InputTriggerCells = cms.InputTag('l1tHGCalBackEndLayer1ProducerHFNose:HGCalBackendLayer1Processor2DClustering'), ProcessorParameters = towerHFNose.clone(), ) diff --git a/L1Trigger/L1THGCal/python/hgcalTower_cff.py b/L1Trigger/L1THGCal/python/hgcalTower_cff.py index 0b9a1704bfc6f..c33312121ce0a 100644 --- a/L1Trigger/L1THGCal/python/hgcalTower_cff.py +++ b/L1Trigger/L1THGCal/python/hgcalTower_cff.py @@ -4,7 +4,7 @@ from L1Trigger.L1THGCal.hgcalTowerProducer_cfi import * -hgcalTower = cms.Task(hgcalTowerProducer) +L1THGCalTower = cms.Task(l1tHGCalTowerProducer) -hgcalTowerHFNose = cms.Task(hgcalTowerProducerHFNose) +L1THGCalTowerHFNose = cms.Task(l1tHGCalTowerProducerHFNose) diff --git a/L1Trigger/L1THGCal/python/hgcalTriggerGeometryESProducer_cfi.py b/L1Trigger/L1THGCal/python/hgcalTriggerGeometryESProducer_cfi.py index 988a434e320d9..163b58a8e6cf8 100644 --- a/L1Trigger/L1THGCal/python/hgcalTriggerGeometryESProducer_cfi.py +++ b/L1Trigger/L1THGCal/python/hgcalTriggerGeometryESProducer_cfi.py @@ -28,7 +28,7 @@ DisconnectedLayers = cms.vuint32(disconnectedTriggerLayers) ) -hgcalTriggerGeometryESProducer = cms.ESProducer( +l1tHGCalTriggerGeometryESProducer = cms.ESProducer( 'HGCalTriggerGeometryESProducer', TriggerGeometry = geometry ) diff --git a/L1Trigger/L1THGCal/python/hgcalTriggerPrimitivesNew_cff.py b/L1Trigger/L1THGCal/python/hgcalTriggerPrimitivesNew_cff.py index 9441c86295b93..49de86d4aa1ee 100644 --- a/L1Trigger/L1THGCal/python/hgcalTriggerPrimitivesNew_cff.py +++ b/L1Trigger/L1THGCal/python/hgcalTriggerPrimitivesNew_cff.py @@ -8,15 +8,15 @@ from L1Trigger.L1THGCal.hgcalTowerMap_cff import * from L1Trigger.L1THGCal.hgcalTower_cff import * -hgcalTriggerPrimitivesTask = cms.Task(hgcalVFE, hgcalConcentrator, hgcalBackEndStage1, hgcalBackEndStage2, hgcalTowerMap, hgcalTower) -hgcalTriggerPrimitives = cms.Sequence(hgcalTriggerPrimitivesTask) +L1THGCalTriggerPrimitivesTask = cms.Task(L1THGCalVFE, L1THGCalConcentrator, L1THGCalBackEndStage1, L1THGCalBackEndStage2, L1THGCalTowerMap, L1THGCalTower) +L1THGCalTriggerPrimitives = cms.Sequence(L1THGCalTriggerPrimitivesTask) -_hfnose_hgcalTriggerPrimitivesTask = hgcalTriggerPrimitivesTask.copy() -_hfnose_hgcalTriggerPrimitivesTask.add(hfnoseVFE, hgcalConcentratorHFNose, hgcalBackEndLayer1HFNose, hgcalBackEndLayer2HFNose, hgcalTowerMapHFNose, hgcalTowerHFNose) +_hfnose_hgcalTriggerPrimitivesTask = L1THGCalTriggerPrimitivesTask.copy() +_hfnose_hgcalTriggerPrimitivesTask.add(L1THFnoseVFE, L1THGCalConcentratorHFNose, L1THGCalBackEndLayer1HFNose, L1THGCalBackEndLayer2HFNose, L1THGCalTowerMapHFNose, L1THGCalTowerHFNose) from Configuration.Eras.Modifier_phase2_hfnose_cff import phase2_hfnose phase2_hfnose.toReplaceWith( - hgcalTriggerPrimitivesTask, _hfnose_hgcalTriggerPrimitivesTask ) + L1THGCalTriggerPrimitivesTask, _hfnose_hgcalTriggerPrimitivesTask ) from Configuration.Eras.Modifier_phase2_hgcalV10_cff import phase2_hgcalV10 from Configuration.Eras.Modifier_phase2_hgcalV11_cff import phase2_hgcalV11 @@ -31,5 +31,5 @@ def _fakeHGCalDigiAlias(process): from EventFilter.HGCalRawToDigi.HGCDigiConverter_cfi import HGCDigiConverter as _HGCDigiConverter process.simHGCalUnsuppressedDigis = _HGCDigiConverter.clone() - process.hgcalTriggerPrimitivesTask.add(process.simHGCalUnsuppressedDigis) + process.L1THGCalTriggerPrimitivesTask.add(process.simHGCalUnsuppressedDigis) doFakeHGCalDigiAlias = convertHGCalDigisSim.makeProcessModifier(_fakeHGCalDigiAlias) diff --git a/L1Trigger/L1THGCal/python/hgcalTriggerPrimitivesSimClustering_cff.py b/L1Trigger/L1THGCal/python/hgcalTriggerPrimitivesSimClustering_cff.py index 5cb88d2e34156..8df64c4060e92 100644 --- a/L1Trigger/L1THGCal/python/hgcalTriggerPrimitivesSimClustering_cff.py +++ b/L1Trigger/L1THGCal/python/hgcalTriggerPrimitivesSimClustering_cff.py @@ -3,11 +3,11 @@ from L1Trigger.L1HGCal.hgcalTriggerPrimitives_cff import * cluster_algo_all = cms.PSet( AlgorithmName = cms.string('HGCalTriggerSimClusterBestChoice'), - FECodec = process.hgcalTriggerPrimitiveDigiProducer.FECodec , + FECodec = process.l1tHGCalTriggerPrimitiveDigiProducer.FECodec , HGCalEESensitive_tag = cms.string('HGCalEESensitive'), HGCalHESiliconSensitive_tag = cms.string('HGCalHESiliconSensitive'), - calib_parameters = process.hgcalTriggerPrimitiveDigiProducer.BEConfiguration.algorithms[0].calib_parameters, + calib_parameters = process.l1tHGCalTriggerPrimitiveDigiProducer.BEConfiguration.algorithms[0].calib_parameters, simcollection=cms.InputTag("mix","MergedCaloTruth",""), simhitsee = cms.InputTag("g4SimHits","HGCHitsEE",""), simhitsfh = cms.InputTag("g4SimHits","HGCHitsHEfront",""), diff --git a/L1Trigger/L1THGCal/python/hgcalTriggerPrimitives_cff.py b/L1Trigger/L1THGCal/python/hgcalTriggerPrimitives_cff.py index 1f56cad428cd1..1ca77d64565d3 100644 --- a/L1Trigger/L1THGCal/python/hgcalTriggerPrimitives_cff.py +++ b/L1Trigger/L1THGCal/python/hgcalTriggerPrimitives_cff.py @@ -8,15 +8,15 @@ from L1Trigger.L1THGCal.hgcalTowerMap_cff import * from L1Trigger.L1THGCal.hgcalTower_cff import * -hgcalTriggerPrimitivesTask = cms.Task(hgcalVFE, hgcalConcentrator, hgcalBackEndLayer1, hgcalBackEndLayer2, hgcalTowerMap, hgcalTower) -hgcalTriggerPrimitives = cms.Sequence(hgcalTriggerPrimitivesTask) +L1THGCalTriggerPrimitivesTask = cms.Task(L1THGCalVFE, L1THGCalConcentrator, L1THGCalBackEndLayer1, L1THGCalBackEndLayer2, L1THGCalTowerMap, L1THGCalTower) +L1THGCalTriggerPrimitives = cms.Sequence(L1THGCalTriggerPrimitivesTask) -_hfnose_hgcalTriggerPrimitivesTask = hgcalTriggerPrimitivesTask.copy() -_hfnose_hgcalTriggerPrimitivesTask.add(hfnoseVFE, hgcalConcentratorHFNose, hgcalBackEndLayer1HFNose, hgcalBackEndLayer2HFNose, hgcalTowerMapHFNose, hgcalTowerHFNose) +_hfnose_hgcalTriggerPrimitivesTask = L1THGCalTriggerPrimitivesTask.copy() +_hfnose_hgcalTriggerPrimitivesTask.add(L1THFnoseVFE, L1THGCalConcentratorHFNose, L1THGCalBackEndLayer1HFNose, L1THGCalBackEndLayer2HFNose, L1THGCalTowerMapHFNose, L1THGCalTowerHFNose) from Configuration.Eras.Modifier_phase2_hfnose_cff import phase2_hfnose phase2_hfnose.toReplaceWith( - hgcalTriggerPrimitivesTask, _hfnose_hgcalTriggerPrimitivesTask ) + L1THGCalTriggerPrimitivesTask, _hfnose_hgcalTriggerPrimitivesTask ) from Configuration.Eras.Modifier_phase2_hgcalV10_cff import phase2_hgcalV10 from Configuration.Eras.Modifier_phase2_hgcalV11_cff import phase2_hgcalV11 @@ -31,5 +31,5 @@ def _fakeHGCalDigiAlias(process): from EventFilter.HGCalRawToDigi.HGCDigiConverter_cfi import HGCDigiConverter as _HGCDigiConverter process.simHGCalUnsuppressedDigis = _HGCDigiConverter.clone() - process.hgcalTriggerPrimitivesTask.add(process.simHGCalUnsuppressedDigis) + process.L1THGCalTriggerPrimitivesTask.add(process.simHGCalUnsuppressedDigis) doFakeHGCalDigiAlias = convertHGCalDigisSim.makeProcessModifier(_fakeHGCalDigiAlias) diff --git a/L1Trigger/L1THGCal/python/hgcalVFEProducer_cfi.py b/L1Trigger/L1THGCal/python/hgcalVFEProducer_cfi.py index 65a20cdbd5713..a7bb01713c2ad 100644 --- a/L1Trigger/L1THGCal/python/hgcalVFEProducer_cfi.py +++ b/L1Trigger/L1THGCal/python/hgcalVFEProducer_cfi.py @@ -139,7 +139,7 @@ -hgcalVFEProducer = cms.EDProducer( +l1tHGCalVFEProducer = cms.EDProducer( "HGCalVFEProducer", eeDigis = cms.InputTag('simHGCalUnsuppressedDigis:EE'), fhDigis = cms.InputTag('simHGCalUnsuppressedDigis:HEfront'), @@ -147,7 +147,7 @@ ProcessorParameters = vfe_proc.clone() ) -hfnoseVFEProducer = cms.EDProducer( +l1tHFnoseVFEProducer = cms.EDProducer( "HFNoseVFEProducer", noseDigis = cms.InputTag('simHFNoseUnsuppressedDigis:HFNose'), ProcessorParameters = vfe_proc.clone() diff --git a/L1Trigger/L1THGCal/python/hgcalVFE_cff.py b/L1Trigger/L1THGCal/python/hgcalVFE_cff.py index 8d56b1ffe5856..4ac45659da6cc 100644 --- a/L1Trigger/L1THGCal/python/hgcalVFE_cff.py +++ b/L1Trigger/L1THGCal/python/hgcalVFE_cff.py @@ -3,6 +3,6 @@ from L1Trigger.L1THGCal.hgcalTriggerGeometryESProducer_cfi import * from L1Trigger.L1THGCal.hgcalVFEProducer_cfi import * -hgcalVFE = cms.Task(hgcalVFEProducer) -hfnoseVFE = cms.Task(hfnoseVFEProducer) +L1THGCalVFE = cms.Task(l1tHGCalVFEProducer) +L1THFnoseVFE = cms.Task(l1tHFnoseVFEProducer) diff --git a/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV11Imp2_cfg.py b/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV11Imp2_cfg.py index 04972c9f6e5d8..911a73af748ca 100644 --- a/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV11Imp2_cfg.py +++ b/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV11Imp2_cfg.py @@ -97,10 +97,10 @@ from L1Trigger.L1THGCal.customTriggerGeometry import custom_geometry_V11_Imp2 process = custom_geometry_V11_Imp2(process) -process.hgcaltriggergeomtester = cms.EDAnalyzer( +process.L1THGCaltriggergeomtester = cms.EDAnalyzer( "HGCalTriggerGeomTesterV9Imp2" ) -process.test_step = cms.Path(process.hgcaltriggergeomtester) +process.test_step = cms.Path(process.L1THGCaltriggergeomtester) # Schedule definition process.schedule = cms.Schedule(process.test_step,process.endjob_step) diff --git a/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV11Imp3_cfg.py b/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV11Imp3_cfg.py index f12b8ff896814..1fc3ac0ead156 100644 --- a/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV11Imp3_cfg.py +++ b/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV11Imp3_cfg.py @@ -104,10 +104,10 @@ from L1Trigger.L1THGCal.customTriggerGeometry import custom_geometry_V11_Imp3 process = custom_geometry_V11_Imp3(process) -process.hgcaltriggergeomtester = cms.EDAnalyzer( +process.L1THGCaltriggergeomtester = cms.EDAnalyzer( "HGCalTriggerGeomTesterV9Imp3" ) -process.test_step = cms.Path(process.hgcaltriggergeomtester) +process.test_step = cms.Path(process.L1THGCaltriggergeomtester) # Schedule definition process.schedule = cms.Schedule(process.test_step,process.endjob_step) diff --git a/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV9Imp2_Nose_cfg.py b/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV9Imp2_Nose_cfg.py index fe10ad953aaa5..74898ebb0c945 100644 --- a/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV9Imp2_Nose_cfg.py +++ b/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV9Imp2_Nose_cfg.py @@ -68,10 +68,10 @@ outputCommands = cms.untracked.vstring( 'keep *_genParticles_*_*', 'keep *_caloParticles_*_*', - 'keep *_*hgcalBackEndLayer1Producer*_*_*', - 'keep *_*hgcalBackEndLayer2Producer*_*_*', - 'keep *_*hgcalTowerMapProducer*_*_*', - 'keep *_*hgcalTowerProducer*_*_*' + 'keep *_*l1tHGCalBackEndLayer1Producer*_*_*', + 'keep *_*l1tHGCalBackEndLayer2Producer*_*_*', + 'keep *_*l1tHGCalTowerMapProducer*_*_*', + 'keep *_*l1tHGCalTowerProducer*_*_*' ), fileName = cms.untracked.string('file:/tmp/dalfonso/test.root') @@ -133,14 +133,14 @@ from L1Trigger.L1THGCal.customTriggerGeometry import custom_geometry_decentralized_V11 process = custom_geometry_decentralized_V11(process) -process.hgcaltriggergeomtester = cms.EDAnalyzer( +process.L1THGCaltriggergeomtester = cms.EDAnalyzer( "HGCalTriggerGeomTesterV9Imp2" ) -process.test_step = cms.Path(process.hgcaltriggergeomtester) +process.test_step = cms.Path(process.L1THGCaltriggergeomtester) ## to test the full TP -process.hgcl1tpg_step = cms.Path(process.hgcalTriggerPrimitives) +process.hgcl1tpg_step = cms.Path(process.L1THGCalTriggerPrimitives) # Schedule definition # test_step diff --git a/L1Trigger/L1THGCalUtilities/python/HGC3DClusterGenMatchSelector_cff.py b/L1Trigger/L1THGCalUtilities/python/HGC3DClusterGenMatchSelector_cff.py index d4cfb8c1fe095..7051f6a40bb2f 100644 --- a/L1Trigger/L1THGCalUtilities/python/HGC3DClusterGenMatchSelector_cff.py +++ b/L1Trigger/L1THGCalUtilities/python/HGC3DClusterGenMatchSelector_cff.py @@ -2,4 +2,4 @@ from L1Trigger.L1THGCalUtilities.HGC3DClusterGenMatchSelector_cfi import * -hgcalTriggerSelector = cms.Sequence(hgc3DClusterGenMatchSelector) +L1THGCalTriggerSelector = cms.Sequence(l1tHGCal3DClusterGenMatchSelector) diff --git a/L1Trigger/L1THGCalUtilities/python/HGC3DClusterGenMatchSelector_cfi.py b/L1Trigger/L1THGCalUtilities/python/HGC3DClusterGenMatchSelector_cfi.py index 7bbb7f3fadb81..4c06857c5fbac 100644 --- a/L1Trigger/L1THGCalUtilities/python/HGC3DClusterGenMatchSelector_cfi.py +++ b/L1Trigger/L1THGCalUtilities/python/HGC3DClusterGenMatchSelector_cfi.py @@ -1,8 +1,8 @@ import FWCore.ParameterSet.Config as cms -hgc3DClusterGenMatchSelector = cms.EDProducer( +l1tHGCal3DClusterGenMatchSelector = cms.EDProducer( "HGC3DClusterGenMatchSelector", - src = cms.InputTag('hgcalBackEndLayer2Producer:HGCalBackendLayer2Processor3DClustering'), + src = cms.InputTag('l1tHGCalBackEndLayer2Producer:HGCalBackendLayer2Processor3DClustering'), genSrc = cms.InputTag('genParticles'), dR = cms.double(0.3) ) diff --git a/L1Trigger/L1THGCalUtilities/python/caloTruthCellsNtuples_cff.py b/L1Trigger/L1THGCalUtilities/python/caloTruthCellsNtuples_cff.py index 4b57c388ae500..d1a6a6d2c566a 100644 --- a/L1Trigger/L1THGCalUtilities/python/caloTruthCellsNtuples_cff.py +++ b/L1Trigger/L1THGCalUtilities/python/caloTruthCellsNtuples_cff.py @@ -1,44 +1,44 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.L1THGCalUtilities.caloTruthCellsProducer_cfi import caloTruthCellsProducer +from L1Trigger.L1THGCalUtilities.caloTruthCellsProducer_cfi import l1tCaloTruthCellsProducer from L1Trigger.L1THGCalUtilities.hgcalTriggerNtuples_cfi import * ntuple_multiclusters_fulltruth = ntuple_multiclusters.clone( - Multiclusters = cms.InputTag('caloTruthCellsProducer'), + Multiclusters = cms.InputTag('l1tCaloTruthCellsProducer'), Prefix = cms.untracked.string('cl3dfulltruth') ) -hgcalTriggerNtuplizer.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 -if caloTruthCellsProducer.makeCellsCollection: +if l1tCaloTruthCellsProducer.makeCellsCollection: ## ntuplize clusters and towers - ntuple_triggercells.caloParticlesToCells = cms.InputTag('caloTruthCellsProducer') + ntuple_triggercells.caloParticlesToCells = cms.InputTag('l1tCaloTruthCellsProducer') ntuple_triggercells.FillTruthMap = cms.bool(True) ntuple_triggercells_truth = ntuple_triggercells.clone( - TriggerCells = cms.InputTag('caloTruthCellsProducer'), - Multiclusters = cms.InputTag('hgcalTruthBackEndLayer2Producer:HGCalBackendLayer2Processor3DClustering'), + TriggerCells = cms.InputTag('l1tCaloTruthCellsProducer'), + Multiclusters = cms.InputTag('l1tHGCalTruthBackEndLayer2Producer:HGCalBackendLayer2Processor3DClustering'), Prefix = cms.untracked.string('tctruth'), FillTruthMap = cms.bool(False) ) ntuple_clusters_truth = ntuple_clusters.clone( - Clusters = cms.InputTag('hgcalTruthBackEndLayer1Producer:HGCalBackendLayer1Processor2DClustering'), + Clusters = cms.InputTag('l1tHGCalTruthBackEndLayer1Producer:HGCalBackendLayer1Processor2DClustering'), Prefix = cms.untracked.string('cltruth') ) ntuple_multiclusters_truth = ntuple_multiclusters.clone( - Multiclusters = cms.InputTag('hgcalTruthBackEndLayer2Producer:HGCalBackendLayer2Processor3DClustering'), + Multiclusters = cms.InputTag('l1tHGCalTruthBackEndLayer2Producer:HGCalBackendLayer2Processor3DClustering'), Prefix = cms.untracked.string('cl3dtruth') ) ntuple_towers_truth = ntuple_towers.clone( - Towers = cms.InputTag('hgcalTruthTowerProducer:HGCalTowerProcessor'), + Towers = cms.InputTag('l1tHGCalTruthTowerProducer:HGCalTowerProcessor'), Prefix = cms.untracked.string('towertruth') ) - hgcalTriggerNtuplizer.Ntuples.append(ntuple_triggercells_truth) - hgcalTriggerNtuplizer.Ntuples.append(ntuple_multiclusters_truth) - hgcalTriggerNtuplizer.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/caloTruthCellsProducer_cfi.py b/L1Trigger/L1THGCalUtilities/python/caloTruthCellsProducer_cfi.py index a5e9e332f156f..03f410291700c 100644 --- a/L1Trigger/L1THGCalUtilities/python/caloTruthCellsProducer_cfi.py +++ b/L1Trigger/L1THGCalUtilities/python/caloTruthCellsProducer_cfi.py @@ -2,9 +2,9 @@ from L1Trigger.L1THGCal.hgcalBackEndLayer1Producer_cfi import dummy_C2d_params -caloTruthCellsProducer = cms.EDProducer('CaloTruthCellsProducer', +l1tCaloTruthCellsProducer = cms.EDProducer('CaloTruthCellsProducer', caloParticles = cms.InputTag('mix', 'MergedCaloTruth'), - triggerCells = cms.InputTag('hgcalVFEProducer:HGCalVFEProcessorSums'), + triggerCells = cms.InputTag('l1tHGCalVFEProducer:HGCalVFEProcessorSums'), simHitsEE = cms.InputTag('g4SimHits:HGCHitsEE'), simHitsHEfront = cms.InputTag('g4SimHits:HGCHitsHEfront'), simHitsHEback = cms.InputTag('g4SimHits:HcalHits'), diff --git a/L1Trigger/L1THGCalUtilities/python/caloTruthCells_cff.py b/L1Trigger/L1THGCalUtilities/python/caloTruthCells_cff.py index f7a653936e022..3c355008569bc 100644 --- a/L1Trigger/L1THGCalUtilities/python/caloTruthCells_cff.py +++ b/L1Trigger/L1THGCalUtilities/python/caloTruthCells_cff.py @@ -1,42 +1,42 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.L1THGCalUtilities.caloTruthCellsProducer_cfi import caloTruthCellsProducer +from L1Trigger.L1THGCalUtilities.caloTruthCellsProducer_cfi import l1tCaloTruthCellsProducer -caloTruthCells = cms.Sequence(caloTruthCellsProducer) +L1TCaloTruthCells = cms.Sequence(l1tCaloTruthCellsProducer) -if caloTruthCellsProducer.makeCellsCollection: +if l1tCaloTruthCellsProducer.makeCellsCollection: ## cluster and tower sequence - from L1Trigger.L1THGCal.hgcalConcentratorProducer_cfi import hgcalConcentratorProducer - from L1Trigger.L1THGCal.hgcalBackEndLayer1Producer_cfi import hgcalBackEndLayer1Producer - from L1Trigger.L1THGCal.hgcalBackEndLayer2Producer_cfi import hgcalBackEndLayer2Producer - from L1Trigger.L1THGCal.hgcalTowerMapProducer_cfi import hgcalTowerMapProducer - from L1Trigger.L1THGCal.hgcalTowerProducer_cfi import hgcalTowerProducer + from L1Trigger.L1THGCal.hgcalConcentratorProducer_cfi import l1tHGCalConcentratorProducer + from L1Trigger.L1THGCal.hgcalBackEndLayer1Producer_cfi import l1tHGCalBackEndLayer1Producer + from L1Trigger.L1THGCal.hgcalBackEndLayer2Producer_cfi import l1tHGCalBackEndLayer2Producer + from L1Trigger.L1THGCal.hgcalTowerMapProducer_cfi import l1tHGCalTowerMapProducer + from L1Trigger.L1THGCal.hgcalTowerProducer_cfi import l1tHGCalTowerProducer - hgcalTruthConcentratorProducer = hgcalConcentratorProducer.clone( - InputTriggerCells = cms.InputTag('caloTruthCellsProducer') + l1tHGCalTruthConcentratorProducer = l1tHGCalConcentratorProducer.clone( + InputTriggerCells = cms.InputTag('l1tCaloTruthCellsProducer') ) - hgcalTruthBackEndLayer1Producer = hgcalBackEndLayer1Producer.clone( - InputTriggerCells = cms.InputTag('hgcalTruthConcentratorProducer:HGCalConcentratorProcessorSelection') + l1tHGCalTruthBackEndLayer1Producer = l1tHGCalBackEndLayer1Producer.clone( + InputTriggerCells = cms.InputTag('l1tHGCalTruthConcentratorProducer:HGCalConcentratorProcessorSelection') ) - hgcalTruthBackEndLayer2Producer = hgcalBackEndLayer2Producer.clone( - InputCluster = cms.InputTag('hgcalTruthBackEndLayer1Producer:HGCalBackendLayer1Processor2DClustering') + l1tHGCalTruthBackEndLayer2Producer = l1tHGCalBackEndLayer2Producer.clone( + InputCluster = cms.InputTag('l1tHGCalTruthBackEndLayer1Producer:HGCalBackendLayer1Processor2DClustering') ) - hgcalTruthTowerMapProducer = hgcalTowerMapProducer.clone( - InputTriggerCells = cms.InputTag('caloTruthCellsProducer') + l1tHGCalTruthTowerMapProducer = l1tHGCalTowerMapProducer.clone( + InputTriggerCells = cms.InputTag('l1tCaloTruthCellsProducer') ) - hgcalTruthTowerProducer = hgcalTowerProducer.clone( - InputTowerMaps = cms.InputTag('hgcalTruthTowerMapProducer:HGCalTowerMapProcessor') + l1tHGCalTruthTowerProducer = l1tHGCalTowerProducer.clone( + InputTowerMaps = cms.InputTag('l1tHGCalTruthTowerMapProducer:HGCalTowerMapProcessor') ) - caloTruthCells += cms.Sequence( - hgcalTruthConcentratorProducer * - hgcalTruthBackEndLayer1Producer * - hgcalTruthBackEndLayer2Producer * - hgcalTruthTowerMapProducer * - hgcalTruthTowerProducer + L1TCaloTruthCells += cms.Sequence( + l1tHGCalTruthConcentratorProducer * + l1tHGCalTruthBackEndLayer1Producer * + l1tHGCalTruthBackEndLayer2Producer * + l1tHGCalTruthTowerMapProducer * + l1tHGCalTruthTowerProducer ) diff --git a/L1Trigger/L1THGCalUtilities/python/clustering2d.py b/L1Trigger/L1THGCalUtilities/python/clustering2d.py index edf910e32f10b..df279230316d6 100644 --- a/L1Trigger/L1THGCalUtilities/python/clustering2d.py +++ b/L1Trigger/L1THGCalUtilities/python/clustering2d.py @@ -13,7 +13,7 @@ def create_distance(process, inputs, seed_threshold=distance_C2d_params.seeding_threshold_silicon, # MipT cluster_threshold=distance_C2d_params.clustering_threshold_silicon # MipT ): - producer = process.hgcalBackEndLayer1Producer.clone( + producer = process.l1tHGCalBackEndLayer1Producer.clone( InputTriggerCells = cms.InputTag(inputs) ) producer.ProcessorParameters.C2d_parameters = distance_C2d_params.clone( @@ -27,7 +27,7 @@ def create_topological(process, inputs, seed_threshold=topological_C2d_params.seeding_threshold_silicon, # MipT cluster_threshold=topological_C2d_params.clustering_threshold_silicon # MipT ): - producer = process.hgcalBackEndLayer1Producer.clone( + producer = process.l1tHGCalBackEndLayer1Producer.clone( InputTriggerCells = cms.InputTag(inputs) ) producer.ProcessorParameters.C2d_parameters = topological_C2d_params.clone() @@ -40,7 +40,7 @@ def create_constrainedtopological(process, inputs, seed_threshold=constrTopological_C2d_params.seeding_threshold_silicon, # MipT cluster_threshold=constrTopological_C2d_params.clustering_threshold_silicon # MipT ): - producer = process.hgcalBackEndLayer1Producer.clone( + producer = process.l1tHGCalBackEndLayer1Producer.clone( InputTriggerCells = cms.InputTag(inputs) ) producer.ProcessorParameters.C2d_parameters = constrTopological_C2d_params.clone( @@ -53,7 +53,7 @@ def create_constrainedtopological(process, inputs, class CreateDummy(object): def __call__(self, process, inputs): - producer = process.hgcalBackEndLayer1Producer.clone( + producer = process.l1tHGCalBackEndLayer1Producer.clone( InputTriggerCells = cms.InputTag(inputs) ) producer.ProcessorParameters.C2d_parameters = dummy_C2d_params.clone() @@ -61,7 +61,7 @@ def __call__(self, process, inputs): class CreateTruthDummy(object): def __call__(self, process, inputs): - producer = process.hgcalBackEndLayer1Producer.clone( + producer = process.l1tHGCalBackEndLayer1Producer.clone( InputTriggerCells = cms.InputTag(inputs) ) producer.ProcessorParameters.C2d_parameters = dummy_C2d_params.clone() @@ -78,7 +78,7 @@ def __init__(self, ) def __call__(self, process, inputs): - producer = process.hgcalBackEndLayer1Producer.clone( + producer = process.l1tHGCalBackEndLayer1Producer.clone( InputTriggerCells = cms.InputTag(inputs), ProcessorParameters = self.processor ) diff --git a/L1Trigger/L1THGCalUtilities/python/clustering2d_v2.py b/L1Trigger/L1THGCalUtilities/python/clustering2d_v2.py index ca4635954cd97..94c4b71be0aa7 100644 --- a/L1Trigger/L1THGCalUtilities/python/clustering2d_v2.py +++ b/L1Trigger/L1THGCalUtilities/python/clustering2d_v2.py @@ -15,7 +15,7 @@ def __init__(self, ) def __call__(self,process,inputs): - producer = process.hgcalBackEndStage1Producer.clone( + producer = process.l1tHGCalBackEndStage1Producer.clone( InputTriggerCells = cms.InputTag(inputs), C2d_parameters = dummy_C2d_params.clone(), ProcessorParameters = self.processor diff --git a/L1Trigger/L1THGCalUtilities/python/clustering3d.py b/L1Trigger/L1THGCalUtilities/python/clustering3d.py index c110effab12ea..ccb3261beb22b 100644 --- a/L1Trigger/L1THGCalUtilities/python/clustering3d.py +++ b/L1Trigger/L1THGCalUtilities/python/clustering3d.py @@ -18,7 +18,7 @@ def create_distance(process, inputs, distance=distance_C3d_params.dR_multicluster ): - producer = process.hgcalBackEndLayer2Producer.clone( + producer = process.l1tHGCalBackEndLayer2Producer.clone( InputCluster = cms.InputTag(inputs) ) producer.ProcessorParameters.C3d_parameters = distance_C3d_params.clone( @@ -31,7 +31,7 @@ def create_dbscan(process, inputs, distance=dbscan_C3d_params.dist_dbscan_multicluster, min_points=dbscan_C3d_params.minN_dbscan_multicluster ): - producer = process.hgcalBackEndLayer2Producer.clone( + producer = process.l1tHGCalBackEndLayer2Producer.clone( InputCluster = cms.InputTag(inputs) ) producer.ProcessorParameters.C3d_parameters = dbscan_C3d_params.clone( @@ -57,7 +57,7 @@ def __init__(self, set_histomax_clustering_params(self.clustering_parameters, distance, shape_threshold, shape_distance) def __call__(self, process, inputs): - producer = process.hgcalBackEndLayer2Producer.clone( + producer = process.l1tHGCalBackEndLayer2Producer.clone( InputCluster = cms.InputTag(inputs) ) producer.ProcessorParameters.C3d_parameters.histoMax_C3d_clustering_parameters = self.clustering_parameters @@ -83,7 +83,7 @@ def __init__(self, set_histomax_clustering_params(self.clustering_parameters, 0, shape_threshold, shape_distance) def __call__(self, process, inputs): - producer = process.hgcalBackEndLayer2Producer.clone( + producer = process.l1tHGCalBackEndLayer2Producer.clone( InputCluster = cms.InputTag(inputs) ) producer.ProcessorParameters.C3d_parameters.histoMax_C3d_clustering_parameters = self.clustering_parameters @@ -108,7 +108,7 @@ def __init__(self, set_histomax_clustering_params(self.clustering_parameters, 0, shape_threshold, shape_distance) def __call__(self, process, inputs): - producer = process.hgcalBackEndLayer2Producer.clone( + producer = process.l1tHGCalBackEndLayer2Producer.clone( InputCluster = cms.InputTag(inputs) ) producer.ProcessorParameters.C3d_parameters.histoMax_C3d_clustering_parameters = self.clustering_parameters @@ -134,7 +134,7 @@ def __init__(self, set_histomax_clustering_params(self.clustering_parameters, distance, shape_threshold, shape_distance) def __call__(self, process, inputs): - producer = process.hgcalBackEndLayer2Producer.clone( + producer = process.l1tHGCalBackEndLayer2Producer.clone( InputCluster = cms.InputTag(inputs) ) producer.ProcessorParameters.C3d_parameters.histoMax_C3d_seeding_parameters = self.seeding_parameters @@ -160,7 +160,7 @@ def __init__(self, set_histomax_clustering_params(self.clustering_parameters, distance, shape_threshold, shape_distance) def __call__(self, process, inputs): - producer = process.hgcalBackEndLayer2Producer.clone( + producer = process.l1tHGCalBackEndLayer2Producer.clone( InputCluster = cms.InputTag(inputs) ) producer.ProcessorParameters.C3d_parameters.histoMax_C3d_seeding_parameters = self.seeding_parameters @@ -184,7 +184,7 @@ def __init__(self, set_histomax_clustering_params(self.clustering_parameters, distance, shape_threshold, shape_distance) def __call__(self, process, inputs): - producer = process.hgcalBackEndLayer2Producer.clone( + producer = process.l1tHGCalBackEndLayer2Producer.clone( InputCluster = cms.InputTag(inputs) ) producer.ProcessorParameters.C3d_parameters.histoMax_C3d_seeding_parameters = self.seeding_parameters diff --git a/L1Trigger/L1THGCalUtilities/python/concentrator.py b/L1Trigger/L1THGCalUtilities/python/concentrator.py index 03c13be9de544..a6905a13b7fd3 100644 --- a/L1Trigger/L1THGCalUtilities/python/concentrator.py +++ b/L1Trigger/L1THGCalUtilities/python/concentrator.py @@ -21,7 +21,7 @@ def __init__(self, ) def __call__(self, process, inputs): - producer = process.hgcalConcentratorProducer.clone( + producer = process.l1tHGCalConcentratorProducer.clone( InputTriggerCells = cms.InputTag(inputs), InputTriggerSums = cms.InputTag(inputs), ProcessorParameters = self.processor @@ -40,7 +40,7 @@ def __init__(self, ) def __call__(self, process, inputs): - producer = process.hgcalConcentratorProducer.clone( + producer = process.l1tHGCalConcentratorProducer.clone( InputTriggerCells = cms.InputTag(inputs), InputTriggerSums = cms.InputTag(inputs), ProcessorParameters = self.processor @@ -61,7 +61,7 @@ def __init__(self, ) def __call__(self, process, inputs): - producer = process.hgcalConcentratorProducer.clone( + producer = process.l1tHGCalConcentratorProducer.clone( InputTriggerCells = cms.InputTag(inputs), InputTriggerSums = cms.InputTag(inputs), ProcessorParameters = self.processor @@ -102,7 +102,7 @@ def __init__(self, ) def __call__(self, process, inputs): - producer = process.hgcalConcentratorProducer.clone( + producer = process.l1tHGCalConcentratorProducer.clone( InputTriggerCells = cms.InputTag(inputs), InputTriggerSums = cms.InputTag(inputs), ProcessorParameters = self.processor @@ -121,7 +121,7 @@ def __init__(self, ) def __call__(self, process, inputs): - producer = process.hgcalConcentratorProducer.clone( + producer = process.l1tHGCalConcentratorProducer.clone( InputTriggerCells = cms.InputTag(inputs), InputTriggerSums = cms.InputTag(inputs), ProcessorParameters = self.processor @@ -145,7 +145,7 @@ def __init__(self, ) def __call__(self, process, inputs): - producer = process.hgcalConcentratorProducer.clone( + producer = process.l1tHGCalConcentratorProducer.clone( InputTriggerCells = cms.InputTag(inputs), InputTriggerSums = cms.InputTag(inputs), ProcessorParameters = self.processor @@ -178,7 +178,7 @@ def __init__(self, ) def __call__(self, process, inputs): - producer = process.hgcalConcentratorProducer.clone( + producer = process.l1tHGCalConcentratorProducer.clone( InputTriggerCells = cms.InputTag(inputs), InputTriggerSums = cms.InputTag(inputs), ProcessorParameters = self.processor diff --git a/L1Trigger/L1THGCalUtilities/python/customNtuples.py b/L1Trigger/L1THGCalUtilities/python/customNtuples.py index 680ce686a6e31..06dff08f23b1d 100644 --- a/L1Trigger/L1THGCalUtilities/python/customNtuples.py +++ b/L1Trigger/L1THGCalUtilities/python/customNtuples.py @@ -1,39 +1,39 @@ import FWCore.ParameterSet.Config as cms def custom_ntuples_layer1_truncation(process): - ntuples = process.hgcalTriggerNtuplizer.Ntuples + ntuples = process.L1THGCalTriggerNtuplizer.Ntuples for ntuple in ntuples: if ntuple.NtupleName=='HGCalTriggerNtupleHGCClusters' or \ ntuple.NtupleName=='HGCalTriggerNtupleHGCTriggerCells' or \ ntuple.NtupleName=='HGCalTriggerNtupleHGCMulticlusters': - ntuple.Clusters = cms.InputTag('hgcalBackEndLayer1Producer:HGCalBackendLayer1Processor') + ntuple.Clusters = cms.InputTag('l1tHGCalBackEndLayer1Producer:HGCalBackendLayer1Processor') return process def custom_ntuples_stage1_truncation(process): - ntuples = process.hgcalTriggerNtuplizer.Ntuples + ntuples = process.L1THGCalTriggerNtuplizer.Ntuples for ntuple in ntuples: if ntuple.NtupleName=='HGCalTriggerNtupleHGCClusters' or \ ntuple.NtupleName=='HGCalTriggerNtupleHGCTriggerCells' or \ ntuple.NtupleName=='HGCalTriggerNtupleHGCMulticlusters': - ntuple.Clusters = cms.InputTag('hgcalBackEndStage1Producer:HGCalBackendStage1Processor') - ntuple.Multiclusters = cms.InputTag('hgcalBackEndStage2Producer:HGCalBackendLayer2Processor3DClustering') + ntuple.Clusters = cms.InputTag('l1tHGCalBackEndStage1Producer:HGCalBackendStage1Processor') + ntuple.Multiclusters = cms.InputTag('l1tHGCalBackEndStage2Producer:HGCalBackendLayer2Processor3DClustering') return process def custom_ntuples_standalone_clustering(process): - ntuples = process.hgcalTriggerNtuplizer.Ntuples + ntuples = process.L1THGCalTriggerNtuplizer.Ntuples for ntuple in ntuples: if ntuple.NtupleName=='HGCalTriggerNtupleHGCTriggerCells' or \ ntuple.NtupleName=='HGCalTriggerNtupleHGCClusters' or \ ntuple.NtupleName=='HGCalTriggerNtupleHGCMulticlusters': - ntuple.Multiclusters = cms.InputTag('hgcalBackEndLayer2Producer:HGCalBackendLayer2Processor3DClusteringSA') + ntuple.Multiclusters = cms.InputTag('l1tHGCalBackEndLayer2Producer:HGCalBackendLayer2Processor3DClusteringSA') return process def custom_ntuples_standalone_tower(process): - ntuples = process.hgcalTriggerNtuplizer.Ntuples + ntuples = process.L1THGCalTriggerNtuplizer.Ntuples for ntuple in ntuples: if ntuple.NtupleName=='HGCalTriggerNtupleHGCTowers': - ntuple.Towers = cms.InputTag('hgcalTowerProducer:HGCalTowerProcessorSA') + ntuple.Towers = cms.InputTag('l1tHGCalTowerProducer:HGCalTowerProcessorSA') return process @@ -62,6 +62,6 @@ def __call__(self, process, inputs): elif ntuple=='multiclusters': pset.Multiclusters = cms.InputTag(inputs[2]) vpset.append(pset) - ntuplizer = process.hgcalTriggerNtuplizer.clone() + ntuplizer = process.L1THGCalTriggerNtuplizer.clone() ntuplizer.Ntuples = cms.VPSet(vpset) return ntuplizer diff --git a/L1Trigger/L1THGCalUtilities/python/hgcalTriggerChains.py b/L1Trigger/L1THGCalUtilities/python/hgcalTriggerChains.py index 90b48b31190a8..57d853a5f5be4 100644 --- a/L1Trigger/L1THGCalUtilities/python/hgcalTriggerChains.py +++ b/L1Trigger/L1THGCalUtilities/python/hgcalTriggerChains.py @@ -64,7 +64,7 @@ def register_truth_chain(self, vfe, truth_prod, backend1='', backend2='', select self.truth_chain.append( (vfe, truth_prod, backend1, backend2, selector, ntuple) ) def create_sequences(self, process): - if not hasattr(process, 'hgcalTriggerSelector'): + if not hasattr(process, 'L1THGCalTriggerSelector'): process.load('L1Trigger.L1THGCalUtilities.HGC3DClusterGenMatchSelector_cff') tmp = cms.TaskPlaceholder("tmp") tmpseq = cms.SequencePlaceholder("tmp") @@ -121,26 +121,26 @@ def create_sequences(self, process): backend2_task.remove(tmp) selector_sequence.remove(tmpseq) ntuple_sequence.remove(tmpseq) - process.globalReplace('hgcalVFE', vfe_task) - process.globalReplace('hgcalConcentrator', concentrator_task) + process.globalReplace('L1THGCalVFE', vfe_task) + process.globalReplace('L1THGCalConcentrator', concentrator_task) if 'HGCalBackendStage1Processor' in backend1_processor: - process.globalReplace('hgcalBackEndStage1', backend1_task) - process.globalReplace('hgcalBackEndStage2', backend2_task) + process.globalReplace('L1THGCalBackEndStage1', backend1_task) + process.globalReplace('L1THGCalBackEndStage2', backend2_task) else: - process.globalReplace('hgcalBackEndLayer1', backend1_task) - process.globalReplace('hgcalBackEndLayer2', backend2_task) - process.globalReplace('hgcalTriggerSelector', selector_sequence) - process.globalReplace('hgcalTriggerNtuples', ntuple_sequence) + process.globalReplace('L1THGCalBackEndLayer1', backend1_task) + process.globalReplace('L1THGCalBackEndLayer2', backend2_task) + process.globalReplace('L1THGCalTriggerSelector', selector_sequence) + process.globalReplace('L1THGCalTriggerNtuples', ntuple_sequence) return process def create_truth_sequences(self, process): if not hasattr(process, 'caloTruthCellsProducer'): - from L1Trigger.L1THGCalUtilities.caloTruthCellsProducer_cfi import caloTruthCellsProducer + from L1Trigger.L1THGCalUtilities.caloTruthCellsProducer_cfi import l1tCaloTruthCellsProducer process.load('L1Trigger.L1THGCalUtilities.caloTruthCells_cff') - process.truthCellsProd = cms.Task(caloTruthCellsProducer) - hgcalTriggerPrimitivesTask = cms.Task(process.hgcalVFE, process.truthCellsProd, process.hgcalBackEndLayer1, process.hgcalBackEndLayer2, process.hgcalTowerMap, process.hgcalTower) - process.hgcalTriggerPrimitivesTruth = cms.Sequence(hgcalTriggerPrimitivesTask) - if not hasattr(process, 'hgcalTriggerSelector'): + process.L1TTruthCellsProd = cms.Task(l1tCaloTruthCellsProducer) + L1THGCalTriggerPrimitivesTask = cms.Task(process.L1THGcalVFE, process.L1TTruthCellsProd, process.L1THGCalBackEndLayer1, process.L1THGCalBackEndLayer2, process.L1THGCalTowerMap, process.L1THGCalTower) + process.L1THGCalTriggerPrimitivesTruth = cms.Sequence(L1THGCalTriggerPrimitivesTask) + if not hasattr(process, 'L1THGCalTriggerSelector'): process.load('L1Trigger.L1THGCalUtilities.HGC3DClusterGenMatchSelector_cff') tmp = cms.TaskPlaceholder("tmp") tmpseq = cms.SequencePlaceholder("tmp") @@ -207,10 +207,10 @@ def create_truth_sequences(self, process): backend2_task.remove(tmp) selector_sequence.remove(tmpseq) ntuple_sequence.remove(tmpseq) - process.globalReplace('hgcalVFE', vfe_task) - process.globalReplace('truthCellsProd', truth_prod_task) - process.globalReplace('hgcalBackEndLayer1', backend1_task) - process.globalReplace('hgcalBackEndLayer2', backend2_task) - process.globalReplace('hgcalTriggerSelector', selector_sequence) - process.globalReplace('hgcalTriggerNtuples', ntuple_sequence) + process.globalReplace('L1THGCalVFE', vfe_task) + process.globalReplace('L1TTruthCellsProd', truth_prod_task) + process.globalReplace('L1THGCalBackEndLayer1', backend1_task) + process.globalReplace('L1THGCalBackEndLayer2', backend2_task) + process.globalReplace('L1THGCalTriggerSelector', selector_sequence) + process.globalReplace('L1THGCalTriggerNtuples', ntuple_sequence) return process diff --git a/L1Trigger/L1THGCalUtilities/python/hgcalTriggerNtuples_cff.py b/L1Trigger/L1THGCalUtilities/python/hgcalTriggerNtuples_cff.py index 73f3996d7b25b..4eb550442d36b 100644 --- a/L1Trigger/L1THGCalUtilities/python/hgcalTriggerNtuples_cff.py +++ b/L1Trigger/L1THGCalUtilities/python/hgcalTriggerNtuples_cff.py @@ -2,6 +2,6 @@ from L1Trigger.L1THGCalUtilities.hgcalTriggerNtuples_cfi import * -hgcalTriggerNtuples = cms.Sequence(hgcalTriggerNtuplizer) +L1THGCalTriggerNtuples = cms.Sequence(hgcalTriggerNtuplizer) diff --git a/L1Trigger/L1THGCalUtilities/python/hgcalTriggerNtuples_cfi.py b/L1Trigger/L1THGCalUtilities/python/hgcalTriggerNtuples_cfi.py index 71a5bf4352115..33ca8153d84e4 100644 --- a/L1Trigger/L1THGCalUtilities/python/hgcalTriggerNtuples_cfi.py +++ b/L1Trigger/L1THGCalUtilities/python/hgcalTriggerNtuples_cfi.py @@ -56,8 +56,8 @@ ntuple_triggercells = cms.PSet( NtupleName = cms.string('HGCalTriggerNtupleHGCTriggerCells'), - TriggerCells = cms.InputTag('hgcalConcentratorProducer:HGCalConcentratorProcessorSelection'), - Multiclusters = cms.InputTag('hgcalBackEndLayer2Producer:HGCalBackendLayer2Processor3DClustering'), + TriggerCells = cms.InputTag('l1tHGCalConcentratorProducer:HGCalConcentratorProcessorSelection'), + Multiclusters = cms.InputTag('l1tHGCalBackEndLayer2Producer:HGCalBackendLayer2Processor3DClustering'), eeSimHits = cms.InputTag('g4SimHits:HGCHitsEE'), fhSimHits = cms.InputTag('g4SimHits:HGCHitsHEfront'), bhSimHits = cms.InputTag('g4SimHits:HGCHitsHEback'), @@ -72,25 +72,25 @@ ntuple_triggersums = cms.PSet( NtupleName = cms.string('HGCalTriggerNtupleHGCTriggerSums'), - TriggerSums = cms.InputTag('hgcalConcentratorProducer:HGCalConcentratorProcessorSelection'), + TriggerSums = cms.InputTag('l1tHGCalConcentratorProducer:HGCalConcentratorProcessorSelection'), ) ntuple_econdata = cms.PSet( NtupleName = cms.string('HGCalTriggerNtupleHGCConcentratorData'), - ConcentratorData = cms.InputTag('hgcalConcentratorProducer:HGCalConcentratorProcessorSelection'), + ConcentratorData = cms.InputTag('l1tHGCalConcentratorProducer:HGCalConcentratorProcessorSelection'), ) ntuple_clusters = cms.PSet( NtupleName = cms.string('HGCalTriggerNtupleHGCClusters'), - Clusters = cms.InputTag('hgcalBackEndLayer1Producer:HGCalBackendLayer1Processor2DClustering'), - Multiclusters = cms.InputTag('hgcalBackEndLayer2Producer:HGCalBackendLayer2Processor3DClustering'), + Clusters = cms.InputTag('l1tHGCalBackEndLayer1Producer:HGCalBackendLayer1Processor2DClustering'), + Multiclusters = cms.InputTag('l1tHGCalBackEndLayer2Producer:HGCalBackendLayer2Processor3DClustering'), FilterClustersInMulticlusters = cms.bool(False) ) from L1Trigger.L1THGCal.egammaIdentification import egamma_identification_histomax ntuple_multiclusters = cms.PSet( NtupleName = cms.string('HGCalTriggerNtupleHGCMulticlusters'), - Multiclusters = cms.InputTag('hgcalBackEndLayer2Producer:HGCalBackendLayer2Processor3DClustering'), + Multiclusters = cms.InputTag('l1tHGCalBackEndLayer2Producer:HGCalBackendLayer2Processor3DClustering'), EGIdentification = egamma_identification_histomax.clone(), FillLayerInfo = cms.bool(False), FillInterpretationInfo = cms.bool(True) @@ -98,10 +98,10 @@ ntuple_towers = cms.PSet( NtupleName = cms.string('HGCalTriggerNtupleHGCTowers'), - Towers = cms.InputTag('hgcalTowerProducer:HGCalTowerProcessor') + Towers = cms.InputTag('l1tHGCalTowerProducer:HGCalTowerProcessor') ) -hgcalTriggerNtuplizer = cms.EDAnalyzer( +L1THGCalTriggerNtuplizer = cms.EDAnalyzer( "HGCalTriggerNtupleManager", Ntuples = cms.VPSet( ntuple_event, diff --git a/L1Trigger/L1THGCalUtilities/python/hgcalTriggerValidation_cff.py b/L1Trigger/L1THGCalUtilities/python/hgcalTriggerValidation_cff.py index 09b917592b26b..eefdd4118888b 100644 --- a/L1Trigger/L1THGCalUtilities/python/hgcalTriggerValidation_cff.py +++ b/L1Trigger/L1THGCalUtilities/python/hgcalTriggerValidation_cff.py @@ -3,6 +3,6 @@ from L1Trigger.L1THGCal.hgcalTriggerPrimitives_cff import * from L1Trigger.L1THGCalUtilities.hgcalTriggerNtuples_cff import * -hgcalTriggerValidation = cms.Sequence(hgcalTriggerPrimitives*hgcalTriggerNtuples) +L1THGCalTriggerValidation = cms.Sequence(L1THGCalTriggerPrimitives*L1THGCalTriggerNtuples) diff --git a/L1Trigger/L1THGCalUtilities/python/selectors.py b/L1Trigger/L1THGCalUtilities/python/selectors.py index 845d38ea1df05..fc9b7605b730a 100644 --- a/L1Trigger/L1THGCalUtilities/python/selectors.py +++ b/L1Trigger/L1THGCalUtilities/python/selectors.py @@ -7,7 +7,7 @@ def __init__(self, self.dR = distance def __call__(self, process, inputs): - producer = process.hgc3DClusterGenMatchSelector.clone( + producer = process.l1tHGCal3DClusterGenMatchSelector.clone( dR = cms.double(self.dR), src = cms.InputTag(inputs) ) diff --git a/L1Trigger/L1THGCalUtilities/python/truth_prod.py b/L1Trigger/L1THGCalUtilities/python/truth_prod.py index 73e2c214e4cfd..64d73aff51547 100644 --- a/L1Trigger/L1THGCalUtilities/python/truth_prod.py +++ b/L1Trigger/L1THGCalUtilities/python/truth_prod.py @@ -1,8 +1,8 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.L1THGCalUtilities.caloTruthCellsProducer_cfi import caloTruthCellsProducer +from L1Trigger.L1THGCalUtilities.caloTruthCellsProducer_cfi import l1tCaloTruthCellsProducer def create_truth_prod(process, inputs): - producer = process.caloTruthCellsProducer.clone( + producer = process.l1tCaloTruthCellsProducer.clone( triggerCells = cms.InputTag('{}:HGCalVFEProcessorSums'.format(inputs)) ) return producer diff --git a/L1Trigger/L1THGCalUtilities/python/vfe.py b/L1Trigger/L1THGCalUtilities/python/vfe.py index f5be28bd48423..5689423458fd3 100644 --- a/L1Trigger/L1THGCalUtilities/python/vfe.py +++ b/L1Trigger/L1THGCalUtilities/python/vfe.py @@ -17,7 +17,7 @@ def __init__(self, ) def __call__(self, process): - producer = process.hgcalVFEProducer.clone( + producer = process.l1tHGCalVFEProducer.clone( ProcessorParameters = self.processor ) return producer diff --git a/L1Trigger/L1THGCalUtilities/test/testCustomHGCalL1T_RelValV11_cfg.py b/L1Trigger/L1THGCalUtilities/test/testCustomHGCalL1T_RelValV11_cfg.py index 3d27f3c8ee44f..3002393221953 100644 --- a/L1Trigger/L1THGCalUtilities/test/testCustomHGCalL1T_RelValV11_cfg.py +++ b/L1Trigger/L1THGCalUtilities/test/testCustomHGCalL1T_RelValV11_cfg.py @@ -73,12 +73,12 @@ process = custom_hgcroc_compression(process, exponentBits=4, mantissaBits=4, truncationBits_hdm=0, truncationBits_ldm=0, rounding=False) process = custom_hgcroc_oot(process, oot_coefficients=[0., -0.2]) -process.hgcl1tpg_step = cms.Path(process.hgcalTriggerPrimitives) +process.hgcl1tpg_step = cms.Path(process.L1THGCalTriggerPrimitives) # load ntuplizer process.load('L1Trigger.L1THGCalUtilities.hgcalTriggerNtuples_cff') -process.ntuple_step = cms.Path(process.hgcalTriggerNtuples) +process.ntuple_step = cms.Path(process.L1THGCalTriggerNtuples) # Schedule definition process.schedule = cms.Schedule(process.hgcl1tpg_step, process.ntuple_step) diff --git a/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_RelValV11_cfg.py b/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_RelValV11_cfg.py index 44a733bb24069..9abd80aa3ebc7 100644 --- a/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_RelValV11_cfg.py +++ b/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_RelValV11_cfg.py @@ -68,12 +68,12 @@ # load HGCAL TPG simulation process.load('L1Trigger.L1THGCal.hgcalTriggerPrimitives_cff') -process.hgcl1tpg_step = cms.Path(process.hgcalTriggerPrimitives) +process.hgcl1tpg_step = cms.Path(process.L1THGCalTriggerPrimitives) # load ntuplizer process.load('L1Trigger.L1THGCalUtilities.hgcalTriggerNtuples_cff') -process.ntuple_step = cms.Path(process.hgcalTriggerNtuples) +process.ntuple_step = cms.Path(process.L1THGCalTriggerNtuples) # Schedule definition process.schedule = cms.Schedule(process.hgcl1tpg_step, process.ntuple_step) diff --git a/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_multialgo_V11_cfg.py b/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_multialgo_V11_cfg.py index 45717cd58d4a1..6edfc966bed67 100644 --- a/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_multialgo_V11_cfg.py +++ b/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_multialgo_V11_cfg.py @@ -106,12 +106,12 @@ process = chains.create_sequences(process) # Remove towers from sequence -process.hgcalTriggerPrimitives.remove(process.hgcalTowerMap) -process.hgcalTriggerPrimitives.remove(process.hgcalTower) +process.L1THGCalTriggerPrimitives.remove(process.L1THGCalTowerMap) +process.L1THGCalTriggerPrimitives.remove(process.L1THGCalTower) -process.hgcl1tpg_step = cms.Path(process.hgcalTriggerPrimitives) -process.selector_step = cms.Path(process.hgcalTriggerSelector) -process.ntuple_step = cms.Path(process.hgcalTriggerNtuples) +process.hgcl1tpg_step = cms.Path(process.L1THGCalTriggerPrimitives) +process.selector_step = cms.Path(process.L1THGCalTriggerSelector) +process.ntuple_step = cms.Path(process.L1THGCalTriggerNtuples) # Schedule definition process.schedule = cms.Schedule(process.hgcl1tpg_step, process.selector_step, process.ntuple_step) diff --git a/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_multialgo_with_truth_cfg.py b/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_multialgo_with_truth_cfg.py index 6fc232cdf2ad1..a23e21a8edbe7 100644 --- a/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_multialgo_with_truth_cfg.py +++ b/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_multialgo_with_truth_cfg.py @@ -100,12 +100,12 @@ process = chains.create_truth_sequences(process) # Remove towers from sequence -process.hgcalTriggerPrimitivesTruth.remove(process.hgcalTowerMap) -process.hgcalTriggerPrimitivesTruth.remove(process.hgcalTower) +process.L1THGCalTriggerPrimitivesTruth.remove(process.L1THGCalTowerMap) +process.L1THGCalTriggerPrimitivesTruth.remove(process.L1THGCalTower) -process.hgcl1tpg_truth_step = cms.Path(process.hgcalTriggerPrimitivesTruth) -process.selector_step = cms.Path(process.hgcalTriggerSelector) -process.ntuple_step = cms.Path(process.hgcalTriggerNtuples) +process.hgcl1tpg_truth_step = cms.Path(process.L1THGCalTriggerPrimitivesTruth) +process.selector_step = cms.Path(process.L1THGCalTriggerSelector) +process.ntuple_step = cms.Path(process.L1THGCalTriggerNtuples) # Schedule definition process.schedule = cms.Schedule(process.hgcl1tpg_truth_step, process.selector_step, process.ntuple_step) diff --git a/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_newProcessors_V11_cfg.py b/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_newProcessors_V11_cfg.py index da5e5e2a85c17..072674b02cf94 100644 --- a/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_newProcessors_V11_cfg.py +++ b/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_newProcessors_V11_cfg.py @@ -74,7 +74,7 @@ process = custom_clustering_standalone(process) process = custom_tower_standalone(process) -process.hgcl1tpg_step = cms.Path(process.hgcalTriggerPrimitives) +process.hgcl1tpg_step = cms.Path(process.L1THGCalTriggerPrimitives) # load ntuplizer @@ -82,7 +82,7 @@ from L1Trigger.L1THGCalUtilities.customNtuples import custom_ntuples_standalone_clustering, custom_ntuples_standalone_tower process = custom_ntuples_standalone_clustering(process) process = custom_ntuples_standalone_tower(process) -process.ntuple_step = cms.Path(process.hgcalTriggerNtuples) +process.ntuple_step = cms.Path(process.L1THGCalTriggerNtuples) # Schedule definition process.schedule = cms.Schedule(process.hgcl1tpg_step, process.ntuple_step) diff --git a/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_stage1Truncation_V11_cfg.py b/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_stage1Truncation_V11_cfg.py index 298506222d54d..9374fa7e7b7d9 100644 --- a/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_stage1Truncation_V11_cfg.py +++ b/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_stage1Truncation_V11_cfg.py @@ -78,7 +78,7 @@ from L1Trigger.L1THGCal.customTriggerGeometry import custom_geometry_V11_Imp3 process = custom_geometry_V11_Imp3(process) -process.hgcl1tpg_step = cms.Path(process.hgcalTriggerPrimitives) +process.hgcl1tpg_step = cms.Path(process.L1THGCalTriggerPrimitives) # load ntuplizer and custom to use collections from Stag1 truncation processor @@ -87,7 +87,7 @@ from L1Trigger.L1THGCalUtilities.customNtuples import custom_ntuples_layer1_truncation process = custom_ntuples_stage1_truncation(process) #process = custom_ntuples_layer1_truncation(process) -process.ntuple_step = cms.Path(process.hgcalTriggerNtuples) +process.ntuple_step = cms.Path(process.L1THGCalTriggerNtuples) # Schedule definition process.schedule = cms.Schedule(process.hgcl1tpg_step, process.ntuple_step) diff --git a/L1Trigger/L1TTrackMatch/plugins/L1FastTrackingJetProducer.cc b/L1Trigger/L1TTrackMatch/plugins/L1FastTrackingJetProducer.cc index 35d46da11db45..f7113e9e97192 100644 --- a/L1Trigger/L1TTrackMatch/plugins/L1FastTrackingJetProducer.cc +++ b/L1Trigger/L1TTrackMatch/plugins/L1FastTrackingJetProducer.cc @@ -256,7 +256,7 @@ void L1FastTrackingJetProducer::fillDescriptions(edm::ConfigurationDescriptions& { // L1FastTrackingJets edm::ParameterSetDescription desc; - desc.add("L1TrackInputTag", edm::InputTag("TTTracksFromTrackletEmulation", "Level1TTTracks")); + desc.add("L1TrackInputTag", edm::InputTag("l1tTTTracksFromTrackletEmulation", "Level1TTTracks")); desc.add("L1PrimaryVertexTag", "l1vertices"); desc.add("GenInfo", edm::InputTag("TTTrackAssociatorFromPixelDigis", "Level1TTTracks")); desc.add("trk_zMax", 15.0); diff --git a/L1Trigger/L1TTrackMatch/python/L1FastTrackingJetProducer_cfi.py b/L1Trigger/L1TTrackMatch/python/L1FastTrackingJetProducer_cfi.py index ffea31f70368b..f28047728f903 100644 --- a/L1Trigger/L1TTrackMatch/python/L1FastTrackingJetProducer_cfi.py +++ b/L1Trigger/L1TTrackMatch/python/L1FastTrackingJetProducer_cfi.py @@ -1,10 +1,8 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.VertexFinder.VertexProducer_cff import VertexProducer - -L1FastTrackingJets = cms.EDProducer("L1FastTrackingJetProducer", - L1TrackInputTag = cms.InputTag("TTTracksFromTrackletEmulation", "Level1TTTracks"), - L1PrimaryVertexTag=cms.InputTag("VertexProducer", VertexProducer.l1VertexCollectionName.value()), +l1tFastTrackingJets = cms.EDProducer("L1FastTrackingJetProducer", + L1TrackInputTag = cms.InputTag("l1tTTTracksFromTrackletEmulation", "Level1TTTracks"), + L1PrimaryVertexTag=cms.InputTag("l1tVertexProducer", "l1vertices"), 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 +22,9 @@ selectTrkMatchGenOrPU=cms.bool(False) ) -L1FastTrackingJetsExtended = cms.EDProducer("L1FastTrackingJetProducer", - L1TrackInputTag = cms.InputTag("TTTracksFromExtendedTrackletEmulation", "Level1TTTracks"), - L1PrimaryVertexTag=cms.InputTag("VertexProducer", VertexProducer.l1VertexCollectionName.value()), +l1tFastTrackingJetsExtended = cms.EDProducer("L1FastTrackingJetProducer", + L1TrackInputTag = cms.InputTag("l1tTTTracksFromExtendedTrackletEmulation", "Level1TTTracks"), + L1PrimaryVertexTag=cms.InputTag("l1tVertexProducer", "l1vertices"), 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..48714cf2597c4 100644 --- a/L1Trigger/L1TTrackMatch/python/L1GTTInputProducer_cfi.py +++ b/L1Trigger/L1TTrackMatch/python/L1GTTInputProducer_cfi.py @@ -1,13 +1,13 @@ import FWCore.ParameterSet.Config as cms -L1GTTInputProducer = cms.EDProducer('L1GTTInputProducer', - l1TracksInputTag = cms.InputTag("TTTracksFromTrackletEmulation", "Level1TTTracks"), +l1tGTTInputProducer = cms.EDProducer('L1GTTInputProducer', + l1TracksInputTag = cms.InputTag("l1tTTTracksFromTrackletEmulation", "Level1TTTracks"), outputCollectionName = cms.string("Level1TTTracksConverted"), debug = cms.int32(0) # Verbosity levels: 0, 1, 2, 3 ) -L1GTTInputProducerExtended = cms.EDProducer('L1GTTInputProducer', - l1TracksInputTag = cms.InputTag("TTTracksFromExtendedTrackletEmulation", "Level1TTTracks"), +l1tGTTInputProducerExtended = cms.EDProducer('L1GTTInputProducer', + l1TracksInputTag = cms.InputTag("l1tTTTracksFromExtendedTrackletEmulation", "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..cfbf78122e1a2 100644 --- a/L1Trigger/L1TTrackMatch/python/L1TkHTMissEmulatorProducer_cfi.py +++ b/L1Trigger/L1TTrackMatch/python/L1TkHTMissEmulatorProducer_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -L1TrackerEmuHTMiss = cms.EDProducer("L1TkHTMissEmulatorProducer", - L1TkJetEmulationInputTag = cms.InputTag("L1TrackJetsEmulation", "L1TrackJets"), +l1tTrackerEmuHTMiss = cms.EDProducer("L1TkHTMissEmulatorProducer", + L1TkJetEmulationInputTag = cms.InputTag("l1tTrackJetsEmulation", "L1TrackJets"), L1MHTCollectionName = cms.string("L1TrackerEmuHTMiss"), jet_maxEta = cms.double(2.4), jet_minPt = cms.double(5.0), @@ -11,8 +11,8 @@ displaced = cms.bool(False) ) -L1TrackerEmuHTMissExtended = cms.EDProducer("L1TkHTMissEmulatorProducer", - L1TkJetEmulationInputTag = cms.InputTag("L1TrackJetsExtendedEmulation", "L1TrackJetsExtended"), +l1tTrackerEmuHTMissExtended = cms.EDProducer("L1TkHTMissEmulatorProducer", + L1TkJetEmulationInputTag = cms.InputTag("l1tTrackJetsExtendedEmulation", "L1TrackJetsExtended"), L1MHTCollectionName = cms.string("L1TrackerEmuHTMissExtended"), jet_maxEta = cms.double(2.4), jet_minPt = cms.double(5.0), diff --git a/L1Trigger/L1TTrackMatch/python/L1TkHTMissProducer_cfi.py b/L1Trigger/L1TTrackMatch/python/L1TkHTMissProducer_cfi.py index bdf7c5cb669c5..b7a19f27cc159 100644 --- a/L1Trigger/L1TTrackMatch/python/L1TkHTMissProducer_cfi.py +++ b/L1Trigger/L1TTrackMatch/python/L1TkHTMissProducer_cfi.py @@ -1,9 +1,8 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.VertexFinder.VertexProducer_cff import VertexProducer -L1TkCaloHTMiss = cms.EDProducer("L1TkHTMissProducer", - L1TkJetInputTag = cms.InputTag("L1TkCaloJets", "L1TkCaloJets"), - L1VertexInputTag = cms.InputTag("VertexProducer", VertexProducer.l1VertexCollectionName.value()), +l1tTkCaloHTMiss = cms.EDProducer("L1TkHTMissProducer", + L1TkJetInputTag = cms.InputTag("l1tTkCaloJets", "L1TkCaloJets"), + L1VertexInputTag = cms.InputTag("l1tVertexProducer", "l1vertices"), 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 +16,11 @@ 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(doVtxConstrain = True) -L1TrackerHTMiss = cms.EDProducer("L1TkHTMissProducer", - L1TkJetInputTag = cms.InputTag("L1TrackJets", "L1TrackJets"), - L1VertexInputTag = cms.InputTag("VertexProducer", VertexProducer.l1VertexCollectionName.value()), +l1tTrackerHTMiss = cms.EDProducer("L1TkHTMissProducer", + L1TkJetInputTag = cms.InputTag("l1tTrackJets", "L1TrackJets"), + L1VertexInputTag = cms.InputTag("l1tVertexProducer", "l1vertices"), jet_maxEta = cms.double(2.4), jet_minPt = cms.double(5.0), jet_minNtracksLowPt=cms.int32(2), @@ -36,9 +34,9 @@ displaced = cms.bool(False) # Run with prompt/displaced jets ) -L1TrackerHTMissExtended = cms.EDProducer("L1TkHTMissProducer", - L1TkJetInputTag = cms.InputTag("L1TrackJetsExtended", "L1TrackJetsExtended"), - L1VertexInputTag = cms.InputTag("VertexProducer", VertexProducer.l1VertexCollectionName.value()), +l1tTrackerHTMissExtended = cms.EDProducer("L1TkHTMissProducer", + L1TkJetInputTag = cms.InputTag("l1tTrackJetsExtended", "L1TrackJetsExtended"), + L1VertexInputTag = cms.InputTag("l1tVertexProducer", "l1vertices"), jet_maxEta = cms.double(2.4), jet_minPt = cms.double(5.0), jet_minNtracksLowPt=cms.int32(2), diff --git a/L1Trigger/L1TTrackMatch/python/L1TkMETAnalyser_cfi.py b/L1Trigger/L1TTrackMatch/python/L1TkMETAnalyser_cfi.py index edd1fa9afd9b3..7c9dce5c9b43a 100644 --- a/L1Trigger/L1TTrackMatch/python/L1TkMETAnalyser_cfi.py +++ b/L1Trigger/L1TTrackMatch/python/L1TkMETAnalyser_cfi.py @@ -1,10 +1,10 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.L1TTrackMatch.L1TrackerEtMissEmulatorProducer_cfi import L1TrackerEmuEtMiss -from L1Trigger.L1TTrackMatch.L1TrackerEtMissProducer_cfi import L1TrackerEtMiss +from L1Trigger.L1TTrackMatch.L1TrackerEtMissEmulatorProducer_cfi import l1tTrackerEmuEtMiss +from L1Trigger.L1TTrackMatch.L1TrackerEtMissProducer_cfi import l1tTrackerEtMiss L1TkMETAnalyser = cms.EDAnalyzer('L1TkMETAnalyser', - TrackMETInputTag = cms.InputTag("L1TrackerEtMiss",L1TrackerEtMiss.L1MetCollectionName.value()), - TrackMETEmuInputTag = cms.InputTag("L1TrackerEmuEtMiss",L1TrackerEmuEtMiss.L1MetCollectionName.value()), + TrackMETInputTag = cms.InputTag("l1tTrackerEtMiss",l1tTrackerEtMiss.L1MetCollectionName.value()), + TrackMETEmuInputTag = cms.InputTag("l1tTrackerEmuEtMiss",l1tTrackerEmuEtMiss.L1MetCollectionName.value()), TrackMETHWInputTag = cms.InputTag("GTTOutputFileReader"), HW_Analysis = cms.bool(False) -) \ No newline at end of file +) diff --git a/L1Trigger/L1TTrackMatch/python/L1TkObjectProducers_cff.py b/L1Trigger/L1TTrackMatch/python/L1TkObjectProducers_cff.py index 3515445e92bc9..e136acb5a6b76 100644 --- a/L1Trigger/L1TTrackMatch/python/L1TkObjectProducers_cff.py +++ b/L1Trigger/L1TTrackMatch/python/L1TkObjectProducers_cff.py @@ -50,11 +50,8 @@ # 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 VertexProducer -pVertexProducer = cms.Path( VertexProducer ) +from L1Trigger.VertexFinder.VertexProducer_cfi import l1tVertexProducer +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..70f71f9ef6299 100644 --- a/L1Trigger/L1TTrackMatch/python/L1TrackFastJetProducer_cfi.py +++ b/L1Trigger/L1TTrackMatch/python/L1TrackFastJetProducer_cfi.py @@ -1,9 +1,8 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.VertexFinder.VertexProducer_cff import VertexProducer -L1TrackFastJets = cms.EDProducer("L1TrackFastJetProducer", - L1TrackInputTag = cms.InputTag("TTTracksFromTrackletEmulation", "Level1TTTracks"), - L1PrimaryVertexTag=cms.InputTag("VertexProducer", VertexProducer.l1VertexCollectionName.value()), +l1tTrackFastJets = cms.EDProducer("L1TrackFastJetProducer", + L1TrackInputTag = cms.InputTag("l1tTTTracksFromTrackletEmulation", "Level1TTTracks"), + L1PrimaryVertexTag=cms.InputTag("l1tVertexProducer", "l1vertices"), 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 +18,9 @@ displaced = cms.bool(False) # use prompt/displaced tracks ) -L1TrackFastJetsExtended = cms.EDProducer("L1TrackFastJetProducer", - L1TrackInputTag = cms.InputTag("TTTracksFromExtendedTrackletEmulation", "Level1TTTracks"), - L1PrimaryVertexTag=cms.InputTag("VertexProducer", VertexProducer.l1VertexCollectionName.value()), +l1tTrackFastJetsExtended = cms.EDProducer("L1TrackFastJetProducer", + L1TrackInputTag = cms.InputTag("l1tTTTracksFromExtendedTrackletEmulation", "Level1TTTracks"), + L1PrimaryVertexTag=cms.InputTag("l1tVertexProducer", "l1vertices"), 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..97b8651af4bdd 100644 --- a/L1Trigger/L1TTrackMatch/python/L1TrackJetEmulationProducer_cfi.py +++ b/L1Trigger/L1TTrackMatch/python/L1TrackJetEmulationProducer_cfi.py @@ -1,9 +1,8 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.VertexFinder.VertexProducer_cff import VertexProducer -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 +29,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..f5cb69f300b4c 100644 --- a/L1Trigger/L1TTrackMatch/python/L1TrackJetProducer_cfi.py +++ b/L1Trigger/L1TTrackMatch/python/L1TrackJetProducer_cfi.py @@ -1,10 +1,8 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.VertexFinder.VertexProducer_cff import VertexProducer - -L1TrackJets = cms.EDProducer('L1TrackJetProducer', - L1TrackInputTag= cms.InputTag("TTTracksFromTrackletEmulation", "Level1TTTracks"), - L1PVertexCollection = cms.InputTag("VertexProducer", VertexProducer.l1VertexCollectionName.value()), +l1tTrackJets = cms.EDProducer('L1TrackJetProducer', + L1TrackInputTag= cms.InputTag("l1tTTTracksFromTrackletEmulation", "Level1TTTracks"), + L1PVertexCollection = cms.InputTag("l1tVertexProducer", "l1vertices"), 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 +29,9 @@ nDisplacedTracks=cms.int32(2) #Number of displaced tracks required per jet ) -L1TrackJetsExtended = cms.EDProducer('L1TrackJetProducer', - L1TrackInputTag= cms.InputTag("TTTracksFromExtendedTrackletEmulation", "Level1TTTracks"), - L1PVertexCollection = cms.InputTag("VertexProducer", VertexProducer.l1VertexCollectionName.value()), +l1tTrackJetsExtended = cms.EDProducer('L1TrackJetProducer', + L1TrackInputTag= cms.InputTag("l1tTTTracksFromExtendedTrackletEmulation", "Level1TTTracks"), + L1PVertexCollection = cms.InputTag("l1tVertexProducer", "l1vertices"), 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..f5fbc98026a9e 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 prompt/displaced tracks ) diff --git a/L1Trigger/L1TTrackMatch/python/L1TrackerEtMissEmulatorProducer_cfi.py b/L1Trigger/L1TTrackMatch/python/L1TrackerEtMissEmulatorProducer_cfi.py index 445f9580d671a..b0cac9847ead0 100644 --- a/L1Trigger/L1TTrackMatch/python/L1TrackerEtMissEmulatorProducer_cfi.py +++ b/L1Trigger/L1TTrackMatch/python/L1TrackerEtMissEmulatorProducer_cfi.py @@ -1,14 +1,12 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.VertexFinder.VertexProducer_cff import VertexProducer -from L1Trigger.L1TTrackMatch.L1TrackSelectionProducer_cfi import L1TrackSelectionProducer -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", "Level1TTTracksSelectedEmulation"), + L1TrackAssociatedInputTag = cms.InputTag("l1tTrackSelectionProducer", "Level1TTTracksSelectedAssociatedEmulation"), # To bypass GTT input module use cms.InputTag("TTTracksFromTrackletEmulation", "Level1TTTracks") # and set useGTTinput to false - L1VertexInputTag = cms.InputTag("VertexProducer", VertexProducer.l1VertexCollectionName.value()), - # This will use the vertex algorithm as specified in VertexProducer_cff, if using emulated vertex + L1VertexInputTag = cms.InputTag("l1tVertexProducer", "l1vertices"), + # This will use the vertex algorithm as specified in VertexProducer_cfi, 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..711b6fee700d7 100644 --- a/L1Trigger/L1TTrackMatch/python/L1TrackerEtMissProducer_cfi.py +++ b/L1Trigger/L1TTrackMatch/python/L1TrackerEtMissProducer_cfi.py @@ -1,11 +1,9 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.VertexFinder.VertexProducer_cff import VertexProducer -from L1Trigger.L1TTrackMatch.L1TrackSelectionProducer_cfi import L1TrackSelectionProducer, L1TrackSelectionProducerExtended -L1TrackerEtMiss = cms.EDProducer('L1TrackerEtMissProducer', - L1TrackInputTag = cms.InputTag("L1TrackSelectionProducer", L1TrackSelectionProducer.outputCollectionName.value()), - L1TrackAssociatedInputTag = cms.InputTag("L1TrackSelectionProducer", L1TrackSelectionProducer.outputCollectionName.value() + "Associated"), - L1MetCollectionName = cms.string("L1TrackerEtMiss"), +l1tTrackerEtMiss = cms.EDProducer('L1TrackerEtMissProducer', + L1TrackInputTag = cms.InputTag("l1tTrackSelectionProducer", "Level1TTTracksSelected"), + L1TrackAssociatedInputTag = cms.InputTag("l1tTrackSelectionProducer", "Level1TTTracksSelectedAssociated"), + L1MetCollectionName = cms.string("l1tTrackerEtMiss"), 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. # When maxPt < 0, no special treatment is done for high PT tracks. @@ -15,8 +13,8 @@ debug = cms.bool(False) ) -L1TrackerEtMissExtended = L1TrackerEtMiss.clone( #NOT OPTIMIZED, STUDIED, OR USED - L1TrackInputTag = ("L1TrackSelectionProducerExtended", L1TrackSelectionProducerExtended.outputCollectionName.value()), - L1TrackAssociatedInputTag = ("L1TrackSelectionProducerExtended", L1TrackSelectionProducerExtended.outputCollectionName.value() + "Associated"), - L1MetCollectionName = "L1TrackerExtendedEtMiss", +l1tTrackerEtMissExtended = l1tTrackerEtMiss.clone( #NOT OPTIMIZED, STUDIED, OR USED + L1TrackInputTag = ("l1tTrackSelectionProducerExtended", "Level1TTTracksExtendedSelected"), + L1TrackAssociatedInputTag = ("l1tTrackSelectionProducerExtended", "Level1TTTracksExtendedSelectedAssociated"), + L1MetCollectionName = "l1tTrackerExtendedEtMiss", ) diff --git a/L1Trigger/L1TTrackMatch/test/L1TrackMET_cfg.py b/L1Trigger/L1TTrackMatch/test/L1TrackMET_cfg.py index ca73009d2f861..97b631f00d08e 100644 --- a/L1Trigger/L1TTrackMatch/test/L1TrackMET_cfg.py +++ b/L1Trigger/L1TTrackMatch/test/L1TrackMET_cfg.py @@ -53,7 +53,7 @@ if ReRunTracking: process.load("L1Trigger.TrackFindingTracklet.L1HybridEmulationTracks_cff") - producerSum = process.L1HybridTracks + process.L1HybridTracksWithAssociators + producerSum = process.L1THybridTracks + process.L1THybridTracksWithAssociators else: producerSum = None @@ -71,43 +71,43 @@ # Primary vertex ############################################################ -process.load('L1Trigger.VertexFinder.VertexProducer_cff') -process.VertexProducer.l1TracksInputTag = cms.InputTag("TTTracksFromTrackletEmulation", "Level1TTTracks") +process.load('L1Trigger.VertexFinder.VertexProducer_cfi') +process.l1tVertexProducer.l1TracksInputTag = cms.InputTag("l1tTTTracksFromTrackletEmulation", "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") +process.l1tTrackerEtMiss.L1VertexInputTag = cms.InputTag(producerName,"l1vertices") setattr(process, producerName, producer) producerSum += producer -producerSum += process.L1TrackerEtMiss +producerSum += process.l1tTrackerEtMiss -process.L1TrackerEmuEtMiss.useGTTinput = GTTInput +process.l1tTrackerEmuEtMiss.useGTTinput = GTTInput if GTTInput: - process.L1TrackerEmuEtMiss.L1TrackInputTag = cms.InputTag("L1GTTInputProducer","Level1TTTracksConverted") + process.l1tTrackerEmuEtMiss.L1TrackInputTag = cms.InputTag("l1tGTTInputProducer","Level1TTTracksConverted") else: - process.L1TrackerEmuEtMiss.L1TrackInputTag = cms.InputTag("TTTracksFromTrackletEmulation", "Level1TTTracks") + process.l1tTrackerEmuEtMiss.L1TrackInputTag = cms.InputTag("l1tTTTracksFromTrackletEmulation", "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") +process.l1tTrackerEmuEtMiss.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") + Emuproducer.l1TracksInputTag = cms.InputTag("l1tTTTracksFromTrackletEmulation", "Level1TTTracks") setattr(process, EmuproducerName, Emuproducer) producerSum += Emuproducer -producerSum += process.L1TrackerEmuEtMiss +producerSum += process.l1tTrackerEmuEtMiss process.p = cms.Path(producerSum + process.L1TkMETAnalyser) diff --git a/L1Trigger/L1TTrackMatch/test/L1TrackObjectNtupleMaker_cfg.py b/L1Trigger/L1TTrackMatch/test/L1TrackObjectNtupleMaker_cfg.py index 4e3396cbed916..b7dcb8f65fbb8 100644 --- a/L1Trigger/L1TTrackMatch/test/L1TrackObjectNtupleMaker_cfg.py +++ b/L1Trigger/L1TTrackMatch/test/L1TrackObjectNtupleMaker_cfg.py @@ -96,73 +96,73 @@ process.load("L1Trigger.L1TTrackMatch.L1TrackerEtMissEmulatorProducer_cfi") process.load("L1Trigger.L1TTrackMatch.L1TkHTMissProducer_cfi") process.load("L1Trigger.L1TTrackMatch.L1TkHTMissEmulatorProducer_cfi") -process.load('L1Trigger.VertexFinder.VertexProducer_cff') +process.load('L1Trigger.VertexFinder.VertexProducer_cfi') ############################################################ # Primary vertex ############################################################ -process.L1VertexFinder = process.VertexProducer.clone() +process.l1tVertexFinder = process.l1tVertexProducer.clone() process.pPV = cms.Path(process.L1VertexFinder) -process.L1VertexFinderEmulator = process.VertexProducer.clone() -process.L1VertexFinderEmulator.VertexReconstruction.Algorithm = "fastHistoEmulation" -process.L1VertexFinderEmulator.l1TracksInputTag = cms.InputTag("L1GTTInputProducer","Level1TTTracksConverted") -process.pPVemu = cms.Path(process.L1VertexFinderEmulator) - -process.L1TrackFastJets.L1PrimaryVertexTag = cms.InputTag("L1VertexFinder", "l1vertices") -process.L1TrackFastJetsExtended.L1PrimaryVertexTag = cms.InputTag("L1VertexFinder", "l1vertices") -process.L1TrackJets.L1PVertexCollection = cms.InputTag("L1VertexFinder", "l1vertices") -process.L1TrackJetsExtended.L1PVertexCollection = cms.InputTag("L1VertexFinder", "l1vertices") -process.L1TrackerEtMiss.L1VertexInputTag = cms.InputTag("L1VertexFinder", "l1vertices") -process.L1TrackerHTMiss.L1VertexInputTag = cms.InputTag("L1VertexFinder", "l1vertices") -process.L1TrackerEtMissExtended.L1VertexInputTag = cms.InputTag("L1VertexFinder", "l1vertices") -process.L1TrackerHTMissExtended.L1VertexInputTag = cms.InputTag("L1VertexFinder", "l1vertices") -process.L1TrackerEmuEtMiss.L1VertexInputTag = cms.InputTag("L1VertexFinderEmulator", "l1verticesEmulation") +process.l1tVertexFinderEmulator = process.l1tVertexProducer.clone() +process.l1tVertexFinderEmulator.VertexReconstruction.Algorithm = "fastHistoEmulation" +process.l1tVertexFinderEmulator.l1TracksInputTag = cms.InputTag("l1tGTTInputProducer","Level1TTTracksConverted") +process.pPVemu = cms.Path(process.l1tVertexFinderEmulator) + +process.l1tTrackFastJets.L1PrimaryVertexTag = cms.InputTag("l1tVertexFinder", "l1vertices") +process.l1tTrackFastJetsExtended.L1PrimaryVertexTag = cms.InputTag("l1tVertexFinder", "l1vertices") +process.l1tTrackJets.L1PVertexCollection = cms.InputTag("l1tVertexFinder", "l1vertices") +process.l1tTrackJetsExtended.L1PVertexCollection = cms.InputTag("l1tVertexFinder", "l1vertices") +process.l1tTrackerEtMiss.L1VertexInputTag = cms.InputTag("l1tVertexFinder", "l1vertices") +process.l1tTrackerHTMiss.L1VertexInputTag = cms.InputTag("l1tVertexFinder", "l1vertices") +process.l1tTrackerEtMissExtended.L1VertexInputTag = cms.InputTag("l1tVertexFinder", "l1vertices") +process.l1tTrackerHTMissExtended.L1VertexInputTag = cms.InputTag("l1tVertexFinder", "l1vertices") +process.l1tTrackerEmuEtMiss.L1VertexInputTag = cms.InputTag("l1tVertexFinderEmulator", "l1verticesEmulation") # HYBRID: prompt tracking if (L1TRKALGO == 'HYBRID'): - process.TTTracksEmu = cms.Path(process.L1HybridTracks) - process.TTTracksEmuWithTruth = cms.Path(process.L1HybridTracksWithAssociators) - process.pL1TrackSelection = cms.Path(process.L1TrackSelectionProducer) - process.pL1TrackJets = cms.Path(process.L1TrackJets) - process.pL1TrackFastJets=cms.Path(process.L1TrackFastJets) - process.pL1GTTInput = cms.Path(process.L1GTTInputProducer) - process.pL1TrackJetsEmu = cms.Path(process.L1TrackJetsEmulation) - process.pTkMET = cms.Path(process.L1TrackerEtMiss) - process.pTkMETEmu = cms.Path(process.L1TrackerEmuEtMiss) - process.pTkMHT = cms.Path(process.L1TrackerHTMiss) - process.pTkMHTEmulator = cms.Path(process.L1TrackerEmuHTMiss) + process.TTTracksEmu = cms.Path(process.L1THybridTracks) + process.TTTracksEmuWithTruth = cms.Path(process.L1THybridTracksWithAssociators) + process.pL1TrackSelection = cms.Path(process.l1tTrackSelectionProducer) + process.pL1TrackJets = cms.Path(process.l1tTrackJets) + process.pL1TrackFastJets=cms.Path(process.l1tTrackFastJets) + process.pL1GTTInput = cms.Path(process.l1tGTTInputProducer) + process.pL1TrackJetsEmu = cms.Path(process.l1tTrackJetsEmulation) + process.pTkMET = cms.Path(process.l1tTrackerEtMiss) + process.pTkMETEmu = cms.Path(process.l1tTrackerEmuEtMiss) + process.pTkMHT = cms.Path(process.l1tTrackerHTMiss) + process.pTkMHTEmulator = cms.Path(process.l1tTrackerEmuHTMiss) DISPLACED = 'Prompt' # HYBRID: extended tracking elif (L1TRKALGO == 'HYBRID_DISPLACED'): - process.TTTracksEmu = cms.Path(process.L1ExtendedHybridTracks) - process.TTTracksEmuWithTruth = cms.Path(process.L1ExtendedHybridTracksWithAssociators) - process.pL1TrackSelection = cms.Path(process.L1TrackSelectionProducerExtended) - process.pL1TrackJets = cms.Path(process.L1TrackJetsExtended) - process.pL1TrackFastJets = cms.Path(process.L1TrackFastJetsExtended) - process.pL1GTTInput = cms.Path(process.L1GTTInputProducerExtended) - process.pL1TrackJetsEmu = cms.Path(process.L1TrackJetsExtendedEmulation) - process.pTkMET = cms.Path(process.L1TrackerEtMissExtended) + process.TTTracksEmu = cms.Path(process.L1TExtendedHybridTracks) + process.TTTracksEmuWithTruth = cms.Path(process.L1TExtendedHybridTracksWithAssociators) + process.pL1TrackSelection = cms.Path(process.l1tTrackSelectionProducerExtended) + process.pL1TrackJets = cms.Path(process.l1tTrackJetsExtended) + process.pL1TrackFastJets = cms.Path(process.l1tTrackFastJetsExtended) + process.pL1GTTInput = cms.Path(process.l1tGTTInputProducerExtended) + process.pL1TrackJetsEmu = cms.Path(process.l1tTrackJetsExtendedEmulation) + process.pTkMET = cms.Path(process.l1tTrackerEtMissExtended) #process.pTkMETEmu = cms.Path(process.L1TrackerEmuEtMissExtended) #Doesn't exist - process.pTkMHT = cms.Path(process.L1TrackerHTMissExtended) - process.pTkMHTEmulator = cms.Path(process.L1TrackerEmuHTMissExtended) + process.pTkMHT = cms.Path(process.l1tTrackerHTMissExtended) + process.pTkMHTEmulator = cms.Path(process.l1tTrackerEmuHTMissExtended) DISPLACED = 'Displaced'# # HYBRID: extended tracking elif (L1TRKALGO == 'HYBRID_PROMPTANDDISP'): - process.TTTracksEmu = cms.Path(process.L1PromptExtendedHybridTracks) - process.TTTracksEmuWithTruth = cms.Path(process.L1PromptExtendedHybridTracksWithAssociators) - process.pL1TrackSelection = cms.Path(process.L1TrackSelectionProducer*process.L1TrackSelectionProducerExtended) - process.pL1TrackJets = cms.Path(process.L1TrackJets*process.L1TrackJetsExtended) - process.pL1TrackFastJets = cms.Path(process.L1TrackFastJets*process.L1TrackFastJetsExtended) - process.pL1GTTInput = cms.Path(process.L1GTTInputProducer*process.L1GTTInputProducerExtended) - process.pL1TrackJetsEmu = cms.Path(process.L1TrackJetsEmulation*process.L1TrackJetsExtendedEmulation) - process.pTkMET = cms.Path(process.L1TrackerEtMiss*process.L1TrackerEtMissExtended) - process.pTkMETEmu = cms.Path(process.L1TrackerEmuEtMiss) - process.pTkMHT = cms.Path(process.L1TrackerHTMiss*process.L1TrackerHTMissExtended) - process.pTkMHTEmulator = cms.Path(process.L1TrackerEmuHTMiss*process.L1TrackerEmuHTMissExtended) + process.TTTracksEmu = cms.Path(process.L1TPromptExtendedHybridTracks) + process.TTTracksEmuWithTruth = cms.Path(process.L1TPromptExtendedHybridTracksWithAssociators) + process.pL1TrackSelection = cms.Path(process.l1tTrackSelectionProducer*process.l1tTrackSelectionProducerExtended) + process.pL1TrackJets = cms.Path(process.l1tTrackJets*process.l1tTrackJetsExtended) + process.pL1TrackFastJets = cms.Path(process.l1tTrackFastJets*process.l1tTrackFastJetsExtended) + process.pL1GTTInput = cms.Path(process.l1tGTTInputProducer*process.l1tGTTInputProducerExtended) + process.pL1TrackJetsEmu = cms.Path(process.l1tTrackJetsEmulation*process.l1tTrackJetsExtendedEmulation) + process.pTkMET = cms.Path(process.l1tTrackerEtMiss*process.l1tTrackerEtMissExtended) + process.pTkMETEmu = cms.Path(process.l1tTrackerEmuEtMiss) + process.pTkMHT = cms.Path(process.l1tTrackerHTMiss*process.l1tTrackerHTMissExtended) + process.pTkMHTEmulator = cms.Path(process.l1tTrackerEmuHTMiss*process.l1tTrackerEmuHTMissExtended) DISPLACED = 'Both' @@ -190,16 +190,16 @@ TP_minPt = cms.double(2.0), # only save TPs with pt > X GeV TP_maxEta = cms.double(2.5), # only save TPs with |eta| < X TP_maxZ0 = cms.double(15.0), # only save TPs with |z0| < X cm - L1TrackInputTag = cms.InputTag("TTTracksFromTrackletEmulation", "Level1TTTracks"), # TTTracks, prompt - L1TrackExtendedInputTag = cms.InputTag("TTTracksFromExtendedTrackletEmulation", "Level1TTTracks"), # TTTracks, extended + L1TrackInputTag = cms.InputTag("l1tTTTracksFromTrackletEmulation", "Level1TTTracks"), # TTTracks, prompt + L1TrackExtendedInputTag = cms.InputTag("l1tTTTracksFromExtendedTrackletEmulation", "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"), @@ -209,22 +209,22 @@ ##track jets and track MET SaveTrackJets = cms.bool(True), #includes emulated jets SaveTrackSums = cms.bool(True), #includes simulated/emulated track MET, MHT, and HT - TrackFastJetsInputTag = cms.InputTag("L1TrackFastJets","L1TrackFastJets"), - TrackFastJetsExtendedInputTag = cms.InputTag("L1TrackFastJetsExtended","L1TrackFastJetsExtended"), - TrackJetsInputTag = cms.InputTag("L1TrackJets", "L1TrackJets"), - TrackJetsExtendedInputTag=cms.InputTag("L1TrackJetsExtended", "L1TrackJetsExtended"), - TrackJetsEmuInputTag = cms.InputTag("L1TrackJetsEmulation","L1TrackJets"), - TrackJetsExtendedEmuInputTag = cms.InputTag("L1TrackJetsExtendedEmulation","L1TrackJetsExtended"), - TrackMETInputTag = cms.InputTag("L1TrackerEtMiss","L1TrackerEtMiss"), - TrackMETExtendedInputTag = cms.InputTag("L1TrackerEtMissExtended","L1TrackerExtendedEtMiss"), - TrackMETEmuInputTag = cms.InputTag("L1TrackerEmuEtMiss","L1TrackerEmuEtMiss"), + TrackFastJetsInputTag = cms.InputTag("l1tTrackFastJets","L1TrackFastJets"), + TrackFastJetsExtendedInputTag = cms.InputTag("l1tTrackFastJetsExtended","L1TrackFastJetsExtended"), + TrackJetsInputTag = cms.InputTag("l1tTrackJets", "L1TrackJets"), + TrackJetsExtendedInputTag=cms.InputTag("l1tTrackJetsExtended", "L1TrackJetsExtended"), + TrackJetsEmuInputTag = cms.InputTag("l1tTrackJetsEmulation","L1TrackJets"), + TrackJetsExtendedEmuInputTag = cms.InputTag("l1tTrackJetsExtendedEmulation","L1TrackJetsExtended"), + TrackMETInputTag = cms.InputTag("l1tTrackerEtMiss","L1TrackerEtMiss"), + TrackMETExtendedInputTag = cms.InputTag("l1tTrackerEtMissExtended","L1TrackerExtendedEtMiss"), + TrackMETEmuInputTag = cms.InputTag("l1tTrackerEmuEtMiss","L1TrackerEmuEtMiss"), TrackMHTInputTag = cms.InputTag("L1TrackerHTMiss","L1TrackerHTMiss"), #includes HT - TrackMHTExtendedInputTag = cms.InputTag("L1TrackerHTMissExtended","L1TrackerHTMissExtended"), - TrackMHTEmuInputTag = cms.InputTag("L1TrackerEmuHTMiss",process.L1TrackerEmuHTMiss.L1MHTCollectionName.value()), - TrackMHTEmuExtendedInputTag = cms.InputTag("L1TrackerEmuHTMissExtended",process.L1TrackerEmuHTMissExtended.L1MHTCollectionName.value()), + TrackMHTExtendedInputTag = cms.InputTag("l1tTrackerHTMissExtended","L1TrackerHTMissExtended"), + TrackMHTEmuInputTag = cms.InputTag("l1tTrackerEmuHTMiss",process.l1tTrackerEmuHTMiss.L1MHTCollectionName.value()), + TrackMHTEmuExtendedInputTag = cms.InputTag("l1tTrackerEmuHTMissExtended",process.l1tTrackerEmuHTMissExtended.L1MHTCollectionName.value()), GenParticleInputTag = cms.InputTag("genParticles",""), - RecoVertexInputTag=cms.InputTag("L1VertexFinder", "l1vertices"), - RecoVertexEmuInputTag=cms.InputTag("L1VertexFinderEmulator", "l1verticesEmulation"), + RecoVertexInputTag=cms.InputTag("l1tVertexFinder", "l1vertices"), + RecoVertexEmuInputTag=cms.InputTag("l1tVertexFinderEmulator", "l1verticesEmulation"), ) process.ntuple = cms.Path(process.L1TrackNtuple) diff --git a/L1Trigger/Phase2L1GMT/python/gmt_cff.py b/L1Trigger/Phase2L1GMT/python/gmt_cff.py index 96c12f0436fe1..fbc9ab8cd95d0 100644 --- a/L1Trigger/Phase2L1GMT/python/gmt_cff.py +++ b/L1Trigger/Phase2L1GMT/python/gmt_cff.py @@ -1,3 +1,3 @@ import FWCore.ParameterSet.Config as cms from L1Trigger.Phase2L1GMT.gmt_cfi import * -phase2GMT = cms.Sequence(gmtStubs*gmtMuons) +phase2GMT = cms.Sequence(l1tGMTStubs*l1tGMTMuons) diff --git a/L1Trigger/Phase2L1GMT/python/gmt_cfi.py b/L1Trigger/Phase2L1GMT/python/gmt_cfi.py index 858005d14881b..6e8bcde812de1 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,9 +43,9 @@ -gmtMuons = cms.EDProducer('Phase2L1TGMTProducer', - srcTracks = cms.InputTag("TTTracksFromTrackletEmulation:Level1TTTracks"), - srcStubs = cms.InputTag('gmtStubs'), +l1tGMTMuons = cms.EDProducer('Phase2L1TGMTProducer', + srcTracks = cms.InputTag("l1tTTTracksFromTrackletEmulation:Level1TTTracks"), + srcStubs = cms.InputTag('l1tGMTStubs'), srcBMTF = cms.InputTag('simBmtfDigis','BMTF'), srcEMTF = cms.InputTag('simEmtfDigis','EMTF'), srcOMTF = cms.InputTag('simOmtfDigis','OMTF'), @@ -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/Phase2L1GMT/test/gmtStudy.py b/L1Trigger/Phase2L1GMT/test/gmtStudy.py index c04e360bd1384..f80fac6b05a58 100644 --- a/L1Trigger/Phase2L1GMT/test/gmtStudy.py +++ b/L1Trigger/Phase2L1GMT/test/gmtStudy.py @@ -81,7 +81,7 @@ def strAppend(s): def fetchTracks(event): trackHandle = Handle('vector,Phase2TrackerDigi,edm::refhelper::FindForDetSetVector > > >') - event.getByLabel("TTTracksFromTrackletEmulation:Level1TTTracks",trackHandle) + event.getByLabel("l1tTTTracksFromTrackletEmulation:Level1TTTracks",trackHandle) return trackHandle.product() @@ -154,8 +154,8 @@ def deltaR2( e1, p1, e2, p2): if counter==100000: break; gen=fetchGEN(event,2.4) - stubs = fetchStubs(event,'gmtStubs') - tps = filter(lambda x: ID(x.hwEta(),x.hwPt(),x.hwQual()),fetchTPS(event,'gmtMuons')) + stubs = fetchStubs(event,'l1tGMTStubs') + tps = filter(lambda x: ID(x.hwEta(),x.hwPt(),x.hwQual()),fetchTPS(event,'l1tGMTMuons')) # tps = fetchTPS(event,'gmtMuons') tracks=fetchTracks(event) diff --git a/L1Trigger/Phase2L1GMT/test/runGMT.py b/L1Trigger/Phase2L1GMT/test/runGMT.py index cec51bb3cf1dd..e47bdd1610416 100644 --- a/L1Trigger/Phase2L1GMT/test/runGMT.py +++ b/L1Trigger/Phase2L1GMT/test/runGMT.py @@ -87,11 +87,11 @@ fileName = cms.untracked.string('reprocess.root'), outputCommands = cms.untracked.vstring( "drop *_*_*_*", - "keep *_gmtMuons_*_*", - "keep *_gmtStubs_*_*", + "keep *_l1tGMTMuons_*_*", + "keep *_l1tGMTStubs_*_*", "keep *_genParticles_*_*", - "keep *_TTTracksFromTrackletEmulation_Level1TTTracks_*", - "keep *_L1TkMuons_*_*" + "keep *_l1tTTTracksFromTrackletEmulation_Level1TTTracks_*", + "keep *_l1tTkMuons_*_*" ), splitLevel = cms.untracked.int32(0) ) @@ -115,9 +115,9 @@ process.dtTriggerPhase2PrimitiveDigis.scenario = 0 process.load("L1Trigger.Phase2L1GMT.gmt_cff") -process.gmtMuons.trackMatching.verbose=1 -process.gmtMuons.verbose=0 -process.gmtMuons.trackConverter.verbose=0 +process.l1tGMTMuons.trackMatching.verbose=1 +process.l1tGMTMuons.verbose=0 +process.l1tGMTMuons.trackConverter.verbose=0 @@ -144,7 +144,7 @@ process.FEVTDEBUGHLToutput_step = cms.EndPath(process.FEVTDEBUGHLToutput) # Schedule definition -process.schedule = cms.Schedule(process.raw2digi_step,process.L1TrackTrigger_step,process.testpath,process.endjob_step,process.FEVTDEBUGHLToutput_step) +process.schedule = cms.Schedule(process.raw2digi_step,process.L1TTrackTrigger_step,process.testpath,process.endjob_step,process.FEVTDEBUGHLToutput_step) from PhysicsTools.PatAlgos.tools.helpers import associatePatAlgosToolsTask associatePatAlgosToolsTask(process) diff --git a/L1Trigger/Phase2L1GMT/test/test.py b/L1Trigger/Phase2L1GMT/test/test.py index 96b038e2b408f..3d03b86b05e7d 100644 --- a/L1Trigger/Phase2L1GMT/test/test.py +++ b/L1Trigger/Phase2L1GMT/test/test.py @@ -126,7 +126,7 @@ "keep *_simEmtfDigis_*_*", "keep *_simOmtfDigis_*_*", "keep *_genParticles_*_*", - "keep *_TTTracksFromTrackletEmulation_Level1TTTracks_*" + "keep *_l1tTTTracksFromTrackletEmulation_Level1TTTracks_*" ) ) @@ -203,7 +203,7 @@ process.prod = cms.EDProducer('Phase2L1TGMTProducer', - srcTracks = cms.InputTag("TTTracksFromTrackletEmulation:Level1TTTracks"), + srcTracks = cms.InputTag("l1tTTTracksFromTrackletEmulation:Level1TTTracks"), srcStubs = cms.InputTag('stubs'), srcBMTF = cms.InputTag('simBmtfDigis','BMTF'), srcEMTF = cms.InputTag('simEmtfDigis','EMTF'), 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..878b74fc1466f 100644 --- a/L1Trigger/Phase2L1ParticleFlow/python/l1ctLayer1_cff.py +++ b/L1Trigger/Phase2L1ParticleFlow/python/l1ctLayer1_cff.py @@ -2,10 +2,10 @@ import math -from L1Trigger.Phase2L1ParticleFlow.pfTracksFromL1Tracks_cfi import pfTracksFromL1Tracks -from L1Trigger.Phase2L1ParticleFlow.pfClustersFromL1EGClusters_cfi import pfClustersFromL1EGClusters -from L1Trigger.Phase2L1ParticleFlow.pfClustersFromCombinedCalo_cff import pfClustersFromCombinedCaloHCal, pfClustersFromCombinedCaloHF -from L1Trigger.Phase2L1ParticleFlow.pfClustersFromHGC3DClusters_cfi import pfClustersFromHGC3DClusters +from L1Trigger.Phase2L1ParticleFlow.pfTracksFromL1Tracks_cfi import l1tPFTracksFromL1Tracks +from L1Trigger.Phase2L1ParticleFlow.pfClustersFromL1EGClusters_cfi import l1tPFClustersFromL1EGClusters +from L1Trigger.Phase2L1ParticleFlow.pfClustersFromCombinedCalo_cff import l1tPFClustersFromCombinedCaloHCal, l1tPFClustersFromCombinedCaloHF +from L1Trigger.Phase2L1ParticleFlow.pfClustersFromHGC3DClusters_cfi import l1tPFClustersFromHGC3DClusters from L1Trigger.Phase2L1ParticleFlow.l1TkEgAlgoEmulator_cfi import tkEgAlgoParameters,tkEgSorterParameters @@ -14,12 +14,12 @@ dxyScale = cms.double(3.85) ) -l1ctLayer1Barrel = cms.EDProducer("L1TCorrelatorLayer1Producer", - tracks = cms.InputTag('pfTracksFromL1Tracks'), - muons = cms.InputTag('L1SAMuonsGmt','promptSAMuons'), - emClusters = cms.VInputTag(cms.InputTag('pfClustersFromL1EGClusters')), - hadClusters = cms.VInputTag(cms.InputTag('pfClustersFromCombinedCaloHCal:calibrated')), - vtxCollection = cms.InputTag("L1VertexFinderEmulator","l1verticesEmulation"), +l1tLayer1Barrel = cms.EDProducer("L1TCorrelatorLayer1Producer", + tracks = cms.InputTag('l1tPFTracksFromL1Tracks'), + muons = cms.InputTag('l1tSAMuonsGmt','promptSAMuons'), + emClusters = cms.VInputTag(cms.InputTag('l1tPFClustersFromL1EGClusters')), + hadClusters = cms.VInputTag(cms.InputTag('l1tPFClustersFromCombinedCaloHCal:calibrated')), + 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", - tracks = cms.InputTag('pfTracksFromL1Tracks'), - muons = cms.InputTag('L1SAMuonsGmt','promptSAMuons'), - emClusters = cms.VInputTag(cms.InputTag('pfClustersFromHGC3DClusters:egamma')), # used only for E/gamma - hadClusters = cms.VInputTag(cms.InputTag('pfClustersFromHGC3DClusters')), - vtxCollection = cms.InputTag("L1VertexFinderEmulator","l1verticesEmulation"), +l1tLayer1HGCal = cms.EDProducer("L1TCorrelatorLayer1Producer", + tracks = cms.InputTag('l1tPFTracksFromL1Tracks'), + muons = cms.InputTag('l1tSAMuonsGmt','promptSAMuons'), + emClusters = cms.VInputTag(cms.InputTag('l1tPFClustersFromHGC3DClusters:egamma')), # used only for E/gamma + hadClusters = cms.VInputTag(cms.InputTag('l1tPFClustersFromHGC3DClusters')), + 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'), - emClusters = cms.VInputTag(cms.InputTag('pfClustersFromHGC3DClusters:egamma')), # used only for E/gamma - hadClusters = cms.VInputTag(cms.InputTag('pfClustersFromHGC3DClusters')), - vtxCollection = cms.InputTag("L1VertexFinderEmulator","l1verticesEmulation"), + muons = cms.InputTag('l1tSAMuonsGmt','promptSAMuons'), + emClusters = cms.VInputTag(cms.InputTag('l1tPFClustersFromHGC3DClusters:egamma')), # used only for E/gamma + hadClusters = cms.VInputTag(cms.InputTag('l1tPFClustersFromHGC3DClusters')), + 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"), + hadClusters = cms.VInputTag(cms.InputTag('l1tPFClustersFromCombinedCaloHF:calibrated')), + 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,26 +502,26 @@ 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( - pfClustersFromL1EGClusters, - pfClustersFromCombinedCaloHCal, - pfClustersFromCombinedCaloHF, - pfClustersFromHGC3DClusters, - pfTracksFromL1Tracks +L1TLayer1TaskInputsTask = cms.Task( + l1tPFClustersFromL1EGClusters, + l1tPFClustersFromCombinedCaloHCal, + l1tPFClustersFromCombinedCaloHF, + l1tPFClustersFromHGC3DClusters, + l1tPFTracksFromL1Tracks ) -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..d35ff7a709ae0 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(L1PFObjects = '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_cff.py b/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromCombinedCalo_cff.py index 96698e77bd2f6..b1ce9fccf1614 100644 --- a/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromCombinedCalo_cff.py +++ b/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromCombinedCalo_cff.py @@ -1,13 +1,13 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.Phase2L1ParticleFlow.pfClustersFromCombinedCalo_cfi import pfClustersFromCombinedCalo +from L1Trigger.Phase2L1ParticleFlow.pfClustersFromCombinedCalo_cfi import l1tPFClustersFromCombinedCalo # Using phase2_hgcalV10 to customize the config for all 106X samples, since there's no other modifier for it from Configuration.Eras.Modifier_phase2_hgcalV10_cff import phase2_hgcalV10 from Configuration.Eras.Modifier_phase2_hgcalV11_cff import phase2_hgcalV11 # Calorimeter part: ecal + hcal + hf only -pfClustersFromCombinedCaloHCal = pfClustersFromCombinedCalo.clone( +l1tPFClustersFromCombinedCaloHCal = l1tPFClustersFromCombinedCalo.clone( hcalHGCTowers = [], hcalDigis = [], hcalDigisBarrel = True, hcalDigisHF = False, hadCorrector = cms.string("L1Trigger/Phase2L1ParticleFlow/data/hadcorr_barrel.root"), @@ -17,7 +17,7 @@ scale = cms.vdouble( 0.122, 0.143, 0.465), kind = cms.string('calo'), )) -phase2_hgcalV10.toModify(pfClustersFromCombinedCaloHCal, +phase2_hgcalV10.toModify(l1tPFClustersFromCombinedCaloHCal, hadCorrector = "L1Trigger/Phase2L1ParticleFlow/data/hadcorr_barrel_106X.root", resol = cms.PSet( etaBins = cms.vdouble( 0.700, 1.200, 1.600), @@ -26,7 +26,7 @@ kind = cms.string('calo'), ) ) -phase2_hgcalV11.toModify(pfClustersFromCombinedCaloHCal, +phase2_hgcalV11.toModify(l1tPFClustersFromCombinedCaloHCal, hadCorrector = "L1Trigger/Phase2L1ParticleFlow/data/hadcorr_barrel_110X.root", resol = cms.PSet( etaBins = cms.vdouble( 0.700, 1.200, 1.600), @@ -36,7 +36,7 @@ ) ) -pfClustersFromCombinedCaloHF = pfClustersFromCombinedCalo.clone( +l1tPFClustersFromCombinedCaloHF = l1tPFClustersFromCombinedCalo.clone( ecalCandidates = [], hcalHGCTowers = [], phase2barrelCaloTowers = [], hadCorrector = cms.string("L1Trigger/Phase2L1ParticleFlow/data/hfcorr.root"), @@ -46,8 +46,8 @@ scale = cms.vdouble( 0.152, 0.151, 0.144, 0.179), kind = cms.string('calo'), )) -phase2_hgcalV10.toModify(pfClustersFromCombinedCaloHF, - hcalCandidates = cms.VInputTag(cms.InputTag("hgcalBackEndLayer2Producer","HGCalBackendLayer2Processor3DClustering")), +phase2_hgcalV10.toModify(l1tPFClustersFromCombinedCaloHF, + hcalCandidates = cms.VInputTag(cms.InputTag("l1tHGCalBackEndLayer2Producer","HGCalBackendLayer2Processor3DClustering")), hadCorrector = "L1Trigger/Phase2L1ParticleFlow/data/hfcorr_106X.root", resol = cms.PSet( etaBins = cms.vdouble( 3.500, 4.000, 4.500, 5.000), @@ -56,8 +56,8 @@ kind = cms.string('calo'), ) ) -phase2_hgcalV11.toModify(pfClustersFromCombinedCaloHF, - hcalCandidates = cms.VInputTag(cms.InputTag("hgcalBackEndLayer2Producer","HGCalBackendLayer2Processor3DClustering")), +phase2_hgcalV11.toModify(l1tPFClustersFromCombinedCaloHF, + hcalCandidates = cms.VInputTag(cms.InputTag("l1tHGCalBackEndLayer2Producer","HGCalBackendLayer2Processor3DClustering")), hadCorrector = "L1Trigger/Phase2L1ParticleFlow/data/hfcorr_110X.root", resol = cms.PSet( etaBins = cms.vdouble( 3.500, 4.000, 4.500, 5.000), diff --git a/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromCombinedCalo_cfi.py b/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromCombinedCalo_cfi.py index 15cbb2308957f..e1eb04d8f2375 100644 --- a/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromCombinedCalo_cfi.py +++ b/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromCombinedCalo_cfi.py @@ -1,13 +1,13 @@ import FWCore.ParameterSet.Config as cms -pfClustersFromCombinedCalo = cms.EDProducer("L1TPFCaloProducer", - ecalCandidates = cms.VInputTag(cms.InputTag('pfClustersFromL1EGClusters')), # using EM from towers in HGC, no longer reading also 'pfClustersFromHGC3DClustersEM' +l1tPFClustersFromCombinedCalo = cms.EDProducer("L1TPFCaloProducer", + ecalCandidates = cms.VInputTag(cms.InputTag('l1tPFClustersFromL1EGClusters')), # using EM from towers in HGC, no longer reading also 'pfClustersFromHGC3DClustersEM' hcalCandidates = cms.VInputTag(), hcalDigis = cms.VInputTag(cms.InputTag('simHcalTriggerPrimitiveDigis')), hcalDigisBarrel = cms.bool(False), hcalDigisHF = cms.bool(True), - phase2barrelCaloTowers = cms.VInputTag(cms.InputTag("L1EGammaClusterEmuProducer","L1CaloTowerCollection","")), - hcalHGCTowers = cms.VInputTag(cms.InputTag("hgcalTowerProducer:HGCalTowerProcessor") ), + phase2barrelCaloTowers = cms.VInputTag(cms.InputTag("l1tEGammaClusterEmuProducer","L1CaloTowerCollection","")), + hcalHGCTowers = cms.VInputTag(cms.InputTag("l1tHGCalTowerProducer:HGCalTowerProcessor") ), hcalHGCTowersHadOnly = cms.bool(False), # take also EM part from towers emCorrector = cms.string(""), # no need to correct further hcCorrector = cms.string(""), # no correction to hcal-only in the default scheme diff --git a/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromHGC3DClusters_cfi.py b/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromHGC3DClusters_cfi.py index 85a4f844e044f..9b8791b4798b1 100644 --- a/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromHGC3DClusters_cfi.py +++ b/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromHGC3DClusters_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -pfClustersFromHGC3DClusters = cms.EDProducer("PFClusterProducerFromHGC3DClusters", - src = cms.InputTag("hgcalBackEndLayer2Producer","HGCalBackendLayer2Processor3DClustering"), +l1tPFClustersFromHGC3DClusters = cms.EDProducer("PFClusterProducerFromHGC3DClusters", + src = cms.InputTag("l1tHGCalBackEndLayer2Producer","HGCalBackendLayer2Processor3DClustering"), corrector = cms.string("L1Trigger/Phase2L1ParticleFlow/data/hadcorr_HGCal3D_TC.root"), correctorEmfMax = cms.double(1.125), preEmId = cms.string("hOverE < 0.3 && hOverE >= 0"), @@ -48,7 +48,7 @@ from Configuration.Eras.Modifier_phase2_hgcalV10_cff import phase2_hgcalV10 from Configuration.Eras.Modifier_phase2_hgcalV11_cff import phase2_hgcalV11 -phase2_hgcalV10.toModify(pfClustersFromHGC3DClusters, +phase2_hgcalV10.toModify(l1tPFClustersFromHGC3DClusters, corrector = "L1Trigger/Phase2L1ParticleFlow/data/hadcorr_HGCal3D_TC_106X.root", resol = cms.PSet( etaBins = cms.vdouble( 1.700, 1.900, 2.200, 2.500, 2.800, 2.900), @@ -57,7 +57,7 @@ kind = cms.string('calo') ), ) -phase2_hgcalV11.toModify(pfClustersFromHGC3DClusters, +phase2_hgcalV11.toModify(l1tPFClustersFromHGC3DClusters, corrector = "L1Trigger/Phase2L1ParticleFlow/data/hadcorr_HGCal3D_TC_110X.root", resol = cms.PSet( etaBins = cms.vdouble( 1.700, 1.900, 2.200, 2.500, 2.800, 2.900), diff --git a/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromL1EGClusters_cfi.py b/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromL1EGClusters_cfi.py index ff4e72aa7ec17..51bd652351ead 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",), +l1tPFClustersFromL1EGClusters = cms.EDProducer("PFClusterProducerFromL1EGClusters", + src = cms.InputTag("l1tEGammaClusterEmuProducer",), etMin = cms.double(0.5), corrector = cms.string("L1Trigger/Phase2L1ParticleFlow/data/emcorr_barrel.root"), resol = cms.PSet( @@ -15,7 +15,7 @@ # use phase2_hgcalV10 to customize for 106X L1TDR MC even in the barrel, since there's no other modifier for it from Configuration.Eras.Modifier_phase2_hgcalV10_cff import phase2_hgcalV10 from Configuration.Eras.Modifier_phase2_hgcalV11_cff import phase2_hgcalV11 -phase2_hgcalV10.toModify(pfClustersFromL1EGClusters, +phase2_hgcalV10.toModify(l1tPFClustersFromL1EGClusters, corrector = "", # In this setup, TP's are already calibrated correctly :-) # L1Trigger/Phase2L1ParticleFlow/data/emcorr_barrel_106X.root", resol = cms.PSet( @@ -25,7 +25,7 @@ kind = cms.string('calo') ) ) -phase2_hgcalV11.toModify(pfClustersFromL1EGClusters, +phase2_hgcalV11.toModify(l1tPFClustersFromL1EGClusters, corrector = "", # In this setup, TP's are already calibrated correctly :-) # L1Trigger/Phase2L1ParticleFlow/data/emcorr_barrel_110X.root", resol = cms.PSet( diff --git a/L1Trigger/Phase2L1ParticleFlow/python/pfTracksFromL1Tracks_cfi.py b/L1Trigger/Phase2L1ParticleFlow/python/pfTracksFromL1Tracks_cfi.py index e37ab47123b00..4134c0d189be5 100644 --- a/L1Trigger/Phase2L1ParticleFlow/python/pfTracksFromL1Tracks_cfi.py +++ b/L1Trigger/Phase2L1ParticleFlow/python/pfTracksFromL1Tracks_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -pfTracksFromL1Tracks = cms.EDProducer("PFTrackProducerFromL1Tracks", - L1TrackTag = cms.InputTag("TTTracksFromTrackletEmulation", "Level1TTTracks"), +l1tPFTracksFromL1Tracks = cms.EDProducer("PFTrackProducerFromL1Tracks", + L1TrackTag = cms.InputTag("l1tTTTracksFromTrackletEmulation", "Level1TTTracks"), nParam = cms.uint32(4), resolCalo = cms.PSet( etaBins = cms.vdouble( 1.300, 1.700, 2.800, 3.200, 4.000, 5.000), diff --git a/L1Trigger/Phase2L1ParticleFlow/test/make_l1ctLayer1_dumpFiles_cfg.py b/L1Trigger/Phase2L1ParticleFlow/test/make_l1ctLayer1_dumpFiles_cfg.py index 536f8b9391c93..38dd684c2b7a6 100644 --- a/L1Trigger/Phase2L1ParticleFlow/test/make_l1ctLayer1_dumpFiles_cfg.py +++ b/L1Trigger/Phase2L1ParticleFlow/test/make_l1ctLayer1_dumpFiles_cfg.py @@ -33,16 +33,16 @@ process.load('L1Trigger.Phase2L1ParticleFlow.l1ctLayer1_cff') process.load('L1Trigger.Phase2L1ParticleFlow.l1ctLayer2EG_cff') process.load('L1Trigger.L1TTrackMatch.L1GTTInputProducer_cfi') -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.load('L1Trigger.VertexFinder.VertexProducer_cfi') +process.l1tVertexFinderEmulator = process.l1tVertexProducer.clone() +process.l1tVertexFinderEmulator.VertexReconstruction.Algorithm = "fastHistoEmulation" +process.l1tVertexFinderEmulator.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.pfTracksFromL1Tracks + - process.l1ParticleFlow_calo + - process.l1ctLayer1Barrel + - process.l1ctLayer1Barrel9 + - process.l1ctLayer1HGCal + - process.l1ctLayer1HGCalNoTK + - process.l1ctLayer1HF + - process.l1ctLayer1 + - process.l1ctLayer2EG + process.l1tSAMuonsGmt + + process.l1tGTTInputProducer + + process.l1tVertexFinderEmulator + + process.l1tPFTracksFromL1Tracks + + 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.l1tPFClustersFromCombinedCaloHCal.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..cd99991a62a92 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,25 +49,25 @@ 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, process.offlineBeamSpot, - process.TTTracksFromTrackletEmulation, + process.l1tTTTracksFromTrackletEmulation, 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..525cb149a7632 100644 --- a/L1Trigger/Phase2L1Taus/python/l1emulator_cff.py +++ b/L1Trigger/Phase2L1Taus/python/l1emulator_cff.py @@ -6,42 +6,36 @@ from CalibCalorimetry.CaloTPG.CaloTPGTranscoder_cfi import * from L1Trigger.L1THGCal.hgcalTriggerPrimitives_cff import * -l1emulator += hgcalTriggerPrimitives +l1emulator += L1THGCalTriggerPrimitives from SimCalorimetry.EcalEBTrigPrimProducers.ecalEBTriggerPrimitiveDigis_cff import * l1emulator += simEcalEBTriggerPrimitiveDigis from L1Trigger.TrackFindingTracklet.Tracklet_cfi import * -L1TRK_NAME = "TTTracksFromTrackletEmulation" +L1TRK_NAME = "l1tTTTracksFromTrackletEmulation" L1TRK_LABEL = "Level1TTTracks" from RecoVertex.BeamSpotProducer.BeamSpot_cfi import * l1emulator += offlineBeamSpot -l1emulator += TTTracksFromTrackletEmulation +l1emulator += l1tTTTracksFromTrackletEmulation from SimTracker.TrackTriggerAssociation.TrackTriggerAssociator_cff import * TTTrackAssociatorFromPixelDigis.TTTracks = cms.VInputTag( cms.InputTag(L1TRK_NAME, L1TRK_LABEL) ) l1emulator += TrackTriggerAssociatorTracks -from L1Trigger.VertexFinder.VertexProducer_cff import * -l1emulator += VertexProducer +from L1Trigger.VertexFinder.VertexProducer_cfi import * +l1emulator += l1tVertexProducer from Configuration.StandardSequences.SimL1Emulator_cff import * l1emulator += SimL1Emulator from L1Trigger.Phase2L1ParticleFlow.pfTracksFromL1Tracks_cfi import * -l1emulator += pfTracksFromL1Tracks +l1emulator += l1tPFTracksFromL1Tracks 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..a12a0d616e7bb 100644 --- a/L1Trigger/Phase2L1Taus/test/produceHPSPFTaus_cfg.py +++ b/L1Trigger/Phase2L1Taus/test/produceHPSPFTaus_cfg.py @@ -124,31 +124,29 @@ ), outputCommands = cms.untracked.vstring( 'drop *_*_*_*', - 'keep *_l1ctLayer1_PF_*', - 'keep *_l1ctLayer1_Puppi_*', - #'keep *_l1pfCandidates_PF_*', - #'keep *_l1pfCandidates_Puppi_*', - 'keep *_l1pfProducer*_z0_*', - 'keep *_pfTracksFromL1Tracks*_*_*', - 'keep *_pfClustersFrom*_*_*', - 'keep *_TTTracksFromTracklet_*_*', - 'keep *_VertexProducer_*_*', - 'keep *_L1TkPrimaryVertex_*_*', + 'keep *_l1tLayer1_PF_*', + 'keep *_l1tLayer1_Puppi_*', + 'keep *_l1tPFProducer*_z0_*', + 'keep *_l1tPFTracksFromL1Tracks*_*_*', + 'keep *_l1tPFClustersFrom*_*_*', + 'keep *_l1tTTTracksFromTracklet_*_*', + 'keep *_l1tVertexProducer_*_*', + 'keep *_l1tTkPrimaryVertex_*_*', 'keep *_slimmedTaus_*_*', 'keep *_packedPFCandidates_*_*', 'keep *_generator_*_*', 'keep *_caloStage2Digis_*_*', - 'keep *_HPSPFTauProducer*PF_*_*', - 'keep *_HPSPFTauProducer*Puppi_*_*', + 'keep *_l1tHPSPFTauProducer*PF_*_*', + 'keep *_l1tHPSPFTauProducer*Puppi_*_*', 'keep *_prunedGenParticles_*_*', 'keep *_tauGenJetsSelectorAllHadrons_*_*', 'keep *_particleFlow_*_*', 'keep *_generalTracks_*_*', 'keep *_electronGsfTracks_*_*', 'keep *_offlineSlimmedPrimaryVertices_*_*', - 'keep *_L1PFTauProducer_*_*', + 'keep *_l1tPFTauProducer_*_*', 'keep *_slimmedAddPileupInfo_*_*', - "keep *_Phase1L1TJetProducer_*_*", + "keep *_l1tPhase1JetProducer_*_*", ) ) process.outpath = cms.EndPath(process.out) diff --git a/L1Trigger/TrackFindingTracklet/python/L1HybridEmulationTracks_cff.py b/L1Trigger/TrackFindingTracklet/python/L1HybridEmulationTracks_cff.py index e977bd04faa73..fdde59710461f 100644 --- a/L1Trigger/TrackFindingTracklet/python/L1HybridEmulationTracks_cff.py +++ b/L1Trigger/TrackFindingTracklet/python/L1HybridEmulationTracks_cff.py @@ -7,20 +7,20 @@ from SimTracker.TrackTriggerAssociation.TrackTriggerAssociator_cff import * # prompt hybrid emulation -TTTrackAssociatorFromPixelDigis.TTTracks = cms.VInputTag(cms.InputTag("TTTracksFromTrackletEmulation", "Level1TTTracks") ) +TTTrackAssociatorFromPixelDigis.TTTracks = cms.VInputTag(cms.InputTag("l1tTTTracksFromTrackletEmulation", "Level1TTTracks") ) -L1HybridTracks = cms.Sequence(offlineBeamSpot*TTTracksFromTrackletEmulation) -L1HybridTracksWithAssociators = cms.Sequence(offlineBeamSpot*TTTracksFromTrackletEmulation*TrackTriggerAssociatorTracks) +L1THybridTracks = cms.Sequence(offlineBeamSpot*l1tTTTracksFromTrackletEmulation) +L1THybridTracksWithAssociators = cms.Sequence(offlineBeamSpot*l1tTTTracksFromTrackletEmulation*TrackTriggerAssociatorTracks) # extended hybrid emulation TTTrackAssociatorFromPixelDigisExtended = TTTrackAssociatorFromPixelDigis.clone( - TTTracks = cms.VInputTag(cms.InputTag("TTTracksFromExtendedTrackletEmulation", "Level1TTTracks") ) + TTTracks = cms.VInputTag(cms.InputTag("l1tTTTracksFromExtendedTrackletEmulation", "Level1TTTracks") ) ) -L1ExtendedHybridTracks = cms.Sequence(offlineBeamSpot*TTTracksFromExtendedTrackletEmulation) -L1ExtendedHybridTracksWithAssociators = cms.Sequence(offlineBeamSpot*TTTracksFromExtendedTrackletEmulation*TTTrackAssociatorFromPixelDigisExtended) +L1TExtendedHybridTracks = cms.Sequence(offlineBeamSpot*l1tTTTracksFromExtendedTrackletEmulation) +L1TExtendedHybridTracksWithAssociators = cms.Sequence(offlineBeamSpot*l1tTTTracksFromExtendedTrackletEmulation*TTTrackAssociatorFromPixelDigisExtended) # both (prompt + extended) hybrid emulation -L1PromptExtendedHybridTracks = cms.Sequence(offlineBeamSpot*TTTracksFromTrackletEmulation*TTTracksFromExtendedTrackletEmulation) -L1PromptExtendedHybridTracksWithAssociators = cms.Sequence(offlineBeamSpot*TTTracksFromTrackletEmulation*TrackTriggerAssociatorTracks*TTTracksFromExtendedTrackletEmulation*TTTrackAssociatorFromPixelDigisExtended) +L1TPromptExtendedHybridTracks = cms.Sequence(offlineBeamSpot*l1tTTTracksFromTrackletEmulation*l1tTTTracksFromExtendedTrackletEmulation) +L1TPromptExtendedHybridTracksWithAssociators = cms.Sequence(offlineBeamSpot*l1tTTTracksFromTrackletEmulation*TrackTriggerAssociatorTracks*l1tTTTracksFromExtendedTrackletEmulation*TTTrackAssociatorFromPixelDigisExtended) diff --git a/L1Trigger/TrackFindingTracklet/python/Tracklet_cfi.py b/L1Trigger/TrackFindingTracklet/python/Tracklet_cfi.py index d317d03649f10..2745ec30a8f03 100644 --- a/L1Trigger/TrackFindingTracklet/python/Tracklet_cfi.py +++ b/L1Trigger/TrackFindingTracklet/python/Tracklet_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms from L1Trigger.TrackTrigger.TrackQualityParams_cfi import * -TTTracksFromTrackletEmulation = cms.EDProducer("L1FPGATrackProducer", +l1tTTTracksFromTrackletEmulation = cms.EDProducer("L1FPGATrackProducer", TTStubSource = cms.InputTag("TTStubsFromPhase2TrackerDigis","StubAccepted"), InputTagTTDTC = cms.InputTag("TrackerDTCProducer", "StubAccepted"), readMoreMcTruth = cms.bool(True), @@ -22,7 +22,7 @@ TrackQualityPSet = cms.PSet(TrackQualityParams) ) -TTTracksFromExtendedTrackletEmulation = TTTracksFromTrackletEmulation.clone( +l1tTTTracksFromExtendedTrackletEmulation = l1tTTTracksFromTrackletEmulation.clone( Extended = cms.bool(True), Hnpar = cms.uint32(5), # specifying where the TrackletEngineDisplaced(TED)/TripletEngine(TRE) tables are located diff --git a/L1Trigger/TrackFindingTracklet/test/HybridTracks_cfg.py b/L1Trigger/TrackFindingTracklet/test/HybridTracks_cfg.py index 8b5ac9c0841e5..cae42a3e840a8 100644 --- a/L1Trigger/TrackFindingTracklet/test/HybridTracks_cfg.py +++ b/L1Trigger/TrackFindingTracklet/test/HybridTracks_cfg.py @@ -51,16 +51,16 @@ process.load("L1Trigger.TrackFindingTracklet.L1HybridEmulationTracks_cff") # prompt tracking only -process.TTTracksEmulation = cms.Path(process.L1HybridTracks) -process.TTTracksEmulationWithTruth = cms.Path(process.L1HybridTracksWithAssociators) +process.TTTracksEmulation = cms.Path(process.L1THybridTracks) +process.TTTracksEmulationWithTruth = cms.Path(process.L1THybridTracksWithAssociators) # extended tracking only -#process.TTTracksEmulation = cms.Path(process.L1ExtendedHybridTracks) -#process.TTTracksEmulationWithTruth = cms.Path(process.L1ExtendedHybridTracksWithAssociators) +#process.TTTracksEmulation = cms.Path(process.L1TExtendedHybridTracks) +#process.TTTracksEmulationWithTruth = cms.Path(process.L1TExtendedHybridTracksWithAssociators) # both prompt+extended hybrid tracking -#process.TTTracksEmulation = cms.Path(process.L1PromptExtendedHybridTracks) -#process.TTTracksEmulationWithTruth = cms.Path(process.L1PromptExtendedHybridTracksWithAssociators) +#process.TTTracksEmulation = cms.Path(process.L1TPromptExtendedHybridTracks) +#process.TTTracksEmulationWithTruth = cms.Path(process.L1TPromptExtendedHybridTracksWithAssociators) # ---------------------------------------------------------------------------------- # output module diff --git a/L1Trigger/TrackFindingTracklet/test/L1TrackNtupleMaker_cfg.py b/L1Trigger/TrackFindingTracklet/test/L1TrackNtupleMaker_cfg.py index 9b770b4519ec3..17a89466a4c2f 100644 --- a/L1Trigger/TrackFindingTracklet/test/L1TrackNtupleMaker_cfg.py +++ b/L1Trigger/TrackFindingTracklet/test/L1TrackNtupleMaker_cfg.py @@ -127,19 +127,19 @@ # HYBRID: prompt tracking if (L1TRKALGO == 'HYBRID'): - process.TTTracksEmulation = cms.Path(process.L1HybridTracks) - process.TTTracksEmulationWithTruth = cms.Path(process.L1HybridTracksWithAssociators) + process.TTTracksEmulation = cms.Path(process.L1THybridTracks) + process.TTTracksEmulationWithTruth = cms.Path(process.L1THybridTracksWithAssociators) NHELIXPAR = 4 - L1TRK_NAME = "TTTracksFromTrackletEmulation" + L1TRK_NAME = "l1tTTTracksFromTrackletEmulation" L1TRK_LABEL = "Level1TTTracks" L1TRUTH_NAME = "TTTrackAssociatorFromPixelDigis" # HYBRID: extended tracking elif (L1TRKALGO == 'HYBRID_DISPLACED'): - process.TTTracksEmulation = cms.Path(process.L1ExtendedHybridTracks) - process.TTTracksEmulationWithTruth = cms.Path(process.L1ExtendedHybridTracksWithAssociators) + process.TTTracksEmulation = cms.Path(process.L1TExtendedHybridTracks) + process.TTTracksEmulationWithTruth = cms.Path(process.L1TExtendedHybridTracksWithAssociators) NHELIXPAR = 5 - L1TRK_NAME = "TTTracksFromExtendedTrackletEmulation" + L1TRK_NAME = "l1tTTTracksFromExtendedTrackletEmulation" L1TRK_LABEL = "Level1TTTracks" L1TRUTH_NAME = "TTTrackAssociatorFromPixelDigisExtended" @@ -147,10 +147,10 @@ elif (L1TRKALGO == 'TRACKLET'): print "\n WARNING: This is not the baseline algorithm! Prefer HYBRID or HYBRID_DISPLACED!" print "\n To run the Tracklet-only algorithm, ensure you have commented out 'CXXFLAGS=-DUSEHYBRID' in BuildFile.xml & recompiled! \n" - process.TTTracksEmulation = cms.Path(process.L1HybridTracks) - process.TTTracksEmulationWithTruth = cms.Path(process.L1HybridTracksWithAssociators) + process.TTTracksEmulation = cms.Path(process.L1THybridTracks) + process.TTTracksEmulationWithTruth = cms.Path(process.L1THybridTracksWithAssociators) NHELIXPAR = 4 - L1TRK_NAME = "TTTracksFromTrackletEmulation" + L1TRK_NAME = "l1tTTTracksFromTrackletEmulation" L1TRK_LABEL = "Level1TTTracks" L1TRUTH_NAME = "TTTrackAssociatorFromPixelDigis" diff --git a/L1Trigger/VertexFinder/python/InputDataProducer_cff.py b/L1Trigger/VertexFinder/python/InputDataProducer_cff.py index 7710bb04070fc..0474537abae81 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_cfi 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..9c33726a077be 100644 --- a/L1Trigger/VertexFinder/python/TPStubValueMapProducer_cff.py +++ b/L1Trigger/VertexFinder/python/TPStubValueMapProducer_cff.py @@ -1,30 +1,30 @@ 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_cfi 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"), tpInputTag = cms.InputTag("mix", "MergedTrackTruth"), - stubInputTag = cms.InputTag("TTStubsFromPhase2TrackerDigis", "StubAccepted"), - stubTruthInputTag = cms.InputTag("TTStubAssociatorFromPixelDigis", "StubAccepted"), - clusterTruthInputTag = cms.InputTag("TTClusterAssociatorFromPixelDigis", "ClusterAccepted"), + stubInputTag = cms.InputTag("l1tTTStubsFromPhase2TrackerDigis", "StubAccepted"), + stubTruthInputTag = cms.InputTag("l1tTTStubAssociatorFromPixelDigis", "StubAccepted"), + clusterTruthInputTag = cms.InputTag("l1tTTClusterAssociatorFromPixelDigis", "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_cfi.py similarity index 50% rename from L1Trigger/VertexFinder/python/VertexNTupler_cff.py rename to L1Trigger/VertexFinder/python/VertexNTupler_cfi.py index 185fa67d775d4..590e1c38058a9 100644 --- a/L1Trigger/VertexFinder/python/VertexNTupler_cff.py +++ b/L1Trigger/VertexFinder/python/VertexNTupler_cfi.py @@ -1,15 +1,14 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.VertexFinder.VertexProducer_cff import VertexProducer -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( cms.InputTag("l1tTTTracksFromTrackletEmulation", "Level1TTTracks") ), 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", "l1vertices") ), l1VertexTrackInputs = cms.vstring('hybrid'), l1VertexBranchNames = cms.vstring('fastHisto'), emulationVertexInputTags = cms.VInputTag(), @@ -59,9 +58,68 @@ # === Vertex Reconstruction configuration - VertexReconstruction = VertexProducer.VertexReconstruction, + VertexReconstruction = cms.PSet( + # Vertex Reconstruction Algorithm + Algorithm = cms.string("fastHisto"), + # Vertex distance [cm] + VertexDistance = cms.double(.15), + # Assumed Vertex Resolution [cm] + VertexResolution = cms.double(.10), + # Distance Type for agglomerative algorithm (0: MaxDistance, 1: MinDistance, 2: MeanDistance, 3: CentralDistance) + DistanceType = cms.uint32(0), + # Minimum number of tracks to accept vertex + MinTracks = cms.uint32(2), + # Compute the z0 position of the vertex with a mean weighted with track momenta + # 0 = unweighted + # 1 = pT weighted + # 2 = pT^2 weighted + WeightedMean = cms.uint32(1), + # Chi2 cut for the Adaptive Vertex Reconstruction Algorithm + AVR_chi2cut = cms.double(5.), + # Do track quality cuts in emulation algorithms + EM_DoQualityCuts = cms.bool(False), + # Track-stubs Pt compatibility cut + FH_DoPtComp = cms.bool(True), + # chi2dof < 5 for tracks with Pt > 10 + FH_DoTightChi2 = cms.bool(False), + # fastHisto algorithm histogram parameters (min,max,width) [cm] + # TDR settings: [-14.95, 15.0, 0.1] + # L1TkPrimaryVertexProducer: [-30.0, 30.0, 0.09983361065] + # Firmware: [-14.4, 14.4, 0.4] + FH_HistogramParameters = cms.vdouble(-30.0, 30.0, 0.09983361065), + # The number of vertixes to return (i.e. N windows with the highest combined pT) + FH_NVtx = cms.uint32(10), + # fastHisto algorithm assumed vertex half-width [cm] + FH_VertexWidth = cms.double(.15), + # Window size of the sliding window + FH_WindowSize = cms.uint32(3), + # Kmeans number of iterations + KmeansIterations = cms.uint32(10), + # Kmeans number of clusters + KmeansNumClusters = cms.uint32(18), + # DBSCAN pt threshold + DBSCANPtThreshold = cms.double(4.), + # DBSCAN min density tracks + DBSCANMinDensityTracks = cms.uint32(2), + # Minimum pt of tracks used to create vertex [GeV] + VxMinTrackPt = cms.double(2.0), + # Maximum pt of tracks used to create vertex [GeV] + VxMaxTrackPt = cms.double(127.0), + # When the track pt > VxMaxTrackPt, how should the tracks be considered + # -1 = tracks are valid + # 0 = tracks are mismeasured and ignored/truncated + # 1 = tracks are mismeasured and saturate at VxMaxTrackPt + # Option '0' was used for the TDR, but '1' is used for the firmware + VxMaxTrackPtBehavior = cms.int32(1), + # Maximum chi2 of tracks used to create vertex + VxMaxTrackChi2 = cms.double(100.), + # Minimum number of stubs associated to a track + VxMinNStub = cms.uint32(4), + # Minimum number of stubs in PS modules associated to a track + VxMinNStubPS = cms.uint32(3), + ), # Debug printout - debug = VertexProducer.debug, + debug = cms.uint32(0), printResults = cms.bool(False) ) diff --git a/L1Trigger/VertexFinder/python/VertexProducer_cff.py b/L1Trigger/VertexFinder/python/VertexProducer_cfi.py similarity index 95% rename from L1Trigger/VertexFinder/python/VertexProducer_cff.py rename to L1Trigger/VertexFinder/python/VertexProducer_cfi.py index e2aa8641a4148..5e3ea56bdd17e 100644 --- a/L1Trigger/VertexFinder/python/VertexProducer_cff.py +++ b/L1Trigger/VertexFinder/python/VertexProducer_cfi.py @@ -1,8 +1,8 @@ import FWCore.ParameterSet.Config as cms -VertexProducer = cms.EDProducer('VertexProducer', +l1tVertexProducer = cms.EDProducer('VertexProducer', - l1TracksInputTag = cms.InputTag("TTTracksFromTrackletEmulation", "Level1TTTracks"), + l1TracksInputTag = cms.InputTag("l1tTTTracksFromTrackletEmulation", "Level1TTTracks"), l1VertexCollectionName = cms.string("l1vertices"), diff --git a/L1Trigger/VertexFinder/test/vertexFinder_cfg.py b/L1Trigger/VertexFinder/test/vertexFinder_cfg.py index 687f406d7f0bc..5cd22cbf047fa 100644 --- a/L1Trigger/VertexFinder/test/vertexFinder_cfg.py +++ b/L1Trigger/VertexFinder/test/vertexFinder_cfg.py @@ -70,20 +70,20 @@ #--- Load config fragment that configures vertex producer -process.load('L1Trigger.VertexFinder.VertexProducer_cff') -process.VertexProducer.l1TracksInputTag = l1TracksTag +process.load('L1Trigger.VertexFinder.VertexProducer_cfi') +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..bae1ff8b4a8bc 100644 --- a/L1Trigger/VertexFinder/test/vertexNTupler_cfg.py +++ b/L1Trigger/VertexFinder/test/vertexNTupler_cfg.py @@ -12,7 +12,7 @@ options.register('nstart', 0,VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.int, "File index to start on") options.register('nfiles', -1,VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.int, "Number of files to process per job") options.register('storeTracks', False, VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.bool, "Store tracks in NTuple") -options.register('l1Tracks','TTTracksFromTrackletEmulation:Level1TTTracks', VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, 'L1 track collection to use') +options.register('l1Tracks','l1tTTTracksFromTrackletEmulation:Level1TTTracks', VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, 'L1 track collection to use') options.register('runVariations', False, VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.bool, "Run some pre-defined algorithmic variations") options.register('threads', 1,VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.int, "Number of threads to run") options.register('streams', 0,VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.int, "Number of streams to run") @@ -79,8 +79,8 @@ numberOfStreams = cms.untracked.uint32(options.streams if options.streams>0 else 0) ) -process.load('L1Trigger.VertexFinder.VertexProducer_cff') -process.VertexProducer.l1TracksInputTag = l1TracksTag +process.load('L1Trigger.VertexFinder.VertexProducer_cfi') +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) diff --git a/RecoEgamma/EgammaHLTProducers/plugins/EgammaHLTEleL1TrackIsolProducer.cc b/RecoEgamma/EgammaHLTProducers/plugins/EgammaHLTEleL1TrackIsolProducer.cc index 611ea49c506a5..5478aee191264 100644 --- a/RecoEgamma/EgammaHLTProducers/plugins/EgammaHLTEleL1TrackIsolProducer.cc +++ b/RecoEgamma/EgammaHLTProducers/plugins/EgammaHLTEleL1TrackIsolProducer.cc @@ -58,7 +58,7 @@ void EgammaHLTEleL1TrackIsolProducer::fillDescriptions(edm::ConfigurationDescrip edm::ParameterSetDescription desc; desc.add("ecalCands", edm::InputTag("hltEgammaCandidates")); desc.add("eles", edm::InputTag("hltEgammaGsfElectrons")); - desc.add("l1Tracks", edm::InputTag("TTTracksFromTrackletEmulation", "Level1TTTracks")); + desc.add("l1Tracks", edm::InputTag("l1tTTTracksFromTrackletEmulation", "Level1TTTracks")); desc.add("isolCfg", EgammaL1TkIsolation::makePSetDescription()); descriptions.add("hltEgammaHLTEleL1TrackIsolProducer", desc); } diff --git a/RecoEgamma/EgammaHLTProducers/plugins/EgammaHLTPhase2ExtraProducer.cc b/RecoEgamma/EgammaHLTProducers/plugins/EgammaHLTPhase2ExtraProducer.cc index 8775aac93647e..a71fab784883e 100644 --- a/RecoEgamma/EgammaHLTProducers/plugins/EgammaHLTPhase2ExtraProducer.cc +++ b/RecoEgamma/EgammaHLTProducers/plugins/EgammaHLTPhase2ExtraProducer.cc @@ -193,7 +193,7 @@ EgammaHLTPhase2ExtraProducer::EgammaHLTPhase2ExtraProducer(const edm::ParameterS void EgammaHLTPhase2ExtraProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; desc.add("egTrigObjs", edm::InputTag("hltEgammaHLTExtra")); - desc.add("l1Trks", edm::InputTag("TTTracksFromTrackletEmulation", "Level1TTTracks")); + desc.add("l1Trks", edm::InputTag("l1tTTTracksFromTrackletEmulation", "Level1TTTracks")); desc.add("trkParts", edm::InputTag("mix", "MergedTrackTruth")); desc.add("l1TrkToTrkPartMap", edm::InputTag("TTTrackAssociatorFromPixelDigis", "Level1TTTracks")); desc.add("hgcalLayerClusters", edm::InputTag("hgcalLayerClusters")); diff --git a/RecoTracker/TkSeedGenerator/plugins/SeedGeneratorFromL1TTracksEDProducer.cc b/RecoTracker/TkSeedGenerator/plugins/SeedGeneratorFromL1TTracksEDProducer.cc index cc61887fc12e2..e1bf0579b2f2e 100644 --- a/RecoTracker/TkSeedGenerator/plugins/SeedGeneratorFromL1TTracksEDProducer.cc +++ b/RecoTracker/TkSeedGenerator/plugins/SeedGeneratorFromL1TTracksEDProducer.cc @@ -88,7 +88,7 @@ SeedGeneratorFromL1TTracksEDProducer::SeedGeneratorFromL1TTracksEDProducer(const void SeedGeneratorFromL1TTracksEDProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; - desc.add("InputCollection", {"TTTracksFromTrackletEmulation", "Level1TTTracks"}); + desc.add("InputCollection", {"l1tTTTracksFromTrackletEmulation", "Level1TTTracks"}); desc.add("estimator", ""); desc.add("propagator", ""); desc.add("MeasurementTrackerEvent", {""}); diff --git a/Validation/HGCalValidation/python/hgcalRunEmulatorValidationTPG_cff.py b/Validation/HGCalValidation/python/hgcalRunEmulatorValidationTPG_cff.py index a60516ee0c951..62c53e67fb472 100644 --- a/Validation/HGCalValidation/python/hgcalRunEmulatorValidationTPG_cff.py +++ b/Validation/HGCalValidation/python/hgcalRunEmulatorValidationTPG_cff.py @@ -21,4 +21,4 @@ tag = cms.untracked.string('validation_HGCAL_TPG') ) -hgcalTPGRunEmulatorValidation = cms.Sequence(hgcalTriggerPrimitives*hgcalTrigPrimValidation*onlineSaver) +hgcalTPGRunEmulatorValidation = cms.Sequence(L1THGCalTriggerPrimitives*L1THGCalTrigPrimValidation*onlineSaver) diff --git a/Validation/HGCalValidation/python/hgcalValidationTPG_cfi.py b/Validation/HGCalValidation/python/hgcalValidationTPG_cfi.py index 2759e6290a6d6..6b4801f9b0ecd 100644 --- a/Validation/HGCalValidation/python/hgcalValidationTPG_cfi.py +++ b/Validation/HGCalValidation/python/hgcalValidationTPG_cfi.py @@ -4,10 +4,10 @@ hgcalTrigPrimValidation = DQMEDAnalyzer( "HGCalTriggerValidator", - TriggerCells = cms.InputTag('hgcalConcentratorProducer:HGCalConcentratorProcessorSelection'), - Clusters = cms.InputTag('hgcalBackEndLayer1Producer:HGCalBackendLayer1Processor2DClustering'), - Multiclusters = cms.InputTag('hgcalBackEndLayer2Producer:HGCalBackendLayer2Processor3DClustering'), - Towers = cms.InputTag('hgcalTowerProducer:HGCalTowerProcessor'), + TriggerCells = cms.InputTag('l1tHGCalConcentratorProducer:HGCalConcentratorProcessorSelection'), + Clusters = cms.InputTag('l1tHGCalBackEndLayer1Producer:HGCalBackendLayer1Processor2DClustering'), + Multiclusters = cms.InputTag('l1tHGCalBackEndLayer2Producer:HGCalBackendLayer2Processor3DClustering'), + Towers = cms.InputTag('l1tHGCalTowerProducer:HGCalTowerProcessor'), EGIdentification = egamma_identification_drnn_cone.clone() ) From 443ad71bb999f7e2ca7032dda89b4adc66fcacdd Mon Sep 17 00:00:00 2001 From: ccaillol Date: Tue, 6 Sep 2022 20:06:12 +0200 Subject: [PATCH 2/4] fix renaming in SimL1EmulatorDM (cherry picked from commit 01d1d01ad9bdb1a02e85f4ec46861f6d5d4fe5ca) --- .../StandardSequences/python/SimL1EmulatorDM_cff.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Configuration/StandardSequences/python/SimL1EmulatorDM_cff.py b/Configuration/StandardSequences/python/SimL1EmulatorDM_cff.py index 34da91d6b3cde..bf457e5d63689 100644 --- a/Configuration/StandardSequences/python/SimL1EmulatorDM_cff.py +++ b/Configuration/StandardSequences/python/SimL1EmulatorDM_cff.py @@ -15,9 +15,9 @@ # simHcalTechTrigDigis.ttpDigiCollection = "DMHcalTTPDigis" # -hgcalVFEProducer.eeDigis = "mixData:HGCDigisEE" -hgcalVFEProducer.fhDigis = "mixData:HGCDigisHEfront" -hgcalVFEProducer.bhDigis = "mixData:HGCDigisHEback" +l1tHGCalVFEProducer.eeDigis = "mixData:HGCDigisEE" +l1tHGCalVFEProducer.fhDigis = "mixData:HGCDigisHEfront" +l1tHGCalVFEProducer.bhDigis = "mixData:HGCDigisHEback" from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger # Legacy and Stage-1 Trigger From 33b765a408e22407cf7aab943515a06fee97d0ec Mon Sep 17 00:00:00 2001 From: ccaillol Date: Wed, 7 Sep 2022 09:56:11 +0200 Subject: [PATCH 3/4] minor fixes to l1t renaming (cherry picked from commit 65f532cd8eaeb41191ca5c8df725cb85a05b3feb) --- .../python/caloTruthCellsNtuples_cff.py | 8 ++++---- L1Trigger/L1THGCalUtilities/python/customNtuples.py | 10 +++++----- .../python/hgcalTriggerNtuples_cfi.py | 2 +- L1Trigger/L1TTrackMatch/python/L1TkMETAnalyser_cfi.py | 6 ++---- L1Trigger/Phase2L1GMT/test/runGMT.py | 2 +- L1Trigger/VertexFinder/python/InputDataProducer_cff.py | 2 +- .../VertexFinder/python/TPStubValueMapProducer_cff.py | 2 +- L1Trigger/VertexFinder/test/vertexNTupler_cfg.py | 2 +- 8 files changed, 16 insertions(+), 18 deletions(-) diff --git a/L1Trigger/L1THGCalUtilities/python/caloTruthCellsNtuples_cff.py b/L1Trigger/L1THGCalUtilities/python/caloTruthCellsNtuples_cff.py index d1a6a6d2c566a..3bfc787840aae 100644 --- 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 index 06dff08f23b1d..1889b0ee12da7 100644 --- 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 index 33ca8153d84e4..efd3a8dabe3d0 100644 --- 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 index 7c9dce5c9b43a..5c36564b50c06 100644 --- 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 index e47bdd1610416..4a870ad535b43 100644 --- 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 index 0474537abae81..63f589ec2751e 100644 --- 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 index 9c33726a077be..495c5b3fa6f1d 100644 --- 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 index bae1ff8b4a8bc..ec2de4cce74eb 100644 --- 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: From 6f2b07178515117db66685160a3409bed3def71b Mon Sep 17 00:00:00 2001 From: ccaillol Date: Mon, 12 Sep 2022 14:56:14 +0200 Subject: [PATCH 4/4] rename cfis (cherry picked from commit 780186283da778a7dba73a3955c56a7ee4aeedd4) --- .../Configuration/python/SimL1Emulator_cff.py | 28 ++++++++--------- .../test/gtt/createFirmwareInputFiles_cfg.py | 2 +- .../L1CaloTrigger/python/L1CaloJets_cff.py | 8 ++--- .../python/Phase1L1TJets_9x9_cff.py | 6 ++-- .../python/Phase1L1TJets_9x9trimmed_cff.py | 8 ++--- .../L1CaloTrigger/python/Phase1L1TJets_cff.py | 6 ++-- .../python/l1EgammaStaProducers_cff.py | 2 +- ...er_cfi.py => l1tCaloJetHTTProducer_cfi.py} | 0 ...ducer_cfi.py => l1tCaloJetProducer_cfi.py} | 0 ... l1tEGammaCrystalsEmulatorProducer_cfi.py} | 0 ..._cfi.py => l1tPhase1JetCalibrator9_cfi.py} | 0 ... l1tPhase1JetCalibrator_9x9trimmed_cfi.py} | 2 +- ...r_cfi.py => l1tPhase1JetCalibrator_cfi.py} | 0 ...cer_cfi.py => l1tPhase1JetProducer_cfi.py} | 0 ...cfi.py => l1tPhase1JetSumsProducer_cfi.py} | 0 ....py => l1tTowerCalibrationProducer_cfi.py} | 0 .../test_L1EGCrystalClusterEmulator_cfg.py | 2 +- L1Trigger/L1THGCal/python/customClustering.py | 4 +-- .../L1THGCal/python/customHistoSeeding.py | 2 +- .../L1THGCal/python/customNewProcessors.py | 6 ++-- .../python/customTriggerCellSelect.py | 2 +- L1Trigger/L1THGCal/python/customVFE.py | 2 +- .../L1THGCal/python/hgcalBackEndLayer1_cff.py | 4 +-- .../L1THGCal/python/hgcalBackEndLayer2_cff.py | 4 +-- .../L1THGCal/python/hgcalConcentrator_cff.py | 4 +-- .../L1THGCal/python/hgcalTowerMap_cff.py | 4 +-- L1Trigger/L1THGCal/python/hgcalTower_cff.py | 4 +-- .../python/hgcalTriggerPrimitivesNew_cff.py | 2 +- .../python/hgcalTriggerPrimitives_cff.py | 2 +- L1Trigger/L1THGCal/python/hgcalVFE_cff.py | 4 +-- ...y => l1tHGCalBackEndLayer1Producer_cfi.py} | 0 ...y => l1tHGCalBackEndLayer2Producer_cfi.py} | 0 ...py => l1tHGCalConcentratorProducer_cfi.py} | 2 +- ...cfi.py => l1tHGCalTowerMapProducer_cfi.py} | 0 ...er_cfi.py => l1tHGCalTowerProducer_cfi.py} | 2 +- ... l1tHGCalTriggerGeometryESProducer_cfi.py} | 0 ...ucer_cfi.py => l1tHGCalVFEProducer_cfi.py} | 2 +- .../python/caloTruthCellsProducer_cfi.py | 2 +- .../python/caloTruthCells_cff.py | 10 +++---- .../L1THGCalUtilities/python/clustering2d.py | 2 +- .../python/clustering2d_v2.py | 2 +- .../L1THGCalUtilities/python/clustering3d.py | 2 +- .../L1THGCalUtilities/python/concentrator.py | 2 +- L1Trigger/L1THGCalUtilities/python/vfe.py | 2 +- .../python/L1TkObjectProducers_cff.py | 12 ++++---- ...i.py => l1tFastTrackingJetProducer_cfi.py} | 0 ...ucer_cfi.py => l1tGTTInputProducer_cfi.py} | 0 ...roducer_cfi.py => l1tTrackFastJets_cfi.py} | 0 ...er_cfi.py => l1tTrackJetsEmulation_cfi.py} | 0 ...JetProducer_cfi.py => l1tTrackJets_cfi.py} | 0 ...fi.py => l1tTrackSelectionProducer_cfi.py} | 0 ...ucer_cfi.py => l1tTrackerEmuEtMiss_cfi.py} | 2 +- ...ucer_cfi.py => l1tTrackerEmuHTMiss_cfi.py} | 0 ...roducer_cfi.py => l1tTrackerEtMiss_cfi.py} | 0 ...roducer_cfi.py => l1tTrackerHTMiss_cfi.py} | 0 .../L1TTrackMatch/test/L1TrackMET_cfg.py | 8 ++--- .../test/L1TrackObjectNtupleMaker_cfg.py | 20 ++++++------- .../python/l1ctLayer1_cff.py | 6 ++-- .../python/l1pfJetMet_cff.py | 6 ++-- ..._cfi.py => l1tDeregionizerProducer_cfi.py} | 0 ...roducer_cfi.py => l1tMETPFProducer_cfi.py} | 0 ...roducer_cfi.py => l1tMHTPFProducer_cfi.py} | 0 ...y => l1tPFClustersFromCombinedCalo_cfi.py} | 0 ...> l1tPFClustersFromHGC3DClustersEM_cfi.py} | 8 ++--- ... => l1tPFClustersFromHGC3DClusters_cfi.py} | 0 ...y => l1tPFClustersFromL1EGClusters_cfi.py} | 0 ..._cfi.py => l1tPFTracksFromL1Tracks_cfi.py} | 0 ...cfi.py => l1tSeedConePFJetProducer_cfi.py} | 0 .../python/pfClustersFromCombinedCalo_cff.py | 2 +- .../test/make_l1ctLayer1_dumpFiles_cfg.py | 4 +-- .../Phase2L1Taus/python/l1emulator_cff.py | 6 ++-- .../python/L1HybridEmulationTracks_cff.py | 2 +- ...> l1tTTTracksFromTrackletEmulation_cfi.py} | 0 ...cer_cff.py => l1tInputDataProducer_cfi.py} | 8 ++--- ...ff.py => l1tTPStubValueMapProducer_cfi.py} | 6 ++-- ...NTupler_cfi.py => l1tVertexNTupler_cfi.py} | 6 ++-- ...oducer_cfi.py => l1tVertexProducer_cfi.py} | 0 .../VertexFinder/test/vertexFinder_cfg.py | 2 +- .../VertexFinder/test/vertexNTupler_cfg.py | 30 +++++++++---------- .../hgcalRunEmulatorValidationTPG_cff.py | 14 ++++----- .../python/hgcalValidationTPG_cff.py | 2 +- 81 files changed, 140 insertions(+), 140 deletions(-) rename L1Trigger/L1CaloTrigger/python/{L1CaloJetHTTProducer_cfi.py => l1tCaloJetHTTProducer_cfi.py} (100%) rename L1Trigger/L1CaloTrigger/python/{L1CaloJetProducer_cfi.py => l1tCaloJetProducer_cfi.py} (100%) rename L1Trigger/L1CaloTrigger/python/{L1EGammaCrystalsEmulatorProducer_cfi.py => l1tEGammaCrystalsEmulatorProducer_cfi.py} (100%) rename L1Trigger/L1CaloTrigger/python/{Phase1L1TJetCalibrator_9x9Jets_cfi.py => l1tPhase1JetCalibrator9_cfi.py} (100%) rename L1Trigger/L1CaloTrigger/python/{Phase1L1TJetCalibrator_9x9trimmedJets_cfi.py => l1tPhase1JetCalibrator_9x9trimmed_cfi.py} (99%) rename L1Trigger/L1CaloTrigger/python/{Phase1L1TJetCalibrator_cfi.py => l1tPhase1JetCalibrator_cfi.py} (100%) rename L1Trigger/L1CaloTrigger/python/{Phase1L1TJetProducer_cfi.py => l1tPhase1JetProducer_cfi.py} (100%) rename L1Trigger/L1CaloTrigger/python/{Phase1L1TJetSumsProducer_cfi.py => l1tPhase1JetSumsProducer_cfi.py} (100%) rename L1Trigger/L1CaloTrigger/python/{L1TowerCalibrationProducer_cfi.py => l1tTowerCalibrationProducer_cfi.py} (100%) rename L1Trigger/L1THGCal/python/{hgcalBackEndLayer1Producer_cfi.py => l1tHGCalBackEndLayer1Producer_cfi.py} (100%) rename L1Trigger/L1THGCal/python/{hgcalBackEndLayer2Producer_cfi.py => l1tHGCalBackEndLayer2Producer_cfi.py} (100%) rename L1Trigger/L1THGCal/python/{hgcalConcentratorProducer_cfi.py => l1tHGCalConcentratorProducer_cfi.py} (99%) rename L1Trigger/L1THGCal/python/{hgcalTowerMapProducer_cfi.py => l1tHGCalTowerMapProducer_cfi.py} (100%) rename L1Trigger/L1THGCal/python/{hgcalTowerProducer_cfi.py => l1tHGCalTowerProducer_cfi.py} (92%) rename L1Trigger/L1THGCal/python/{hgcalTriggerGeometryESProducer_cfi.py => l1tHGCalTriggerGeometryESProducer_cfi.py} (100%) rename L1Trigger/L1THGCal/python/{hgcalVFEProducer_cfi.py => l1tHGCalVFEProducer_cfi.py} (98%) rename L1Trigger/L1TTrackMatch/python/{L1FastTrackingJetProducer_cfi.py => l1tFastTrackingJetProducer_cfi.py} (100%) rename L1Trigger/L1TTrackMatch/python/{L1GTTInputProducer_cfi.py => l1tGTTInputProducer_cfi.py} (100%) rename L1Trigger/L1TTrackMatch/python/{L1TrackFastJetProducer_cfi.py => l1tTrackFastJets_cfi.py} (100%) rename L1Trigger/L1TTrackMatch/python/{L1TrackJetEmulationProducer_cfi.py => l1tTrackJetsEmulation_cfi.py} (100%) rename L1Trigger/L1TTrackMatch/python/{L1TrackJetProducer_cfi.py => l1tTrackJets_cfi.py} (100%) rename L1Trigger/L1TTrackMatch/python/{L1TrackSelectionProducer_cfi.py => l1tTrackSelectionProducer_cfi.py} (100%) rename L1Trigger/L1TTrackMatch/python/{L1TrackerEtMissEmulatorProducer_cfi.py => l1tTrackerEmuEtMiss_cfi.py} (89%) rename L1Trigger/L1TTrackMatch/python/{L1TkHTMissEmulatorProducer_cfi.py => l1tTrackerEmuHTMiss_cfi.py} (100%) rename L1Trigger/L1TTrackMatch/python/{L1TrackerEtMissProducer_cfi.py => l1tTrackerEtMiss_cfi.py} (100%) rename L1Trigger/L1TTrackMatch/python/{L1TkHTMissProducer_cfi.py => l1tTrackerHTMiss_cfi.py} (100%) rename L1Trigger/Phase2L1ParticleFlow/python/{DeregionizerProducer_cfi.py => l1tDeregionizerProducer_cfi.py} (100%) rename L1Trigger/Phase2L1ParticleFlow/python/{L1MetPfProducer_cfi.py => l1tMETPFProducer_cfi.py} (100%) rename L1Trigger/Phase2L1ParticleFlow/python/{L1MhtPfProducer_cfi.py => l1tMHTPFProducer_cfi.py} (100%) rename L1Trigger/Phase2L1ParticleFlow/python/{pfClustersFromCombinedCalo_cfi.py => l1tPFClustersFromCombinedCalo_cfi.py} (100%) rename L1Trigger/Phase2L1ParticleFlow/python/{pfClustersFromHGC3DClustersEM_cfi.py => l1tPFClustersFromHGC3DClustersEM_cfi.py} (82%) rename L1Trigger/Phase2L1ParticleFlow/python/{pfClustersFromHGC3DClusters_cfi.py => l1tPFClustersFromHGC3DClusters_cfi.py} (100%) rename L1Trigger/Phase2L1ParticleFlow/python/{pfClustersFromL1EGClusters_cfi.py => l1tPFClustersFromL1EGClusters_cfi.py} (100%) rename L1Trigger/Phase2L1ParticleFlow/python/{pfTracksFromL1Tracks_cfi.py => l1tPFTracksFromL1Tracks_cfi.py} (100%) rename L1Trigger/Phase2L1ParticleFlow/python/{L1SeedConePFJetProducer_cfi.py => l1tSeedConePFJetProducer_cfi.py} (100%) rename L1Trigger/TrackFindingTracklet/python/{Tracklet_cfi.py => l1tTTTracksFromTrackletEmulation_cfi.py} (100%) rename L1Trigger/VertexFinder/python/{InputDataProducer_cff.py => l1tInputDataProducer_cfi.py} (78%) rename L1Trigger/VertexFinder/python/{TPStubValueMapProducer_cff.py => l1tTPStubValueMapProducer_cfi.py} (84%) rename L1Trigger/VertexFinder/python/{VertexNTupler_cfi.py => l1tVertexNTupler_cfi.py} (96%) rename L1Trigger/VertexFinder/python/{VertexProducer_cfi.py => l1tVertexProducer_cfi.py} (100%) diff --git a/L1Trigger/Configuration/python/SimL1Emulator_cff.py b/L1Trigger/Configuration/python/SimL1Emulator_cff.py index dc501e8ee3c99..e2474fe8a7304 100644 --- a/L1Trigger/Configuration/python/SimL1Emulator_cff.py +++ b/L1Trigger/Configuration/python/SimL1Emulator_cff.py @@ -89,25 +89,25 @@ # Barrel and EndCap EGamma # ######################################################################## -from L1Trigger.L1CaloTrigger.L1EGammaCrystalsEmulatorProducer_cfi import * +from L1Trigger.L1CaloTrigger.l1tEGammaCrystalsEmulatorProducer_cfi import * _phase2_siml1emulator.add(l1tEGammaClusterEmuProducer) # Barrel and EndCap CaloJet/HT # ######################################################################## # ---- Produce the calibrated tower collection combining Barrel, HGCal, HF -from L1Trigger.L1CaloTrigger.L1TowerCalibrationProducer_cfi import * +from L1Trigger.L1CaloTrigger.l1tTowerCalibrationProducer_cfi import * l1tTowerCalibration = l1tTowerCalibrationProducer.clone( L1HgcalTowersInputTag = ("l1tHGCalTowerProducer","HGCalTowerProcessor",""), l1CaloTowers = ("l1tEGammaClusterEmuProducer","L1CaloTowerCollection","") ) # ---- Produce the L1CaloJets -from L1Trigger.L1CaloTrigger.L1CaloJetProducer_cfi import * +from L1Trigger.L1CaloTrigger.l1tCaloJetProducer_cfi import * l1tCaloJet = l1tCaloJetProducer.clone ( l1CaloTowers = ("l1tTowerCalibration","L1CaloTowerCalibratedCollection",""), L1CrystalClustersInputTag = ("l1tEGammaClusterEmuProducer", "","") ) # ---- Produce the CaloJet HTT Sums -from L1Trigger.L1CaloTrigger.L1CaloJetHTTProducer_cfi import * +from L1Trigger.L1CaloTrigger.l1tCaloJetHTTProducer_cfi import * l1tCaloJetHTT = l1tCaloJetHTTProducer.clone( BXVCaloJetsInputTag = ("L1CaloJet", "CaloJets") ) @@ -120,8 +120,8 @@ # ######################################################################## # Phase-2 L1T - TrackTrigger dependent modules # ######################################################################## -from L1Trigger.L1TTrackMatch.L1GTTInputProducer_cfi import * -from L1Trigger.VertexFinder.VertexProducer_cfi import * +from L1Trigger.L1TTrackMatch.l1tGTTInputProducer_cfi import * +from L1Trigger.VertexFinder.l1tVertexProducer_cfi import * l1tVertexFinder = l1tVertexProducer.clone() l1tVertexFinderEmulator = l1tVertexProducer.clone() l1tVertexFinderEmulator.VertexReconstruction.Algorithm = "fastHistoEmulation" @@ -145,10 +145,10 @@ # Tracker Objects # ######################################################################## -from L1Trigger.L1TTrackMatch.L1TrackJetProducer_cfi import * -from L1Trigger.L1TTrackMatch.L1TrackFastJetProducer_cfi import * -from L1Trigger.L1TTrackMatch.L1TrackerEtMissProducer_cfi import * -from L1Trigger.L1TTrackMatch.L1TkHTMissProducer_cfi import * +from L1Trigger.L1TTrackMatch.l1tTrackJets_cfi import * +from L1Trigger.L1TTrackMatch.l1tTrackFastJets_cfi import * +from L1Trigger.L1TTrackMatch.l1tTrackerEtMiss_cfi import * +from L1Trigger.L1TTrackMatch.l1tTrackerHTMiss_cfi import * # make the input tags consistent with the choice L1VertexFinder above l1tTrackJets.L1PVertexCollection = ("L1VertexFinder", "l1vertices") l1tTrackJetsExtended.L1PVertexCollection = ("L1VertexFinder", "l1vertices") @@ -162,15 +162,15 @@ _phase2_siml1emulator.add(l1tTrackerHTMiss) #Emulated tracker objects -from L1Trigger.L1TTrackMatch.L1TrackJetEmulationProducer_cfi import * +from L1Trigger.L1TTrackMatch.l1tTrackJetsEmulation_cfi import * _phase2_siml1emulator.add(l1tTrackJetsEmulation) _phase2_siml1emulator.add(l1tTrackJetsExtendedEmulation) -from L1Trigger.L1TTrackMatch.L1TrackerEtMissEmulatorProducer_cfi import * +from L1Trigger.L1TTrackMatch.l1tTrackerEmuEtMiss_cfi import * l1tTrackerEmuEtMiss.L1VertexInputTag = ("L1VertexFinderEmulator","l1verticesEmulation") _phase2_siml1emulator.add(l1tTrackerEmuEtMiss) -from L1Trigger.L1TTrackMatch.L1TkHTMissEmulatorProducer_cfi import * +from L1Trigger.L1TTrackMatch.l1tTrackerEmuHTMiss_cfi import * _phase2_siml1emulator.add(l1tTrackerEmuHTMiss) _phase2_siml1emulator.add(l1tTrackerEmuHTMissExtended) @@ -204,7 +204,7 @@ from L1Trigger.Phase2L1ParticleFlow.l1pfJetMet_cff import * _phase2_siml1emulator.add(L1TPFJetsTask) -from L1Trigger.Phase2L1ParticleFlow.L1MetPfProducer_cfi import * +from L1Trigger.Phase2L1ParticleFlow.l1tMETPFProducer_cfi import * _phase2_siml1emulator.add(l1tMETPFProducer) diff --git a/L1Trigger/DemonstratorTools/test/gtt/createFirmwareInputFiles_cfg.py b/L1Trigger/DemonstratorTools/test/gtt/createFirmwareInputFiles_cfg.py index 664c9d5ebc410..ca1169a0e213c 100644 --- a/L1Trigger/DemonstratorTools/test/gtt/createFirmwareInputFiles_cfg.py +++ b/L1Trigger/DemonstratorTools/test/gtt/createFirmwareInputFiles_cfg.py @@ -60,7 +60,7 @@ ) process.load("L1Trigger.TrackFindingTracklet.L1HybridEmulationTracks_cff") -process.load('L1Trigger.L1TTrackMatch.L1GTTInputProducer_cfi') +process.load('L1Trigger.L1TTrackMatch.l1tGTTInputProducer_cfi') process.load('L1Trigger.VertexFinder.VertexProducer_cff') process.load('L1Trigger.DemonstratorTools.GTTFileWriter_cff') diff --git a/L1Trigger/L1CaloTrigger/python/L1CaloJets_cff.py b/L1Trigger/L1CaloTrigger/python/L1CaloJets_cff.py index d0647b0a36188..bfd0802564924 100644 --- a/L1Trigger/L1CaloTrigger/python/L1CaloJets_cff.py +++ b/L1Trigger/L1CaloTrigger/python/L1CaloJets_cff.py @@ -8,7 +8,7 @@ # # ---- Produce the L1EGCrystal clusters using Emulator -from L1Trigger.L1CaloTrigger.L1EGammaCrystalsEmulatorProducer_cfi import * +from L1Trigger.L1CaloTrigger.l1tEGammaCrystalsEmulatorProducer_cfi import * l1tEGammaClusterEmuProducer.ecalTPEB = cms.InputTag("simEcalEBTriggerPrimitiveDigis","","") @@ -16,7 +16,7 @@ # # ---- Produce the calibrated tower collection combining Barrel, HGCal, HF -from L1Trigger.L1CaloTrigger.L1TowerCalibrationProducer_cfi import * +from L1Trigger.L1CaloTrigger.l1tTowerCalibrationProducer_cfi import * l1tTowerCalibrationProducer.L1HgcalTowersInputTag = cms.InputTag("l1tHGCalTowerProducer","HGCalTowerProcessor","") l1tTowerCalibrationProducer.l1CaloTowers = cms.InputTag("l1tEGammaClusterEmuProducer","L1CaloTowerCollection","") @@ -26,7 +26,7 @@ # # ---- Produce the L1CaloJets -from L1Trigger.L1CaloTrigger.L1CaloJetProducer_cfi import * +from L1Trigger.L1CaloTrigger.l1tCaloJetProducer_cfi import * l1tCaloJetProducer.l1CaloTowers = cms.InputTag("l1tTowerCalibrationProducer","L1CaloTowerCalibratedCollection","") l1tCaloJetProducer.L1CrystalClustersInputTag = cms.InputTag("l1tEGammaClusterEmuProducer", "L1EGXtalClusterEmulator","") @@ -36,7 +36,7 @@ # # ---- Produce the CaloJet HTT Sums -from L1Trigger.L1CaloTrigger.L1CaloJetHTTProducer_cfi import * +from L1Trigger.L1CaloTrigger.l1tCaloJetHTTProducer_cfi import * diff --git a/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_9x9_cff.py b/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_9x9_cff.py index e09084fd75b17..b63d3217f6262 100644 --- a/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_9x9_cff.py +++ b/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_9x9_cff.py @@ -1,8 +1,8 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.L1CaloTrigger.Phase1L1TJetProducer_cfi import l1tPhase1JetProducer -from L1Trigger.L1CaloTrigger.Phase1L1TJetCalibrator_9x9Jets_cfi import l1tPhase1JetCalibrator9 -from L1Trigger.L1CaloTrigger.Phase1L1TJetSumsProducer_cfi import l1tPhase1JetSumsProducer +from L1Trigger.L1CaloTrigger.l1tPhase1JetProducer_cfi import l1tPhase1JetProducer +from L1Trigger.L1CaloTrigger.l1tPhase1JetCalibrator9_cfi import l1tPhase1JetCalibrator9 +from L1Trigger.L1CaloTrigger.l1tPhase1JetSumsProducer_cfi import l1tPhase1JetSumsProducer l1tPhase1JetProducer9x9 = l1tPhase1JetProducer.clone( jetIEtaSize = 9, diff --git a/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_9x9trimmed_cff.py b/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_9x9trimmed_cff.py index 91bf65b1996de..da7fc33991b51 100644 --- a/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_9x9trimmed_cff.py +++ b/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_9x9trimmed_cff.py @@ -1,8 +1,8 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.L1CaloTrigger.Phase1L1TJetProducer_cfi import l1tPhase1JetProducer -from L1Trigger.L1CaloTrigger.Phase1L1TJetCalibrator_9x9trimmedJets_cfi import l1tPhase1JetCalibrator -from L1Trigger.L1CaloTrigger.Phase1L1TJetSumsProducer_cfi import l1tPhase1JetSumsProducer +from L1Trigger.L1CaloTrigger.l1tPhase1JetProducer_cfi import l1tPhase1JetProducer +from L1Trigger.L1CaloTrigger.l1tPhase1JetCalibrator_9x9trimmed_cfi import l1tPhase1JetCalibrator_9x9trimmed +from L1Trigger.L1CaloTrigger.l1tPhase1JetSumsProducer_cfi import l1tPhase1JetSumsProducer l1tPhase1JetProducer9x9trimmed = l1tPhase1JetProducer.clone( jetIEtaSize = 9, @@ -11,7 +11,7 @@ outputCollectionName = "UncalibratedPhase1L1TJetFromPfCandidates" ) -l1tPhase1JetCalibrator9x9trimmed = l1tPhase1JetCalibrator.clone( +l1tPhase1JetCalibrator9x9trimmed = l1tPhase1JetCalibrator_9x9trimmed.clone( inputCollectionTag = ("l1tPhase1JetProducer9x9trimmed", "UncalibratedPhase1L1TJetFromPfCandidates", ""), outputCollectionName = "Phase1L1TJetFromPfCandidates" ) diff --git a/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_cff.py b/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_cff.py index 45f93a48601e8..220b3a7541bad 100644 --- a/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_cff.py +++ b/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_cff.py @@ -1,8 +1,8 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.L1CaloTrigger.Phase1L1TJetProducer_cfi import l1tPhase1JetProducer -from L1Trigger.L1CaloTrigger.Phase1L1TJetCalibrator_cfi import l1tPhase1JetCalibrator -from L1Trigger.L1CaloTrigger.Phase1L1TJetSumsProducer_cfi import l1tPhase1JetSumsProducer +from L1Trigger.L1CaloTrigger.l1tPhase1JetProducer_cfi import l1tPhase1JetProducer +from L1Trigger.L1CaloTrigger.l1tPhase1JetCalibrator_cfi import l1tPhase1JetCalibrator +from L1Trigger.L1CaloTrigger.l1tPhase1JetSumsProducer_cfi import l1tPhase1JetSumsProducer L1TPhase1JetsSequence = cms.Sequence( l1tPhase1JetProducer + diff --git a/L1Trigger/L1CaloTrigger/python/l1EgammaStaProducers_cff.py b/L1Trigger/L1CaloTrigger/python/l1EgammaStaProducers_cff.py index 9da1269b8242a..c6c3a5f539280 100644 --- a/L1Trigger/L1CaloTrigger/python/l1EgammaStaProducers_cff.py +++ b/L1Trigger/L1CaloTrigger/python/l1EgammaStaProducers_cff.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.L1CaloTrigger.L1EGammaCrystalsEmulatorProducer_cfi import * +from L1Trigger.L1CaloTrigger.l1tEGammaCrystalsEmulatorProducer_cfi import * L1TEgammaStaProducers = cms.Sequence(l1tEGammaClusterEmuProducer) diff --git a/L1Trigger/L1CaloTrigger/python/L1CaloJetHTTProducer_cfi.py b/L1Trigger/L1CaloTrigger/python/l1tCaloJetHTTProducer_cfi.py similarity index 100% rename from L1Trigger/L1CaloTrigger/python/L1CaloJetHTTProducer_cfi.py rename to L1Trigger/L1CaloTrigger/python/l1tCaloJetHTTProducer_cfi.py diff --git a/L1Trigger/L1CaloTrigger/python/L1CaloJetProducer_cfi.py b/L1Trigger/L1CaloTrigger/python/l1tCaloJetProducer_cfi.py similarity index 100% rename from L1Trigger/L1CaloTrigger/python/L1CaloJetProducer_cfi.py rename to L1Trigger/L1CaloTrigger/python/l1tCaloJetProducer_cfi.py diff --git a/L1Trigger/L1CaloTrigger/python/L1EGammaCrystalsEmulatorProducer_cfi.py b/L1Trigger/L1CaloTrigger/python/l1tEGammaCrystalsEmulatorProducer_cfi.py similarity index 100% rename from L1Trigger/L1CaloTrigger/python/L1EGammaCrystalsEmulatorProducer_cfi.py rename to L1Trigger/L1CaloTrigger/python/l1tEGammaCrystalsEmulatorProducer_cfi.py diff --git a/L1Trigger/L1CaloTrigger/python/Phase1L1TJetCalibrator_9x9Jets_cfi.py b/L1Trigger/L1CaloTrigger/python/l1tPhase1JetCalibrator9_cfi.py similarity index 100% rename from L1Trigger/L1CaloTrigger/python/Phase1L1TJetCalibrator_9x9Jets_cfi.py rename to L1Trigger/L1CaloTrigger/python/l1tPhase1JetCalibrator9_cfi.py diff --git a/L1Trigger/L1CaloTrigger/python/Phase1L1TJetCalibrator_9x9trimmedJets_cfi.py b/L1Trigger/L1CaloTrigger/python/l1tPhase1JetCalibrator_9x9trimmed_cfi.py similarity index 99% rename from L1Trigger/L1CaloTrigger/python/Phase1L1TJetCalibrator_9x9trimmedJets_cfi.py rename to L1Trigger/L1CaloTrigger/python/l1tPhase1JetCalibrator_9x9trimmed_cfi.py index 921b79f7480ef..080df51103a53 100644 --- a/L1Trigger/L1CaloTrigger/python/Phase1L1TJetCalibrator_9x9trimmedJets_cfi.py +++ b/L1Trigger/L1CaloTrigger/python/l1tPhase1JetCalibrator_9x9trimmed_cfi.py @@ -182,7 +182,7 @@ ) ) -l1tPhase1JetCalibrator = cms.EDProducer('Phase1L1TJetCalibrator', +l1tPhase1JetCalibrator_9x9trimmed = cms.EDProducer('Phase1L1TJetCalibrator', inputCollectionTag = cms.InputTag("l1tPhase1JetProducer", "UncalibratedPhase1L1TJetFromPfCandidates", ""), absEtaBinning = cms.vdouble([p.etaMin.value() for p in calibration] + [calibration[-1].etaMax.value()]), calibration = calibration, diff --git a/L1Trigger/L1CaloTrigger/python/Phase1L1TJetCalibrator_cfi.py b/L1Trigger/L1CaloTrigger/python/l1tPhase1JetCalibrator_cfi.py similarity index 100% rename from L1Trigger/L1CaloTrigger/python/Phase1L1TJetCalibrator_cfi.py rename to L1Trigger/L1CaloTrigger/python/l1tPhase1JetCalibrator_cfi.py diff --git a/L1Trigger/L1CaloTrigger/python/Phase1L1TJetProducer_cfi.py b/L1Trigger/L1CaloTrigger/python/l1tPhase1JetProducer_cfi.py similarity index 100% rename from L1Trigger/L1CaloTrigger/python/Phase1L1TJetProducer_cfi.py rename to L1Trigger/L1CaloTrigger/python/l1tPhase1JetProducer_cfi.py diff --git a/L1Trigger/L1CaloTrigger/python/Phase1L1TJetSumsProducer_cfi.py b/L1Trigger/L1CaloTrigger/python/l1tPhase1JetSumsProducer_cfi.py similarity index 100% rename from L1Trigger/L1CaloTrigger/python/Phase1L1TJetSumsProducer_cfi.py rename to L1Trigger/L1CaloTrigger/python/l1tPhase1JetSumsProducer_cfi.py diff --git a/L1Trigger/L1CaloTrigger/python/L1TowerCalibrationProducer_cfi.py b/L1Trigger/L1CaloTrigger/python/l1tTowerCalibrationProducer_cfi.py similarity index 100% rename from L1Trigger/L1CaloTrigger/python/L1TowerCalibrationProducer_cfi.py rename to L1Trigger/L1CaloTrigger/python/l1tTowerCalibrationProducer_cfi.py diff --git a/L1Trigger/L1CaloTrigger/python/test_L1EGCrystalClusterEmulator_cfg.py b/L1Trigger/L1CaloTrigger/python/test_L1EGCrystalClusterEmulator_cfg.py index 01d4daee06824..8d7c00df0769d 100644 --- a/L1Trigger/L1CaloTrigger/python/test_L1EGCrystalClusterEmulator_cfg.py +++ b/L1Trigger/L1CaloTrigger/python/test_L1EGCrystalClusterEmulator_cfg.py @@ -48,7 +48,7 @@ # ---- Produce the L1EGCrystal clusters using Emulator -process.load('L1Trigger.L1CaloTrigger.L1EGammaCrystalsEmulatorProducer_cfi') +process.load('L1Trigger.L1CaloTrigger.l1tEGammaCrystalsEmulatorProducer_cfi') process.pL1EG = cms.Path( process.l1tEGammaClusterEmuProducer ) diff --git a/L1Trigger/L1THGCal/python/customClustering.py b/L1Trigger/L1THGCal/python/customClustering.py index 5734e2f0b509d..40c9a742bc297 100644 --- a/L1Trigger/L1THGCal/python/customClustering.py +++ b/L1Trigger/L1THGCal/python/customClustering.py @@ -1,9 +1,9 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.L1THGCal.hgcalBackEndLayer1Producer_cfi import dummy_C2d_params, \ +from L1Trigger.L1THGCal.l1tHGCalBackEndLayer1Producer_cfi import dummy_C2d_params, \ distance_C2d_params, \ topological_C2d_params, \ constrTopological_C2d_params -from L1Trigger.L1THGCal.hgcalBackEndLayer2Producer_cfi import distance_C3d_params, \ +from L1Trigger.L1THGCal.l1tHGCalBackEndLayer2Producer_cfi import distance_C3d_params, \ dbscan_C3d_params, \ histoMax_C3d_clustering_params, \ histoMaxVariableDR_C3d_params, \ diff --git a/L1Trigger/L1THGCal/python/customHistoSeeding.py b/L1Trigger/L1THGCal/python/customHistoSeeding.py index d1c59ae781e79..82377aa16ef29 100644 --- a/L1Trigger/L1THGCal/python/customHistoSeeding.py +++ b/L1Trigger/L1THGCal/python/customHistoSeeding.py @@ -1,5 +1,5 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.L1THGCal.hgcalBackEndLayer2Producer_cfi import histoMax_C3d_seeding_params, \ +from L1Trigger.L1THGCal.l1tHGCalBackEndLayer2Producer_cfi import histoMax_C3d_seeding_params, \ histoSecondaryMax_C3d_params, \ histoInterpolatedMax_C3d_params, \ histoThreshold_C3d_params, \ diff --git a/L1Trigger/L1THGCal/python/customNewProcessors.py b/L1Trigger/L1THGCal/python/customNewProcessors.py index de6e3408ef379..d31c147e1f68a 100644 --- a/L1Trigger/L1THGCal/python/customNewProcessors.py +++ b/L1Trigger/L1THGCal/python/customNewProcessors.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.L1THGCal.hgcalBackEndLayer1Producer_cfi import layer1truncation_proc -from L1Trigger.L1THGCal.hgcalBackEndLayer1Producer_cfi import stage1truncation_proc -from L1Trigger.L1THGCal.hgcalBackEndLayer1Producer_cfi import truncation_params +from L1Trigger.L1THGCal.l1tHGCalBackEndLayer1Producer_cfi import layer1truncation_proc +from L1Trigger.L1THGCal.l1tHGCalBackEndLayer1Producer_cfi import stage1truncation_proc +from L1Trigger.L1THGCal.l1tHGCalBackEndLayer1Producer_cfi import truncation_params def custom_layer1_truncation(process): parameters = layer1truncation_proc.clone() diff --git a/L1Trigger/L1THGCal/python/customTriggerCellSelect.py b/L1Trigger/L1THGCal/python/customTriggerCellSelect.py index 65b766b6b4e47..6c477d3f7cb24 100644 --- a/L1Trigger/L1THGCal/python/customTriggerCellSelect.py +++ b/L1Trigger/L1THGCal/python/customTriggerCellSelect.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms import SimCalorimetry.HGCalSimProducers.hgcalDigitizer_cfi as digiparam -from L1Trigger.L1THGCal.hgcalConcentratorProducer_cfi import threshold_conc_proc, best_conc_proc, supertc_conc_proc, coarsetc_onebitfraction_proc, coarsetc_equalshare_proc, bestchoice_ndata_decentralized, custom_conc_proc, autoEncoder_conc_proc +from L1Trigger.L1THGCal.l1tHGCalConcentratorProducer_cfi import threshold_conc_proc, best_conc_proc, supertc_conc_proc, coarsetc_onebitfraction_proc, coarsetc_equalshare_proc, bestchoice_ndata_decentralized, custom_conc_proc, autoEncoder_conc_proc def custom_triggercellselect_supertriggercell(process, stcSize=supertc_conc_proc.stcSize, diff --git a/L1Trigger/L1THGCal/python/customVFE.py b/L1Trigger/L1THGCal/python/customVFE.py index e513c682d8f2f..d10a9fc1e1fda 100644 --- a/L1Trigger/L1THGCal/python/customVFE.py +++ b/L1Trigger/L1THGCal/python/customVFE.py @@ -1,4 +1,4 @@ -from L1Trigger.L1THGCal.hgcalVFEProducer_cfi import vfe_proc +from L1Trigger.L1THGCal.l1tHGCalVFEProducer_cfi import vfe_proc def custom_hgcroc_oot(process, oot_coefficients=vfe_proc.linearizationCfg_si.oot_coefficients diff --git a/L1Trigger/L1THGCal/python/hgcalBackEndLayer1_cff.py b/L1Trigger/L1THGCal/python/hgcalBackEndLayer1_cff.py index bb8c7e67345aa..e6b07179c3a21 100644 --- a/L1Trigger/L1THGCal/python/hgcalBackEndLayer1_cff.py +++ b/L1Trigger/L1THGCal/python/hgcalBackEndLayer1_cff.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.L1THGCal.hgcalTriggerGeometryESProducer_cfi import * -from L1Trigger.L1THGCal.hgcalBackEndLayer1Producer_cfi import * +from L1Trigger.L1THGCal.l1tHGCalTriggerGeometryESProducer_cfi import * +from L1Trigger.L1THGCal.l1tHGCalBackEndLayer1Producer_cfi import * L1THGCalBackEndLayer1 = cms.Task(l1tHGCalBackEndLayer1Producer) diff --git a/L1Trigger/L1THGCal/python/hgcalBackEndLayer2_cff.py b/L1Trigger/L1THGCal/python/hgcalBackEndLayer2_cff.py index a268a09d6c080..39376706ea420 100644 --- a/L1Trigger/L1THGCal/python/hgcalBackEndLayer2_cff.py +++ b/L1Trigger/L1THGCal/python/hgcalBackEndLayer2_cff.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.L1THGCal.hgcalTriggerGeometryESProducer_cfi import * -from L1Trigger.L1THGCal.hgcalBackEndLayer2Producer_cfi import * +from L1Trigger.L1THGCal.l1tHGCalTriggerGeometryESProducer_cfi import * +from L1Trigger.L1THGCal.l1tHGCalBackEndLayer2Producer_cfi import * L1THGCalBackEndLayer2 = cms.Task(l1tHGCalBackEndLayer2Producer) diff --git a/L1Trigger/L1THGCal/python/hgcalConcentrator_cff.py b/L1Trigger/L1THGCal/python/hgcalConcentrator_cff.py index 38cb407a15230..0492f779ce568 100644 --- a/L1Trigger/L1THGCal/python/hgcalConcentrator_cff.py +++ b/L1Trigger/L1THGCal/python/hgcalConcentrator_cff.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.L1THGCal.hgcalTriggerGeometryESProducer_cfi import * -from L1Trigger.L1THGCal.hgcalConcentratorProducer_cfi import * +from L1Trigger.L1THGCal.l1tHGCalTriggerGeometryESProducer_cfi import * +from L1Trigger.L1THGCal.l1tHGCalConcentratorProducer_cfi import * L1THGCalConcentrator = cms.Task(l1tHGCalConcentratorProducer) diff --git a/L1Trigger/L1THGCal/python/hgcalTowerMap_cff.py b/L1Trigger/L1THGCal/python/hgcalTowerMap_cff.py index c0675abd54f65..449a9e7bd7693 100644 --- a/L1Trigger/L1THGCal/python/hgcalTowerMap_cff.py +++ b/L1Trigger/L1THGCal/python/hgcalTowerMap_cff.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.L1THGCal.hgcalTriggerGeometryESProducer_cfi import * -from L1Trigger.L1THGCal.hgcalTowerMapProducer_cfi import * +from L1Trigger.L1THGCal.l1tHGCalTriggerGeometryESProducer_cfi import * +from L1Trigger.L1THGCal.l1tHGCalTowerMapProducer_cfi import * L1THGCalTowerMap = cms.Task(l1tHGCalTowerMapProducer) diff --git a/L1Trigger/L1THGCal/python/hgcalTower_cff.py b/L1Trigger/L1THGCal/python/hgcalTower_cff.py index c33312121ce0a..de42425b293b1 100644 --- a/L1Trigger/L1THGCal/python/hgcalTower_cff.py +++ b/L1Trigger/L1THGCal/python/hgcalTower_cff.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.L1THGCal.hgcalTriggerGeometryESProducer_cfi import * -from L1Trigger.L1THGCal.hgcalTowerProducer_cfi import * +from L1Trigger.L1THGCal.l1tHGCalTriggerGeometryESProducer_cfi import * +from L1Trigger.L1THGCal.l1tHGCalTowerProducer_cfi import * L1THGCalTower = cms.Task(l1tHGCalTowerProducer) diff --git a/L1Trigger/L1THGCal/python/hgcalTriggerPrimitivesNew_cff.py b/L1Trigger/L1THGCal/python/hgcalTriggerPrimitivesNew_cff.py index 49de86d4aa1ee..4f69ed4d22d27 100644 --- a/L1Trigger/L1THGCal/python/hgcalTriggerPrimitivesNew_cff.py +++ b/L1Trigger/L1THGCal/python/hgcalTriggerPrimitivesNew_cff.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.L1THGCal.hgcalTriggerGeometryESProducer_cfi import * +from L1Trigger.L1THGCal.l1tHGCalTriggerGeometryESProducer_cfi import * from L1Trigger.L1THGCal.hgcalVFE_cff import * from L1Trigger.L1THGCal.hgcalConcentrator_cff import * from L1Trigger.L1THGCal.hgcalBackEndLayer1_cff import * diff --git a/L1Trigger/L1THGCal/python/hgcalTriggerPrimitives_cff.py b/L1Trigger/L1THGCal/python/hgcalTriggerPrimitives_cff.py index 1ca77d64565d3..61f2e52b05d63 100644 --- a/L1Trigger/L1THGCal/python/hgcalTriggerPrimitives_cff.py +++ b/L1Trigger/L1THGCal/python/hgcalTriggerPrimitives_cff.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.L1THGCal.hgcalTriggerGeometryESProducer_cfi import * +from L1Trigger.L1THGCal.l1tHGCalTriggerGeometryESProducer_cfi import * from L1Trigger.L1THGCal.hgcalVFE_cff import * from L1Trigger.L1THGCal.hgcalConcentrator_cff import * from L1Trigger.L1THGCal.hgcalBackEndLayer1_cff import * diff --git a/L1Trigger/L1THGCal/python/hgcalVFE_cff.py b/L1Trigger/L1THGCal/python/hgcalVFE_cff.py index 4ac45659da6cc..6ab0686fd6557 100644 --- a/L1Trigger/L1THGCal/python/hgcalVFE_cff.py +++ b/L1Trigger/L1THGCal/python/hgcalVFE_cff.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.L1THGCal.hgcalTriggerGeometryESProducer_cfi import * -from L1Trigger.L1THGCal.hgcalVFEProducer_cfi import * +from L1Trigger.L1THGCal.l1tHGCalTriggerGeometryESProducer_cfi import * +from L1Trigger.L1THGCal.l1tHGCalVFEProducer_cfi import * L1THGCalVFE = cms.Task(l1tHGCalVFEProducer) L1THFnoseVFE = cms.Task(l1tHFnoseVFEProducer) diff --git a/L1Trigger/L1THGCal/python/hgcalBackEndLayer1Producer_cfi.py b/L1Trigger/L1THGCal/python/l1tHGCalBackEndLayer1Producer_cfi.py similarity index 100% rename from L1Trigger/L1THGCal/python/hgcalBackEndLayer1Producer_cfi.py rename to L1Trigger/L1THGCal/python/l1tHGCalBackEndLayer1Producer_cfi.py diff --git a/L1Trigger/L1THGCal/python/hgcalBackEndLayer2Producer_cfi.py b/L1Trigger/L1THGCal/python/l1tHGCalBackEndLayer2Producer_cfi.py similarity index 100% rename from L1Trigger/L1THGCal/python/hgcalBackEndLayer2Producer_cfi.py rename to L1Trigger/L1THGCal/python/l1tHGCalBackEndLayer2Producer_cfi.py diff --git a/L1Trigger/L1THGCal/python/hgcalConcentratorProducer_cfi.py b/L1Trigger/L1THGCal/python/l1tHGCalConcentratorProducer_cfi.py similarity index 99% rename from L1Trigger/L1THGCal/python/hgcalConcentratorProducer_cfi.py rename to L1Trigger/L1THGCal/python/l1tHGCalConcentratorProducer_cfi.py index 58c85c70af1c6..5220528262b6b 100644 --- a/L1Trigger/L1THGCal/python/hgcalConcentratorProducer_cfi.py +++ b/L1Trigger/L1THGCal/python/l1tHGCalConcentratorProducer_cfi.py @@ -76,7 +76,7 @@ rounding = cms.bool(True), ) -from L1Trigger.L1THGCal.hgcalVFEProducer_cfi import vfe_proc +from L1Trigger.L1THGCal.l1tHGCalVFEProducer_cfi import vfe_proc best_conc_proc = cms.PSet(ProcessorName = cms.string('HGCalConcentratorProcessorSelection'), Method = cms.vstring(['bestChoiceSelect']*3), NData = cms.vuint32(bestchoice_ndata_decentralized), diff --git a/L1Trigger/L1THGCal/python/hgcalTowerMapProducer_cfi.py b/L1Trigger/L1THGCal/python/l1tHGCalTowerMapProducer_cfi.py similarity index 100% rename from L1Trigger/L1THGCal/python/hgcalTowerMapProducer_cfi.py rename to L1Trigger/L1THGCal/python/l1tHGCalTowerMapProducer_cfi.py diff --git a/L1Trigger/L1THGCal/python/hgcalTowerProducer_cfi.py b/L1Trigger/L1THGCal/python/l1tHGCalTowerProducer_cfi.py similarity index 92% rename from L1Trigger/L1THGCal/python/hgcalTowerProducer_cfi.py rename to L1Trigger/L1THGCal/python/l1tHGCalTowerProducer_cfi.py index 17291264dd6d2..97f4dbbc145fc 100644 --- a/L1Trigger/L1THGCal/python/hgcalTowerProducer_cfi.py +++ b/L1Trigger/L1THGCal/python/l1tHGCalTowerProducer_cfi.py @@ -1,5 +1,5 @@ import FWCore.ParameterSet.Config as cms -import L1Trigger.L1THGCal.hgcalTowerMapProducer_cfi as hgcalTowerMapProducer_cfi +import L1Trigger.L1THGCal.l1tHGCalTowerMapProducer_cfi as hgcalTowerMapProducer_cfi tower = cms.PSet( ProcessorName = cms.string('HGCalTowerProcessor'), includeTrigCells = cms.bool(False), diff --git a/L1Trigger/L1THGCal/python/hgcalTriggerGeometryESProducer_cfi.py b/L1Trigger/L1THGCal/python/l1tHGCalTriggerGeometryESProducer_cfi.py similarity index 100% rename from L1Trigger/L1THGCal/python/hgcalTriggerGeometryESProducer_cfi.py rename to L1Trigger/L1THGCal/python/l1tHGCalTriggerGeometryESProducer_cfi.py diff --git a/L1Trigger/L1THGCal/python/hgcalVFEProducer_cfi.py b/L1Trigger/L1THGCal/python/l1tHGCalVFEProducer_cfi.py similarity index 98% rename from L1Trigger/L1THGCal/python/hgcalVFEProducer_cfi.py rename to L1Trigger/L1THGCal/python/l1tHGCalVFEProducer_cfi.py index a7bb01713c2ad..6f0a31b2e9f3a 100644 --- a/L1Trigger/L1THGCal/python/hgcalVFEProducer_cfi.py +++ b/L1Trigger/L1THGCal/python/l1tHGCalVFEProducer_cfi.py @@ -1,7 +1,7 @@ from __future__ import absolute_import import FWCore.ParameterSet.Config as cms -from L1Trigger.L1THGCal.hgcalTriggerGeometryESProducer_cfi import * +from L1Trigger.L1THGCal.l1tHGCalTriggerGeometryESProducer_cfi import * import SimCalorimetry.HGCalSimProducers.hgcalDigitizer_cfi as digiparam import RecoLocalCalo.HGCalRecProducers.HGCalUncalibRecHit_cfi as recoparam diff --git a/L1Trigger/L1THGCalUtilities/python/caloTruthCellsProducer_cfi.py b/L1Trigger/L1THGCalUtilities/python/caloTruthCellsProducer_cfi.py index 03f410291700c..b728b101e5a54 100644 --- a/L1Trigger/L1THGCalUtilities/python/caloTruthCellsProducer_cfi.py +++ b/L1Trigger/L1THGCalUtilities/python/caloTruthCellsProducer_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.L1THGCal.hgcalBackEndLayer1Producer_cfi import dummy_C2d_params +from L1Trigger.L1THGCal.l1tHGCalBackEndLayer1Producer_cfi import dummy_C2d_params l1tCaloTruthCellsProducer = cms.EDProducer('CaloTruthCellsProducer', caloParticles = cms.InputTag('mix', 'MergedCaloTruth'), diff --git a/L1Trigger/L1THGCalUtilities/python/caloTruthCells_cff.py b/L1Trigger/L1THGCalUtilities/python/caloTruthCells_cff.py index 3c355008569bc..405b9c4bf06c5 100644 --- a/L1Trigger/L1THGCalUtilities/python/caloTruthCells_cff.py +++ b/L1Trigger/L1THGCalUtilities/python/caloTruthCells_cff.py @@ -7,11 +7,11 @@ if l1tCaloTruthCellsProducer.makeCellsCollection: ## cluster and tower sequence - from L1Trigger.L1THGCal.hgcalConcentratorProducer_cfi import l1tHGCalConcentratorProducer - from L1Trigger.L1THGCal.hgcalBackEndLayer1Producer_cfi import l1tHGCalBackEndLayer1Producer - from L1Trigger.L1THGCal.hgcalBackEndLayer2Producer_cfi import l1tHGCalBackEndLayer2Producer - from L1Trigger.L1THGCal.hgcalTowerMapProducer_cfi import l1tHGCalTowerMapProducer - from L1Trigger.L1THGCal.hgcalTowerProducer_cfi import l1tHGCalTowerProducer + from L1Trigger.L1THGCal.l1tHGCalConcentratorProducer_cfi import l1tHGCalConcentratorProducer + from L1Trigger.L1THGCal.l1tHGCalBackEndLayer1Producer_cfi import l1tHGCalBackEndLayer1Producer + from L1Trigger.L1THGCal.l1tHGCalBackEndLayer2Producer_cfi import l1tHGCalBackEndLayer2Producer + from L1Trigger.L1THGCal.l1tHGCalTowerMapProducer_cfi import l1tHGCalTowerMapProducer + from L1Trigger.L1THGCal.l1tHGCalTowerProducer_cfi import l1tHGCalTowerProducer l1tHGCalTruthConcentratorProducer = l1tHGCalConcentratorProducer.clone( InputTriggerCells = cms.InputTag('l1tCaloTruthCellsProducer') diff --git a/L1Trigger/L1THGCalUtilities/python/clustering2d.py b/L1Trigger/L1THGCalUtilities/python/clustering2d.py index df279230316d6..374b51c132c38 100644 --- a/L1Trigger/L1THGCalUtilities/python/clustering2d.py +++ b/L1Trigger/L1THGCalUtilities/python/clustering2d.py @@ -1,5 +1,5 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.L1THGCal.hgcalBackEndLayer1Producer_cfi import dummy_C2d_params, \ +from L1Trigger.L1THGCal.l1tHGCalBackEndLayer1Producer_cfi import dummy_C2d_params, \ distance_C2d_params, \ topological_C2d_params, \ constrTopological_C2d_params, \ diff --git a/L1Trigger/L1THGCalUtilities/python/clustering2d_v2.py b/L1Trigger/L1THGCalUtilities/python/clustering2d_v2.py index 94c4b71be0aa7..2f38bed6308be 100644 --- a/L1Trigger/L1THGCalUtilities/python/clustering2d_v2.py +++ b/L1Trigger/L1THGCalUtilities/python/clustering2d_v2.py @@ -1,5 +1,5 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.L1THGCal.hgcalBackEndLayer1Producer_cfi import dummy_C2d_params, \ +from L1Trigger.L1THGCal.l1tHGCalBackEndLayer1Producer_cfi import dummy_C2d_params, \ stage1truncation_proc, \ truncation_params diff --git a/L1Trigger/L1THGCalUtilities/python/clustering3d.py b/L1Trigger/L1THGCalUtilities/python/clustering3d.py index ccb3261beb22b..0fdf302cc5f2f 100644 --- a/L1Trigger/L1THGCalUtilities/python/clustering3d.py +++ b/L1Trigger/L1THGCalUtilities/python/clustering3d.py @@ -1,5 +1,5 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.L1THGCal.hgcalBackEndLayer2Producer_cfi import distance_C3d_params, \ +from L1Trigger.L1THGCal.l1tHGCalBackEndLayer2Producer_cfi import distance_C3d_params, \ dbscan_C3d_params, \ histoMax_C3d_clustering_params, \ histoMax_C3d_seeding_params, \ diff --git a/L1Trigger/L1THGCalUtilities/python/concentrator.py b/L1Trigger/L1THGCalUtilities/python/concentrator.py index a6905a13b7fd3..6a7ef10049320 100644 --- a/L1Trigger/L1THGCalUtilities/python/concentrator.py +++ b/L1Trigger/L1THGCalUtilities/python/concentrator.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms import SimCalorimetry.HGCalSimProducers.hgcalDigitizer_cfi as digiparam -from L1Trigger.L1THGCal.hgcalConcentratorProducer_cfi import threshold_conc_proc, best_conc_proc, supertc_conc_proc, coarsetc_onebitfraction_proc, custom_conc_proc, autoEncoder_conc_proc +from L1Trigger.L1THGCal.l1tHGCalConcentratorProducer_cfi import threshold_conc_proc, best_conc_proc, supertc_conc_proc, coarsetc_onebitfraction_proc, custom_conc_proc, autoEncoder_conc_proc class CreateSuperTriggerCell(object): diff --git a/L1Trigger/L1THGCalUtilities/python/vfe.py b/L1Trigger/L1THGCalUtilities/python/vfe.py index 5689423458fd3..2fabdb4ece93b 100644 --- a/L1Trigger/L1THGCalUtilities/python/vfe.py +++ b/L1Trigger/L1THGCalUtilities/python/vfe.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.L1THGCal.hgcalVFEProducer_cfi import vfe_proc +from L1Trigger.L1THGCal.l1tHGCalVFEProducer_cfi import vfe_proc class CreateVfe(object): def __init__(self, diff --git a/L1Trigger/L1TTrackMatch/python/L1TkObjectProducers_cff.py b/L1Trigger/L1TTrackMatch/python/L1TkObjectProducers_cff.py index e136acb5a6b76..3ca0ab90d2387 100644 --- a/L1Trigger/L1TTrackMatch/python/L1TkObjectProducers_cff.py +++ b/L1Trigger/L1TTrackMatch/python/L1TkObjectProducers_cff.py @@ -50,15 +50,15 @@ # from L1Trigger.L1TTrackMatch.L1TkCaloJetProducer_cfi import L1TkCaloJets # pL1TkCaloJets = cms.Path( L1TkCaloJets) -from L1Trigger.VertexFinder.VertexProducer_cfi import l1tVertexProducer +from L1Trigger.VertexFinder.l1tVertexProducer_cfi import l1tVertexProducer pVertexProducer = cms.Path( l1tVertexProducer ) -# from L1Trigger.L1TTrackMatch.L1TrackerEtMissProducer_cfi import L1TrackerEtMiss -# pL1TrkMET = cms.Path( L1TrackerEtMiss ) +# from L1Trigger.L1TTrackMatch.l1tTrackerEtMiss_cfi import l1tTrackerEtMiss +# pL1TrkMET = cms.Path( l1tTrackerEtMiss ) -# from L1Trigger.L1TTrackMatch.L1TkHTMissProducer_cfi import L1TkCaloHTMissVtx, L1TrackerHTMiss -# pL1TkCaloHTMissVtx = cms.Path( L1TkCaloHTMissVtx ) -# pL1TrackerHTMiss = cms.Path( L1TrackerHTMiss ) +# from L1Trigger.L1TTrackMatch.l1tTrackerHTMiss_cfi import l1tTkCaloHTMissVtx, l1tTrackerHTMiss +# pL1TkCaloHTMissVtx = cms.Path( l1tTkCaloHTMissVtx ) +# pL1TrackerHTMiss = cms.Path( l1tTrackerHTMiss ) from L1Trigger.L1TTrackMatch.L1TkMuonProducer_cfi import L1TkMuons, L1TkMuonsTP pL1TkMuon = cms.Path( L1TkMuons * L1TkMuonsTP ) diff --git a/L1Trigger/L1TTrackMatch/python/L1FastTrackingJetProducer_cfi.py b/L1Trigger/L1TTrackMatch/python/l1tFastTrackingJetProducer_cfi.py similarity index 100% rename from L1Trigger/L1TTrackMatch/python/L1FastTrackingJetProducer_cfi.py rename to L1Trigger/L1TTrackMatch/python/l1tFastTrackingJetProducer_cfi.py diff --git a/L1Trigger/L1TTrackMatch/python/L1GTTInputProducer_cfi.py b/L1Trigger/L1TTrackMatch/python/l1tGTTInputProducer_cfi.py similarity index 100% rename from L1Trigger/L1TTrackMatch/python/L1GTTInputProducer_cfi.py rename to L1Trigger/L1TTrackMatch/python/l1tGTTInputProducer_cfi.py diff --git a/L1Trigger/L1TTrackMatch/python/L1TrackFastJetProducer_cfi.py b/L1Trigger/L1TTrackMatch/python/l1tTrackFastJets_cfi.py similarity index 100% rename from L1Trigger/L1TTrackMatch/python/L1TrackFastJetProducer_cfi.py rename to L1Trigger/L1TTrackMatch/python/l1tTrackFastJets_cfi.py diff --git a/L1Trigger/L1TTrackMatch/python/L1TrackJetEmulationProducer_cfi.py b/L1Trigger/L1TTrackMatch/python/l1tTrackJetsEmulation_cfi.py similarity index 100% rename from L1Trigger/L1TTrackMatch/python/L1TrackJetEmulationProducer_cfi.py rename to L1Trigger/L1TTrackMatch/python/l1tTrackJetsEmulation_cfi.py diff --git a/L1Trigger/L1TTrackMatch/python/L1TrackJetProducer_cfi.py b/L1Trigger/L1TTrackMatch/python/l1tTrackJets_cfi.py similarity index 100% rename from L1Trigger/L1TTrackMatch/python/L1TrackJetProducer_cfi.py rename to L1Trigger/L1TTrackMatch/python/l1tTrackJets_cfi.py diff --git a/L1Trigger/L1TTrackMatch/python/L1TrackSelectionProducer_cfi.py b/L1Trigger/L1TTrackMatch/python/l1tTrackSelectionProducer_cfi.py similarity index 100% rename from L1Trigger/L1TTrackMatch/python/L1TrackSelectionProducer_cfi.py rename to L1Trigger/L1TTrackMatch/python/l1tTrackSelectionProducer_cfi.py diff --git a/L1Trigger/L1TTrackMatch/python/L1TrackerEtMissEmulatorProducer_cfi.py b/L1Trigger/L1TTrackMatch/python/l1tTrackerEmuEtMiss_cfi.py similarity index 89% rename from L1Trigger/L1TTrackMatch/python/L1TrackerEtMissEmulatorProducer_cfi.py rename to L1Trigger/L1TTrackMatch/python/l1tTrackerEmuEtMiss_cfi.py index b0cac9847ead0..665a3aa8f8d72 100644 --- a/L1Trigger/L1TTrackMatch/python/L1TrackerEtMissEmulatorProducer_cfi.py +++ b/L1Trigger/L1TTrackMatch/python/l1tTrackerEmuEtMiss_cfi.py @@ -6,7 +6,7 @@ # To bypass GTT input module use cms.InputTag("TTTracksFromTrackletEmulation", "Level1TTTracks") # and set useGTTinput to false L1VertexInputTag = cms.InputTag("l1tVertexProducer", "l1vertices"), - # This will use the vertex algorithm as specified in VertexProducer_cfi, if using emulated vertex + # This will use the vertex algorithm as specified in l1tVertexProducer_cfi, if using emulated vertex # set useVertexEmulator to true L1MetCollectionName = cms.string("L1TrackerEmuEtMiss"), diff --git a/L1Trigger/L1TTrackMatch/python/L1TkHTMissEmulatorProducer_cfi.py b/L1Trigger/L1TTrackMatch/python/l1tTrackerEmuHTMiss_cfi.py similarity index 100% rename from L1Trigger/L1TTrackMatch/python/L1TkHTMissEmulatorProducer_cfi.py rename to L1Trigger/L1TTrackMatch/python/l1tTrackerEmuHTMiss_cfi.py diff --git a/L1Trigger/L1TTrackMatch/python/L1TrackerEtMissProducer_cfi.py b/L1Trigger/L1TTrackMatch/python/l1tTrackerEtMiss_cfi.py similarity index 100% rename from L1Trigger/L1TTrackMatch/python/L1TrackerEtMissProducer_cfi.py rename to L1Trigger/L1TTrackMatch/python/l1tTrackerEtMiss_cfi.py diff --git a/L1Trigger/L1TTrackMatch/python/L1TkHTMissProducer_cfi.py b/L1Trigger/L1TTrackMatch/python/l1tTrackerHTMiss_cfi.py similarity index 100% rename from L1Trigger/L1TTrackMatch/python/L1TkHTMissProducer_cfi.py rename to L1Trigger/L1TTrackMatch/python/l1tTrackerHTMiss_cfi.py diff --git a/L1Trigger/L1TTrackMatch/test/L1TrackMET_cfg.py b/L1Trigger/L1TTrackMatch/test/L1TrackMET_cfg.py index 97b631f00d08e..c8ebed5fd351f 100644 --- a/L1Trigger/L1TTrackMatch/test/L1TrackMET_cfg.py +++ b/L1Trigger/L1TTrackMatch/test/L1TrackMET_cfg.py @@ -58,20 +58,20 @@ producerSum = None if GTTInput: - process.load('L1Trigger.L1TTrackMatch.L1GTTInputProducer_cfi') + process.load('L1Trigger.L1TTrackMatch.l1tGTTInputProducer_cfi') producerSum = producerSum + process.L1GTTInputProducer -process.load("L1Trigger.L1TTrackMatch.L1TrackerEtMissProducer_cfi") -process.load("L1Trigger.L1TTrackMatch.L1TrackerEtMissEmulatorProducer_cfi") +process.load("L1Trigger.L1TTrackMatch.l1tTrackerEtMiss_cfi") +process.load("L1Trigger.L1TTrackMatch.l1tTrackerEmuEtMiss_cfi") process.load("L1Trigger.L1TTrackMatch.L1TkMETAnalyser_cfi") ############################################################ # Primary vertex ############################################################ -process.load('L1Trigger.VertexFinder.VertexProducer_cfi') +process.load('L1Trigger.VertexFinder.l1tVertexProducer_cfi') process.l1tVertexProducer.l1TracksInputTag = cms.InputTag("l1tTTTracksFromTrackletEmulation", "Level1TTTracks") diff --git a/L1Trigger/L1TTrackMatch/test/L1TrackObjectNtupleMaker_cfg.py b/L1Trigger/L1TTrackMatch/test/L1TrackObjectNtupleMaker_cfg.py index b7dcb8f65fbb8..1f06f25f3b0b8 100644 --- a/L1Trigger/L1TTrackMatch/test/L1TrackObjectNtupleMaker_cfg.py +++ b/L1Trigger/L1TTrackMatch/test/L1TrackObjectNtupleMaker_cfg.py @@ -87,16 +87,16 @@ process.dtc = cms.Path(process.TrackerDTCProducer)#*process.TrackerDTCAnalyzer) process.load("L1Trigger.TrackFindingTracklet.L1HybridEmulationTracks_cff") -process.load("L1Trigger.L1TTrackMatch.L1TrackSelectionProducer_cfi") -process.load("L1Trigger.L1TTrackMatch.L1TrackJetProducer_cfi") -process.load("L1Trigger.L1TTrackMatch.L1GTTInputProducer_cfi") -process.load("L1Trigger.L1TTrackMatch.L1TrackJetEmulationProducer_cfi") -process.load("L1Trigger.L1TTrackMatch.L1TrackFastJetProducer_cfi") -process.load("L1Trigger.L1TTrackMatch.L1TrackerEtMissProducer_cfi") -process.load("L1Trigger.L1TTrackMatch.L1TrackerEtMissEmulatorProducer_cfi") -process.load("L1Trigger.L1TTrackMatch.L1TkHTMissProducer_cfi") -process.load("L1Trigger.L1TTrackMatch.L1TkHTMissEmulatorProducer_cfi") -process.load('L1Trigger.VertexFinder.VertexProducer_cfi') +process.load("L1Trigger.L1TTrackMatch.l1tTrackSelectionProducer_cfi") +process.load("L1Trigger.L1TTrackMatch.l1tTrackJets_cfi") +process.load("L1Trigger.L1TTrackMatch.l1tGTTInputProducer_cfi") +process.load("L1Trigger.L1TTrackMatch.l1tTrackJetsEmulation_cfi") +process.load("L1Trigger.L1TTrackMatch.l1tTrackFastJets_cfi") +process.load("L1Trigger.L1TTrackMatch.l1tTrackerEtMiss_cfi") +process.load("L1Trigger.L1TTrackMatch.l1tTrackerEmuEtMiss_cfi") +process.load("L1Trigger.L1TTrackMatch.l1tTrackerHTMiss_cfi") +process.load("L1Trigger.L1TTrackMatch.l1tTrackerEmuHTMiss_cfi") +process.load('L1Trigger.VertexFinder.l1tVertexProducer_cfi') ############################################################ diff --git a/L1Trigger/Phase2L1ParticleFlow/python/l1ctLayer1_cff.py b/L1Trigger/Phase2L1ParticleFlow/python/l1ctLayer1_cff.py index 878b74fc1466f..355f9517fa8fd 100644 --- a/L1Trigger/Phase2L1ParticleFlow/python/l1ctLayer1_cff.py +++ b/L1Trigger/Phase2L1ParticleFlow/python/l1ctLayer1_cff.py @@ -2,10 +2,10 @@ import math -from L1Trigger.Phase2L1ParticleFlow.pfTracksFromL1Tracks_cfi import l1tPFTracksFromL1Tracks -from L1Trigger.Phase2L1ParticleFlow.pfClustersFromL1EGClusters_cfi import l1tPFClustersFromL1EGClusters +from L1Trigger.Phase2L1ParticleFlow.l1tPFTracksFromL1Tracks_cfi import l1tPFTracksFromL1Tracks +from L1Trigger.Phase2L1ParticleFlow.l1tPFClustersFromL1EGClusters_cfi import l1tPFClustersFromL1EGClusters from L1Trigger.Phase2L1ParticleFlow.pfClustersFromCombinedCalo_cff import l1tPFClustersFromCombinedCaloHCal, l1tPFClustersFromCombinedCaloHF -from L1Trigger.Phase2L1ParticleFlow.pfClustersFromHGC3DClusters_cfi import l1tPFClustersFromHGC3DClusters +from L1Trigger.Phase2L1ParticleFlow.l1tPFClustersFromHGC3DClusters_cfi import l1tPFClustersFromHGC3DClusters from L1Trigger.Phase2L1ParticleFlow.l1TkEgAlgoEmulator_cfi import tkEgAlgoParameters,tkEgSorterParameters diff --git a/L1Trigger/Phase2L1ParticleFlow/python/l1pfJetMet_cff.py b/L1Trigger/Phase2L1ParticleFlow/python/l1pfJetMet_cff.py index d35ff7a709ae0..0bca4124f50e7 100644 --- a/L1Trigger/Phase2L1ParticleFlow/python/l1pfJetMet_cff.py +++ b/L1Trigger/Phase2L1ParticleFlow/python/l1pfJetMet_cff.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.Phase2L1ParticleFlow.L1SeedConePFJetProducer_cfi import l1tSeedConePFJetProducer, l1tSeedConePFJetEmulatorProducer -from L1Trigger.Phase2L1ParticleFlow.DeregionizerProducer_cfi import l1tDeregionizerProducer as l1tLayer2Deregionizer +from L1Trigger.Phase2L1ParticleFlow.l1tSeedConePFJetProducer_cfi import l1tSeedConePFJetProducer, l1tSeedConePFJetEmulatorProducer +from L1Trigger.Phase2L1ParticleFlow.l1tDeregionizerProducer_cfi import l1tDeregionizerProducer as l1tLayer2Deregionizer l1tSCPFL1PF = l1tSeedConePFJetProducer.clone(L1PFObjects = 'l1tLayer1:PF') l1tSCPFL1Puppi = l1tSeedConePFJetProducer.clone() l1tSCPFL1PuppiEmulator = l1tSeedConePFJetEmulatorProducer.clone(L1PFObjects = 'l1tLayer2Deregionizer:Puppi') @@ -19,7 +19,7 @@ l1tSCPFL1PuppiCorrectedEmulator = _correctedJets.clone(jets = 'l1tSCPFL1PuppiEmulator', correctorDir = 'L1PuppiSC4EmuDeregJets') -from L1Trigger.Phase2L1ParticleFlow.L1MhtPfProducer_cfi import l1tMHTPFProducer +from L1Trigger.Phase2L1ParticleFlow.l1tMHTPFProducer_cfi import l1tMHTPFProducer l1tSCPFL1PuppiCorrectedEmulatorMHT = l1tMHTPFProducer.clone() L1TPFJetsTask = cms.Task( diff --git a/L1Trigger/Phase2L1ParticleFlow/python/DeregionizerProducer_cfi.py b/L1Trigger/Phase2L1ParticleFlow/python/l1tDeregionizerProducer_cfi.py similarity index 100% rename from L1Trigger/Phase2L1ParticleFlow/python/DeregionizerProducer_cfi.py rename to L1Trigger/Phase2L1ParticleFlow/python/l1tDeregionizerProducer_cfi.py diff --git a/L1Trigger/Phase2L1ParticleFlow/python/L1MetPfProducer_cfi.py b/L1Trigger/Phase2L1ParticleFlow/python/l1tMETPFProducer_cfi.py similarity index 100% rename from L1Trigger/Phase2L1ParticleFlow/python/L1MetPfProducer_cfi.py rename to L1Trigger/Phase2L1ParticleFlow/python/l1tMETPFProducer_cfi.py diff --git a/L1Trigger/Phase2L1ParticleFlow/python/L1MhtPfProducer_cfi.py b/L1Trigger/Phase2L1ParticleFlow/python/l1tMHTPFProducer_cfi.py similarity index 100% rename from L1Trigger/Phase2L1ParticleFlow/python/L1MhtPfProducer_cfi.py rename to L1Trigger/Phase2L1ParticleFlow/python/l1tMHTPFProducer_cfi.py diff --git a/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromCombinedCalo_cfi.py b/L1Trigger/Phase2L1ParticleFlow/python/l1tPFClustersFromCombinedCalo_cfi.py similarity index 100% rename from L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromCombinedCalo_cfi.py rename to L1Trigger/Phase2L1ParticleFlow/python/l1tPFClustersFromCombinedCalo_cfi.py diff --git a/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromHGC3DClustersEM_cfi.py b/L1Trigger/Phase2L1ParticleFlow/python/l1tPFClustersFromHGC3DClustersEM_cfi.py similarity index 82% rename from L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromHGC3DClustersEM_cfi.py rename to L1Trigger/Phase2L1ParticleFlow/python/l1tPFClustersFromHGC3DClustersEM_cfi.py index 1d30550aab519..d63f7892435e3 100644 --- a/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromHGC3DClustersEM_cfi.py +++ b/L1Trigger/Phase2L1ParticleFlow/python/l1tPFClustersFromHGC3DClustersEM_cfi.py @@ -1,8 +1,8 @@ import FWCore.ParameterSet.Config as cms -import L1Trigger.Phase2L1ParticleFlow.pfClustersFromHGC3DClusters_cfi +import L1Trigger.Phase2L1ParticleFlow.l1tPFClustersFromHGC3DClusters_cfi -pfClustersFromHGC3DClustersEM = L1Trigger.Phase2L1ParticleFlow.pfClustersFromHGC3DClusters_cfi.pfClustersFromHGC3DClusters.clone( +l1tPFClustersFromHGC3DClustersEM = L1Trigger.Phase2L1ParticleFlow.l1tPFClustersFromHGC3DClusters_cfi.l1tPFClustersFromHGC3DClusters.clone( emOnly = cms.bool(True), useEMInterpretation = cms.string("emOnly"), # use EM intepretation to redefine the energy etMin = cms.double(0.0), @@ -19,7 +19,7 @@ from Configuration.Eras.Modifier_phase2_hgcalV10_cff import phase2_hgcalV10 from Configuration.Eras.Modifier_phase2_hgcalV11_cff import phase2_hgcalV11 -phase2_hgcalV10.toModify(pfClustersFromHGC3DClustersEM, +phase2_hgcalV10.toModify(l1tPFClustersFromHGC3DClustersEM, corrector = "L1Trigger/Phase2L1ParticleFlow/data/emcorr_hgc_106X.root", resol = cms.PSet( etaBins = cms.vdouble( 1.700, 1.900, 2.200, 2.500, 2.800, 2.900), @@ -28,7 +28,7 @@ kind = cms.string('calo') ), ) -phase2_hgcalV11.toModify(pfClustersFromHGC3DClustersEM, +phase2_hgcalV11.toModify(l1tPFClustersFromHGC3DClustersEM, corrector = "L1Trigger/Phase2L1ParticleFlow/data/emcorr_hgc_110X.root", resol = cms.PSet( etaBins = cms.vdouble( 1.700, 1.900, 2.200, 2.500, 2.800, 2.900), diff --git a/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromHGC3DClusters_cfi.py b/L1Trigger/Phase2L1ParticleFlow/python/l1tPFClustersFromHGC3DClusters_cfi.py similarity index 100% rename from L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromHGC3DClusters_cfi.py rename to L1Trigger/Phase2L1ParticleFlow/python/l1tPFClustersFromHGC3DClusters_cfi.py diff --git a/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromL1EGClusters_cfi.py b/L1Trigger/Phase2L1ParticleFlow/python/l1tPFClustersFromL1EGClusters_cfi.py similarity index 100% rename from L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromL1EGClusters_cfi.py rename to L1Trigger/Phase2L1ParticleFlow/python/l1tPFClustersFromL1EGClusters_cfi.py diff --git a/L1Trigger/Phase2L1ParticleFlow/python/pfTracksFromL1Tracks_cfi.py b/L1Trigger/Phase2L1ParticleFlow/python/l1tPFTracksFromL1Tracks_cfi.py similarity index 100% rename from L1Trigger/Phase2L1ParticleFlow/python/pfTracksFromL1Tracks_cfi.py rename to L1Trigger/Phase2L1ParticleFlow/python/l1tPFTracksFromL1Tracks_cfi.py diff --git a/L1Trigger/Phase2L1ParticleFlow/python/L1SeedConePFJetProducer_cfi.py b/L1Trigger/Phase2L1ParticleFlow/python/l1tSeedConePFJetProducer_cfi.py similarity index 100% rename from L1Trigger/Phase2L1ParticleFlow/python/L1SeedConePFJetProducer_cfi.py rename to L1Trigger/Phase2L1ParticleFlow/python/l1tSeedConePFJetProducer_cfi.py diff --git a/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromCombinedCalo_cff.py b/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromCombinedCalo_cff.py index b1ce9fccf1614..648fae8b9832a 100644 --- a/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromCombinedCalo_cff.py +++ b/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromCombinedCalo_cff.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.Phase2L1ParticleFlow.pfClustersFromCombinedCalo_cfi import l1tPFClustersFromCombinedCalo +from L1Trigger.Phase2L1ParticleFlow.l1tPFClustersFromCombinedCalo_cfi import l1tPFClustersFromCombinedCalo # Using phase2_hgcalV10 to customize the config for all 106X samples, since there's no other modifier for it from Configuration.Eras.Modifier_phase2_hgcalV10_cff import phase2_hgcalV10 diff --git a/L1Trigger/Phase2L1ParticleFlow/test/make_l1ctLayer1_dumpFiles_cfg.py b/L1Trigger/Phase2L1ParticleFlow/test/make_l1ctLayer1_dumpFiles_cfg.py index 38dd684c2b7a6..924c8d01a6bd0 100644 --- a/L1Trigger/Phase2L1ParticleFlow/test/make_l1ctLayer1_dumpFiles_cfg.py +++ b/L1Trigger/Phase2L1ParticleFlow/test/make_l1ctLayer1_dumpFiles_cfg.py @@ -32,8 +32,8 @@ process.load("L1Trigger.Phase2L1ParticleFlow.l1ParticleFlow_cff") process.load('L1Trigger.Phase2L1ParticleFlow.l1ctLayer1_cff') process.load('L1Trigger.Phase2L1ParticleFlow.l1ctLayer2EG_cff') -process.load('L1Trigger.L1TTrackMatch.L1GTTInputProducer_cfi') -process.load('L1Trigger.VertexFinder.VertexProducer_cfi') +process.load('L1Trigger.L1TTrackMatch.l1tGTTInputProducer_cfi') +process.load('L1Trigger.VertexFinder.l1tVertexProducer_cfi') process.l1tVertexFinderEmulator = process.l1tVertexProducer.clone() process.l1tVertexFinderEmulator.VertexReconstruction.Algorithm = "fastHistoEmulation" process.l1tVertexFinderEmulator.l1TracksInputTag = cms.InputTag("l1tGTTInputProducer", "Level1TTTracksConverted") diff --git a/L1Trigger/Phase2L1Taus/python/l1emulator_cff.py b/L1Trigger/Phase2L1Taus/python/l1emulator_cff.py index 525cb149a7632..40d3022377c6a 100644 --- a/L1Trigger/Phase2L1Taus/python/l1emulator_cff.py +++ b/L1Trigger/Phase2L1Taus/python/l1emulator_cff.py @@ -11,7 +11,7 @@ from SimCalorimetry.EcalEBTrigPrimProducers.ecalEBTriggerPrimitiveDigis_cff import * l1emulator += simEcalEBTriggerPrimitiveDigis -from L1Trigger.TrackFindingTracklet.Tracklet_cfi import * +from L1Trigger.TrackFindingTracklet.l1tTTTracksFromTrackletEmulation_cfi import * L1TRK_NAME = "l1tTTTracksFromTrackletEmulation" L1TRK_LABEL = "Level1TTTracks" @@ -24,13 +24,13 @@ TTTrackAssociatorFromPixelDigis.TTTracks = cms.VInputTag( cms.InputTag(L1TRK_NAME, L1TRK_LABEL) ) l1emulator += TrackTriggerAssociatorTracks -from L1Trigger.VertexFinder.VertexProducer_cfi import * +from L1Trigger.VertexFinder.l1tVertexProducer_cfi import * l1emulator += l1tVertexProducer from Configuration.StandardSequences.SimL1Emulator_cff import * l1emulator += SimL1Emulator -from L1Trigger.Phase2L1ParticleFlow.pfTracksFromL1Tracks_cfi import * +from L1Trigger.Phase2L1ParticleFlow.l1tPFTracksFromL1Tracks_cfi import * l1emulator += l1tPFTracksFromL1Tracks from L1Trigger.Phase2L1ParticleFlow.l1ParticleFlow_cff import * diff --git a/L1Trigger/TrackFindingTracklet/python/L1HybridEmulationTracks_cff.py b/L1Trigger/TrackFindingTracklet/python/L1HybridEmulationTracks_cff.py index fdde59710461f..3ac44e808ef26 100644 --- a/L1Trigger/TrackFindingTracklet/python/L1HybridEmulationTracks_cff.py +++ b/L1Trigger/TrackFindingTracklet/python/L1HybridEmulationTracks_cff.py @@ -2,7 +2,7 @@ from RecoVertex.BeamSpotProducer.BeamSpot_cfi import * -from L1Trigger.TrackFindingTracklet.Tracklet_cfi import * +from L1Trigger.TrackFindingTracklet.l1tTTTracksFromTrackletEmulation_cfi import * from SimTracker.TrackTriggerAssociation.TrackTriggerAssociator_cff import * diff --git a/L1Trigger/TrackFindingTracklet/python/Tracklet_cfi.py b/L1Trigger/TrackFindingTracklet/python/l1tTTTracksFromTrackletEmulation_cfi.py similarity index 100% rename from L1Trigger/TrackFindingTracklet/python/Tracklet_cfi.py rename to L1Trigger/TrackFindingTracklet/python/l1tTTTracksFromTrackletEmulation_cfi.py diff --git a/L1Trigger/VertexFinder/python/InputDataProducer_cff.py b/L1Trigger/VertexFinder/python/l1tInputDataProducer_cfi.py similarity index 78% rename from L1Trigger/VertexFinder/python/InputDataProducer_cff.py rename to L1Trigger/VertexFinder/python/l1tInputDataProducer_cfi.py index 63f589ec2751e..f16560701af2f 100644 --- a/L1Trigger/VertexFinder/python/InputDataProducer_cff.py +++ b/L1Trigger/VertexFinder/python/l1tInputDataProducer_cfi.py @@ -1,8 +1,8 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.VertexFinder.VertexNTupler_cfi import l1tVertexNTupler -from L1Trigger.VertexFinder.VertexProducer_cfi import l1tVertexProducer +from L1Trigger.VertexFinder.l1tVertexNTupler_cfi import l1tVertexNTupler +from L1Trigger.VertexFinder.l1tVertexProducer_cfi import l1tVertexProducer -InputDataProducer = cms.EDProducer('InputDataProducer', +l1tInputDataProducer = cms.EDProducer('InputDataProducer', #=== The name of the output collection outputCollectionName = cms.string("InputData"), @@ -22,7 +22,7 @@ hepMCInputTag = cms.InputTag("generatorSmeared","","SIM"), genParticleInputTag = cms.InputTag("genParticles",""), tpInputTag = cms.InputTag("mix", "MergedTrackTruth"), - tpValueMapInputTag = cms.InputTag("TPStubValueMapProducer:TPs"), + tpValueMapInputTag = cms.InputTag("l1tTPStubValueMapProducer:TPs"), stubInputTag = cms.InputTag("TTStubsFromPhase2TrackerDigis", "StubAccepted"), #=== Debug printout diff --git a/L1Trigger/VertexFinder/python/TPStubValueMapProducer_cff.py b/L1Trigger/VertexFinder/python/l1tTPStubValueMapProducer_cfi.py similarity index 84% rename from L1Trigger/VertexFinder/python/TPStubValueMapProducer_cff.py rename to L1Trigger/VertexFinder/python/l1tTPStubValueMapProducer_cfi.py index 495c5b3fa6f1d..fc560b6f684f5 100644 --- a/L1Trigger/VertexFinder/python/TPStubValueMapProducer_cff.py +++ b/L1Trigger/VertexFinder/python/l1tTPStubValueMapProducer_cfi.py @@ -1,8 +1,8 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.VertexFinder.VertexNTupler_cfi import l1tVertexNTupler -from L1Trigger.VertexFinder.VertexProducer_cfi import l1tVertexProducer +from L1Trigger.VertexFinder.l1tVertexNTupler_cfi import l1tVertexNTupler +from L1Trigger.VertexFinder.l1tVertexProducer_cfi import l1tVertexProducer -TPStubValueMapProducer = cms.EDProducer('TPStubValueMapProducer', +l1tTPStubValueMapProducer = cms.EDProducer('TPStubValueMapProducer', #=== The name of the output collection outputCollectionNames = cms.vstring("TPs","TPsUse","allMatchedTPs"), diff --git a/L1Trigger/VertexFinder/python/VertexNTupler_cfi.py b/L1Trigger/VertexFinder/python/l1tVertexNTupler_cfi.py similarity index 96% rename from L1Trigger/VertexFinder/python/VertexNTupler_cfi.py rename to L1Trigger/VertexFinder/python/l1tVertexNTupler_cfi.py index 590e1c38058a9..1710cbed7ec96 100644 --- a/L1Trigger/VertexFinder/python/VertexNTupler_cfi.py +++ b/L1Trigger/VertexFinder/python/l1tVertexNTupler_cfi.py @@ -1,12 +1,12 @@ import FWCore.ParameterSet.Config as cms l1tVertexNTupler = cms.EDAnalyzer('VertexNTupler', - inputDataInputTag = cms.InputTag("InputDataProducer","InputData"), + inputDataInputTag = cms.InputTag("l1tInputDataProducer","InputData"), genParticleInputTag = cms.InputTag("genParticles",""), l1TracksInputTags = cms.VInputTag( cms.InputTag("l1tTTTracksFromTrackletEmulation", "Level1TTTracks") ), l1TracksTruthMapInputTags = cms.VInputTag( cms.InputTag("TTTrackAssociatorFromPixelDigis", "Level1TTTracks") ), - l1TracksTPInputTags = cms.InputTag("TPStubValueMapProducer:allMatchedTPs"), - l1TracksTPValueMapInputTags = cms.InputTag("TPStubValueMapProducer:TPs"), + l1TracksTPInputTags = cms.InputTag("l1tTPStubValueMapProducer:allMatchedTPs"), + l1TracksTPValueMapInputTags = cms.InputTag("l1tTPStubValueMapProducer:TPs"), l1TracksBranchNames = cms.vstring('hybrid'), l1VertexInputTags = cms.VInputTag( cms.InputTag("l1tVertexProducer", "l1vertices") ), l1VertexTrackInputs = cms.vstring('hybrid'), diff --git a/L1Trigger/VertexFinder/python/VertexProducer_cfi.py b/L1Trigger/VertexFinder/python/l1tVertexProducer_cfi.py similarity index 100% rename from L1Trigger/VertexFinder/python/VertexProducer_cfi.py rename to L1Trigger/VertexFinder/python/l1tVertexProducer_cfi.py diff --git a/L1Trigger/VertexFinder/test/vertexFinder_cfg.py b/L1Trigger/VertexFinder/test/vertexFinder_cfg.py index 5cd22cbf047fa..e7bcf972d3a7c 100644 --- a/L1Trigger/VertexFinder/test/vertexFinder_cfg.py +++ b/L1Trigger/VertexFinder/test/vertexFinder_cfg.py @@ -70,7 +70,7 @@ #--- Load config fragment that configures vertex producer -process.load('L1Trigger.VertexFinder.VertexProducer_cfi') +process.load('L1Trigger.VertexFinder.l1tVertexProducer_cfi') process.l1tVertexProducer.l1TracksInputTag = l1TracksTag #--- Load config fragment that configures vertex analyzer diff --git a/L1Trigger/VertexFinder/test/vertexNTupler_cfg.py b/L1Trigger/VertexFinder/test/vertexNTupler_cfg.py index ec2de4cce74eb..8212c07d3b82b 100644 --- a/L1Trigger/VertexFinder/test/vertexNTupler_cfg.py +++ b/L1Trigger/VertexFinder/test/vertexNTupler_cfg.py @@ -79,16 +79,16 @@ numberOfStreams = cms.untracked.uint32(options.streams if options.streams>0 else 0) ) -process.load('L1Trigger.VertexFinder.VertexProducer_cfi') +process.load('L1Trigger.VertexFinder.l1tVertexProducer_cfi') process.l1tVertexProducer.l1TracksInputTag = l1TracksTag -process.load('L1Trigger.VertexFinder.TPStubValueMapProducer_cff') -process.load('L1Trigger.VertexFinder.InputDataProducer_cff') +process.load('L1Trigger.VertexFinder.l1tTPStubValueMapProducer_cfi') +process.load('L1Trigger.VertexFinder.l1tInputDataProducer_cfi') -process.load('L1Trigger.VertexFinder.VertexNTupler_cfi') -process.L1TVertexNTupler.l1TracksInputTag = l1TracksTag +process.load('L1Trigger.VertexFinder.l1tVertexNTupler_cfi') +process.l1tVertexNTupler.l1TracksInputTag = l1TracksTag -if process.L1TVertexNTupler.debug == 0: +if process.l1tVertexNTupler.debug == 0: process.MessageLogger.cerr.FwkReport.reportEvery = 50 process.Timing = cms.Service("Timing", summaryOnly = cms.untracked.bool(True)) @@ -103,16 +103,16 @@ if "Emulation" in algo: if "L1GTTInputProducer" not in process.producerNames(): - process.load('L1Trigger.L1TTrackMatch.L1GTTInputProducer_cfi') + process.load('L1Trigger.L1TTrackMatch.l1tGTTInputProducer_cfi') producer.l1TracksInputTag = cms.InputTag("l1tGTTInputProducer","Level1TTTracksConverted") producerSum = process.L1GTTInputProducer + producerSum - process.L1TVertexNTupler.emulationVertexInputTags.append( cms.InputTag(producerName, 'l1verticesEmulation') ) - process.L1TVertexNTupler.emulationVertexBranchNames.append(algo) + process.l1tVertexNTupler.emulationVertexInputTags.append( cms.InputTag(producerName, 'l1verticesEmulation') ) + process.l1tVertexNTupler.emulationVertexBranchNames.append(algo) else: - process.L1TVertexNTupler.l1VertexInputTags.append( cms.InputTag(producerName, 'l1vertices') ) - process.L1TVertexNTupler.l1VertexBranchNames.append(algo) - process.L1TVertexNTupler.l1VertexTrackInputs.append('hybrid') + process.l1tVertexNTupler.l1VertexInputTags.append( cms.InputTag(producerName, 'l1vertices') ) + process.l1tVertexNTupler.l1VertexBranchNames.append(algo) + process.l1tVertexNTupler.l1VertexTrackInputs.append('hybrid') setattr(process, producerName, producer) producerSum += producer @@ -145,8 +145,8 @@ print "producer name =", producerName setattr(process, producerName, producer) producerNames += [producerName] - process.L1TVertexNTupler.extraVertexDescriptions += ['DBSCAN(dist={0},minPt={1},minDensity={2},seedTrackPt{3})'.format(dist, minPt, minDensity, seedTrackPt)] - process.L1TVertexNTupler.extraVertexInputTags.append( cms.InputTag(producerName, 'l1vertices')) + process.l1tVertexNTupler.extraVertexDescriptions += ['DBSCAN(dist={0},minPt={1},minDensity={2},seedTrackPt{3})'.format(dist, minPt, minDensity, seedTrackPt)] + process.l1tVertexNTupler.extraVertexInputTags.append( cms.InputTag(producerName, 'l1vertices')) producerSum += producer print "Total number of producers =", len(additionalProducerAlgorithms)+1 @@ -173,7 +173,7 @@ process.add_(cms.Service("Tracer", dumpPathsAndConsumes = cms.untracked.bool(True))) # SETUP THE PATH -process.p = cms.Path(producerSum + process.TPStubValueMapProducer + process.InputDataProducer + process.L1TVertexNTupler) +process.p = cms.Path(producerSum + process.l1tTPStubValueMapProducer + process.l1tInputDataProducer + process.l1tVertexNTupler) # DUMP AND EXIT if options.dump: diff --git a/Validation/HGCalValidation/python/hgcalRunEmulatorValidationTPG_cff.py b/Validation/HGCalValidation/python/hgcalRunEmulatorValidationTPG_cff.py index 62c53e67fb472..7952acefbd492 100644 --- a/Validation/HGCalValidation/python/hgcalRunEmulatorValidationTPG_cff.py +++ b/Validation/HGCalValidation/python/hgcalRunEmulatorValidationTPG_cff.py @@ -1,12 +1,12 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.L1THGCal.hgcalTriggerGeometryESProducer_cfi import * -from L1Trigger.L1THGCal.hgcalVFEProducer_cfi import * -from L1Trigger.L1THGCal.hgcalConcentratorProducer_cfi import * -from L1Trigger.L1THGCal.hgcalBackEndLayer1Producer_cfi import * -from L1Trigger.L1THGCal.hgcalBackEndLayer2Producer_cfi import * -from L1Trigger.L1THGCal.hgcalTowerMapProducer_cfi import * -from L1Trigger.L1THGCal.hgcalTowerProducer_cfi import * +from L1Trigger.L1THGCal.l1tHGCalTriggerGeometryESProducer_cfi import * +from L1Trigger.L1THGCal.l1tHGCalVFEProducer_cfi import * +from L1Trigger.L1THGCal.l1tHGCalConcentratorProducer_cfi import * +from L1Trigger.L1THGCal.l1tHGCalBackEndLayer1Producer_cfi import * +from L1Trigger.L1THGCal.l1tHGCalBackEndLayer2Producer_cfi import * +from L1Trigger.L1THGCal.l1tHGCalTowerMapProducer_cfi import * +from L1Trigger.L1THGCal.l1tHGCalTowerProducer_cfi import * from L1Trigger.L1THGCal.hgcalTriggerPrimitives_cff import * from Validation.HGCalValidation.hgcalValidationTPG_cfi import * diff --git a/Validation/HGCalValidation/python/hgcalValidationTPG_cff.py b/Validation/HGCalValidation/python/hgcalValidationTPG_cff.py index 15f5423b8582b..5258dfbc8a16c 100644 --- a/Validation/HGCalValidation/python/hgcalValidationTPG_cff.py +++ b/Validation/HGCalValidation/python/hgcalValidationTPG_cff.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -from L1Trigger.L1THGCal.hgcalTriggerGeometryESProducer_cfi import * +from L1Trigger.L1THGCal.l1tHGCalTriggerGeometryESProducer_cfi import * from Validation.HGCalValidation.hgcalValidationTPG_cfi import * runHGCALValidationTPG = cms.Sequence(hgcalTrigPrimValidation)