diff --git a/Configuration/EventContent/python/EventContent_cff.py b/Configuration/EventContent/python/EventContent_cff.py index 54cca52eaebc8..96303dd959a72 100644 --- a/Configuration/EventContent/python/EventContent_cff.py +++ b/Configuration/EventContent/python/EventContent_cff.py @@ -677,8 +677,13 @@ def SwapKeepAndDrop(l): ]) phase2_tracker.toModify(FEVTDEBUGHLTEventContent, outputCommands = FEVTDEBUGHLTEventContent.outputCommands+[ + 'keep *_hltSiPixelClusters_*_*', + 'keep *_hltSiPhase2Clusters_*_*', 'keep *_hltPhase2PixelTracks_*_*', - 'keep *_hltPhase2PixelVertices_*_*' + 'keep *_hltPhase2PixelVertices_*_*', + 'keep *_hltGeneralTracks_*_*', + 'keep *_hltOfflinePrimaryVertices_*_*', + 'keep *_hltHGCalRecHit_*_*' ]) phase2_common.toModify(FEVTDEBUGHLTEventContent, @@ -689,6 +694,11 @@ def SwapKeepAndDrop(l): phase2_muon.toModify(FEVTDEBUGHLTEventContent, outputCommands = FEVTDEBUGHLTEventContent.outputCommands + ['keep recoMuons_muons1stStep_*_*']) +phase2_hgcal.toModify(FEVTDEBUGHLTEventContent, + outputCommands = FEVTDEBUGHLTEventContent.outputCommands + TICL_FEVTHLT.outputCommands) + +ticl_v5.toModify(FEVTDEBUGHLTEventContent, outputCommands=FEVTDEBUGHLTEventContent.outputCommands+TICLv5_FEVTHLT.outputCommands) + from Configuration.ProcessModifiers.premix_stage2_cff import premix_stage2 (premix_stage2 & phase2_tracker).toModify(FEVTDEBUGHLTEventContent, diff --git a/DQMOffline/Trigger/python/PrimaryVertexMonitoring_cff.py b/DQMOffline/Trigger/python/PrimaryVertexMonitoring_cff.py index f6354bad83460..08afda0e6be08 100644 --- a/DQMOffline/Trigger/python/PrimaryVertexMonitoring_cff.py +++ b/DQMOffline/Trigger/python/PrimaryVertexMonitoring_cff.py @@ -9,7 +9,7 @@ from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker phase2_tracker.toModify(hltVerticesMonitoring, TopFolderName = "HLT/Vertexing/hltFullVertices", - vertexLabel = cms.InputTag("offlinePrimaryVertices","","HLT")) + vertexLabel = cms.InputTag("hltOfflinePrimaryVertices")) hltPixelVerticesMonitoring = hltVerticesMonitoring.clone( TopFolderName = "HLT/Vertexing/hltPixelVertices", diff --git a/DQMOffline/Trigger/python/SiTrackerPhase2_OfflineMonitoring_cff.py b/DQMOffline/Trigger/python/SiTrackerPhase2_OfflineMonitoring_cff.py index 245b70652e468..e78fe6da73def 100644 --- a/DQMOffline/Trigger/python/SiTrackerPhase2_OfflineMonitoring_cff.py +++ b/DQMOffline/Trigger/python/SiTrackerPhase2_OfflineMonitoring_cff.py @@ -4,11 +4,11 @@ HLTclusterMonitorIT = clusterMonitorIT.clone( TopFolderName = cms.string('HLT/TrackerPhase2ITCluster'), - InnerPixelClusterSource = cms.InputTag('siPixelClusters','','HLT'), + InnerPixelClusterSource = cms.InputTag('hltSiPixelClusters'), ) HLTclusterMonitorOT = clusterMonitorOT.clone( TopFolderName = cms.string('HLT/TrackerPhase2OTCluster'), - clusterSrc = cms.InputTag('siPhase2Clusters','','HLT'), + clusterSrc = cms.InputTag('hltSiPhase2Clusters'), ) HLTtrackerphase2DQMSource = cms.Sequence(HLTclusterMonitorIT + diff --git a/DQMOffline/Trigger/python/TrackToTrackMonitoring_cff.py b/DQMOffline/Trigger/python/TrackToTrackMonitoring_cff.py index 8c7aacc7b6a6c..bcb8af4d4e612 100644 --- a/DQMOffline/Trigger/python/TrackToTrackMonitoring_cff.py +++ b/DQMOffline/Trigger/python/TrackToTrackMonitoring_cff.py @@ -30,8 +30,8 @@ from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker phase2_tracker.toModify(hltMerged2highPurity, - monitoredTrack = cms.InputTag("generalTracks","","HLT"), - monitoredPrimaryVertices = cms.InputTag("offlinePrimaryVertices","","HLT")) + monitoredTrack = cms.InputTag("hltGeneralTracks"), + monitoredPrimaryVertices = cms.InputTag("hltOfflinePrimaryVertices")) hltMerged2highPurityPV = TrackToTrackComparisonHists.clone( dzWRTPvCut = 0.1, @@ -51,8 +51,8 @@ from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker phase2_tracker.toModify(hltMerged2highPurityPV, - monitoredTrack = cms.InputTag("generalTracks","","HLT"), - monitoredPrimaryVertices = cms.InputTag("offlinePrimaryVertices","","HLT")) + monitoredTrack = cms.InputTag("hltGeneralTracks"), + monitoredPrimaryVertices = cms.InputTag("hltOfflinePrimaryVertices")) # # E/gamma monitoring @@ -82,11 +82,11 @@ from Configuration.Eras.Modifier_phase2_common_cff import phase2_common phase2_common.toModify(hltEgammaGsfTracksVsOffline, monitoredTrack = cms.InputTag("hltEgammaGsfTracksL1Seeded"), - monitoredPrimaryVertices = cms.InputTag("offlinePrimaryVertices","","HLT")) + monitoredPrimaryVertices = cms.InputTag("hltOfflinePrimaryVertices")) phase2_common.toModify(hltEgammaGsfTracksVsOfflinePV, monitoredTrack = cms.InputTag("hltEgammaGsfTracksL1Seeded"), - monitoredPrimaryVertices = cms.InputTag("offlinePrimaryVertices","","HLT")) + monitoredPrimaryVertices = cms.InputTag("hltOfflinePrimaryVertices")) hltToOfflineTrackValidatorSequence = cms.Sequence( cms.ignore(highPurityTracks) diff --git a/DQMOffline/Trigger/python/TrackingMonitoring_cff.py b/DQMOffline/Trigger/python/TrackingMonitoring_cff.py index 49df998fa33f2..eb779d8bc27dc 100644 --- a/DQMOffline/Trigger/python/TrackingMonitoring_cff.py +++ b/DQMOffline/Trigger/python/TrackingMonitoring_cff.py @@ -115,8 +115,8 @@ phase2_tracker.toModify(iterHLTTracksMonitoringHLT, primaryVertex = 'hltPhase2PixelVertices', - TrackProducer = 'generalTracks::HLT', - allTrackProducer = 'generalTracks::HLT') + TrackProducer = 'hltGeneralTracks', + allTrackProducer = 'hltGeneralTracks') iter3TracksMonitoringHLT = trackingMonHLT.clone( FolderName = 'HLT/Tracking/iter3Merged', diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/ecalBarrelClusterFastTimer_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/ecalBarrelClusterFastTimer_cfi.py deleted file mode 100644 index 2e65773d897b8..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/ecalBarrelClusterFastTimer_cfi.py +++ /dev/null @@ -1,13 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -ecalBarrelClusterFastTimer = cms.EDProducer("EcalBarrelClusterFastTimer", - ebClusters = cms.InputTag("particleFlowClusterECALUncorrected"), - ebTimeHits = cms.InputTag("ecalDetailedTimeRecHit","EcalRecHitsEB"), - ecalDepth = cms.double(7.0), - minEnergyToConsider = cms.double(0.0), - minFractionToConsider = cms.double(0.1), - resolutionModels = cms.VPSet(cms.PSet( - modelName = cms.string('PerfectResolutionModel') - )), - timedVertices = cms.InputTag("offlinePrimaryVertices4D") -) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/fixedGridRhoFastjetAllTmp_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/fixedGridRhoFastjetAllTmp_cfi.py deleted file mode 100644 index f313bdcc2a772..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/fixedGridRhoFastjetAllTmp_cfi.py +++ /dev/null @@ -1,7 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -fixedGridRhoFastjetAllTmp = cms.EDProducer("FixedGridRhoProducerFastjet", - gridSpacing = cms.double(0.55), - maxRapidity = cms.double(5.0), - pfCandidatesTag = cms.InputTag("particleFlowTmp") -) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalMergeLayerClustersL1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalMergeLayerClustersL1Seeded_cfi.py deleted file mode 100644 index 5ce0f9ea7deaf..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalMergeLayerClustersL1Seeded_cfi.py +++ /dev/null @@ -1,12 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -hgcalMergeLayerClustersL1Seeded = cms.EDProducer("MergeClusterProducer", - layerClustersEE = cms.InputTag("hgcalLayerClustersEEL1Seeded"), - layerClustersHSci = cms.InputTag("hgcalLayerClustersHSciL1Seeded"), - layerClustersHSi = cms.InputTag("hgcalLayerClustersHSiL1Seeded"), - mightGet = cms.optional.untracked.vstring, - timeClname = cms.string('timeLayerCluster'), - time_layerclustersEE = cms.InputTag("hgcalLayerClustersEEL1Seeded","timeLayerCluster"), - time_layerclustersHSci = cms.InputTag("hgcalLayerClustersHSciL1Seeded","timeLayerCluster"), - time_layerclustersHSi = cms.InputTag("hgcalLayerClustersHSiL1Seeded","timeLayerCluster") -) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalMergeLayerClusters_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalMergeLayerClusters_cfi.py deleted file mode 100644 index 35e5128f57683..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalMergeLayerClusters_cfi.py +++ /dev/null @@ -1,12 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -hgcalMergeLayerClusters = cms.EDProducer("MergeClusterProducer", - layerClustersEE = cms.InputTag("hgcalLayerClustersEE"), - layerClustersHSci = cms.InputTag("hgcalLayerClustersHSci"), - layerClustersHSi = cms.InputTag("hgcalLayerClustersHSi"), - mightGet = cms.optional.untracked.vstring, - timeClname = cms.string('timeLayerCluster'), - time_layerclustersEE = cms.InputTag("hgcalLayerClustersEE","timeLayerCluster"), - time_layerclustersHSci = cms.InputTag("hgcalLayerClustersHSci","timeLayerCluster"), - time_layerclustersHSi = cms.InputTag("hgcalLayerClustersHSi","timeLayerCluster") -) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/highPtTripletStepTrackSelectionHighPurity_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/highPtTripletStepTrackSelectionHighPurity_cfi.py deleted file mode 100644 index 842bdf6d7ea8b..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/highPtTripletStepTrackSelectionHighPurity_cfi.py +++ /dev/null @@ -1,10 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -highPtTripletStepTrackSelectionHighPurity = cms.EDProducer("TrackCollectionFilterCloner", - copyExtras = cms.untracked.bool(True), - copyTrajectories = cms.untracked.bool(False), - minQuality = cms.string('highPurity'), - originalMVAVals = cms.InputTag("highPtTripletStepTrackCutClassifier","MVAValues"), - originalQualVals = cms.InputTag("highPtTripletStepTrackCutClassifier","QualityMasks"), - originalSource = cms.InputTag("highPtTripletStepTracks") -) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK4PFCHSJetCorrectorL1_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK4PFCHSJetCorrectorL1_cfi.py index 28f5e71f6d441..a30fd165b9e73 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK4PFCHSJetCorrectorL1_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK4PFCHSJetCorrectorL1_cfi.py @@ -3,5 +3,5 @@ hltAK4PFCHSJetCorrectorL1 = cms.EDProducer("L1FastjetCorrectorProducer", algorithm = cms.string('AK4PFchs'), level = cms.string('L1FastJet'), - srcRho = cms.InputTag("fixedGridRhoFastjetAllTmp") + srcRho = cms.InputTag("hltFixedGridRhoFastjetAllTmp") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK4PFCHSJets_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK4PFCHSJets_cfi.py index 3e52389c7aaaa..52f03927b7ac8 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK4PFCHSJets_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK4PFCHSJets_cfi.py @@ -24,7 +24,7 @@ maxRecoveredHcalCells = cms.uint32(9999999), minSeed = cms.uint32(14327), rParam = cms.double(0.4), - src = cms.InputTag("pfNoPileUpJME"), + src = cms.InputTag("hltPfNoPileUpJME"), srcPVs = cms.InputTag(""), useDeterministicSeed = cms.bool(True), voronoiRfact = cms.double(-0.9) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK4PFClusterJets_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK4PFClusterJets_cfi.py index c80f4dde06cbf..b766c2521744c 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK4PFClusterJets_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK4PFClusterJets_cfi.py @@ -26,7 +26,7 @@ nSigmaPU = cms.double(1.0), rParam = cms.double(0.4), radiusPU = cms.double(0.5), - src = cms.InputTag("pfClusterRefsForJets"), + src = cms.InputTag("hltPfClusterRefsForJets"), srcPVs = cms.InputTag("NotUsed"), useDeterministicSeed = cms.bool(True), voronoiRfact = cms.double(-0.9) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK4PFJetCorrectorL1_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK4PFJetCorrectorL1_cfi.py index 355e96c997325..c17822b08208b 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK4PFJetCorrectorL1_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK4PFJetCorrectorL1_cfi.py @@ -3,5 +3,5 @@ hltAK4PFJetCorrectorL1 = cms.EDProducer("L1FastjetCorrectorProducer", algorithm = cms.string('AK4PF'), level = cms.string('L1FastJet'), - srcRho = cms.InputTag("fixedGridRhoFastjetAllTmp") + srcRho = cms.InputTag("hltFixedGridRhoFastjetAllTmp") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK4PFJetsForTaus_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK4PFJetsForTaus_cfi.py index 4746a4099596e..3de15d1cb429a 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK4PFJetsForTaus_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK4PFJetsForTaus_cfi.py @@ -58,7 +58,7 @@ radiusPU = cms.double(0.4), rcut_factor = cms.double(-1.0), restrictInputs = cms.bool(False), - src = cms.InputTag("particleFlowTmp"), + src = cms.InputTag("hltParticleFlowTmp"), srcPVs = cms.InputTag("hltPhase2PixelVertices"), srcWeights = cms.InputTag(""), subjetPtMin = cms.double(-1.0), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK4PFJets_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK4PFJets_cfi.py index f452c03a36962..bd01974051e3c 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK4PFJets_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK4PFJets_cfi.py @@ -24,7 +24,7 @@ maxRecoveredHcalCells = cms.uint32(9999999), minSeed = cms.uint32(14327), rParam = cms.double(0.4), - src = cms.InputTag("particleFlowTmp"), + src = cms.InputTag("hltParticleFlowTmp"), srcPVs = cms.InputTag(""), useDeterministicSeed = cms.bool(True), voronoiRfact = cms.double(-0.9) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK4PFPuppiJetCorrectorL1_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK4PFPuppiJetCorrectorL1_cfi.py index 3c4aece7f347b..2f518939163ad 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK4PFPuppiJetCorrectorL1_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK4PFPuppiJetCorrectorL1_cfi.py @@ -3,5 +3,5 @@ hltAK4PFPuppiJetCorrectorL1 = cms.EDProducer("L1FastjetCorrectorProducer", algorithm = cms.string('AK4PFPuppiHLT'), level = cms.string('L1FastJet'), - srcRho = cms.InputTag("fixedGridRhoFastjetAllTmp") + srcRho = cms.InputTag("hltFixedGridRhoFastjetAllTmp") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK4PFPuppiJets_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK4PFPuppiJets_cfi.py index 29f66c57ef6e3..b3e5b2c0aca1a 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK4PFPuppiJets_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK4PFPuppiJets_cfi.py @@ -24,7 +24,7 @@ maxRecoveredHcalCells = cms.uint32(9999999), minSeed = cms.uint32(14327), rParam = cms.double(0.4), - src = cms.InputTag("particleFlowTmp"), + src = cms.InputTag("hltParticleFlowTmp"), srcPVs = cms.InputTag(""), srcWeights = cms.InputTag("hltPFPuppi"), useDeterministicSeed = cms.bool(True), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK8PFCHSJetCorrectorL1_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK8PFCHSJetCorrectorL1_cfi.py index 778b41507ed76..0a9ec11d5ef55 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK8PFCHSJetCorrectorL1_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK8PFCHSJetCorrectorL1_cfi.py @@ -3,5 +3,5 @@ hltAK8PFCHSJetCorrectorL1 = cms.EDProducer("L1FastjetCorrectorProducer", algorithm = cms.string('AK8PFchs'), level = cms.string('L1FastJet'), - srcRho = cms.InputTag("fixedGridRhoFastjetAllTmp") + srcRho = cms.InputTag("hltFixedGridRhoFastjetAllTmp") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK8PFCHSJets_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK8PFCHSJets_cfi.py index 90c5c123e653d..f16e532f4ca5b 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK8PFCHSJets_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK8PFCHSJets_cfi.py @@ -24,7 +24,7 @@ maxRecoveredHcalCells = cms.uint32(9999999), minSeed = cms.uint32(14327), rParam = cms.double(0.8), - src = cms.InputTag("pfNoPileUpJME"), + src = cms.InputTag("hltPfNoPileUpJME"), srcPVs = cms.InputTag(""), useDeterministicSeed = cms.bool(True), voronoiRfact = cms.double(-0.9) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK8PFClusterJets_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK8PFClusterJets_cfi.py index a4dcc97a53de8..e8a670dd3727b 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK8PFClusterJets_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK8PFClusterJets_cfi.py @@ -26,7 +26,7 @@ nSigmaPU = cms.double(1.0), rParam = cms.double(0.8), radiusPU = cms.double(0.5), - src = cms.InputTag("pfClusterRefsForJets"), + src = cms.InputTag("hltPfClusterRefsForJets"), srcPVs = cms.InputTag("NotUsed"), useDeterministicSeed = cms.bool(True), voronoiRfact = cms.double(-0.9) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK8PFJetCorrectorL1_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK8PFJetCorrectorL1_cfi.py index 6dc1bb0297b6d..c2f7df74c22c6 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK8PFJetCorrectorL1_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK8PFJetCorrectorL1_cfi.py @@ -3,5 +3,5 @@ hltAK8PFJetCorrectorL1 = cms.EDProducer("L1FastjetCorrectorProducer", algorithm = cms.string('AK8PF'), level = cms.string('L1FastJet'), - srcRho = cms.InputTag("fixedGridRhoFastjetAllTmp") + srcRho = cms.InputTag("hltFixedGridRhoFastjetAllTmp") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK8PFJets_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK8PFJets_cfi.py index f7c00b67709bf..1177bc248010c 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK8PFJets_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK8PFJets_cfi.py @@ -24,7 +24,7 @@ maxRecoveredHcalCells = cms.uint32(9999999), minSeed = cms.uint32(14327), rParam = cms.double(0.8), - src = cms.InputTag("particleFlowTmp"), + src = cms.InputTag("hltParticleFlowTmp"), srcPVs = cms.InputTag(""), useDeterministicSeed = cms.bool(True), voronoiRfact = cms.double(-0.9) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK8PFPuppiJetCorrectorL1_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK8PFPuppiJetCorrectorL1_cfi.py index 307247636024a..df3df5913d56d 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK8PFPuppiJetCorrectorL1_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK8PFPuppiJetCorrectorL1_cfi.py @@ -3,5 +3,5 @@ hltAK8PFPuppiJetCorrectorL1 = cms.EDProducer("L1FastjetCorrectorProducer", algorithm = cms.string('AK8PFPuppi'), level = cms.string('L1FastJet'), - srcRho = cms.InputTag("fixedGridRhoFastjetAllTmp") + srcRho = cms.InputTag("hltFixedGridRhoFastjetAllTmp") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK8PFPuppiJets_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK8PFPuppiJets_cfi.py index 164588d23e69a..f456eb22e27a6 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK8PFPuppiJets_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltAK8PFPuppiJets_cfi.py @@ -24,7 +24,7 @@ maxRecoveredHcalCells = cms.uint32(9999999), minSeed = cms.uint32(14327), rParam = cms.double(0.8), - src = cms.InputTag("particleFlowTmp"), + src = cms.InputTag("hltParticleFlowTmp"), srcPVs = cms.InputTag(""), srcWeights = cms.InputTag("hltPFPuppi"), useDeterministicSeed = cms.bool(True), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/ak4CaloJetsForTrk_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltAk4CaloJetsForTrk_cfi.py similarity index 89% rename from HLTrigger/Configuration/python/HLT_75e33/modules/ak4CaloJetsForTrk_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltAk4CaloJetsForTrk_cfi.py index 5b4a7c10be22f..54ce4bf1ea889 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/ak4CaloJetsForTrk_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltAk4CaloJetsForTrk_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -ak4CaloJetsForTrk = cms.EDProducer("FastjetJetProducer", +hltAk4CaloJetsForTrk = cms.EDProducer("FastjetJetProducer", Active_Area_Repeats = cms.int32(1), GhostArea = cms.double(0.01), Ghost_EtaMax = cms.double(5.0), @@ -27,7 +27,7 @@ rParam = cms.double(0.4), radiusPU = cms.double(0.5), src = cms.InputTag("hltPhase2TowerMakerForAll"), - srcPVs = cms.InputTag("firstStepPrimaryVerticesUnsorted"), + srcPVs = cms.InputTag("hltFirstStepPrimaryVerticesUnsorted"), useDeterministicSeed = cms.bool(True), voronoiRfact = cms.double(-0.9) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/bunchSpacingProducer_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltBunchSpacingProducer_cfi.py similarity index 100% rename from HLTrigger/Configuration/python/HLT_75e33/modules/bunchSpacingProducer_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltBunchSpacingProducer_cfi.py diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltCaloMET_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltCaloMET_cfi.py index 17ff5caad525d..45b460b15f166 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltCaloMET_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltCaloMET_cfi.py @@ -5,5 +5,5 @@ calculateSignificance = cms.bool(False), globalThreshold = cms.double(0.3), noHF = cms.bool(False), - src = cms.InputTag("towerMaker") + src = cms.InputTag("hltTowerMaker") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltDeepBLifetimeTagInfosPFPuppiModEta2p4_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltDeepBLifetimeTagInfosPFPuppiModEta2p4_cfi.py index c11b4ee33a661..bdb26b960205b 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltDeepBLifetimeTagInfosPFPuppiModEta2p4_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltDeepBLifetimeTagInfosPFPuppiModEta2p4_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms hltDeepBLifetimeTagInfosPFPuppiModEta2p4 = cms.EDProducer("CandIPProducer", - candidates = cms.InputTag("particleFlowTmp"), + candidates = cms.InputTag("hltParticleFlowTmp"), computeGhostTrack = cms.bool(True), computeProbabilities = cms.bool(True), ghostTrackPriorDeltaR = cms.double(0.03), @@ -15,6 +15,6 @@ minimumNumberOfHits = cms.int32(3), minimumNumberOfPixelHits = cms.int32(2), minimumTransverseMomentum = cms.double(1.0), - primaryVertex = cms.InputTag("offlinePrimaryVertices"), + primaryVertex = cms.InputTag("hltOfflinePrimaryVertices"), useTrackQuality = cms.bool(False) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltDeepBLifetimeTagInfosPFPuppi_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltDeepBLifetimeTagInfosPFPuppi_cfi.py index f52013809a94e..411c891ba97fc 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltDeepBLifetimeTagInfosPFPuppi_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltDeepBLifetimeTagInfosPFPuppi_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms hltDeepBLifetimeTagInfosPFPuppi = cms.EDProducer("CandIPProducer", - candidates = cms.InputTag("particleFlowTmp"), + candidates = cms.InputTag("hltParticleFlowTmp"), computeGhostTrack = cms.bool(True), computeProbabilities = cms.bool(True), ghostTrackPriorDeltaR = cms.double(0.03), @@ -15,6 +15,6 @@ minimumNumberOfHits = cms.int32(3), minimumNumberOfPixelHits = cms.int32(2), minimumTransverseMomentum = cms.double(1.0), - primaryVertex = cms.InputTag("offlinePrimaryVertices"), + primaryVertex = cms.InputTag("hltOfflinePrimaryVertices"), useTrackQuality = cms.bool(False) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltDeepInclusiveVertexFinderPF_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltDeepInclusiveVertexFinderPF_cfi.py index 9609135fba8ae..074eb7f4666e4 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltDeepInclusiveVertexFinderPF_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltDeepInclusiveVertexFinderPF_cfi.py @@ -22,8 +22,8 @@ mightGet = cms.optional.untracked.vstring, minHits = cms.uint32(8), minPt = cms.double(1.4), - primaryVertices = cms.InputTag("offlinePrimaryVertices"), - tracks = cms.InputTag("particleFlowTmp"), + primaryVertices = cms.InputTag("hltOfflinePrimaryVertices"), + tracks = cms.InputTag("hltParticleFlowTmp"), useDirectVertexFitter = cms.bool(True), useVertexReco = cms.bool(True), vertexMinAngleCosine = cms.double(0.95), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltDeepTrackVertexArbitratorPF_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltDeepTrackVertexArbitratorPF_cfi.py index 8760855a7c58c..f8e8155eeb7ae 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltDeepTrackVertexArbitratorPF_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltDeepTrackVertexArbitratorPF_cfi.py @@ -10,11 +10,11 @@ fitterTini = cms.double(256), maxTimeSignificance = cms.double(3.5), mightGet = cms.optional.untracked.vstring, - primaryVertices = cms.InputTag("offlinePrimaryVertices"), + primaryVertices = cms.InputTag("hltOfflinePrimaryVertices"), secondaryVertices = cms.InputTag("hltDeepInclusiveSecondaryVerticesPF"), sigCut = cms.double(5), trackMinLayers = cms.int32(4), trackMinPixels = cms.int32(1), trackMinPt = cms.double(1.4), - tracks = cms.InputTag("particleFlowTmp") + tracks = cms.InputTag("hltParticleFlowTmp") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEcalBarrelClusterFastTimer_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEcalBarrelClusterFastTimer_cfi.py new file mode 100644 index 0000000000000..339586a1ab3fb --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEcalBarrelClusterFastTimer_cfi.py @@ -0,0 +1,13 @@ +import FWCore.ParameterSet.Config as cms + +hltEcalBarrelClusterFastTimer = cms.EDProducer("EcalBarrelClusterFastTimer", + ebClusters = cms.InputTag("hltParticleFlowClusterECALUncorrected"), + ebTimeHits = cms.InputTag("hltEcalDetailedTimeRecHit","EcalRecHitsEB"), + ecalDepth = cms.double(7.0), + minEnergyToConsider = cms.double(0.0), + minFractionToConsider = cms.double(0.1), + resolutionModels = cms.VPSet(cms.PSet( + modelName = cms.string('PerfectResolutionModel') + )), + timedVertices = cms.InputTag("hltOfflinePrimaryVertices4D") +) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/ecalDetailedTimeRecHit_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEcalDetailedTimeRecHit_cfi.py similarity index 89% rename from HLTrigger/Configuration/python/HLT_75e33/modules/ecalDetailedTimeRecHit_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltEcalDetailedTimeRecHit_cfi.py index 5e2a94ad95386..3ead731280a5a 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/ecalDetailedTimeRecHit_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEcalDetailedTimeRecHit_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -ecalDetailedTimeRecHit = cms.EDProducer("EcalDetailedTimeRecHitProducer", +hltEcalDetailedTimeRecHit = cms.EDProducer("EcalDetailedTimeRecHitProducer", EBDetailedTimeRecHitCollection = cms.string('EcalRecHitsEB'), EBRecHitCollection = cms.InputTag("hltEcalRecHit","EcalRecHitsEB"), EBTimeDigiCollection = cms.InputTag("mix","EBTimeDigi"), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/ecalMultiFitUncalibRecHit_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEcalMultiFitUncalibRecHit_cfi.py similarity index 97% rename from HLTrigger/Configuration/python/HLT_75e33/modules/ecalMultiFitUncalibRecHit_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltEcalMultiFitUncalibRecHit_cfi.py index 4ea232fc64b82..01b1a052acf40 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/ecalMultiFitUncalibRecHit_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEcalMultiFitUncalibRecHit_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -ecalMultiFitUncalibRecHit = cms.EDProducer("EcalUncalibRecHitProducer", +hltEcalMultiFitUncalibRecHit = cms.EDProducer("EcalUncalibRecHitProducer", EBdigiCollection = cms.InputTag("hltEcalDigis","ebDigis"), EBhitCollection = cms.string('EcalUncalibRecHitsEB'), EEdigiCollection = cms.InputTag("hltEcalDigis","eeDigis"), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEcalRecHit_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEcalRecHit_cfi.py index 5f07e190eb0d0..27fabc5fb4be7 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEcalRecHit_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEcalRecHit_cfi.py @@ -16,11 +16,11 @@ EBLaserMAX = cms.double(3.0), EBLaserMIN = cms.double(0.5), EBrechitCollection = cms.string('EcalRecHitsEB'), - EBuncalibRecHitCollection = cms.InputTag("ecalMultiFitUncalibRecHit","EcalUncalibRecHitsEB"), + EBuncalibRecHitCollection = cms.InputTag("hltEcalMultiFitUncalibRecHit","EcalUncalibRecHitsEB"), EELaserMAX = cms.double(8.0), EELaserMIN = cms.double(0.5), EErechitCollection = cms.string('EcalRecHitsEE'), - EEuncalibRecHitCollection = cms.InputTag("ecalMultiFitUncalibRecHit","EcalUncalibRecHitsEE"), + EEuncalibRecHitCollection = cms.InputTag("hltEcalMultiFitUncalibRecHit","EcalUncalibRecHitsEE"), algo = cms.string('EcalRecHitWorkerSimple'), algoRecover = cms.string('EcalRecHitWorkerRecover'), bdtWeightFileCracks = cms.FileInPath('RecoLocalCalo/EcalDeadChannelRecoveryAlgos/data/BDTWeights/bdtgAllRH_8GT700MeV_onlyCracks_ZskimData2017_v1.xml'), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaCandidatesL1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaCandidatesL1Seeded_cfi.py index 37cae0c5c0bf5..5ffac6c80b413 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaCandidatesL1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaCandidatesL1Seeded_cfi.py @@ -2,6 +2,6 @@ hltEgammaCandidatesL1Seeded = cms.EDProducer("EgammaHLTRecoEcalCandidateProducers", recoEcalCandidateCollection = cms.string(''), - scHybridBarrelProducer = cms.InputTag("hltParticleFlowSuperClusterECALL1Seeded","hltParticleFlowSuperClusterECALBarrel"), - scIslandEndcapProducer = cms.InputTag("particleFlowSuperClusterHGCalFromTICLL1Seeded") + scHybridBarrelProducer = cms.InputTag("hltParticleFlowSuperClusterECALL1Seeded","particleFlowSuperClusterECALBarrel"), + scIslandEndcapProducer = cms.InputTag("hltParticleFlowSuperClusterHGCalFromTICLL1Seeded") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaCandidatesUnseeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaCandidatesUnseeded_cfi.py index d406b5a277ed1..f1f51a98e480c 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaCandidatesUnseeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaCandidatesUnseeded_cfi.py @@ -2,6 +2,6 @@ hltEgammaCandidatesUnseeded = cms.EDProducer("EgammaHLTRecoEcalCandidateProducers", recoEcalCandidateCollection = cms.string(''), - scHybridBarrelProducer = cms.InputTag("hltParticleFlowSuperClusterECALUnseeded","hltParticleFlowSuperClusterECALBarrel"), - scIslandEndcapProducer = cms.InputTag("particleFlowSuperClusterHGCalFromTICLUnseeded") + scHybridBarrelProducer = cms.InputTag("hltParticleFlowSuperClusterECALUnseeded","particleFlowSuperClusterECALBarrel"), + scIslandEndcapProducer = cms.InputTag("hltParticleFlowSuperClusterHGCalFromTICLUnseeded") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaCkfTrackCandidatesForGSFL1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaCkfTrackCandidatesForGSFL1Seeded_cfi.py index 39b66f86ae92b..a2af7f0544158 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaCkfTrackCandidatesForGSFL1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaCkfTrackCandidatesForGSFL1Seeded_cfi.py @@ -1,6 +1,7 @@ import FWCore.ParameterSet.Config as cms hltEgammaCkfTrackCandidatesForGSFL1Seeded = cms.EDProducer("CkfTrackCandidateMaker", + MeasurementTrackerEvent = cms.InputTag("hltMeasurementTrackerEvent"), NavigationSchool = cms.string('SimpleNavigationSchool'), RedundantSeedCleaner = cms.string('CachingSeedCleanerBySharedInput'), TrajectoryBuilderPSet = cms.PSet( diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaCkfTrackCandidatesForGSFUnseeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaCkfTrackCandidatesForGSFUnseeded_cfi.py index e53fcd2b2a596..7451b68ed031f 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaCkfTrackCandidatesForGSFUnseeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaCkfTrackCandidatesForGSFUnseeded_cfi.py @@ -1,6 +1,7 @@ import FWCore.ParameterSet.Config as cms hltEgammaCkfTrackCandidatesForGSFUnseeded = cms.EDProducer("CkfTrackCandidateMaker", + MeasurementTrackerEvent = cms.InputTag("hltMeasurementTrackerEvent"), NavigationSchool = cms.string('SimpleNavigationSchool'), RedundantSeedCleaner = cms.string('CachingSeedCleanerBySharedInput'), TrajectoryBuilderPSet = cms.PSet( diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaEleGsfTrackIsoL1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaEleGsfTrackIsoL1Seeded_cfi.py index eb97d69090650..9bc025aee58b2 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaEleGsfTrackIsoL1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaEleGsfTrackIsoL1Seeded_cfi.py @@ -12,7 +12,7 @@ egTrkIsoZSpan = cms.double(0.15), electronProducer = cms.InputTag("hltEgammaGsfElectronsL1Seeded"), recoEcalCandidateProducer = cms.InputTag("hltEgammaCandidatesL1Seeded"), - trackProducer = cms.InputTag("generalTracks"), + trackProducer = cms.InputTag("hltGeneralTracks"), useGsfTrack = cms.bool(True), useSCRefs = cms.bool(True) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaEleGsfTrackIsoUnseeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaEleGsfTrackIsoUnseeded_cfi.py index 6177f387923b6..46de2388780cd 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaEleGsfTrackIsoUnseeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaEleGsfTrackIsoUnseeded_cfi.py @@ -12,7 +12,7 @@ egTrkIsoZSpan = cms.double(0.15), electronProducer = cms.InputTag("hltEgammaGsfElectronsUnseeded"), recoEcalCandidateProducer = cms.InputTag("hltEgammaCandidatesUnseeded"), - trackProducer = cms.InputTag("generalTracks"), + trackProducer = cms.InputTag("hltGeneralTracks"), useGsfTrack = cms.bool(True), useSCRefs = cms.bool(True) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaEleGsfTrackIsoV6L1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaEleGsfTrackIsoV6L1Seeded_cfi.py index 269dd4739f123..cc634ef336637 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaEleGsfTrackIsoV6L1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaEleGsfTrackIsoV6L1Seeded_cfi.py @@ -12,7 +12,7 @@ egTrkIsoZSpan = cms.double(0.15), electronProducer = cms.InputTag("hltEgammaGsfElectronsL1Seeded"), recoEcalCandidateProducer = cms.InputTag("hltEgammaCandidatesL1Seeded"), - trackProducer = cms.InputTag("generalTracks"), + trackProducer = cms.InputTag("hltGeneralTracks"), useGsfTrack = cms.bool(True), useSCRefs = cms.bool(True) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaEleGsfTrackIsoV6Unseeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaEleGsfTrackIsoV6Unseeded_cfi.py index a3bd145a034fd..85f6eeaf6a905 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaEleGsfTrackIsoV6Unseeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaEleGsfTrackIsoV6Unseeded_cfi.py @@ -12,7 +12,7 @@ egTrkIsoZSpan = cms.double(0.15), electronProducer = cms.InputTag("hltEgammaGsfElectronsUnseeded"), recoEcalCandidateProducer = cms.InputTag("hltEgammaCandidatesUnseeded"), - trackProducer = cms.InputTag("generalTracks"), + trackProducer = cms.InputTag("hltGeneralTracks"), useGsfTrack = cms.bool(True), useSCRefs = cms.bool(True) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaElectronPixelSeedsL1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaElectronPixelSeedsL1Seeded_cfi.py index e97889ae2ec9a..04aad7cb4d65a 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaElectronPixelSeedsL1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaElectronPixelSeedsL1Seeded_cfi.py @@ -44,7 +44,7 @@ useParamMagFieldIfDefined = cms.bool(True), useRecoVertex = cms.bool(False) ), - measTkEvt = cms.InputTag("MeasurementTrackerEvent"), + measTkEvt = cms.InputTag("hltMeasurementTrackerEvent"), superClusters = cms.VInputTag("hltEgammaSuperClustersToPixelMatchL1Seeded"), vertices = cms.InputTag("") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaElectronPixelSeedsUnseeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaElectronPixelSeedsUnseeded_cfi.py index 0f127c3cf6365..20f540ab26949 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaElectronPixelSeedsUnseeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaElectronPixelSeedsUnseeded_cfi.py @@ -44,7 +44,7 @@ useParamMagFieldIfDefined = cms.bool(True), useRecoVertex = cms.bool(False) ), - measTkEvt = cms.InputTag("MeasurementTrackerEvent"), + measTkEvt = cms.InputTag("hltMeasurementTrackerEvent"), superClusters = cms.VInputTag("hltEgammaSuperClustersToPixelMatchUnseeded"), vertices = cms.InputTag("") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaGsfTracksL1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaGsfTracksL1Seeded_cfi.py index 14ad4a67fe9cc..3e8d979bf8a39 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaGsfTracksL1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaGsfTracksL1Seeded_cfi.py @@ -5,7 +5,7 @@ Fitter = cms.string('GsfElectronFittingSmoother'), GeometricInnerState = cms.bool(False), MeasurementTracker = cms.string(''), - MeasurementTrackerEvent = cms.InputTag("MeasurementTrackerEvent"), + MeasurementTrackerEvent = cms.InputTag("hltMeasurementTrackerEvent"), NavigationSchool = cms.string('SimpleNavigationSchool'), Propagator = cms.string('fwdGsfElectronPropagator'), TTRHBuilder = cms.string('WithTrackAngle'), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaGsfTracksUnseeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaGsfTracksUnseeded_cfi.py index e543a511ffd5f..538318151e48d 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaGsfTracksUnseeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaGsfTracksUnseeded_cfi.py @@ -5,7 +5,7 @@ Fitter = cms.string('GsfElectronFittingSmoother'), GeometricInnerState = cms.bool(False), MeasurementTracker = cms.string(''), - MeasurementTrackerEvent = cms.InputTag("MeasurementTrackerEvent"), + MeasurementTrackerEvent = cms.InputTag("hltMeasurementTrackerEvent"), NavigationSchool = cms.string('SimpleNavigationSchool'), Propagator = cms.string('fwdGsfElectronPropagator'), TTRHBuilder = cms.string('WithTrackAngle'), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaHGCALIDVarsL1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaHGCALIDVarsL1Seeded_cfi.py index 23c07139dd3b9..2bfb0cd860038 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaHGCALIDVarsL1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaHGCALIDVarsL1Seeded_cfi.py @@ -1,8 +1,8 @@ import FWCore.ParameterSet.Config as cms hltEgammaHGCALIDVarsL1Seeded = cms.EDProducer("EgammaHLTHGCalIDVarProducer", - hgcalRecHits = cms.InputTag("particleFlowRecHitHGCL1Seeded"), - layerClusters = cms.InputTag("hgcalMergeLayerClustersL1Seeded"), + hgcalRecHits = cms.InputTag("hltParticleFlowRecHitHGCL1Seeded"), + layerClusters = cms.InputTag("hltHgcalMergeLayerClustersL1Seeded"), rCylinder = cms.double(2.8), recoEcalCandidateProducer = cms.InputTag("hltEgammaCandidatesL1Seeded") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaHGCALIDVarsUnseeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaHGCALIDVarsUnseeded_cfi.py index d8c7fe65f157c..bc6f148b9e53d 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaHGCALIDVarsUnseeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaHGCALIDVarsUnseeded_cfi.py @@ -1,8 +1,8 @@ import FWCore.ParameterSet.Config as cms hltEgammaHGCALIDVarsUnseeded = cms.EDProducer("EgammaHLTHGCalIDVarProducer", - hgcalRecHits = cms.InputTag("particleFlowRecHitHGC"), - layerClusters = cms.InputTag("hgcalMergeLayerClusters"), + hgcalRecHits = cms.InputTag("hltParticleFlowRecHitHGC"), + layerClusters = cms.InputTag("hltHgcalMergeLayerClusters"), rCylinder = cms.double(2.8), recoEcalCandidateProducer = cms.InputTag("hltEgammaCandidatesUnseeded") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaHGCalLayerClusterIsoL1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaHGCalLayerClusterIsoL1Seeded_cfi.py index f1eaedfb26f24..81b1cd1fa1ae7 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaHGCalLayerClusterIsoL1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaHGCalLayerClusterIsoL1Seeded_cfi.py @@ -5,7 +5,7 @@ drMax = cms.double(0.2), drVetoEM = cms.double(0.02), drVetoHad = cms.double(0.0), - layerClusterProducer = cms.InputTag("hgcalMergeLayerClustersL1Seeded"), + layerClusterProducer = cms.InputTag("hltHgcalMergeLayerClustersL1Seeded"), minEnergyEM = cms.double(0.02), minEnergyHad = cms.double(0.07), recoEcalCandidateProducer = cms.InputTag("hltEgammaCandidatesL1Seeded"), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaHGCalLayerClusterIsoUnseeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaHGCalLayerClusterIsoUnseeded_cfi.py index 3bd3cca23153a..bceafbcca562d 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaHGCalLayerClusterIsoUnseeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaHGCalLayerClusterIsoUnseeded_cfi.py @@ -5,7 +5,7 @@ drMax = cms.double(0.2), drVetoEM = cms.double(0.02), drVetoHad = cms.double(0.0), - layerClusterProducer = cms.InputTag("hgcalMergeLayerClusters"), + layerClusterProducer = cms.InputTag("hltHgcalMergeLayerClusters"), minEnergyEM = cms.double(0.02), minEnergyHad = cms.double(0.07), recoEcalCandidateProducer = cms.InputTag("hltEgammaCandidatesUnseeded"), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaHollowTrackIsoL1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaHollowTrackIsoL1Seeded_cfi.py index 4e04c818bd5d4..94726fae64574 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaHollowTrackIsoL1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaHollowTrackIsoL1Seeded_cfi.py @@ -10,5 +10,5 @@ egTrkIsoVetoConeSize = cms.double(0.06), egTrkIsoZSpan = cms.double(999999.0), recoEcalCandidateProducer = cms.InputTag("hltEgammaCandidatesL1Seeded"), - trackProducer = cms.InputTag("generalTracks") + trackProducer = cms.InputTag("hltGeneralTracks") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaHollowTrackIsoUnseeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaHollowTrackIsoUnseeded_cfi.py index 67de6353c48d9..e8d1991a7f090 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaHollowTrackIsoUnseeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaHollowTrackIsoUnseeded_cfi.py @@ -10,5 +10,5 @@ egTrkIsoVetoConeSize = cms.double(0.06), egTrkIsoZSpan = cms.double(999999.0), recoEcalCandidateProducer = cms.InputTag("hltEgammaCandidatesUnseeded"), - trackProducer = cms.InputTag("generalTracks") + trackProducer = cms.InputTag("hltGeneralTracks") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltElePixelHitTripletsClusterRemoverL1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltElePixelHitTripletsClusterRemoverL1Seeded_cfi.py index ee7fc2e9853ac..b7aee75c9206f 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltElePixelHitTripletsClusterRemoverL1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltElePixelHitTripletsClusterRemoverL1Seeded_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms hltElePixelHitTripletsClusterRemoverL1Seeded = cms.EDProducer("SeedClusterRemoverPhase2", - phase2OTClusters = cms.InputTag("siPhase2Clusters"), - pixelClusters = cms.InputTag("siPixelClusters"), + phase2OTClusters = cms.InputTag("hltSiPhase2Clusters"), + pixelClusters = cms.InputTag("hltSiPixelClusters"), trajectories = cms.InputTag("hltElePixelSeedsTripletsL1Seeded") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltElePixelHitTripletsClusterRemoverUnseeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltElePixelHitTripletsClusterRemoverUnseeded_cfi.py index be35b5393cecd..8d883172f3998 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltElePixelHitTripletsClusterRemoverUnseeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltElePixelHitTripletsClusterRemoverUnseeded_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms hltElePixelHitTripletsClusterRemoverUnseeded = cms.EDProducer("SeedClusterRemoverPhase2", - phase2OTClusters = cms.InputTag("siPhase2Clusters"), - pixelClusters = cms.InputTag("siPixelClusters"), + phase2OTClusters = cms.InputTag("hltSiPhase2Clusters"), + pixelClusters = cms.InputTag("hltSiPixelClusters"), trajectories = cms.InputTag("hltElePixelSeedsTripletsUnseeded") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/filteredLayerClustersCLUE3DHighL1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltFilteredLayerClustersCLUE3DHighL1Seeded_cfi.py similarity index 55% rename from HLTrigger/Configuration/python/HLT_75e33/modules/filteredLayerClustersCLUE3DHighL1Seeded_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltFilteredLayerClustersCLUE3DHighL1Seeded_cfi.py index 8efd637a77f37..765601d19a667 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/filteredLayerClustersCLUE3DHighL1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltFilteredLayerClustersCLUE3DHighL1Seeded_cfi.py @@ -1,8 +1,8 @@ import FWCore.ParameterSet.Config as cms -filteredLayerClustersCLUE3DHighL1Seeded = cms.EDProducer("FilteredLayerClustersProducer", - LayerClusters = cms.InputTag("hgcalMergeLayerClustersL1Seeded"), - LayerClustersInputMask = cms.InputTag("hgcalMergeLayerClustersL1Seeded","InitialLayerClustersMask"), +hltFilteredLayerClustersCLUE3DHighL1Seeded = cms.EDProducer("FilteredLayerClustersProducer", + LayerClusters = cms.InputTag("hltHgcalMergeLayerClustersL1Seeded"), + LayerClustersInputMask = cms.InputTag("hltHgcalMergeLayerClustersL1Seeded","InitialLayerClustersMask"), clusterFilter = cms.string('ClusterFilterByAlgoAndSize'), iteration_label = cms.string('CLUE3DHigh'), max_cluster_size = cms.int32(9999), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/filteredLayerClustersCLUE3DHigh_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltFilteredLayerClustersCLUE3DHigh_cfi.py similarity index 58% rename from HLTrigger/Configuration/python/HLT_75e33/modules/filteredLayerClustersCLUE3DHigh_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltFilteredLayerClustersCLUE3DHigh_cfi.py index 15577005794eb..765681f7b8d30 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/filteredLayerClustersCLUE3DHigh_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltFilteredLayerClustersCLUE3DHigh_cfi.py @@ -1,8 +1,8 @@ import FWCore.ParameterSet.Config as cms -filteredLayerClustersCLUE3DHigh = cms.EDProducer("FilteredLayerClustersProducer", - LayerClusters = cms.InputTag("hgcalMergeLayerClusters"), - LayerClustersInputMask = cms.InputTag("hgcalMergeLayerClusters","InitialLayerClustersMask"), +hltFilteredLayerClustersCLUE3DHigh = cms.EDProducer("FilteredLayerClustersProducer", + LayerClusters = cms.InputTag("hltHgcalMergeLayerClusters"), + LayerClustersInputMask = cms.InputTag("hltHgcalMergeLayerClusters","InitialLayerClustersMask"), clusterFilter = cms.string('ClusterFilterByAlgoAndSize'), iteration_label = cms.string('CLUE3DHigh'), max_cluster_size = cms.int32(9999), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltFilteredLayerClustersPassThrough_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltFilteredLayerClustersPassThrough_cfi.py index 21c51448f74cd..d8f75b8481ae4 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltFilteredLayerClustersPassThrough_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltFilteredLayerClustersPassThrough_cfi.py @@ -1,8 +1,8 @@ import FWCore.ParameterSet.Config as cms hltFilteredLayerClustersPassthrough = cms.EDProducer("FilteredLayerClustersProducer", - LayerClusters = cms.InputTag("hgcalMergeLayerClusters"), - LayerClustersInputMask = cms.InputTag("ticlTrackstersCLUE3DHigh"), + LayerClusters = cms.InputTag("hltHgcalMergeLayerClusters"), + LayerClustersInputMask = cms.InputTag("hltTiclTrackstersCLUE3DHigh"), algo_number = cms.vint32(6, 7, 8), clusterFilter = cms.string('ClusterFilterBySize'), iteration_label = cms.string('Passthrough'), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/firstStepPrimaryVerticesUnsorted_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltFirstStepPrimaryVerticesUnsorted_cfi.py similarity index 90% rename from HLTrigger/Configuration/python/HLT_75e33/modules/firstStepPrimaryVerticesUnsorted_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltFirstStepPrimaryVerticesUnsorted_cfi.py index c5d04bf799b29..64ac16a6811d6 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/firstStepPrimaryVerticesUnsorted_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltFirstStepPrimaryVerticesUnsorted_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -firstStepPrimaryVerticesUnsorted = cms.EDProducer("PrimaryVertexProducer", +hltFirstStepPrimaryVerticesUnsorted = cms.EDProducer("PrimaryVertexProducer", TkClusParameters = cms.PSet( TkDAClusParameters = cms.PSet( Tmin = cms.double(2.0), @@ -25,7 +25,7 @@ minSiliconLayersWithHits = cms.int32(5), trackQuality = cms.string('any') ), - TrackLabel = cms.InputTag("initialStepTracks"), + TrackLabel = cms.InputTag("hltInitialStepTracks"), beamSpotLabel = cms.InputTag("hltOnlineBeamSpot"), verbose = cms.untracked.bool(False), vertexCollections = cms.VPSet(cms.PSet( diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltFixedGridRhoFastjetAllTmp_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltFixedGridRhoFastjetAllTmp_cfi.py new file mode 100644 index 0000000000000..051f9804bd849 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltFixedGridRhoFastjetAllTmp_cfi.py @@ -0,0 +1,7 @@ +import FWCore.ParameterSet.Config as cms + +hltFixedGridRhoFastjetAllTmp = cms.EDProducer("FixedGridRhoProducerFastjet", + gridSpacing = cms.double(0.55), + maxRapidity = cms.double(5.0), + pfCandidatesTag = cms.InputTag("hltParticleFlowTmp") +) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltFixedGridRhoProducerFastjetAllTau_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltFixedGridRhoProducerFastjetAllTau_cfi.py index 9db661eb3130f..6d0a3402f7e72 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltFixedGridRhoProducerFastjetAllTau_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltFixedGridRhoProducerFastjetAllTau_cfi.py @@ -3,5 +3,5 @@ hltFixedGridRhoProducerFastjetAllTau = cms.EDProducer("FixedGridRhoProducerFastjet", gridSpacing = cms.double(0.55), maxRapidity = cms.double(5.0), - pfCandidatesTag = cms.InputTag("particleFlowTmp") + pfCandidatesTag = cms.InputTag("hltParticleFlowTmp") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/generalTracks_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltGeneralTracks_cfi.py similarity index 70% rename from HLTrigger/Configuration/python/HLT_75e33/modules/generalTracks_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltGeneralTracks_cfi.py index 88df65a928b2b..2b746508d72e6 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/generalTracks_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltGeneralTracks_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -generalTracks = cms.EDProducer("TrackListMerger", +hltGeneralTracks = cms.EDProducer("TrackListMerger", Epsilon = cms.double(-0.001), FoundHitBonus = cms.double(5.0), LostHitPenalty = cms.double(5.0), @@ -8,7 +8,7 @@ MinFound = cms.int32(3), MinPT = cms.double(0.9), ShareFrac = cms.double(0.19), - TrackProducers = cms.VInputTag("initialStepTrackSelectionHighPurity", "highPtTripletStepTrackSelectionHighPurity"), + TrackProducers = cms.VInputTag("hltInitialStepTrackSelectionHighPurity", "hltHighPtTripletStepTrackSelectionHighPurity"), allowFirstHitShare = cms.bool(True), copyExtras = cms.untracked.bool(True), copyMVA = cms.bool(False), @@ -16,7 +16,7 @@ indivShareFrac = cms.vdouble(1.0, 1.0), makeReKeyedSeeds = cms.untracked.bool(False), newQuality = cms.string('confirmed'), - selectedTrackQuals = cms.VInputTag(cms.InputTag("initialStepTrackSelectionHighPurity"), cms.InputTag("highPtTripletStepTrackSelectionHighPurity")), + selectedTrackQuals = cms.VInputTag(cms.InputTag("hltInitialStepTrackSelectionHighPurity"), cms.InputTag("hltHighPtTripletStepTrackSelectionHighPurity")), setsToMerge = cms.VPSet(cms.PSet( pQual = cms.bool(True), tLists = cms.vint32(0, 1) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/goodOfflinePrimaryVertices_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltGoodOfflinePrimaryVertices_cfi.py similarity index 59% rename from HLTrigger/Configuration/python/HLT_75e33/modules/goodOfflinePrimaryVertices_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltGoodOfflinePrimaryVertices_cfi.py index 7ac083542bdb5..d902637c9f2f6 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/goodOfflinePrimaryVertices_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltGoodOfflinePrimaryVertices_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -goodOfflinePrimaryVertices = cms.EDFilter("VertexSelector", +hltGoodOfflinePrimaryVertices = cms.EDFilter("VertexSelector", cut = cms.string('!isFake && ndof >= 4.0 && abs(z) <= 24.0 && abs(position.Rho) <= 2.0'), filter = cms.bool(False), - src = cms.InputTag("offlinePrimaryVertices") + src = cms.InputTag("hltOfflinePrimaryVertices") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/HGCalRecHitL1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHGCalRecHitL1Seeded_cfi.py similarity index 82% rename from HLTrigger/Configuration/python/HLT_75e33/modules/HGCalRecHitL1Seeded_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltHGCalRecHitL1Seeded_cfi.py index 666e57cba0f62..941e7d9fa1f5a 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/HGCalRecHitL1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHGCalRecHitL1Seeded_cfi.py @@ -2,7 +2,7 @@ from ..psets.hgcal_reco_constants_cfi import HGCAL_reco_constants as HGCAL_reco_constants -HGCalRecHitL1Seeded = cms.EDProducer("HGCalRecHitProducer", +hltHGCalRecHitL1Seeded = cms.EDProducer("HGCalRecHitProducer", HGCEE_cce = cms.PSet( refToPSet_ = cms.string('HGCAL_chargeCollectionEfficiencies') ), @@ -13,14 +13,14 @@ refToPSet_ = cms.string('HGCAL_noise_fC') ), HGCEErechitCollection = cms.string('HGCEERecHits'), - HGCEEuncalibRecHitCollection = cms.InputTag("HGCalUncalibRecHitL1Seeded","HGCEEUncalibRecHits"), + HGCEEuncalibRecHitCollection = cms.InputTag("hltHGCalUncalibRecHitL1Seeded","HGCEEUncalibRecHits"), HGCHEB_isSiFE = cms.bool(True), HGCHEB_keV2DIGI = cms.double(0.00148148148148), HGCHEB_noise_MIP = cms.PSet( refToPSet_ = cms.string('HGCAL_noise_heback') ), HGCHEBrechitCollection = cms.string('HGCHEBRecHits'), - HGCHEBuncalibRecHitCollection = cms.InputTag("HGCalUncalibRecHitL1Seeded","HGCHEBUncalibRecHits"), + HGCHEBuncalibRecHitCollection = cms.InputTag("hltHGCalUncalibRecHitL1Seeded","HGCHEBUncalibRecHits"), HGCHEF_cce = cms.PSet( refToPSet_ = cms.string('HGCAL_chargeCollectionEfficiencies') ), @@ -31,7 +31,7 @@ refToPSet_ = cms.string('HGCAL_noise_fC') ), HGCHEFrechitCollection = cms.string('HGCHEFRecHits'), - HGCHEFuncalibRecHitCollection = cms.InputTag("HGCalUncalibRecHitL1Seeded","HGCHEFUncalibRecHits"), + HGCHEFuncalibRecHitCollection = cms.InputTag("hltHGCalUncalibRecHitL1Seeded","HGCHEFUncalibRecHits"), HGCHFNose_cce = cms.PSet( refToPSet_ = cms.string('HGCAL_chargeCollectionEfficiencies') ), @@ -42,7 +42,7 @@ refToPSet_ = cms.string('HGCAL_noise_fC') ), HGCHFNoserechitCollection = cms.string('HGCHFNoseRecHits'), - HGCHFNoseuncalibRecHitCollection = cms.InputTag("HGCalUncalibRecHitL1Seeded","HGCHFNoseUncalibRecHits"), + HGCHFNoseuncalibRecHitCollection = cms.InputTag("hltHGCalUncalibRecHitL1Seeded","HGCHFNoseUncalibRecHits"), algo = cms.string('HGCalRecHitWorkerSimple'), constSiPar = cms.double(0.02), deltasi_index_regemfac = cms.int32(3), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/HGCalRecHit_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHGCalRecHit_cfi.py similarity index 83% rename from HLTrigger/Configuration/python/HLT_75e33/modules/HGCalRecHit_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltHGCalRecHit_cfi.py index a76aa57d184c1..9cf431061b954 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/HGCalRecHit_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHGCalRecHit_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms from ..psets.hgcal_reco_constants_cfi import HGCAL_reco_constants as HGCAL_reco_constants -HGCalRecHit = cms.EDProducer("HGCalRecHitProducer", +hltHGCalRecHit = cms.EDProducer("HGCalRecHitProducer", HGCEE_cce = cms.PSet( refToPSet_ = cms.string('HGCAL_chargeCollectionEfficiencies') ), @@ -12,14 +12,14 @@ refToPSet_ = cms.string('HGCAL_noise_fC') ), HGCEErechitCollection = cms.string('HGCEERecHits'), - HGCEEuncalibRecHitCollection = cms.InputTag("HGCalUncalibRecHit","HGCEEUncalibRecHits"), + HGCEEuncalibRecHitCollection = cms.InputTag("hltHGCalUncalibRecHit","HGCEEUncalibRecHits"), HGCHEB_isSiFE = cms.bool(True), HGCHEB_keV2DIGI = cms.double(0.00148148148148), HGCHEB_noise_MIP = cms.PSet( refToPSet_ = cms.string('HGCAL_noise_heback') ), HGCHEBrechitCollection = cms.string('HGCHEBRecHits'), - HGCHEBuncalibRecHitCollection = cms.InputTag("HGCalUncalibRecHit","HGCHEBUncalibRecHits"), + HGCHEBuncalibRecHitCollection = cms.InputTag("hltHGCalUncalibRecHit","HGCHEBUncalibRecHits"), HGCHEF_cce = cms.PSet( refToPSet_ = cms.string('HGCAL_chargeCollectionEfficiencies') ), @@ -30,7 +30,7 @@ refToPSet_ = cms.string('HGCAL_noise_fC') ), HGCHEFrechitCollection = cms.string('HGCHEFRecHits'), - HGCHEFuncalibRecHitCollection = cms.InputTag("HGCalUncalibRecHit","HGCHEFUncalibRecHits"), + HGCHEFuncalibRecHitCollection = cms.InputTag("hltHGCalUncalibRecHit","HGCHEFUncalibRecHits"), HGCHFNose_cce = cms.PSet( refToPSet_ = cms.string('HGCAL_chargeCollectionEfficiencies') ), @@ -41,7 +41,7 @@ refToPSet_ = cms.string('HGCAL_noise_fC') ), HGCHFNoserechitCollection = cms.string('HGCHFNoseRecHits'), - HGCHFNoseuncalibRecHitCollection = cms.InputTag("HGCalUncalibRecHit","HGCHFNoseUncalibRecHits"), + HGCHFNoseuncalibRecHitCollection = cms.InputTag("hltHGCalUncalibRecHit","HGCHFNoseUncalibRecHits"), algo = cms.string('HGCalRecHitWorkerSimple'), constSiPar = cms.double(0.02), deltasi_index_regemfac = cms.int32(3), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/HGCalUncalibRecHitL1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHGCalUncalibRecHitL1Seeded_cfi.py similarity index 85% rename from HLTrigger/Configuration/python/HLT_75e33/modules/HGCalUncalibRecHitL1Seeded_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltHGCalUncalibRecHitL1Seeded_cfi.py index 7d36dfe28201a..5d9d933b0d410 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/HGCalUncalibRecHitL1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHGCalUncalibRecHitL1Seeded_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms from ..psets.hgcal_reco_constants_cfi import HGCAL_reco_constants as HGCAL_reco_constants -HGCalUncalibRecHitL1Seeded = cms.EDProducer("HGCalUncalibRecHitProducer", +hltHGCalUncalibRecHitL1Seeded = cms.EDProducer("HGCalUncalibRecHitProducer", HGCEEConfig = cms.PSet( adcNbits = cms.uint32(10), adcSaturation = cms.double(100), @@ -13,7 +13,7 @@ toaLSB_ns = cms.double(0.0244), tofDelay = cms.double(-9) ), - HGCEEdigiCollection = cms.InputTag("hgcalDigisL1Seeded","EE"), + HGCEEdigiCollection = cms.InputTag("hltHgcalDigisL1Seeded","EE"), HGCEEhitCollection = cms.string('HGCEEUncalibRecHits'), HGCHEBConfig = cms.PSet( adcNbits = cms.uint32(10), @@ -26,7 +26,7 @@ toaLSB_ns = cms.double(0.0244), tofDelay = cms.double(-14) ), - HGCHEBdigiCollection = cms.InputTag("hgcalDigisL1Seeded","HEback"), + HGCHEBdigiCollection = cms.InputTag("hltHgcalDigisL1Seeded","HEback"), HGCHEBhitCollection = cms.string('HGCHEBUncalibRecHits'), HGCHEFConfig = cms.PSet( adcNbits = cms.uint32(10), @@ -39,7 +39,7 @@ toaLSB_ns = cms.double(0.0244), tofDelay = cms.double(-11) ), - HGCHEFdigiCollection = cms.InputTag("hgcalDigisL1Seeded","HEfront"), + HGCHEFdigiCollection = cms.InputTag("hltHgcalDigisL1Seeded","HEfront"), HGCHEFhitCollection = cms.string('HGCHEFUncalibRecHits'), HGCHFNoseConfig = cms.PSet( adcNbits = cms.uint32(10), @@ -59,4 +59,4 @@ ) from Configuration.ProcessModifiers.ticl_v5_cff import ticl_v5 -ticl_v5.toModify(HGCalUncalibRecHitL1Seeded, computeLocalTime = cms.bool(True)) +ticl_v5.toModify(hltHGCalUncalibRecHitL1Seeded, computeLocalTime = cms.bool(True)) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/HGCalUncalibRecHit_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHGCalUncalibRecHit_cfi.py similarity index 86% rename from HLTrigger/Configuration/python/HLT_75e33/modules/HGCalUncalibRecHit_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltHGCalUncalibRecHit_cfi.py index f8d8f1adb41bd..1cec533eaf6a4 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/HGCalUncalibRecHit_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHGCalUncalibRecHit_cfi.py @@ -2,7 +2,7 @@ from ..psets.hgcal_reco_constants_cfi import HGCAL_reco_constants as HGCAL_reco_constants -HGCalUncalibRecHit = cms.EDProducer("HGCalUncalibRecHitProducer", +hltHGCalUncalibRecHit = cms.EDProducer("HGCalUncalibRecHitProducer", HGCEEConfig = cms.PSet( adcNbits = cms.uint32(10), adcSaturation = cms.double(100), @@ -14,7 +14,7 @@ toaLSB_ns = cms.double(0.0244), tofDelay = cms.double(-9) ), - HGCEEdigiCollection = cms.InputTag("hgcalDigis","EE"), + HGCEEdigiCollection = cms.InputTag("hltHgcalDigis","EE"), HGCEEhitCollection = cms.string('HGCEEUncalibRecHits'), HGCHEBConfig = cms.PSet( adcNbits = cms.uint32(10), @@ -27,7 +27,7 @@ toaLSB_ns = cms.double(0.0244), tofDelay = cms.double(-14) ), - HGCHEBdigiCollection = cms.InputTag("hgcalDigis","HEback"), + HGCHEBdigiCollection = cms.InputTag("hltHgcalDigis","HEback"), HGCHEBhitCollection = cms.string('HGCHEBUncalibRecHits'), HGCHEFConfig = cms.PSet( adcNbits = cms.uint32(10), @@ -40,7 +40,7 @@ toaLSB_ns = cms.double(0.0244), tofDelay = cms.double(-11) ), - HGCHEFdigiCollection = cms.InputTag("hgcalDigis","HEfront"), + HGCHEFdigiCollection = cms.InputTag("hltHgcalDigis","HEfront"), HGCHEFhitCollection = cms.string('HGCHEFUncalibRecHits'), HGCHFNoseConfig = cms.PSet( adcNbits = cms.uint32(10), @@ -60,4 +60,4 @@ ) from Configuration.ProcessModifiers.ticl_v5_cff import ticl_v5 -ticl_v5.toModify(HGCalUncalibRecHit, computeLocalTime = cms.bool(True)) +ticl_v5.toModify(hltHGCalUncalibRecHit, computeLocalTime = cms.bool(True)) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalDigisL1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHgcalDigisL1Seeded_cfi.py similarity index 73% rename from HLTrigger/Configuration/python/HLT_75e33/modules/hgcalDigisL1Seeded_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltHgcalDigisL1Seeded_cfi.py index 213654b8c7af9..eb1f214b0e506 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalDigisL1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHgcalDigisL1Seeded_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -hgcalDigisL1Seeded = cms.EDProducer("HLTHGCalDigisInRegionsProducer", +hltHgcalDigisL1Seeded = cms.EDProducer("HLTHGCalDigisInRegionsProducer", etaPhiRegions = cms.VPSet(cms.PSet( inputColl = cms.InputTag("hltL1TEGammaHGCFilteredCollectionProducer"), maxDEta = cms.double(0.0), @@ -10,7 +10,7 @@ minEt = cms.double(5.0), type = cms.string('L1P2GTCandidate') )), - inputCollTags = cms.VInputTag("hgcalDigis:EE", "hgcalDigis:HEback", "hgcalDigis:HEfront"), + inputCollTags = cms.VInputTag("hltHgcalDigis:EE", "hltHgcalDigis:HEback", "hltHgcalDigis:HEfront"), outputProductNames = cms.vstring( 'EE', 'HEback', diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalDigis_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHgcalDigis_cfi.py similarity index 84% rename from HLTrigger/Configuration/python/HLT_75e33/modules/hgcalDigis_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltHgcalDigis_cfi.py index 75fe26c0652be..0389cd0a37dac 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalDigis_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHgcalDigis_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -hgcalDigis = cms.EDProducer("HGCalRawToDigiFake", +hltHgcalDigis = cms.EDProducer("HGCalRawToDigiFake", bhDigis = cms.InputTag("simHGCalUnsuppressedDigis","HEback"), eeDigis = cms.InputTag("simHGCalUnsuppressedDigis","EE"), fhDigis = cms.InputTag("simHGCalUnsuppressedDigis","HEfront"), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersEEL1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHgcalLayerClustersEEL1Seeded_cfi.py similarity index 94% rename from HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersEEL1Seeded_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltHgcalLayerClustersEEL1Seeded_cfi.py index bc060cc9a4ec4..388949a0bd2f9 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersEEL1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHgcalLayerClustersEEL1Seeded_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms from ..psets.hgcal_reco_constants_cfi import HGCAL_reco_constants as HGCAL_reco_constants -hgcalLayerClustersEEL1Seeded = cms.EDProducer("HGCalLayerClusterProducer", +hltHgcalLayerClustersEEL1Seeded = cms.EDProducer("HGCalLayerClusterProducer", detector = cms.string('EE'), mightGet = cms.optional.untracked.vstring, nHitsTime = cms.uint32(3), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersEE_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHgcalLayerClustersEE_cfi.py similarity index 90% rename from HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersEE_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltHgcalLayerClustersEE_cfi.py index b868a164f09ae..92f6ae078f601 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersEE_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHgcalLayerClustersEE_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms from ..psets.hgcal_reco_constants_cfi import HGCAL_reco_constants as HGCAL_reco_constants -hgcalLayerClustersEE = cms.EDProducer("HGCalLayerClusterProducer", +hltHgcalLayerClustersEE = cms.EDProducer("HGCalLayerClusterProducer", detector = cms.string('EE'), mightGet = cms.optional.untracked.vstring, nHitsTime = cms.uint32(3), @@ -30,6 +30,6 @@ use2x2 = cms.bool(True), verbosity = cms.untracked.uint32(3) ), - recHits = cms.InputTag("HGCalRecHit","HGCEERecHits"), + recHits = cms.InputTag("hltHGCalRecHit","HGCEERecHits"), timeClname = cms.string('timeLayerCluster') ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersHSciL1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHgcalLayerClustersHSciL1Seeded_cfi.py similarity index 94% rename from HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersHSciL1Seeded_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltHgcalLayerClustersHSciL1Seeded_cfi.py index 230bdc87f23d1..5c2341bb56320 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersHSciL1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHgcalLayerClustersHSciL1Seeded_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms from ..psets.hgcal_reco_constants_cfi import HGCAL_reco_constants as HGCAL_reco_constants -hgcalLayerClustersHSciL1Seeded = cms.EDProducer("HGCalLayerClusterProducer", +hltHgcalLayerClustersHSciL1Seeded = cms.EDProducer("HGCalLayerClusterProducer", detector = cms.string('BH'), mightGet = cms.optional.untracked.vstring, nHitsTime = cms.uint32(3), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersHSci_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHgcalLayerClustersHSci_cfi.py similarity index 90% rename from HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersHSci_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltHgcalLayerClustersHSci_cfi.py index 34c3125e1faca..09414371a7481 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersHSci_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHgcalLayerClustersHSci_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms from ..psets.hgcal_reco_constants_cfi import HGCAL_reco_constants as HGCAL_reco_constants -hgcalLayerClustersHSci = cms.EDProducer("HGCalLayerClusterProducer", +hltHgcalLayerClustersHSci = cms.EDProducer("HGCalLayerClusterProducer", detector = cms.string('BH'), mightGet = cms.optional.untracked.vstring, nHitsTime = cms.uint32(3), @@ -30,6 +30,6 @@ use2x2 = cms.bool(True), verbosity = cms.untracked.uint32(3) ), - recHits = cms.InputTag("HGCalRecHit","HGCHEBRecHits"), + recHits = cms.InputTag("hltHGCalRecHit","HGCHEBRecHits"), timeClname = cms.string('timeLayerCluster') ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersHSiL1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHgcalLayerClustersHSiL1Seeded_cfi.py similarity index 94% rename from HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersHSiL1Seeded_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltHgcalLayerClustersHSiL1Seeded_cfi.py index be79095d5427b..d11694809c04c 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersHSiL1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHgcalLayerClustersHSiL1Seeded_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms from ..psets.hgcal_reco_constants_cfi import HGCAL_reco_constants as HGCAL_reco_constants -hgcalLayerClustersHSiL1Seeded = cms.EDProducer("HGCalLayerClusterProducer", +hltHgcalLayerClustersHSiL1Seeded = cms.EDProducer("HGCalLayerClusterProducer", detector = cms.string('FH'), mightGet = cms.optional.untracked.vstring, nHitsTime = cms.uint32(3), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersHSi_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHgcalLayerClustersHSi_cfi.py similarity index 90% rename from HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersHSi_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltHgcalLayerClustersHSi_cfi.py index 23f5b4e714773..9776e2aa1c8a3 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalLayerClustersHSi_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHgcalLayerClustersHSi_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms from ..psets.hgcal_reco_constants_cfi import HGCAL_reco_constants as HGCAL_reco_constants -hgcalLayerClustersHSi = cms.EDProducer("HGCalLayerClusterProducer", +hltHgcalLayerClustersHSi = cms.EDProducer("HGCalLayerClusterProducer", detector = cms.string('FH'), mightGet = cms.optional.untracked.vstring, nHitsTime = cms.uint32(3), @@ -30,6 +30,6 @@ use2x2 = cms.bool(True), verbosity = cms.untracked.uint32(3) ), - recHits = cms.InputTag("HGCalRecHit","HGCHEFRecHits"), + recHits = cms.InputTag("hltHGCalRecHit","HGCHEFRecHits"), timeClname = cms.string('timeLayerCluster') ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltHgcalMergeLayerClustersL1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHgcalMergeLayerClustersL1Seeded_cfi.py new file mode 100644 index 0000000000000..48c3103c50899 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHgcalMergeLayerClustersL1Seeded_cfi.py @@ -0,0 +1,12 @@ +import FWCore.ParameterSet.Config as cms + +hltHgcalMergeLayerClustersL1Seeded = cms.EDProducer("MergeClusterProducer", + layerClustersEE = cms.InputTag("hltHgcalLayerClustersEEL1Seeded"), + layerClustersHSci = cms.InputTag("hltHgcalLayerClustersHSciL1Seeded"), + layerClustersHSi = cms.InputTag("hltHgcalLayerClustersHSiL1Seeded"), + mightGet = cms.optional.untracked.vstring, + timeClname = cms.string('timeLayerCluster'), + time_layerclustersEE = cms.InputTag("hltHgcalLayerClustersEEL1Seeded","timeLayerCluster"), + time_layerclustersHSci = cms.InputTag("hltHgcalLayerClustersHSciL1Seeded","timeLayerCluster"), + time_layerclustersHSi = cms.InputTag("hltHgcalLayerClustersHSiL1Seeded","timeLayerCluster") +) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltHgcalMergeLayerClusters_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHgcalMergeLayerClusters_cfi.py new file mode 100644 index 0000000000000..5cb83e4ad3438 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHgcalMergeLayerClusters_cfi.py @@ -0,0 +1,12 @@ +import FWCore.ParameterSet.Config as cms + +hltHgcalMergeLayerClusters = cms.EDProducer("MergeClusterProducer", + layerClustersEE = cms.InputTag("hltHgcalLayerClustersEE"), + layerClustersHSci = cms.InputTag("hltHgcalLayerClustersHSci"), + layerClustersHSi = cms.InputTag("hltHgcalLayerClustersHSi"), + mightGet = cms.optional.untracked.vstring, + timeClname = cms.string('timeLayerCluster'), + time_layerclustersEE = cms.InputTag("hltHgcalLayerClustersEE","timeLayerCluster"), + time_layerclustersHSci = cms.InputTag("hltHgcalLayerClustersHSci","timeLayerCluster"), + time_layerclustersHSi = cms.InputTag("hltHgcalLayerClustersHSi","timeLayerCluster") +) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltHgcalSoARecHitsProducer_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHgcalSoARecHitsProducer_cfi.py index cac20665fe856..038818d1b26f4 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltHgcalSoARecHitsProducer_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHgcalSoARecHitsProducer_cfi.py @@ -12,7 +12,7 @@ fcPerMip = HGCAL_reco_constants.fcPerMip, maxNumberOfThickIndices = HGCAL_reco_constants.maxNumberOfThickIndices, noises = HGCAL_reco_constants.noises, - recHits = cms.InputTag("HGCalRecHit","HGCEERecHits"), + recHits = cms.InputTag("hltHGCalRecHit","HGCEERecHits"), thicknessCorrection = HGCAL_reco_constants.thicknessCorrection, ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalTrackCollection_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHgcalTrackCollection_cfi.py similarity index 78% rename from HLTrigger/Configuration/python/HLT_75e33/modules/hgcalTrackCollection_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltHgcalTrackCollection_cfi.py index c32003e5e6910..e8829b2688565 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalTrackCollection_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHgcalTrackCollection_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -hgcalTrackCollection = cms.EDProducer("HGCalTrackCollectionProducer", +hltHgcalTrackCollection = cms.EDProducer("HGCalTrackCollectionProducer", DPtOverPtCuts_byTrackAlgo = cms.vdouble( 10.0, 10.0, 10.0, 10.0, 10.0, 5.0 @@ -12,7 +12,7 @@ hgcalGeometryNames = cms.PSet( HGC_ECAL = cms.string('HGCalEESensitive') ), - src = cms.InputTag("pfTrack"), + src = cms.InputTag("hltPfTrack"), trackQuality = cms.string('highPurity'), useIterativeTracking = cms.bool(True) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/highPtTripletStepClusters_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepClusters_cfi.py similarity index 57% rename from HLTrigger/Configuration/python/HLT_75e33/modules/highPtTripletStepClusters_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepClusters_cfi.py index 4cbb25f8d509e..ed02f3aac573f 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/highPtTripletStepClusters_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepClusters_cfi.py @@ -1,14 +1,14 @@ import FWCore.ParameterSet.Config as cms -highPtTripletStepClusters = cms.EDProducer("TrackClusterRemoverPhase2", +hltHighPtTripletStepClusters = cms.EDProducer("TrackClusterRemoverPhase2", TrackQuality = cms.string('highPurity'), maxChi2 = cms.double(9.0), mightGet = cms.optional.untracked.vstring, minNumberOfLayersWithMeasBeforeFiltering = cms.int32(0), oldClusterRemovalInfo = cms.InputTag(""), overrideTrkQuals = cms.InputTag(""), - phase2OTClusters = cms.InputTag("siPhase2Clusters"), - phase2pixelClusters = cms.InputTag("siPixelClusters"), + phase2OTClusters = cms.InputTag("hltSiPhase2Clusters"), + phase2pixelClusters = cms.InputTag("hltSiPixelClusters"), trackClassifier = cms.InputTag("","QualityMasks"), - trajectories = cms.InputTag("initialStepTrackSelectionHighPurity") + trajectories = cms.InputTag("hltInitialStepTrackSelectionHighPurity") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/highPtTripletStepHitDoublets_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepHitDoublets_cfi.py similarity index 69% rename from HLTrigger/Configuration/python/HLT_75e33/modules/highPtTripletStepHitDoublets_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepHitDoublets_cfi.py index d145b5cd9e991..cf6e837235a67 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/highPtTripletStepHitDoublets_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepHitDoublets_cfi.py @@ -1,14 +1,14 @@ import FWCore.ParameterSet.Config as cms -highPtTripletStepHitDoublets = cms.EDProducer("HitPairEDProducer", - clusterCheck = cms.InputTag("trackerClusterCheck"), +hltHighPtTripletStepHitDoublets = cms.EDProducer("HitPairEDProducer", + clusterCheck = cms.InputTag("hltTrackerClusterCheck"), layerPairs = cms.vuint32(0, 1), maxElement = cms.uint32(50000000), maxElementTotal = cms.uint32(50000000), mightGet = cms.optional.untracked.vstring, produceIntermediateHitDoublets = cms.bool(True), produceSeedingHitSets = cms.bool(False), - seedingLayers = cms.InputTag("highPtTripletStepSeedLayers"), + seedingLayers = cms.InputTag("hltHighPtTripletStepSeedLayers"), trackingRegions = cms.InputTag("hltPhase2PixelTracksAndHighPtStepTrackingRegions"), trackingRegionsSeedingLayers = cms.InputTag("") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/highPtTripletStepHitTriplets_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepHitTriplets_cfi.py similarity index 75% rename from HLTrigger/Configuration/python/HLT_75e33/modules/highPtTripletStepHitTriplets_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepHitTriplets_cfi.py index 39cb9768ba3e5..ecbffd658be34 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/highPtTripletStepHitTriplets_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepHitTriplets_cfi.py @@ -1,15 +1,15 @@ import FWCore.ParameterSet.Config as cms -highPtTripletStepHitTriplets = cms.EDProducer("CAHitTripletEDProducer", +hltHighPtTripletStepHitTriplets = cms.EDProducer("CAHitTripletEDProducer", CAHardPtCut = cms.double(0.5), CAPhiCut = cms.double(0.06), CAThetaCut = cms.double(0.003), SeedComparitorPSet = cms.PSet( ComponentName = cms.string('LowPtClusterShapeSeedComparitor'), - clusterShapeCacheSrc = cms.InputTag("siPixelClusterShapeCache"), + clusterShapeCacheSrc = cms.InputTag("hltSiPixelClusterShapeCache"), clusterShapeHitFilter = cms.string('ClusterShapeHitFilter') ), - doublets = cms.InputTag("highPtTripletStepHitDoublets"), + doublets = cms.InputTag("hltHighPtTripletStepHitDoublets"), extraHitRPhitolerance = cms.double(0.032), maxChi2 = cms.PSet( enabled = cms.bool(True), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/highPtTripletStepSeedLayers_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepSeedLayers_cfi.py similarity index 82% rename from HLTrigger/Configuration/python/HLT_75e33/modules/highPtTripletStepSeedLayers_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepSeedLayers_cfi.py index a6d670abd82a0..ce2986e53a148 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/highPtTripletStepSeedLayers_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepSeedLayers_cfi.py @@ -1,15 +1,15 @@ import FWCore.ParameterSet.Config as cms -highPtTripletStepSeedLayers = cms.EDProducer("SeedingLayersEDProducer", +hltHighPtTripletStepSeedLayers = cms.EDProducer("SeedingLayersEDProducer", BPix = cms.PSet( - HitProducer = cms.string('siPixelRecHits'), + HitProducer = cms.string('hltSiPixelRecHits'), TTRHBuilder = cms.string('WithTrackAngle'), - skipClusters = cms.InputTag("highPtTripletStepClusters") + skipClusters = cms.InputTag("hltHighPtTripletStepClusters") ), FPix = cms.PSet( - HitProducer = cms.string('siPixelRecHits'), + HitProducer = cms.string('hltSiPixelRecHits'), TTRHBuilder = cms.string('WithTrackAngle'), - skipClusters = cms.InputTag("highPtTripletStepClusters") + skipClusters = cms.InputTag("hltHighPtTripletStepClusters") ), MTEC = cms.PSet( diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/highPtTripletStepSeeds_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepSeeds_cfi.py similarity index 75% rename from HLTrigger/Configuration/python/HLT_75e33/modules/highPtTripletStepSeeds_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepSeeds_cfi.py index 405926c4c3d51..9f7e4caef37e8 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/highPtTripletStepSeeds_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepSeeds_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -highPtTripletStepSeeds = cms.EDProducer("SeedCreatorFromRegionConsecutiveHitsEDProducer", +hltHighPtTripletStepSeeds = cms.EDProducer("SeedCreatorFromRegionConsecutiveHitsEDProducer", MinOneOverPtError = cms.double(1), OriginTransverseErrorMultiplier = cms.double(1), SeedComparitorPSet = cms.PSet( @@ -12,5 +12,5 @@ magneticField = cms.string(''), mightGet = cms.optional.untracked.vstring, propagator = cms.string('PropagatorWithMaterial'), - seedingHitSets = cms.InputTag("highPtTripletStepHitTriplets") + seedingHitSets = cms.InputTag("hltHighPtTripletStepHitTriplets") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/highPtTripletStepTrackCandidates_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepTrackCandidates_cfi.py similarity index 78% rename from HLTrigger/Configuration/python/HLT_75e33/modules/highPtTripletStepTrackCandidates_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepTrackCandidates_cfi.py index 7d91fe9bd1f6c..52c89d0225873 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/highPtTripletStepTrackCandidates_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepTrackCandidates_cfi.py @@ -1,6 +1,7 @@ import FWCore.ParameterSet.Config as cms -highPtTripletStepTrackCandidates = cms.EDProducer("CkfTrackCandidateMaker", +hltHighPtTripletStepTrackCandidates = cms.EDProducer("CkfTrackCandidateMaker", + MeasurementTrackerEvent = cms.InputTag("hltMeasurementTrackerEvent"), NavigationSchool = cms.string('SimpleNavigationSchool'), RedundantSeedCleaner = cms.string('CachingSeedCleanerBySharedInput'), TrajectoryBuilderPSet = cms.PSet( @@ -18,8 +19,8 @@ maxSeedsBeforeCleaning = cms.uint32(1000), numHitsForSeedCleaner = cms.int32(50), onlyPixelHitsForSeedCleaner = cms.bool(True), - phase2clustersToSkip = cms.InputTag("highPtTripletStepClusters"), + phase2clustersToSkip = cms.InputTag("hltHighPtTripletStepClusters"), reverseTrajectories = cms.bool(False), - src = cms.InputTag("highPtTripletStepSeeds"), + src = cms.InputTag("hltHighPtTripletStepSeeds"), useHitsSplitting = cms.bool(False) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/highPtTripletStepTrackCutClassifier_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepTrackCutClassifier_cfi.py similarity index 90% rename from HLTrigger/Configuration/python/HLT_75e33/modules/highPtTripletStepTrackCutClassifier_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepTrackCutClassifier_cfi.py index 7a9d90cde5e29..d566bc041fc8d 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/highPtTripletStepTrackCutClassifier_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepTrackCutClassifier_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -highPtTripletStepTrackCutClassifier = cms.EDProducer("TrackCutClassifier", +hltHighPtTripletStepTrackCutClassifier = cms.EDProducer("TrackCutClassifier", beamspot = cms.InputTag("hltOnlineBeamSpot"), ignoreVertices = cms.bool(False), mva = cms.PSet( @@ -29,6 +29,6 @@ minPixelHits = cms.vint32(0, 0, 3) ), qualityCuts = cms.vdouble(-0.7, 0.1, 0.7), - src = cms.InputTag("highPtTripletStepTracks"), + src = cms.InputTag("hltHighPtTripletStepTracks"), vertices = cms.InputTag("hltPhase2PixelVertices") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepTrackSelectionHighPurity_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepTrackSelectionHighPurity_cfi.py new file mode 100644 index 0000000000000..f2e99b8a9d0e8 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepTrackSelectionHighPurity_cfi.py @@ -0,0 +1,10 @@ +import FWCore.ParameterSet.Config as cms + +hltHighPtTripletStepTrackSelectionHighPurity = cms.EDProducer("TrackCollectionFilterCloner", + copyExtras = cms.untracked.bool(True), + copyTrajectories = cms.untracked.bool(False), + minQuality = cms.string('highPurity'), + originalMVAVals = cms.InputTag("hltHighPtTripletStepTrackCutClassifier","MVAValues"), + originalQualVals = cms.InputTag("hltHighPtTripletStepTrackCutClassifier","QualityMasks"), + originalSource = cms.InputTag("hltHighPtTripletStepTracks") +) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/highPtTripletStepTracks_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepTracks_cfi.py similarity index 78% rename from HLTrigger/Configuration/python/HLT_75e33/modules/highPtTripletStepTracks_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepTracks_cfi.py index 67e917a5b200c..58a307e4ca62c 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/highPtTripletStepTracks_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepTracks_cfi.py @@ -1,11 +1,11 @@ import FWCore.ParameterSet.Config as cms -highPtTripletStepTracks = cms.EDProducer("TrackProducer", +hltHighPtTripletStepTracks = cms.EDProducer("TrackProducer", AlgorithmName = cms.string('highPtTripletStep'), Fitter = cms.string('FlexibleKFFittingSmoother'), GeometricInnerState = cms.bool(False), MeasurementTracker = cms.string(''), - MeasurementTrackerEvent = cms.InputTag("MeasurementTrackerEvent"), + MeasurementTrackerEvent = cms.InputTag("hltMeasurementTrackerEvent"), NavigationSchool = cms.string('SimpleNavigationSchool'), Propagator = cms.string('RungeKuttaTrackerPropagator'), SimpleMagneticField = cms.string(''), @@ -14,7 +14,7 @@ alias = cms.untracked.string('ctfWithMaterialTracks'), beamSpot = cms.InputTag("hltOnlineBeamSpot"), clusterRemovalInfo = cms.InputTag(""), - src = cms.InputTag("highPtTripletStepTrackCandidates"), + src = cms.InputTag("hltHighPtTripletStepTrackCandidates"), useHitsSplitting = cms.bool(False), useSimpleMF = cms.bool(False) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltHpsCombinatoricRecoTaus_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHpsCombinatoricRecoTaus_cfi.py index 2aa6936f04229..65d5d9d160eb4 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltHpsCombinatoricRecoTaus_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHpsCombinatoricRecoTaus_cfi.py @@ -53,7 +53,7 @@ minRelPhotonSumPt_insideSignalCone = cms.double(0.1), minRelPhotonSumPt_outsideSignalCone = cms.double(1000000000.0), name = cms.string('combinatoric'), - pfCandSrc = cms.InputTag("particleFlowTmp"), + pfCandSrc = cms.InputTag("hltParticleFlowTmp"), plugin = cms.string('RecoTauBuilderCombinatoricPlugin'), qualityCuts = cms.PSet( isolationQualityCuts = cms.PSet( diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltHpsPFTauBasicDiscriminatorsForDeepTau_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHpsPFTauBasicDiscriminatorsForDeepTau_cfi.py index dcc920eac4458..bd78ac3c7561b 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltHpsPFTauBasicDiscriminatorsForDeepTau_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHpsPFTauBasicDiscriminatorsForDeepTau_cfi.py @@ -68,7 +68,7 @@ ), isoConeSizeForDeltaBeta = cms.double(0.8), minTauPtForNoIso = cms.double(-99.0), - particleFlowSrc = cms.InputTag("particleFlowTmp"), + particleFlowSrc = cms.InputTag("hltParticleFlowTmp"), qualityCuts = cms.PSet( isolationQualityCuts = cms.PSet( maxDeltaZ = cms.double(0.2), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltHpsPFTauBasicDiscriminatorsdR03ForDeepTau_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHpsPFTauBasicDiscriminatorsdR03ForDeepTau_cfi.py index a39f0de54fdbd..1e0736e41f504 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltHpsPFTauBasicDiscriminatorsdR03ForDeepTau_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHpsPFTauBasicDiscriminatorsdR03ForDeepTau_cfi.py @@ -68,7 +68,7 @@ ), isoConeSizeForDeltaBeta = cms.double(0.8), minTauPtForNoIso = cms.double(-99.0), - particleFlowSrc = cms.InputTag("particleFlowTmp"), + particleFlowSrc = cms.InputTag("hltParticleFlowTmp"), qualityCuts = cms.PSet( isolationQualityCuts = cms.PSet( maxDeltaZ = cms.double(0.2), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltHpsPFTauDeepTauProducer_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHpsPFTauDeepTauProducer_cfi.py index e57e5d611a0c4..17d678f4260c7 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltHpsPFTauDeepTauProducer_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHpsPFTauDeepTauProducer_cfi.py @@ -4,7 +4,7 @@ electrons = cms.InputTag( "default" ), muons = cms.InputTag( "default" ), taus = cms.InputTag( "hltHpsPFTauProducer" ), - pfcands = cms.InputTag( "particleFlowTmp" ), + pfcands = cms.InputTag( "hltParticleFlowTmp" ), vertices = cms.InputTag( "hltPhase2PixelVertices" ), rho = cms.InputTag( "hltFixedGridRhoProducerFastjetAllTau" ), graph_file = cms.vstring( 'core:RecoTauTag/TrainingFiles/data/DeepTauId/deepTau_2026v2p5_core.pb', diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltHpsPFTauMediumAbsoluteChargedIsolationDiscriminator_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHpsPFTauMediumAbsoluteChargedIsolationDiscriminator_cfi.py index 84a230fb6ae25..4c6da6b543342 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltHpsPFTauMediumAbsoluteChargedIsolationDiscriminator_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHpsPFTauMediumAbsoluteChargedIsolationDiscriminator_cfi.py @@ -50,7 +50,7 @@ maximumOccupancy = cms.uint32(0), maximumSumPtCut = cms.double(3.7), minTauPtForNoIso = cms.double(-99.0), - particleFlowSrc = cms.InputTag("particleFlowTmp"), + particleFlowSrc = cms.InputTag("hltParticleFlowTmp"), qualityCuts = cms.PSet( isolationQualityCuts = cms.PSet( maxDeltaZ = cms.double(0.2), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltHpsPFTauMediumRelativeChargedIsolationDiscriminator_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHpsPFTauMediumRelativeChargedIsolationDiscriminator_cfi.py index 34c2ed3267909..0235f8b11f5de 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltHpsPFTauMediumRelativeChargedIsolationDiscriminator_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHpsPFTauMediumRelativeChargedIsolationDiscriminator_cfi.py @@ -50,7 +50,7 @@ maximumOccupancy = cms.uint32(0), maximumSumPtCut = cms.double(2.0), minTauPtForNoIso = cms.double(-99.0), - particleFlowSrc = cms.InputTag("particleFlowTmp"), + particleFlowSrc = cms.InputTag("hltParticleFlowTmp"), qualityCuts = cms.PSet( isolationQualityCuts = cms.PSet( maxDeltaZ = cms.double(0.2), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/initialStepSeeds_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepSeeds_cfi.py similarity index 86% rename from HLTrigger/Configuration/python/HLT_75e33/modules/initialStepSeeds_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepSeeds_cfi.py index 8dcb08c540326..6eca9fb8de4d9 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/initialStepSeeds_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepSeeds_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -initialStepSeeds = cms.EDProducer("SeedGeneratorFromProtoTracksEDProducer", +hltInitialStepSeeds = cms.EDProducer("SeedGeneratorFromProtoTracksEDProducer", InputCollection = cms.InputTag("hltPhase2PixelTracks"), InputVertexCollection = cms.InputTag(""), SeedCreatorPSet = cms.PSet( diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/initialStepTrackCandidates_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepTrackCandidates_cfi.py similarity index 83% rename from HLTrigger/Configuration/python/HLT_75e33/modules/initialStepTrackCandidates_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepTrackCandidates_cfi.py index 5ddcba7326c45..d504fc7fe972e 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/initialStepTrackCandidates_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepTrackCandidates_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -initialStepTrackCandidates = cms.EDProducer("CkfTrackCandidateMaker", - MeasurementTrackerEvent = cms.InputTag("MeasurementTrackerEvent"), +hltInitialStepTrackCandidates = cms.EDProducer("CkfTrackCandidateMaker", + MeasurementTrackerEvent = cms.InputTag("hltMeasurementTrackerEvent"), NavigationSchool = cms.string('SimpleNavigationSchool'), RedundantSeedCleaner = cms.string('CachingSeedCleanerBySharedInput'), TrajectoryBuilderPSet = cms.PSet( @@ -20,6 +20,6 @@ numHitsForSeedCleaner = cms.int32(50), onlyPixelHitsForSeedCleaner = cms.bool(True), reverseTrajectories = cms.bool(False), - src = cms.InputTag("initialStepSeeds"), + src = cms.InputTag("hltInitialStepSeeds"), useHitsSplitting = cms.bool(False) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/initialStepTrackCutClassifier_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepTrackCutClassifier_cfi.py similarity index 91% rename from HLTrigger/Configuration/python/HLT_75e33/modules/initialStepTrackCutClassifier_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepTrackCutClassifier_cfi.py index fd655b957822a..17094e3c0529c 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/initialStepTrackCutClassifier_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepTrackCutClassifier_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -initialStepTrackCutClassifier = cms.EDProducer("TrackCutClassifier", +hltInitialStepTrackCutClassifier = cms.EDProducer("TrackCutClassifier", beamspot = cms.InputTag("hltOnlineBeamSpot"), ignoreVertices = cms.bool(False), mva = cms.PSet( @@ -29,6 +29,6 @@ minPixelHits = cms.vint32(0, 0, 3) ), qualityCuts = cms.vdouble(-0.7, 0.1, 0.7), - src = cms.InputTag("initialStepTracks"), + src = cms.InputTag("hltInitialStepTracks"), vertices = cms.InputTag("hltPhase2PixelVertices") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepTrackSelectionHighPurity_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepTrackSelectionHighPurity_cfi.py new file mode 100644 index 0000000000000..d299885ff7454 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepTrackSelectionHighPurity_cfi.py @@ -0,0 +1,10 @@ +import FWCore.ParameterSet.Config as cms + +hltInitialStepTrackSelectionHighPurity = cms.EDProducer("TrackCollectionFilterCloner", + copyExtras = cms.untracked.bool(True), + copyTrajectories = cms.untracked.bool(False), + minQuality = cms.string('highPurity'), + originalMVAVals = cms.InputTag("hltInitialStepTrackCutClassifier","MVAValues"), + originalQualVals = cms.InputTag("hltInitialStepTrackCutClassifier","QualityMasks"), + originalSource = cms.InputTag("hltInitialStepTracks") +) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/initialStepTracks_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepTracks_cfi.py similarity index 79% rename from HLTrigger/Configuration/python/HLT_75e33/modules/initialStepTracks_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepTracks_cfi.py index 4c0d2600b7e29..24abb6a06b22c 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/initialStepTracks_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepTracks_cfi.py @@ -1,11 +1,11 @@ import FWCore.ParameterSet.Config as cms -initialStepTracks = cms.EDProducer("TrackProducer", +hltInitialStepTracks = cms.EDProducer("TrackProducer", AlgorithmName = cms.string('initialStep'), Fitter = cms.string('FlexibleKFFittingSmoother'), GeometricInnerState = cms.bool(False), MeasurementTracker = cms.string(''), - MeasurementTrackerEvent = cms.InputTag("MeasurementTrackerEvent"), + MeasurementTrackerEvent = cms.InputTag("hltMeasurementTrackerEvent"), NavigationSchool = cms.string('SimpleNavigationSchool'), Propagator = cms.string('RungeKuttaTrackerPropagator'), SimpleMagneticField = cms.string(''), @@ -14,7 +14,7 @@ alias = cms.untracked.string('ctfWithMaterialTracks'), beamSpot = cms.InputTag("hltOnlineBeamSpot"), clusterRemovalInfo = cms.InputTag(""), - src = cms.InputTag("initialStepTrackCandidates"), + src = cms.InputTag("hltInitialStepTrackCandidates"), useHitsSplitting = cms.bool(False), useSimpleMF = cms.bool(False) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltIter0Phase2L3FromL1TkMuonCkfTrackCandidates_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltIter0Phase2L3FromL1TkMuonCkfTrackCandidates_cfi.py index 515c40fd8dfc4..9fe904b4e9973 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltIter0Phase2L3FromL1TkMuonCkfTrackCandidates_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltIter0Phase2L3FromL1TkMuonCkfTrackCandidates_cfi.py @@ -1,6 +1,7 @@ import FWCore.ParameterSet.Config as cms hltIter0Phase2L3FromL1TkMuonCkfTrackCandidates = cms.EDProducer("CkfTrackCandidateMaker", + MeasurementTrackerEvent = cms.InputTag("hltMeasurementTrackerEvent"), NavigationSchool = cms.string('SimpleNavigationSchool'), RedundantSeedCleaner = cms.string('none'), TrajectoryBuilderPSet = cms.PSet( diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltIter0Phase2L3FromL1TkMuonCtfWithMaterialTracks_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltIter0Phase2L3FromL1TkMuonCtfWithMaterialTracks_cfi.py index adb975ad34a75..cec1efbdf98b8 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltIter0Phase2L3FromL1TkMuonCtfWithMaterialTracks_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltIter0Phase2L3FromL1TkMuonCtfWithMaterialTracks_cfi.py @@ -5,7 +5,7 @@ Fitter = cms.string('FlexibleKFFittingSmoother'), GeometricInnerState = cms.bool(True), MeasurementTracker = cms.string(''), - MeasurementTrackerEvent = cms.InputTag("MeasurementTrackerEvent"), + MeasurementTrackerEvent = cms.InputTag("hltMeasurementTrackerEvent"), NavigationSchool = cms.string(''), Propagator = cms.string('hltESPRungeKuttaTrackerPropagator'), SimpleMagneticField = cms.string(''), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltIter2Phase2L3FromL1TkMuonClustersRefRemoval_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltIter2Phase2L3FromL1TkMuonClustersRefRemoval_cfi.py index dc434b98e708a..c5c6683ea4dc0 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltIter2Phase2L3FromL1TkMuonClustersRefRemoval_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltIter2Phase2L3FromL1TkMuonClustersRefRemoval_cfi.py @@ -6,8 +6,8 @@ minNumberOfLayersWithMeasBeforeFiltering = cms.int32(0), oldClusterRemovalInfo = cms.InputTag(""), overrideTrkQuals = cms.InputTag(""), - phase2OTClusters = cms.InputTag("siPhase2Clusters"), - phase2pixelClusters = cms.InputTag("siPixelClusters"), + phase2OTClusters = cms.InputTag("hltSiPhase2Clusters"), + phase2pixelClusters = cms.InputTag("hltSiPixelClusters"), trackClassifier = cms.InputTag("","QualityMasks"), trajectories = cms.InputTag("hltIter0Phase2L3FromL1TkMuonTrackSelectionHighPurity") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltIter2Phase2L3FromL1TkMuonMaskedMeasurementTrackerEvent_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltIter2Phase2L3FromL1TkMuonMaskedMeasurementTrackerEvent_cfi.py index e06f5cccb50df..4c21c9e410770 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltIter2Phase2L3FromL1TkMuonMaskedMeasurementTrackerEvent_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltIter2Phase2L3FromL1TkMuonMaskedMeasurementTrackerEvent_cfi.py @@ -3,5 +3,5 @@ hltIter2Phase2L3FromL1TkMuonMaskedMeasurementTrackerEvent = cms.EDProducer("MaskedMeasurementTrackerEventProducer", OnDemand = cms.bool(False), phase2clustersToSkip = cms.InputTag("hltIter2Phase2L3FromL1TkMuonClustersRefRemoval"), - src = cms.InputTag("MeasurementTrackerEvent") + src = cms.InputTag("hltMeasurementTrackerEvent") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltIter2Phase2L3FromL1TkMuonPixelClusterCheck_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltIter2Phase2L3FromL1TkMuonPixelClusterCheck_cfi.py index 53e17d72b7ed0..ca7379f57e3cb 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltIter2Phase2L3FromL1TkMuonPixelClusterCheck_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltIter2Phase2L3FromL1TkMuonPixelClusterCheck_cfi.py @@ -1,10 +1,10 @@ import FWCore.ParameterSet.Config as cms hltIter2Phase2L3FromL1TkMuonPixelClusterCheck = cms.EDProducer("ClusterCheckerEDProducer", - ClusterCollectionLabel = cms.InputTag("MeasurementTrackerEvent"), + ClusterCollectionLabel = cms.InputTag("hltMeasurementTrackerEvent"), MaxNumberOfPixelClusters = cms.uint32(10000), MaxNumberOfStripClusters = cms.uint32(50000), - PixelClusterCollectionLabel = cms.InputTag("siPixelClusters"), + PixelClusterCollectionLabel = cms.InputTag("hltSiPixelClusters"), cut = cms.string(''), doClusterCheck = cms.bool(False), silentClusterCheck = cms.untracked.bool(False) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltIter2Phase2L3FromL1TkMuonPixelLayerTriplets_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltIter2Phase2L3FromL1TkMuonPixelLayerTriplets_cfi.py index c142211bec284..0d9c5503fbc4f 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltIter2Phase2L3FromL1TkMuonPixelLayerTriplets_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltIter2Phase2L3FromL1TkMuonPixelLayerTriplets_cfi.py @@ -2,12 +2,12 @@ hltIter2Phase2L3FromL1TkMuonPixelLayerTriplets = cms.EDProducer("SeedingLayersEDProducer", BPix = cms.PSet( - HitProducer = cms.string('siPixelRecHits'), + HitProducer = cms.string('hltSiPixelRecHits'), TTRHBuilder = cms.string('WithTrackAngle'), skipClusters = cms.InputTag("hltIter2Phase2L3FromL1TkMuonClustersRefRemoval") ), FPix = cms.PSet( - HitProducer = cms.string('siPixelRecHits'), + HitProducer = cms.string('hltSiPixelRecHits'), TTRHBuilder = cms.string('WithTrackAngle'), skipClusters = cms.InputTag("hltIter2Phase2L3FromL1TkMuonClustersRefRemoval") ), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/MeasurementTrackerEvent_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltMeasurementTrackerEvent_cfi.py similarity index 69% rename from HLTrigger/Configuration/python/HLT_75e33/modules/MeasurementTrackerEvent_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltMeasurementTrackerEvent_cfi.py index 4c1a2da07840c..3c280e6786af5 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/MeasurementTrackerEvent_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltMeasurementTrackerEvent_cfi.py @@ -1,14 +1,14 @@ import FWCore.ParameterSet.Config as cms -MeasurementTrackerEvent = cms.EDProducer("MeasurementTrackerEventProducer", - Phase2TrackerCluster1DProducer = cms.string('siPhase2Clusters'), +hltMeasurementTrackerEvent = cms.EDProducer("MeasurementTrackerEventProducer", + Phase2TrackerCluster1DProducer = cms.string('hltSiPhase2Clusters'), badPixelFEDChannelCollectionLabels = cms.VInputTag(), inactivePixelDetectorLabels = cms.VInputTag(), inactiveStripDetectorLabels = cms.VInputTag("siStripDigis"), measurementTracker = cms.string(''), mightGet = cms.optional.untracked.vstring, pixelCablingMapLabel = cms.string(''), - pixelClusterProducer = cms.string('siPixelClusters'), + pixelClusterProducer = cms.string('hltSiPixelClusters'), skipClusters = cms.InputTag(""), stripClusterProducer = cms.string(''), switchOffPixelsIfEmpty = cms.bool(True) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/muonCSCDigis_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltMuonCSCDigis_cfi.py similarity index 93% rename from HLTrigger/Configuration/python/HLT_75e33/modules/muonCSCDigis_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltMuonCSCDigis_cfi.py index d8eda507b5c65..144330e932f80 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/muonCSCDigis_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltMuonCSCDigis_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -muonCSCDigis = cms.EDProducer("CSCDCCUnpacker", +hltMuonCSCDigis = cms.EDProducer("CSCDCCUnpacker", Debug = cms.untracked.bool(False), ErrorMask = cms.uint32(0), ExaminerMask = cms.uint32(535558134), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/muonDTDigis_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltMuonDTDigis_cfi.py similarity index 72% rename from HLTrigger/Configuration/python/HLT_75e33/modules/muonDTDigis_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltMuonDTDigis_cfi.py index 3c28816024354..3a27568914c02 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/muonDTDigis_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltMuonDTDigis_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -muonDTDigis = cms.EDProducer("DTuROSRawToDigi", +hltMuonDTDigis = cms.EDProducer("DTuROSRawToDigi", debug = cms.untracked.bool(False), inputLabel = cms.InputTag("rawDataCollector") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/muonGEMDigis_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltMuonGEMDigis_cfi.py similarity index 75% rename from HLTrigger/Configuration/python/HLT_75e33/modules/muonGEMDigis_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltMuonGEMDigis_cfi.py index 9a4fa785e9e0b..93d48b9661c83 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/muonGEMDigis_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltMuonGEMDigis_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -muonGEMDigis = cms.EDProducer("GEMRawToDigiModule", +hltMuonGEMDigis = cms.EDProducer("GEMRawToDigiModule", InputLabel = cms.InputTag("rawDataCollector"), mightGet = cms.optional.untracked.vstring, useDBEMap = cms.bool(False) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/offlinePrimaryVertices_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltOfflinePrimaryVertices_cfi.py similarity index 83% rename from HLTrigger/Configuration/python/HLT_75e33/modules/offlinePrimaryVertices_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltOfflinePrimaryVertices_cfi.py index d57a3e9c1ca2c..9e30d5435821c 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/offlinePrimaryVertices_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltOfflinePrimaryVertices_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -offlinePrimaryVertices = cms.EDProducer("RecoChargedRefCandidatePrimaryVertexSorter", +hltOfflinePrimaryVertices = cms.EDProducer("RecoChargedRefCandidatePrimaryVertexSorter", assignment = cms.PSet( DzCutForChargedFromPUVtxs = cms.double(0.2), EtaMinUseDz = cms.double(-1), @@ -22,8 +22,8 @@ useTiming = cms.bool(False), useVertexFit = cms.bool(True) ), - jets = cms.InputTag("ak4CaloJetsForTrk"), - particles = cms.InputTag("trackRefsForJetsBeforeSorting"), + jets = cms.InputTag("hltAk4CaloJetsForTrk"), + particles = cms.InputTag("hltTrackRefsForJetsBeforeSorting"), produceAssociationToOriginalVertices = cms.bool(False), produceNoPileUpCollection = cms.bool(False), producePileUpCollection = cms.bool(False), @@ -35,5 +35,5 @@ trackTimeResoTag = cms.InputTag(""), trackTimeTag = cms.InputTag(""), usePVMET = cms.bool(True), - vertices = cms.InputTag("unsortedOfflinePrimaryVertices") + vertices = cms.InputTag("hltUnsortedOfflinePrimaryVertices") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPFClusterMET_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPFClusterMET_cfi.py index 4f22bcf107c5c..f07c792b141f1 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPFClusterMET_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPFClusterMET_cfi.py @@ -3,5 +3,5 @@ hltPFClusterMET = cms.EDProducer("PFClusterMETProducer", alias = cms.string('pfClusterMet'), globalThreshold = cms.double(0.0), - src = cms.InputTag("pfClusterRefsForJets") + src = cms.InputTag("hltPfClusterRefsForJets") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPFMETJetCorrectorL1_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPFMETJetCorrectorL1_cfi.py index 599073cce056c..d40e7fa3d935f 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPFMETJetCorrectorL1_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPFMETJetCorrectorL1_cfi.py @@ -3,5 +3,5 @@ hltPFMETJetCorrectorL1 = cms.EDProducer("L1FastjetCorrectorProducer", algorithm = cms.string('AK4PFchs'), level = cms.string('L1FastJet'), - srcRho = cms.InputTag("fixedGridRhoFastjetAllTmp") + srcRho = cms.InputTag("hltFixedGridRhoFastjetAllTmp") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPFMET_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPFMET_cfi.py index 6708c818e5b67..7cdf3488a9ef4 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPFMET_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPFMET_cfi.py @@ -3,5 +3,5 @@ hltPFMET = cms.EDProducer("PFMETProducer", calculateSignificance = cms.bool(False), globalThreshold = cms.double(0.0), - src = cms.InputTag("particleFlowTmp") + src = cms.InputTag("hltParticleFlowTmp") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPFPuppiMET_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPFPuppiMET_cfi.py index c1c30dbf147a7..a9df6a4049550 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPFPuppiMET_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPFPuppiMET_cfi.py @@ -4,6 +4,6 @@ applyWeight = cms.bool(True), calculateSignificance = cms.bool(False), globalThreshold = cms.double(0.0), - src = cms.InputTag("particleFlowTmp"), + src = cms.InputTag("hltParticleFlowTmp"), srcWeights = cms.InputTag("hltPFPuppiNoLep") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPFPuppiNoLep_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPFPuppiNoLep_cfi.py index e6c8040bae191..263a271b447e5 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPFPuppiNoLep_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPFPuppiNoLep_cfi.py @@ -56,7 +56,7 @@ ) ), applyCHS = cms.bool(True), - candName = cms.InputTag("particleFlowTmp"), + candName = cms.InputTag("hltParticleFlowTmp"), clonePackedCands = cms.bool(False), invertPuppi = cms.bool(False), puppiDiagnostics = cms.bool(False), @@ -64,7 +64,7 @@ useExistingWeights = cms.bool(False), useExp = cms.bool(False), usePUProxyValue = cms.bool(True), - vertexName = cms.InputTag("goodOfflinePrimaryVertices"), + vertexName = cms.InputTag("hltGoodOfflinePrimaryVertices"), vtxNdofCut = cms.int32(4), vtxZCut = cms.double(24) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPFPuppi_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPFPuppi_cfi.py index 915c8db348e5f..c0b3a1a46e852 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPFPuppi_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPFPuppi_cfi.py @@ -56,7 +56,7 @@ ) ), applyCHS = cms.bool(True), - candName = cms.InputTag("particleFlowTmp"), + candName = cms.InputTag("hltParticleFlowTmp"), clonePackedCands = cms.bool(False), invertPuppi = cms.bool(False), puppiDiagnostics = cms.bool(False), @@ -64,7 +64,7 @@ useExistingWeights = cms.bool(False), useExp = cms.bool(False), usePUProxyValue = cms.bool(True), - vertexName = cms.InputTag("goodOfflinePrimaryVertices"), + vertexName = cms.InputTag("hltGoodOfflinePrimaryVertices"), vtxNdofCut = cms.int32(4), vtxZCut = cms.double(24) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowBadHcalPseudoCluster_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowBadHcalPseudoCluster_cfi.py similarity index 64% rename from HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowBadHcalPseudoCluster_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowBadHcalPseudoCluster_cfi.py index 379a2a6ad7615..69b31ad8e5fce 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowBadHcalPseudoCluster_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowBadHcalPseudoCluster_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -particleFlowBadHcalPseudoCluster = cms.EDProducer("PFBadHcalPseudoClusterProducer", +hltParticleFlowBadHcalPseudoCluster = cms.EDProducer("PFBadHcalPseudoClusterProducer", debug = cms.untracked.bool(False), enable = cms.bool(False), mightGet = cms.optional.untracked.vstring diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowBlock_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowBlock_cfi.py similarity index 86% rename from HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowBlock_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowBlock_cfi.py index 464f63da5e19b..863317f7e2830 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowBlock_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowBlock_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -particleFlowBlock = cms.EDProducer("PFBlockProducer", +hltParticleFlowBlock = cms.EDProducer("PFBlockProducer", debug = cms.untracked.bool(False), elementImporters = cms.VPSet( cms.PSet( @@ -8,8 +8,8 @@ maximumHoverE = cms.double(0.5), minPTforBypass = cms.double(100.0), minSuperClusterPt = cms.double(10.0), - source_eb = cms.InputTag("particleFlowSuperClusterECAL","particleFlowSuperClusterECALBarrel"), - source_ee = cms.InputTag("particleFlowSuperClusterECAL","particleFlowSuperClusterECALEndcapWithPreshower"), + source_eb = cms.InputTag("hltParticleFlowSuperClusterECAL","particleFlowSuperClusterECALBarrel"), + source_ee = cms.InputTag("hltParticleFlowSuperClusterECAL","particleFlowSuperClusterECALEndcapWithPreshower"), hbheRecHitsTag = cms.InputTag("hltHbhereco"), maxSeverityHB = cms.int32(9), maxSeverityHE = cms.int32(9), @@ -30,17 +30,17 @@ maxDPtOPt = cms.double(1.0), muonMaxDPtOPt = cms.double(1), muonSrc = cms.InputTag("hltPhase2L3Muons"), - source = cms.InputTag("pfTrack"), + source = cms.InputTag("hltPfTrack"), trackQuality = cms.string('highPurity'), useIterativeTracking = cms.bool(True), vetoEndcap = cms.bool(True), vetoMode = cms.uint32(2), - vetoSrc = cms.InputTag("pfTICL") + vetoSrc = cms.InputTag("hltPfTICL") ), cms.PSet( - BCtoPFCMap = cms.InputTag("particleFlowSuperClusterECAL","PFClusterAssociationEBEE"), + BCtoPFCMap = cms.InputTag("hltParticleFlowSuperClusterECAL","PFClusterAssociationEBEE"), importerName = cms.string('ECALClusterImporter'), - source = cms.InputTag("particleFlowClusterECAL") + source = cms.InputTag("hltParticleFlowClusterECAL") ), cms.PSet( importerName = cms.string('GenericClusterImporter'), @@ -48,15 +48,15 @@ ), cms.PSet( importerName = cms.string('GenericClusterImporter'), - source = cms.InputTag("particleFlowBadHcalPseudoCluster") + source = cms.InputTag("hltParticleFlowBadHcalPseudoCluster") ), cms.PSet( importerName = cms.string('GenericClusterImporter'), - source = cms.InputTag("particleFlowClusterHO") + source = cms.InputTag("hltParticleFlowClusterHO") ), cms.PSet( importerName = cms.string('GenericClusterImporter'), - source = cms.InputTag("particleFlowClusterHF") + source = cms.InputTag("hltParticleFlowClusterHF") ) ), linkDefinitions = cms.VPSet( diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowClusterECALUncorrected_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterECALUncorrected_cfi.py similarity index 97% rename from HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowClusterECALUncorrected_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterECALUncorrected_cfi.py index 1ca6e4675d1af..b34fa15b335ce 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowClusterECALUncorrected_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterECALUncorrected_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -particleFlowClusterECALUncorrected = cms.EDProducer("PFClusterProducer", +hltParticleFlowClusterECALUncorrected = cms.EDProducer("PFClusterProducer", energyCorrector = cms.PSet( ), @@ -110,7 +110,7 @@ minFractionInCalc = cms.double(0.0) ), recHitCleaners = cms.VPSet(), - recHitsSource = cms.InputTag("particleFlowRecHitECAL"), + recHitsSource = cms.InputTag("hltParticleFlowRecHitECAL"), seedCleaners = cms.VPSet(cms.PSet( RecHitFlagsToBeExcluded = cms.vstring(), algoName = cms.string('FlagsCleanerECAL') diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowClusterECAL_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterECAL_cfi.py similarity index 84% rename from HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowClusterECAL_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterECAL_cfi.py index a78864a8e4415..b31ec94285c4c 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowClusterECAL_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterECAL_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -particleFlowClusterECAL = cms.EDProducer("CorrectedECALPFClusterProducer", +hltParticleFlowClusterECAL = cms.EDProducer("CorrectedECALPFClusterProducer", energyCorrector = cms.PSet( applyCrackCorrections = cms.bool(False), applyMVACorrections = cms.bool(True), @@ -14,7 +14,7 @@ setEnergyUncertainty = cms.bool(False), srfAwareCorrection = cms.bool(True) ), - inputECAL = cms.InputTag("particleFlowTimeAssignerECAL"), + inputECAL = cms.InputTag("hltParticleFlowTimeAssignerECAL"), mightGet = cms.optional.untracked.vstring, minimumPSEnergy = cms.double(0), skipPS = cms.bool(True) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowClusterHF_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterHF_cfi.py similarity index 95% rename from HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowClusterHF_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterHF_cfi.py index d6a428f93dbee..fe9be808d4afc 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowClusterHF_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterHF_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -particleFlowClusterHF = cms.EDProducer("PFClusterProducer", +hltParticleFlowClusterHF = cms.EDProducer("PFClusterProducer", energyCorrector = cms.PSet( ), @@ -57,7 +57,7 @@ ), recHitCleaners = cms.VPSet(), - recHitsSource = cms.InputTag("particleFlowRecHitHF"), + recHitsSource = cms.InputTag("hltParticleFlowRecHitHF"), seedCleaners = cms.VPSet(), seedFinder = cms.PSet( algoName = cms.string('LocalMaximumSeedFinder'), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowClusterHGCalFromTICLL1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterHGCalFromTICLL1Seeded_cfi.py similarity index 76% rename from HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowClusterHGCalFromTICLL1Seeded_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterHGCalFromTICLL1Seeded_cfi.py index 1938df66e7371..9307ca7c2a9ec 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowClusterHGCalFromTICLL1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterHGCalFromTICLL1Seeded_cfi.py @@ -1,19 +1,19 @@ import FWCore.ParameterSet.Config as cms -particleFlowClusterHGCalFromTICLL1Seeded = cms.EDProducer("PFClusterProducer", +hltParticleFlowClusterHGCalFromTICLL1Seeded = cms.EDProducer("PFClusterProducer", energyCorrector = cms.PSet( ), initialClusteringStep = cms.PSet( algoName = cms.string('PFClusterFromHGCalTrackster'), - clusterSrc = cms.InputTag("hgcalMergeLayerClustersL1Seeded"), + clusterSrc = cms.InputTag("hltHgcalMergeLayerClustersL1Seeded"), filterByTracksterIteration = cms.bool(False), filterByTracksterPID = cms.bool(True), filter_on_categories = cms.vint32(0, 1), filter_on_iterations = cms.vint32(0, 1), pid_threshold = cms.double(0.8), thresholdsByDetector = cms.VPSet(), - tracksterSrc = cms.InputTag("ticlTrackstersCLUE3DHighL1Seeded") + tracksterSrc = cms.InputTag("hltTiclTrackstersCLUE3DHighL1Seeded") ), pfClusterBuilder = cms.PSet( @@ -24,7 +24,7 @@ updateTiming = cms.bool(False) ), recHitCleaners = cms.VPSet(), - recHitsSource = cms.InputTag("particleFlowRecHitHGCL1Seeded"), + recHitsSource = cms.InputTag("hltParticleFlowRecHitHGCL1Seeded"), seedCleaners = cms.VPSet(), seedFinder = cms.PSet( algoName = cms.string('PassThruSeedFinder'), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowClusterHGCalFromTICLUnseeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterHGCalFromTICLUnseeded_cfi.py similarity index 67% rename from HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowClusterHGCalFromTICLUnseeded_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterHGCalFromTICLUnseeded_cfi.py index 9894033ea5555..d389a353a38f8 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowClusterHGCalFromTICLUnseeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterHGCalFromTICLUnseeded_cfi.py @@ -1,19 +1,19 @@ import FWCore.ParameterSet.Config as cms -particleFlowClusterHGCalFromTICLUnseeded = cms.EDProducer("PFClusterProducer", +hltParticleFlowClusterHGCalFromTICLUnseeded = cms.EDProducer("PFClusterProducer", energyCorrector = cms.PSet( ), initialClusteringStep = cms.PSet( algoName = cms.string('PFClusterFromHGCalTrackster'), - clusterSrc = cms.InputTag("hgcalMergeLayerClusters"), + clusterSrc = cms.InputTag("hltHgcalMergeLayerClusters"), filterByTracksterIteration = cms.bool(False), filterByTracksterPID = cms.bool(True), filter_on_categories = cms.vint32(0, 1), filter_on_iterations = cms.vint32(0, 1), pid_threshold = cms.double(0.8), thresholdsByDetector = cms.VPSet(), - tracksterSrc = cms.InputTag("ticlTrackstersCLUE3DHigh") + tracksterSrc = cms.InputTag("hltTiclTrackstersCLUE3DHigh") ), pfClusterBuilder = cms.PSet( @@ -24,7 +24,7 @@ updateTiming = cms.bool(False) ), recHitCleaners = cms.VPSet(), - recHitsSource = cms.InputTag("particleFlowRecHitHGC"), + recHitsSource = cms.InputTag("hltParticleFlowRecHitHGC"), seedCleaners = cms.VPSet(), seedFinder = cms.PSet( algoName = cms.string('PassThruSeedFinder'), @@ -33,3 +33,6 @@ ), usePFThresholdsFromDB = cms.bool(False) ) + +from Configuration.ProcessModifiers.ticl_v5_cff import ticl_v5 +ticl_v5.toModify(hltParticleFlowClusterHGCalFromTICLUnseeded.initialClusteringStep, tracksterSrc = "hltTiclCandidate") diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowClusterHGCal_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterHGCal_cfi.py similarity index 74% rename from HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowClusterHGCal_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterHGCal_cfi.py index 4f13541d2748e..0bb4f2211f25f 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowClusterHGCal_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterHGCal_cfi.py @@ -1,19 +1,19 @@ import FWCore.ParameterSet.Config as cms -particleFlowClusterHGCal = cms.EDProducer("PFClusterProducer", +hltParticleFlowClusterHGCal = cms.EDProducer("PFClusterProducer", energyCorrector = cms.PSet( ), initialClusteringStep = cms.PSet( algoName = cms.string('PFClusterFromHGCalTrackster'), - clusterSrc = cms.InputTag("hgcalMergeLayerClusters"), + clusterSrc = cms.InputTag("hltHgcalMergeLayerClusters"), filterByTracksterIteration = cms.bool(True), filterByTracksterPID = cms.bool(False), filter_on_categories = cms.vint32(0, 1), filter_on_iterations = cms.vint32(0, 1), pid_threshold = cms.double(0.8), thresholdsByDetector = cms.VPSet(), - tracksterSrc = cms.InputTag("ticlTrackstersMerge") + tracksterSrc = cms.InputTag("hltTiclTrackstersMerge") ), pfClusterBuilder = cms.PSet( @@ -24,7 +24,7 @@ updateTiming = cms.bool(False) ), recHitCleaners = cms.VPSet(), - recHitsSource = cms.InputTag("particleFlowRecHitHGC"), + recHitsSource = cms.InputTag("hltParticleFlowRecHitHGC"), seedCleaners = cms.VPSet(), seedFinder = cms.PSet( algoName = cms.string('PassThruSeedFinder'), @@ -35,4 +35,4 @@ ) from Configuration.ProcessModifiers.ticl_v5_cff import ticl_v5 -ticl_v5.toModify(particleFlowClusterHGCal.initialClusteringStep, tracksterSrc = "hltTiclCandidate") +ticl_v5.toModify(hltParticleFlowClusterHGCal.initialClusteringStep, tracksterSrc = "hltTiclCandidate") diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowClusterHO_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterHO_cfi.py similarity index 95% rename from HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowClusterHO_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterHO_cfi.py index 9a76156e662b6..e407a52d2d922 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowClusterHO_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterHO_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -particleFlowClusterHO = cms.EDProducer("PFClusterProducer", +hltParticleFlowClusterHO = cms.EDProducer("PFClusterProducer", energyCorrector = cms.PSet( ), @@ -57,7 +57,7 @@ ), recHitCleaners = cms.VPSet(), - recHitsSource = cms.InputTag("particleFlowRecHitHO"), + recHitsSource = cms.InputTag("hltParticleFlowRecHitHO"), seedCleaners = cms.VPSet(), seedFinder = cms.PSet( algoName = cms.string('LocalMaximumSeedFinder'), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowPtrs_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowPtrs_cfi.py new file mode 100644 index 0000000000000..651d42a439bff --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowPtrs_cfi.py @@ -0,0 +1,5 @@ +import FWCore.ParameterSet.Config as cms + +hltParticleFlowPtrs = cms.EDProducer("PFCandidateFwdPtrProducer", + src = cms.InputTag("hltParticleFlowTmp") +) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowRecHitECAL_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowRecHitECAL_cfi.py similarity index 96% rename from HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowRecHitECAL_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowRecHitECAL_cfi.py index a101cbc1d831a..072256a93a2e2 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowRecHitECAL_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowRecHitECAL_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -particleFlowRecHitECAL = cms.EDProducer("PFRecHitProducer", +hltParticleFlowRecHitECAL = cms.EDProducer("PFRecHitProducer", navigator = cms.PSet( barrel = cms.PSet( diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowRecHitHF_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowRecHitHF_cfi.py similarity index 95% rename from HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowRecHitHF_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowRecHitHF_cfi.py index 64e2b44a0f378..8ecda054fc1a5 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowRecHitHF_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowRecHitHF_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -particleFlowRecHitHF = cms.EDProducer("PFRecHitProducer", +hltParticleFlowRecHitHF = cms.EDProducer("PFRecHitProducer", navigator = cms.PSet( hcalEnums = cms.vint32(4), name = cms.string('PFRecHitHCALDenseIdNavigator') diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowRecHitHGCL1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowRecHitHGCL1Seeded_cfi.py similarity index 84% rename from HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowRecHitHGCL1Seeded_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowRecHitHGCL1Seeded_cfi.py index 005016760b378..3d3473db9e780 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowRecHitHGCL1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowRecHitHGCL1Seeded_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -particleFlowRecHitHGCL1Seeded = cms.EDProducer("PFRecHitProducer", +hltParticleFlowRecHitHGCL1Seeded = cms.EDProducer("PFRecHitProducer", navigator = cms.PSet( hgcee = cms.PSet( name = cms.string('PFRecHitHGCEENavigator'), @@ -24,7 +24,7 @@ name = cms.string('PFRecHitQTestHGCalThresholdSNR'), thresholdSNR = cms.double(5.0) )), - src = cms.InputTag("HGCalRecHitL1Seeded","HGCEERecHits") + src = cms.InputTag("hltHGCalRecHitL1Seeded","HGCEERecHits") ), cms.PSet( geometryInstance = cms.string('HGCalHESiliconSensitive'), @@ -33,7 +33,7 @@ name = cms.string('PFRecHitQTestHGCalThresholdSNR'), thresholdSNR = cms.double(5.0) )), - src = cms.InputTag("HGCalRecHitL1Seeded","HGCHEFRecHits") + src = cms.InputTag("hltHGCalRecHitL1Seeded","HGCHEFRecHits") ), cms.PSet( geometryInstance = cms.string(''), @@ -42,7 +42,7 @@ name = cms.string('PFRecHitQTestHGCalThresholdSNR'), thresholdSNR = cms.double(5.0) )), - src = cms.InputTag("HGCalRecHitL1Seeded","HGCHEBRecHits") + src = cms.InputTag("hltHGCalRecHitL1Seeded","HGCHEBRecHits") ) ) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowRecHitHGC_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowRecHitHGC_cfi.py similarity index 86% rename from HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowRecHitHGC_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowRecHitHGC_cfi.py index 23e9fde2682d4..2159312f1897e 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowRecHitHGC_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowRecHitHGC_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -particleFlowRecHitHGC = cms.EDProducer("PFRecHitProducer", +hltParticleFlowRecHitHGC = cms.EDProducer("PFRecHitProducer", navigator = cms.PSet( hgcee = cms.PSet( name = cms.string('PFRecHitHGCEENavigator'), @@ -24,7 +24,7 @@ name = cms.string('PFRecHitQTestHGCalThresholdSNR'), thresholdSNR = cms.double(5.0) )), - src = cms.InputTag("HGCalRecHit","HGCEERecHits") + src = cms.InputTag("hltHGCalRecHit","HGCEERecHits") ), cms.PSet( geometryInstance = cms.string('HGCalHESiliconSensitive'), @@ -33,7 +33,7 @@ name = cms.string('PFRecHitQTestHGCalThresholdSNR'), thresholdSNR = cms.double(5.0) )), - src = cms.InputTag("HGCalRecHit","HGCHEFRecHits") + src = cms.InputTag("hltHGCalRecHit","HGCHEFRecHits") ), cms.PSet( geometryInstance = cms.string(''), @@ -42,7 +42,7 @@ name = cms.string('PFRecHitQTestHGCalThresholdSNR'), thresholdSNR = cms.double(5.0) )), - src = cms.InputTag("HGCalRecHit","HGCHEBRecHits") + src = cms.InputTag("hltHGCalRecHit","HGCHEBRecHits") ) ) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowRecHitHO_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowRecHitHO_cfi.py similarity index 92% rename from HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowRecHitHO_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowRecHitHO_cfi.py index e8464dcc8f2cc..37f6830aa69b3 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowRecHitHO_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowRecHitHO_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -particleFlowRecHitHO = cms.EDProducer("PFRecHitProducer", +hltParticleFlowRecHitHO = cms.EDProducer("PFRecHitProducer", navigator = cms.PSet( hcalEnums = cms.vint32(3), name = cms.string('PFRecHitHCALDenseIdNavigator') diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowSuperClusterECALL1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowSuperClusterECALL1Seeded_cfi.py index cfd088ef27723..eb1d6a35d2076 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowSuperClusterECALL1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowSuperClusterECALL1Seeded_cfi.py @@ -5,13 +5,13 @@ ClusteringType = cms.string('Mustache'), ESAssociation = cms.InputTag("hltParticleFlowClusterECALL1Seeded"), EnergyWeight = cms.string('Raw'), - PFBasicClusterCollectionBarrel = cms.string('hltParticleFlowBasicClusterECALBarrel'), - PFBasicClusterCollectionEndcap = cms.string('hltParticleFlowBasicClusterECALEndcap'), - PFBasicClusterCollectionPreshower = cms.string('hltParticleFlowBasicClusterECALPreshower'), + PFBasicClusterCollectionBarrel = cms.string('particleFlowBasicClusterECALBarrel'), + PFBasicClusterCollectionEndcap = cms.string('particleFlowBasicClusterECALEndcap'), + PFBasicClusterCollectionPreshower = cms.string('particleFlowBasicClusterECALPreshower'), PFClusters = cms.InputTag("hltParticleFlowClusterECALL1Seeded"), - PFSuperClusterCollectionBarrel = cms.string('hltParticleFlowSuperClusterECALBarrel'), - PFSuperClusterCollectionEndcap = cms.string('hltParticleFlowSuperClusterECALEndcap'), - PFSuperClusterCollectionEndcapWithPreshower = cms.string('hltParticleFlowSuperClusterECALEndcapWithPreshower'), + PFSuperClusterCollectionBarrel = cms.string('particleFlowSuperClusterECALBarrel'), + PFSuperClusterCollectionEndcap = cms.string('particleFlowSuperClusterECALEndcap'), + PFSuperClusterCollectionEndcapWithPreshower = cms.string('particleFlowSuperClusterECALEndcapWithPreshower'), applyCrackCorrections = cms.bool(False), barrelRecHits = cms.InputTag("hltRechitInRegionsECAL","EcalRecHitsEB"), doSatelliteClusterMerge = cms.bool(False), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowSuperClusterECALUnseeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowSuperClusterECALUnseeded_cfi.py index 5e78d04d4da48..7f05e76c25b9d 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowSuperClusterECALUnseeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowSuperClusterECALUnseeded_cfi.py @@ -5,13 +5,13 @@ ClusteringType = cms.string('Mustache'), ESAssociation = cms.InputTag("hltParticleFlowClusterECALUnseeded"), EnergyWeight = cms.string('Raw'), - PFBasicClusterCollectionBarrel = cms.string('hltParticleFlowBasicClusterECALBarrel'), - PFBasicClusterCollectionEndcap = cms.string('hltParticleFlowBasicClusterECALEndcap'), - PFBasicClusterCollectionPreshower = cms.string('hltParticleFlowBasicClusterECALPreshower'), + PFBasicClusterCollectionBarrel = cms.string('particleFlowBasicClusterECALBarrel'), + PFBasicClusterCollectionEndcap = cms.string('particleFlowBasicClusterECALEndcap'), + PFBasicClusterCollectionPreshower = cms.string('particleFlowBasicClusterECALPreshower'), PFClusters = cms.InputTag("hltParticleFlowClusterECALUnseeded"), - PFSuperClusterCollectionBarrel = cms.string('hltParticleFlowSuperClusterECALBarrel'), - PFSuperClusterCollectionEndcap = cms.string('hltParticleFlowSuperClusterECALEndcap'), - PFSuperClusterCollectionEndcapWithPreshower = cms.string('hltParticleFlowSuperClusterECALEndcapWithPreshower'), + PFSuperClusterCollectionBarrel = cms.string('particleFlowSuperClusterECALBarrel'), + PFSuperClusterCollectionEndcap = cms.string('particleFlowSuperClusterECALEndcap'), + PFSuperClusterCollectionEndcapWithPreshower = cms.string('particleFlowSuperClusterECALEndcapWithPreshower'), applyCrackCorrections = cms.bool(False), barrelRecHits = cms.InputTag("hltEcalRecHit","EcalRecHitsEE"), doSatelliteClusterMerge = cms.bool(False), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowSuperClusterECAL_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowSuperClusterECAL_cfi.py similarity index 91% rename from HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowSuperClusterECAL_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowSuperClusterECAL_cfi.py index 3c372227015b9..418011152b9ee 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowSuperClusterECAL_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowSuperClusterECAL_cfi.py @@ -1,14 +1,14 @@ import FWCore.ParameterSet.Config as cms -particleFlowSuperClusterECAL = cms.EDProducer("PFECALSuperClusterProducer", +hltParticleFlowSuperClusterECAL = cms.EDProducer("PFECALSuperClusterProducer", BeamSpot = cms.InputTag("hltOnlineBeamSpot"), ClusteringType = cms.string('Mustache'), - ESAssociation = cms.InputTag("particleFlowClusterECAL"), + ESAssociation = cms.InputTag("hltParticleFlowClusterECAL"), EnergyWeight = cms.string('Raw'), PFBasicClusterCollectionBarrel = cms.string('particleFlowBasicClusterECALBarrel'), PFBasicClusterCollectionEndcap = cms.string('particleFlowBasicClusterECALEndcap'), PFBasicClusterCollectionPreshower = cms.string('particleFlowBasicClusterECALPreshower'), - PFClusters = cms.InputTag("particleFlowClusterECAL"), + PFClusters = cms.InputTag("hltParticleFlowClusterECAL"), PFSuperClusterCollectionBarrel = cms.string('particleFlowSuperClusterECALBarrel'), PFSuperClusterCollectionEndcap = cms.string('particleFlowSuperClusterECALEndcap'), PFSuperClusterCollectionEndcapWithPreshower = cms.string('particleFlowSuperClusterECALEndcapWithPreshower'), @@ -44,7 +44,7 @@ uncertaintyMaxEE = cms.double(0.5), uncertaintyMinEB = cms.double(0.0002), uncertaintyMinEE = cms.double(0.0002), - vertexCollection = cms.InputTag("offlinePrimaryVertices") + vertexCollection = cms.InputTag("hltOfflinePrimaryVertices") ), satelliteClusterSeedThreshold = cms.double(50), satelliteMajorityFraction = cms.double(0.5), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowSuperClusterHGCalFromTICLL1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowSuperClusterHGCalFromTICLL1Seeded_cfi.py similarity index 90% rename from HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowSuperClusterHGCalFromTICLL1Seeded_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowSuperClusterHGCalFromTICLL1Seeded_cfi.py index 8138f44a0f061..5ff2eb180b358 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowSuperClusterHGCalFromTICLL1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowSuperClusterHGCalFromTICLL1Seeded_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -particleFlowSuperClusterHGCalFromTICLL1Seeded = cms.EDProducer("PFECALSuperClusterProducer", +hltParticleFlowSuperClusterHGCalFromTICLL1Seeded = cms.EDProducer("PFECALSuperClusterProducer", BeamSpot = cms.InputTag("hltOnlineBeamSpot"), ClusteringType = cms.string('Mustache'), ESAssociation = cms.InputTag("hltParticleFlowClusterECALL1Seeded"), @@ -8,7 +8,7 @@ PFBasicClusterCollectionBarrel = cms.string('particleFlowBasicClusterECALBarrel'), PFBasicClusterCollectionEndcap = cms.string(''), PFBasicClusterCollectionPreshower = cms.string('particleFlowBasicClusterECALPreshower'), - PFClusters = cms.InputTag("particleFlowClusterHGCalFromTICLL1Seeded"), + PFClusters = cms.InputTag("hltParticleFlowClusterHGCalFromTICLL1Seeded"), PFSuperClusterCollectionBarrel = cms.string('particleFlowSuperClusterECALBarrel'), PFSuperClusterCollectionEndcap = cms.string(''), PFSuperClusterCollectionEndcapWithPreshower = cms.string(''), @@ -28,7 +28,7 @@ eRecHitThreshold = cms.double(1), ecalRecHitsEB = cms.InputTag("hltEcalRecHitL1Seeded","EcalRecHitsEB"), ecalRecHitsEE = cms.InputTag("hltEcalRecHitL1Seeded","EcalRecHitsEE"), - hgcalRecHits = cms.InputTag("particleFlowRecHitHGCL1Seeded"), + hgcalRecHits = cms.InputTag("hltParticleFlowRecHitHGCL1Seeded"), isHLT = cms.bool(True), isPhaseII = cms.bool(True), regressionKeyEB = cms.string('pfscecal_EBCorrection_offline_v2'), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowSuperClusterHGCalFromTICLUnseeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowSuperClusterHGCalFromTICLUnseeded_cfi.py similarity index 87% rename from HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowSuperClusterHGCalFromTICLUnseeded_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowSuperClusterHGCalFromTICLUnseeded_cfi.py index c468952d761d0..2728b3b79f7c2 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowSuperClusterHGCalFromTICLUnseeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowSuperClusterHGCalFromTICLUnseeded_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -particleFlowSuperClusterHGCalFromTICLUnseeded = cms.EDProducer("PFECALSuperClusterProducer", +hltParticleFlowSuperClusterHGCalFromTICLUnseeded = cms.EDProducer("PFECALSuperClusterProducer", BeamSpot = cms.InputTag("hltOnlineBeamSpot"), ClusteringType = cms.string('Mustache'), ESAssociation = cms.InputTag("hltParticleFlowClusterECALUnseeded"), @@ -8,8 +8,8 @@ PFBasicClusterCollectionBarrel = cms.string('particleFlowBasicClusterECALBarrel'), PFBasicClusterCollectionEndcap = cms.string(''), PFBasicClusterCollectionPreshower = cms.string('particleFlowBasicClusterECALPreshower'), - PFClusters = cms.InputTag("particleFlowClusterHGCalFromTICLUnseeded"), - PFSuperClusterCollectionBarrel = cms.string('particleFlowSuperClusterECALBarrel'), + PFClusters = cms.InputTag("hltParticleFlowClusterHGCalFromTICLUnseeded"), + PFSuperClusterCollectionBarrel = cms.string('hltParticleFlowSuperClusterECALBarrel'), PFSuperClusterCollectionEndcap = cms.string(''), PFSuperClusterCollectionEndcapWithPreshower = cms.string(''), applyCrackCorrections = cms.bool(False), @@ -28,7 +28,7 @@ eRecHitThreshold = cms.double(1), ecalRecHitsEB = cms.InputTag("hltEcalRecHit","EcalRecHitsEB"), ecalRecHitsEE = cms.InputTag("hltEcalRecHit","EcalRecHitsEE"), - hgcalRecHits = cms.InputTag("particleFlowRecHitHGC"), + hgcalRecHits = cms.InputTag("hltParticleFlowRecHitHGC"), isHLT = cms.bool(True), isPhaseII = cms.bool(True), regressionKeyEB = cms.string('pfscecal_EBCorrection_offline_v2'), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowSuperClusterHGCal_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowSuperClusterHGCal_cfi.py similarity index 90% rename from HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowSuperClusterHGCal_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowSuperClusterHGCal_cfi.py index e784275d22397..3cc9befa3bd6a 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowSuperClusterHGCal_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowSuperClusterHGCal_cfi.py @@ -1,14 +1,14 @@ import FWCore.ParameterSet.Config as cms -particleFlowSuperClusterHGCal = cms.EDProducer("PFECALSuperClusterProducer", +hltParticleFlowSuperClusterHGCal = cms.EDProducer("PFECALSuperClusterProducer", BeamSpot = cms.InputTag("hltOnlineBeamSpot"), ClusteringType = cms.string('Mustache'), - ESAssociation = cms.InputTag("particleFlowClusterECAL"), + ESAssociation = cms.InputTag("hltParticleFlowClusterECAL"), EnergyWeight = cms.string('Raw'), PFBasicClusterCollectionBarrel = cms.string('particleFlowBasicClusterECALBarrel'), PFBasicClusterCollectionEndcap = cms.string(''), PFBasicClusterCollectionPreshower = cms.string('particleFlowBasicClusterECALPreshower'), - PFClusters = cms.InputTag("particleFlowClusterHGCal"), + PFClusters = cms.InputTag("hltParticleFlowClusterHGCal"), PFSuperClusterCollectionBarrel = cms.string('particleFlowSuperClusterECALBarrel'), PFSuperClusterCollectionEndcap = cms.string(''), PFSuperClusterCollectionEndcapWithPreshower = cms.string(''), @@ -44,7 +44,7 @@ uncertaintyMaxEE = cms.double(0.5), uncertaintyMinEB = cms.double(0.0002), uncertaintyMinEE = cms.double(0.0002), - vertexCollection = cms.InputTag("offlinePrimaryVertices") + vertexCollection = cms.InputTag("hltOfflinePrimaryVertices") ), satelliteClusterSeedThreshold = cms.double(50), satelliteMajorityFraction = cms.double(0.5), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowTimeAssignerECAL_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowTimeAssignerECAL_cfi.py new file mode 100644 index 0000000000000..cddef17d96363 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowTimeAssignerECAL_cfi.py @@ -0,0 +1,8 @@ +import FWCore.ParameterSet.Config as cms + +hltParticleFlowTimeAssignerECAL = cms.EDProducer("PFClusterTimeAssigner", + mightGet = cms.optional.untracked.vstring, + src = cms.InputTag("hltParticleFlowClusterECALUncorrected"), + timeResoSrc = cms.InputTag("hltEcalBarrelClusterFastTimer","PerfectResolutionModelResolution"), + timeSrc = cms.InputTag("hltEcalBarrelClusterFastTimer","PerfectResolutionModel") +) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowTmpBarrel_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowTmpBarrel_cfi.py similarity index 95% rename from HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowTmpBarrel_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowTmpBarrel_cfi.py index 6acd0a60ce7fc..506393adbf6bc 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowTmpBarrel_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowTmpBarrel_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -particleFlowTmpBarrel = cms.EDProducer("PFProducer", +hltParticleFlowTmpBarrel = cms.EDProducer("PFProducer", GedElectronValueMap = cms.InputTag("gedGsfElectronValueMapsTmp"), GedPhotonValueMap = cms.InputTag("gedPhotonsTmp","valMapPFEgammaCandToPhoton"), PFEGammaCandidates = cms.InputTag("particleFlowEGamma"), @@ -97,7 +97,7 @@ punchThroughMETFactor = cms.double(4), trackQuality = cms.string('highPurity') ), - blocks = cms.InputTag("particleFlowBlock"), + blocks = cms.InputTag("hltParticleFlowBlock"), calibHF_a_EMHAD = cms.vdouble( 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 @@ -120,7 +120,7 @@ ), calibHF_use = cms.bool(False), calibrationsLabel = cms.string(''), - cleanedHF = cms.VInputTag("particleFlowRecHitHF:Cleaned", "particleFlowClusterHF:Cleaned"), + cleanedHF = cms.VInputTag("hltParticleFlowRecHitHF:Cleaned", "hltParticleFlowClusterHF:Cleaned"), debug = cms.untracked.bool(False), dptRel_DispVtx = cms.double(10), egammaElectrons = cms.InputTag("mvaElectrons"), @@ -172,6 +172,7 @@ useProtectionsForJetMET = cms.bool(False), useVerticesForNeutral = cms.bool(True), verbose = cms.untracked.bool(False), - vertexCollection = cms.InputTag("offlinePrimaryVertices"), - vetoEndcap = cms.bool(True) + vertexCollection = cms.InputTag("hltOfflinePrimaryVertices"), + vetoEndcap = cms.bool(True), + vetoes = cms.InputTag({"hltPfTICL"}) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowTmp_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowTmp_cfi.py new file mode 100644 index 0000000000000..f9e0f5cb14342 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowTmp_cfi.py @@ -0,0 +1,5 @@ +import FWCore.ParameterSet.Config as cms + +hltParticleFlowTmp = cms.EDProducer("PFCandidateListMerger", + src = cms.VInputTag("hltParticleFlowTmpBarrel", "hltPfTICL") +) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfClusterRefsForJetsECAL_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfClusterRefsForJetsECAL_cfi.py new file mode 100644 index 0000000000000..943015f1249e2 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfClusterRefsForJetsECAL_cfi.py @@ -0,0 +1,6 @@ +import FWCore.ParameterSet.Config as cms + +hltPfClusterRefsForJetsECAL = cms.EDProducer("PFClusterRefCandidateProducer", + particleType = cms.string('pi+'), + src = cms.InputTag("hltParticleFlowClusterECAL") +) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/pfClusterRefsForJetsHCAL_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfClusterRefsForJetsHCAL_cfi.py similarity index 63% rename from HLTrigger/Configuration/python/HLT_75e33/modules/pfClusterRefsForJetsHCAL_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltPfClusterRefsForJetsHCAL_cfi.py index ae1d4e7431a53..a524b2755fb05 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/pfClusterRefsForJetsHCAL_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfClusterRefsForJetsHCAL_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -pfClusterRefsForJetsHCAL = cms.EDProducer("PFClusterRefCandidateProducer", +hltPfClusterRefsForJetsHCAL = cms.EDProducer("PFClusterRefCandidateProducer", particleType = cms.string('pi+'), src = cms.InputTag("hltParticleFlowClusterHCAL") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfClusterRefsForJetsHF_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfClusterRefsForJetsHF_cfi.py new file mode 100644 index 0000000000000..3c28dd44e92a8 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfClusterRefsForJetsHF_cfi.py @@ -0,0 +1,6 @@ +import FWCore.ParameterSet.Config as cms + +hltPfClusterRefsForJetsHF = cms.EDProducer("PFClusterRefCandidateProducer", + particleType = cms.string('pi+'), + src = cms.InputTag("hltParticleFlowClusterHF") +) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfClusterRefsForJetsHGCAL_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfClusterRefsForJetsHGCAL_cfi.py new file mode 100644 index 0000000000000..aab78d1fcc684 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfClusterRefsForJetsHGCAL_cfi.py @@ -0,0 +1,6 @@ +import FWCore.ParameterSet.Config as cms + +hltPfClusterRefsForJetsHGCAL = cms.EDProducer("PFClusterRefCandidateProducer", + particleType = cms.string('pi+'), + src = cms.InputTag("hltParticleFlowClusterHGCal") +) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfClusterRefsForJetsHO_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfClusterRefsForJetsHO_cfi.py new file mode 100644 index 0000000000000..7f857afb0bb08 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfClusterRefsForJetsHO_cfi.py @@ -0,0 +1,6 @@ +import FWCore.ParameterSet.Config as cms + +hltPfClusterRefsForJetsHO = cms.EDProducer("PFClusterRefCandidateProducer", + particleType = cms.string('pi+'), + src = cms.InputTag("hltParticleFlowClusterHO") +) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfClusterRefsForJets_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfClusterRefsForJets_cfi.py new file mode 100644 index 0000000000000..6fd09e125fa8c --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfClusterRefsForJets_cfi.py @@ -0,0 +1,5 @@ +import FWCore.ParameterSet.Config as cms + +hltPfClusterRefsForJets = cms.EDProducer("PFClusterRefCandidateMerger", + src = cms.VInputTag("hltPfClusterRefsForJetsHCAL", "hltPfClusterRefsForJetsECAL", "hltPfClusterRefsForJetsHF", "hltPfClusterRefsForJetsHO", "hltPfClusterRefsForJetsHGCAL") +) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfDeepFlavourTagInfosModEta2p4_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfDeepFlavourTagInfosModEta2p4_cfi.py index f2e1502782e25..52b530c006d6c 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfDeepFlavourTagInfosModEta2p4_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfDeepFlavourTagInfosModEta2p4_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms hltPfDeepFlavourTagInfosModEta2p4 = cms.EDProducer("DeepFlavourTagInfoProducer", - candidates = cms.InputTag("particleFlowTmp"), + candidates = cms.InputTag("hltParticleFlowTmp"), compute_probabilities = cms.bool(False), fallback_puppi_weight = cms.bool(False), fallback_vertex_association = cms.bool(False), @@ -18,5 +18,5 @@ secondary_vertices = cms.InputTag("hltDeepInclusiveSecondaryVerticesPF"), shallow_tag_infos = cms.InputTag("hltDeepCombinedSecondaryVertexBJetTagsInfosPuppiModEta2p4"), vertex_associator = cms.InputTag("hltPrimaryVertexAssociationModEta2p4","original"), - vertices = cms.InputTag("offlinePrimaryVertices") + vertices = cms.InputTag("hltOfflinePrimaryVertices") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfDeepFlavourTagInfos_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfDeepFlavourTagInfos_cfi.py index e84a87f035045..4861a007e123d 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfDeepFlavourTagInfos_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfDeepFlavourTagInfos_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms hltPfDeepFlavourTagInfos = cms.EDProducer("DeepFlavourTagInfoProducer", - candidates = cms.InputTag("particleFlowTmp"), + candidates = cms.InputTag("hltParticleFlowTmp"), compute_probabilities = cms.bool(False), fallback_puppi_weight = cms.bool(False), fallback_vertex_association = cms.bool(False), @@ -18,5 +18,5 @@ secondary_vertices = cms.InputTag("hltDeepInclusiveSecondaryVerticesPF"), shallow_tag_infos = cms.InputTag("hltDeepCombinedSecondaryVertexBJetTagsInfosPuppi"), vertex_associator = cms.InputTag("hltPrimaryVertexAssociation","original"), - vertices = cms.InputTag("offlinePrimaryVertices") + vertices = cms.InputTag("hltOfflinePrimaryVertices") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfNoPileUpJME_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfNoPileUpJME_cfi.py new file mode 100644 index 0000000000000..c4537031c7321 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfNoPileUpJME_cfi.py @@ -0,0 +1,8 @@ +import FWCore.ParameterSet.Config as cms + +hltPfNoPileUpJME = cms.EDProducer("TPPFCandidatesOnPFCandidates", + bottomCollection = cms.InputTag("hltParticleFlowPtrs"), + enable = cms.bool(True), + name = cms.untracked.string('pileUpOnPFCandidates'), + topCollection = cms.InputTag("hltPfPileUpJME") +) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/pfPileUpJME_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfPileUpJME_cfi.py similarity index 63% rename from HLTrigger/Configuration/python/HLT_75e33/modules/pfPileUpJME_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltPfPileUpJME_cfi.py index dfd07440cb4c7..9b082494bf634 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/pfPileUpJME_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfPileUpJME_cfi.py @@ -1,8 +1,8 @@ import FWCore.ParameterSet.Config as cms -pfPileUpJME = cms.EDProducer("PFPileUp", - PFCandidates = cms.InputTag("particleFlowPtrs"), - Vertices = cms.InputTag("goodOfflinePrimaryVertices"), +hltPfPileUpJME = cms.EDProducer("PFPileUp", + PFCandidates = cms.InputTag("hltParticleFlowPtrs"), + Vertices = cms.InputTag("hltGoodOfflinePrimaryVertices"), checkClosestZVertex = cms.bool(False), enable = cms.bool(True), useVertexAssociation = cms.bool(False), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/pfTICL_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfTICL_cfi.py similarity index 87% rename from HLTrigger/Configuration/python/HLT_75e33/modules/pfTICL_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltPfTICL_cfi.py index 5160548f54fd3..c97900f0f8962 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/pfTICL_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfTICL_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -pfTICL = cms.EDProducer("PFTICLProducer", +hltPfTICL = cms.EDProducer("PFTICLProducer", mightGet = cms.optional.untracked.vstring, muonSrc = cms.InputTag("hltPhase2L3Muons"), pfMuonAlgoParameters = cms.PSet( @@ -24,7 +24,7 @@ punchThroughMETFactor = cms.double(4), trackQuality = cms.string('highPurity') ), - ticlCandidateSrc = cms.InputTag("ticlTrackstersMerge"), + ticlCandidateSrc = cms.InputTag("hltTiclTrackstersMerge"), timingQualityThreshold = cms.double(0.5), trackTimeErrorMap = cms.InputTag("tofPID","sigmat0"), trackTimeQualityMap = cms.InputTag("mtdTrackQualityMVA","mtdQualMVA"), @@ -34,4 +34,4 @@ ) from Configuration.ProcessModifiers.ticl_v5_cff import ticl_v5 -ticl_v5.toModify(pfTICL, ticlCandidateSrc = cms.InputTag('hltTiclCandidate'), isTICLv5 = cms.bool(True)) +ticl_v5.toModify(hltPfTICL, ticlCandidateSrc = cms.InputTag('hltTiclCandidate'), isTICLv5 = cms.bool(True)) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/pfTrack_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfTrack_cfi.py similarity index 63% rename from HLTrigger/Configuration/python/HLT_75e33/modules/pfTrack_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltPfTrack_cfi.py index 7d186eb3eeeee..46eed8a61e5f9 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/pfTrack_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfTrack_cfi.py @@ -1,11 +1,11 @@ import FWCore.ParameterSet.Config as cms -pfTrack = cms.EDProducer("PFTrackProducer", +hltPfTrack = cms.EDProducer("PFTrackProducer", GsfTrackModuleLabel = cms.InputTag("electronGsfTracks"), GsfTracksInEvents = cms.bool(False), MuColl = cms.InputTag("hltPhase2L3Muons"), - PrimaryVertexLabel = cms.InputTag("offlinePrimaryVertices"), - TkColList = cms.VInputTag(cms.InputTag("generalTracks")), + PrimaryVertexLabel = cms.InputTag("hltOfflinePrimaryVertices"), + TkColList = cms.VInputTag(cms.InputTag("hltGeneralTracks")), TrackQuality = cms.string('highPurity'), TrajInEvents = cms.bool(False), UseQuality = cms.bool(True) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3FromL1TkMuonPixelLayerQuadruplets_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3FromL1TkMuonPixelLayerQuadruplets_cfi.py index 967652656b1d8..e0ed240c4ab17 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3FromL1TkMuonPixelLayerQuadruplets_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3FromL1TkMuonPixelLayerQuadruplets_cfi.py @@ -2,11 +2,11 @@ hltPhase2L3FromL1TkMuonPixelLayerQuadruplets = cms.EDProducer("SeedingLayersEDProducer", BPix = cms.PSet( - HitProducer = cms.string('siPixelRecHits'), + HitProducer = cms.string('hltSiPixelRecHits'), TTRHBuilder = cms.string('WithTrackAngle') ), FPix = cms.PSet( - HitProducer = cms.string('siPixelRecHits'), + HitProducer = cms.string('hltSiPixelRecHits'), TTRHBuilder = cms.string('WithTrackAngle') ), MTEC = cms.PSet( diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3FromL1TkMuonPixelTracksHitQuadruplets_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3FromL1TkMuonPixelTracksHitQuadruplets_cfi.py index 03e5b1bf0193c..9a9870e27e094 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3FromL1TkMuonPixelTracksHitQuadruplets_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3FromL1TkMuonPixelTracksHitQuadruplets_cfi.py @@ -6,7 +6,7 @@ CAThetaCut = cms.double(0.005), SeedComparitorPSet = cms.PSet( ComponentName = cms.string('LowPtClusterShapeSeedComparitor'), - clusterShapeCacheSrc = cms.InputTag("siPixelClusterShapeCache"), + clusterShapeCacheSrc = cms.InputTag("hltSiPixelClusterShapeCache"), clusterShapeHitFilter = cms.string('ClusterShapeHitFilter') ), doublets = cms.InputTag("hltPhase2L3FromL1TkMuonPixelTracksHitDoublets"), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonHighPtTripletStepClusters_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonHighPtTripletStepClusters_cfi.py index 33c2a079c0428..796b8adb97499 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonHighPtTripletStepClusters_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonHighPtTripletStepClusters_cfi.py @@ -7,8 +7,8 @@ minNumberOfLayersWithMeasBeforeFiltering = cms.int32(0), oldClusterRemovalInfo = cms.InputTag(""), overrideTrkQuals = cms.InputTag(""), - phase2OTClusters = cms.InputTag("siPhase2Clusters"), - phase2pixelClusters = cms.InputTag("siPixelClusters"), + phase2OTClusters = cms.InputTag("hltSiPhase2Clusters"), + phase2pixelClusters = cms.InputTag("hltSiPixelClusters"), trackClassifier = cms.InputTag("","QualityMasks"), trajectories = cms.InputTag("hltPhase2L3MuonInitialStepTracksSelectionHighPurity") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonHighPtTripletStepHitDoublets_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonHighPtTripletStepHitDoublets_cfi.py index 672a3df2374be..43853a61884c7 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonHighPtTripletStepHitDoublets_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonHighPtTripletStepHitDoublets_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms hltPhase2L3MuonHighPtTripletStepHitDoublets = cms.EDProducer("HitPairEDProducer", - clusterCheck = cms.InputTag("trackerClusterCheck"), + clusterCheck = cms.InputTag("hltTrackerClusterCheck"), layerPairs = cms.vuint32(0, 1), maxElement = cms.uint32(50000000), maxElementTotal = cms.uint32(50000000), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonHighPtTripletStepHitTriplets_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonHighPtTripletStepHitTriplets_cfi.py index 7e3f355e1b230..13ec9cd2fceed 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonHighPtTripletStepHitTriplets_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonHighPtTripletStepHitTriplets_cfi.py @@ -6,7 +6,7 @@ CAThetaCut = cms.double(0.003), SeedComparitorPSet = cms.PSet( ComponentName = cms.string('LowPtClusterShapeSeedComparitor'), - clusterShapeCacheSrc = cms.InputTag("siPixelClusterShapeCache"), + clusterShapeCacheSrc = cms.InputTag("hltSiPixelClusterShapeCache"), clusterShapeHitFilter = cms.string('ClusterShapeHitFilter') ), doublets = cms.InputTag("hltPhase2L3MuonHighPtTripletStepHitDoublets"), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonHighPtTripletStepSeedLayers_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonHighPtTripletStepSeedLayers_cfi.py index f4a551ce0df38..07965cea64653 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonHighPtTripletStepSeedLayers_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonHighPtTripletStepSeedLayers_cfi.py @@ -2,12 +2,12 @@ hltPhase2L3MuonHighPtTripletStepSeedLayers = cms.EDProducer("SeedingLayersEDProducer", BPix = cms.PSet( - HitProducer = cms.string('siPixelRecHits'), + HitProducer = cms.string('hltSiPixelRecHits'), TTRHBuilder = cms.string('WithTrackAngle'), skipClusters = cms.InputTag("hltPhase2L3MuonHighPtTripletStepClusters") ), FPix = cms.PSet( - HitProducer = cms.string('siPixelRecHits'), + HitProducer = cms.string('hltSiPixelRecHits'), TTRHBuilder = cms.string('WithTrackAngle'), skipClusters = cms.InputTag("hltPhase2L3MuonHighPtTripletStepClusters") ), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonHighPtTripletStepTrackCandidates_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonHighPtTripletStepTrackCandidates_cfi.py index a35ab70fa632b..e40b94fb1a50f 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonHighPtTripletStepTrackCandidates_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonHighPtTripletStepTrackCandidates_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms hltPhase2L3MuonHighPtTripletStepTrackCandidates = cms.EDProducer("CkfTrackCandidateMaker", - MeasurementTrackerEvent = cms.InputTag("MeasurementTrackerEvent"), + MeasurementTrackerEvent = cms.InputTag("hltMeasurementTrackerEvent"), NavigationSchool = cms.string('SimpleNavigationSchool'), RedundantSeedCleaner = cms.string('CachingSeedCleanerBySharedInput'), TrajectoryBuilderPSet = cms.PSet( diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonHighPtTripletStepTracks_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonHighPtTripletStepTracks_cfi.py index 375630e661bff..c84361cea07a7 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonHighPtTripletStepTracks_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonHighPtTripletStepTracks_cfi.py @@ -5,7 +5,7 @@ Fitter = cms.string('FlexibleKFFittingSmoother'), GeometricInnerState = cms.bool(False), MeasurementTracker = cms.string(''), - MeasurementTrackerEvent = cms.InputTag("MeasurementTrackerEvent"), + MeasurementTrackerEvent = cms.InputTag("hltMeasurementTrackerEvent"), NavigationSchool = cms.string('SimpleNavigationSchool'), Propagator = cms.string('RungeKuttaTrackerPropagator'), SimpleMagneticField = cms.string(''), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonInitialStepTrackCandidates_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonInitialStepTrackCandidates_cfi.py index c8c882d0b583c..3f1bd0c31908a 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonInitialStepTrackCandidates_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonInitialStepTrackCandidates_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms hltPhase2L3MuonInitialStepTrackCandidates = cms.EDProducer("CkfTrackCandidateMaker", - MeasurementTrackerEvent = cms.InputTag("MeasurementTrackerEvent"), + MeasurementTrackerEvent = cms.InputTag("hltMeasurementTrackerEvent"), NavigationSchool = cms.string('SimpleNavigationSchool'), RedundantSeedCleaner = cms.string('CachingSeedCleanerBySharedInput'), TrajectoryBuilderPSet = cms.PSet( diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonInitialStepTracks_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonInitialStepTracks_cfi.py index 252d6083806f7..e19355bbf9956 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonInitialStepTracks_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonInitialStepTracks_cfi.py @@ -5,7 +5,7 @@ Fitter = cms.string('FlexibleKFFittingSmoother'), GeometricInnerState = cms.bool(False), MeasurementTracker = cms.string(''), - MeasurementTrackerEvent = cms.InputTag("MeasurementTrackerEvent"), + MeasurementTrackerEvent = cms.InputTag("hltMeasurementTrackerEvent"), NavigationSchool = cms.string('SimpleNavigationSchool'), Propagator = cms.string('RungeKuttaTrackerPropagator'), SimpleMagneticField = cms.string(''), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonPixelTracksHitDoublets_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonPixelTracksHitDoublets_cfi.py index 2a1e2329aa84f..937877655e4ad 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonPixelTracksHitDoublets_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonPixelTracksHitDoublets_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms hltPhase2L3MuonPixelTracksHitDoublets = cms.EDProducer("HitPairEDProducer", - clusterCheck = cms.InputTag("trackerClusterCheck"), + clusterCheck = cms.InputTag("hltTrackerClusterCheck"), layerPairs = cms.vuint32(0, 1, 2), maxElement = cms.uint32(5000000), maxElementTotal = cms.uint32(50000000), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonPixelTracksHitQuadruplets_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonPixelTracksHitQuadruplets_cfi.py index 74f0340cd5c6e..f590bf261281c 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonPixelTracksHitQuadruplets_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonPixelTracksHitQuadruplets_cfi.py @@ -7,7 +7,7 @@ CAThetaCut = cms.double(0.0012), SeedComparitorPSet = cms.PSet( ComponentName = cms.string('LowPtClusterShapeSeedComparitor'), - clusterShapeCacheSrc = cms.InputTag("siPixelClusterShapeCache"), + clusterShapeCacheSrc = cms.InputTag("hltSiPixelClusterShapeCache"), clusterShapeHitFilter = cms.string('ClusterShapeHitFilter') ), doublets = cms.InputTag("hltPhase2L3MuonPixelTracksHitDoublets"), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonPixelTracksSeedLayers_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonPixelTracksSeedLayers_cfi.py index b5ad919210fb2..a4fca829c0944 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonPixelTracksSeedLayers_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonPixelTracksSeedLayers_cfi.py @@ -2,11 +2,11 @@ hltPhase2L3MuonPixelTracksSeedLayers = cms.EDProducer("SeedingLayersEDProducer", BPix = cms.PSet( - HitProducer = cms.string('siPixelRecHits'), + HitProducer = cms.string('hltSiPixelRecHits'), TTRHBuilder = cms.string('WithTrackAngle') ), FPix = cms.PSet( - HitProducer = cms.string('siPixelRecHits'), + HitProducer = cms.string('hltSiPixelRecHits'), TTRHBuilder = cms.string('WithTrackAngle') ), MTEC = cms.PSet( diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonsHgcalLCIsodR0p2dRVetoEM0p00dRVetoHad0p02minEEM0p00minEHad0p00_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonsHgcalLCIsodR0p2dRVetoEM0p00dRVetoHad0p02minEEM0p00minEHad0p00_cfi.py index e1cd836f16e25..c61a83c4809b2 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonsHgcalLCIsodR0p2dRVetoEM0p00dRVetoHad0p02minEEM0p00minEHad0p00_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonsHgcalLCIsodR0p2dRVetoEM0p00dRVetoHad0p02minEEM0p00minEHad0p00_cfi.py @@ -6,7 +6,7 @@ drVetoEM = cms.double(0.0), drVetoHad = cms.double(0.02), effectiveAreas = cms.vdouble(0.0, 0.0), - layerClusterProducer = cms.InputTag("hgcalMergeLayerClusters"), + layerClusterProducer = cms.InputTag("hltHgcalMergeLayerClusters"), minEnergyEM = cms.double(0.0), minEnergyHad = cms.double(0.0), minEtEM = cms.double(0.0), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3OIMuCtfWithMaterialTracks_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3OIMuCtfWithMaterialTracks_cfi.py index 73c90d4a728f2..f64f9e7fa106f 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3OIMuCtfWithMaterialTracks_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3OIMuCtfWithMaterialTracks_cfi.py @@ -5,7 +5,7 @@ Fitter = cms.string('FlexibleKFFittingSmoother'), GeometricInnerState = cms.bool(True), MeasurementTracker = cms.string(''), - MeasurementTrackerEvent = cms.InputTag("MeasurementTrackerEvent"), + MeasurementTrackerEvent = cms.InputTag("hltMeasurementTrackerEvent"), NavigationSchool = cms.string(''), Propagator = cms.string('hltESPRungeKuttaTrackerPropagator'), SimpleMagneticField = cms.string(''), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3OISeedsFromL2Muons_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3OISeedsFromL2Muons_cfi.py index 60d7161c09761..3ec2fa2b86f9f 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3OISeedsFromL2Muons_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3OISeedsFromL2Muons_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms hltPhase2L3OISeedsFromL2Muons = cms.EDProducer("TSGForOIFromL2", - MeasurementTrackerEvent = cms.InputTag("MeasurementTrackerEvent"), + MeasurementTrackerEvent = cms.InputTag("hltMeasurementTrackerEvent"), SF1 = cms.double(3.0), SF2 = cms.double(4.0), SF3 = cms.double(5.0), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3OITrackCandidates_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3OITrackCandidates_cfi.py index 9929e3cf15ac8..df6ef931e0db9 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3OITrackCandidates_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3OITrackCandidates_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms hltPhase2L3OITrackCandidates = cms.EDProducer("CkfTrackCandidateMaker", - MeasurementTrackerEvent = cms.InputTag("MeasurementTrackerEvent"), + MeasurementTrackerEvent = cms.InputTag("hltMeasurementTrackerEvent"), NavigationSchool = cms.string('SimpleNavigationSchool'), RedundantSeedCleaner = cms.string('CachingSeedCleanerBySharedInput'), TrajectoryBuilderPSet = cms.PSet( diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2PixelTracksHitSeeds_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2PixelTracksHitSeeds_cfi.py index 413947c54f0d6..47ce5b136bdbe 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2PixelTracksHitSeeds_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2PixelTracksHitSeeds_cfi.py @@ -6,7 +6,7 @@ CAThetaCut = cms.double(0.0012), SeedComparitorPSet = cms.PSet( ComponentName = cms.string('LowPtClusterShapeSeedComparitor'), - clusterShapeCacheSrc = cms.InputTag("siPixelClusterShapeCache"), + clusterShapeCacheSrc = cms.InputTag("hltSiPixelClusterShapeCache"), clusterShapeHitFilter = cms.string('ClusterShapeHitFilter') ), doublets = cms.InputTag("hltPhase2PixelTracksHitDoublets"), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2PixelTracksSeedLayers_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2PixelTracksSeedLayers_cfi.py index 308e66694b67c..357254a5f1724 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2PixelTracksSeedLayers_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2PixelTracksSeedLayers_cfi.py @@ -2,11 +2,11 @@ hltPhase2PixelTracksSeedLayers = cms.EDProducer("SeedingLayersEDProducer", BPix = cms.PSet( - HitProducer = cms.string('siPixelRecHits'), + HitProducer = cms.string('hltSiPixelRecHits'), TTRHBuilder = cms.string('WithTrackAngle') ), FPix = cms.PSet( - HitProducer = cms.string('siPixelRecHits'), + HitProducer = cms.string('hltSiPixelRecHits'), TTRHBuilder = cms.string('WithTrackAngle') ), MTEC = cms.PSet( diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPixelClustersMultiplicity_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPixelClustersMultiplicity_cfi.py index 06030a71dc131..65e811afbdeae 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPixelClustersMultiplicity_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPixelClustersMultiplicity_cfi.py @@ -3,5 +3,5 @@ hltPixelClustersMultiplicity = cms.EDProducer("HLTSiPixelClusterMultiplicityValueProducer", defaultValue = cms.double(-1.0), mightGet = cms.optional.untracked.vstring, - src = cms.InputTag("siPixelClusters") + src = cms.InputTag("hltSiPixelClusters") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPixelLayerPairsL1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPixelLayerPairsL1Seeded_cfi.py index 40827fd463d56..9b0ddae22f6ec 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPixelLayerPairsL1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPixelLayerPairsL1Seeded_cfi.py @@ -2,12 +2,12 @@ hltPixelLayerPairsL1Seeded = cms.EDProducer("SeedingLayersEDProducer", BPix = cms.PSet( - HitProducer = cms.string('siPixelRecHits'), + HitProducer = cms.string('hltSiPixelRecHits'), TTRHBuilder = cms.string('TTRHBuilderWithoutAngle4PixelTriplets'), skipClusters = cms.InputTag("hltElePixelHitTripletsClusterRemoverL1Seeded") ), FPix = cms.PSet( - HitProducer = cms.string('siPixelRecHits'), + HitProducer = cms.string('hltSiPixelRecHits'), TTRHBuilder = cms.string('TTRHBuilderWithoutAngle4PixelTriplets'), skipClusters = cms.InputTag("hltElePixelHitTripletsClusterRemoverL1Seeded") ), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPixelLayerPairsUnseeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPixelLayerPairsUnseeded_cfi.py index 4f4ff5cf24706..7f3d963820afc 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPixelLayerPairsUnseeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPixelLayerPairsUnseeded_cfi.py @@ -2,12 +2,12 @@ hltPixelLayerPairsUnseeded = cms.EDProducer("SeedingLayersEDProducer", BPix = cms.PSet( - HitProducer = cms.string('siPixelRecHits'), + HitProducer = cms.string('hltSiPixelRecHits'), TTRHBuilder = cms.string('TTRHBuilderWithoutAngle4PixelTriplets'), skipClusters = cms.InputTag("hltElePixelHitTripletsClusterRemoverUnseeded") ), FPix = cms.PSet( - HitProducer = cms.string('siPixelRecHits'), + HitProducer = cms.string('hltSiPixelRecHits'), TTRHBuilder = cms.string('TTRHBuilderWithoutAngle4PixelTriplets'), skipClusters = cms.InputTag("hltElePixelHitTripletsClusterRemoverUnseeded") ), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPixelLayerTriplets_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPixelLayerTriplets_cfi.py index a47405ee4a428..1e445cdfb753f 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPixelLayerTriplets_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPixelLayerTriplets_cfi.py @@ -2,11 +2,11 @@ hltPixelLayerTriplets = cms.EDProducer("SeedingLayersEDProducer", BPix = cms.PSet( - HitProducer = cms.string('siPixelRecHits'), + HitProducer = cms.string('hltSiPixelRecHits'), TTRHBuilder = cms.string('TTRHBuilderWithoutAngle4PixelTriplets') ), FPix = cms.PSet( - HitProducer = cms.string('siPixelRecHits'), + HitProducer = cms.string('hltSiPixelRecHits'), TTRHBuilder = cms.string('TTRHBuilderWithoutAngle4PixelTriplets') ), MTEC = cms.PSet( diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPrimaryVertexAssociationModEta2p4_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPrimaryVertexAssociationModEta2p4_cfi.py index 24b9efb274ec6..1113cf8d00295 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPrimaryVertexAssociationModEta2p4_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPrimaryVertexAssociationModEta2p4_cfi.py @@ -23,7 +23,7 @@ useVertexFit = cms.bool(True) ), jets = cms.InputTag("hltPFPuppiJetForBtagEta2p4"), - particles = cms.InputTag("particleFlowTmp"), + particles = cms.InputTag("hltParticleFlowTmp"), produceAssociationToOriginalVertices = cms.bool(True), produceNoPileUpCollection = cms.bool(False), producePileUpCollection = cms.bool(False), @@ -33,5 +33,5 @@ ), usePVMET = cms.bool(True), - vertices = cms.InputTag("offlinePrimaryVertices") + vertices = cms.InputTag("hltOfflinePrimaryVertices") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPrimaryVertexAssociation_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPrimaryVertexAssociation_cfi.py index b62a18abaa688..199d73aa849e7 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPrimaryVertexAssociation_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPrimaryVertexAssociation_cfi.py @@ -23,7 +23,7 @@ useVertexFit = cms.bool(True) ), jets = cms.InputTag("hltAK4PFPuppiJets"), - particles = cms.InputTag("particleFlowTmp"), + particles = cms.InputTag("hltParticleFlowTmp"), produceAssociationToOriginalVertices = cms.bool(True), produceNoPileUpCollection = cms.bool(False), producePileUpCollection = cms.bool(False), @@ -33,5 +33,5 @@ ), usePVMET = cms.bool(True), - vertices = cms.InputTag("offlinePrimaryVertices") + vertices = cms.InputTag("hltOfflinePrimaryVertices") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltRechitInRegionsHGCAL_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltRechitInRegionsHGCAL_cfi.py index 797a80d231fe5..5386ee79fba70 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltRechitInRegionsHGCAL_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltRechitInRegionsHGCAL_cfi.py @@ -10,7 +10,7 @@ minEt = cms.double(5.0), type = cms.string('L1P2GTCandidate') )), - inputCollTags = cms.VInputTag("HGCalRecHitL1Seeded:HGCEERecHits", "HGCalRecHitL1Seeded:HGCHEBRecHits", "HGCalRecHitL1Seeded:HGCHEFRecHits"), + inputCollTags = cms.VInputTag("hltHGCalRecHitL1Seeded:HGCEERecHits", "hltHGCalRecHitL1Seeded:HGCHEBRecHits", "hltHGCalRecHitL1Seeded:HGCHEFRecHits"), outputProductNames = cms.vstring( 'HGCEERecHits', 'HGCHEBRecHits', diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/siPhase2Clusters_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltSiPhase2Clusters_cfi.py similarity index 76% rename from HLTrigger/Configuration/python/HLT_75e33/modules/siPhase2Clusters_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltSiPhase2Clusters_cfi.py index 4684840607fa4..342699f45689b 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/siPhase2Clusters_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltSiPhase2Clusters_cfi.py @@ -1,4 +1,4 @@ import FWCore.ParameterSet.Config as cms from RecoLocalTracker.SiPhase2Clusterizer.phase2TrackerClusterizer_cfi import siPhase2Clusters as _siPhase2Clusters -siPhase2Clusters = _siPhase2Clusters.clone() +hltSiPhase2Clusters = _siPhase2Clusters.clone() diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltSiPixelClusterShapeCache_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltSiPixelClusterShapeCache_cfi.py new file mode 100644 index 0000000000000..f9ab439bc557a --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltSiPixelClusterShapeCache_cfi.py @@ -0,0 +1,7 @@ +import FWCore.ParameterSet.Config as cms + +hltSiPixelClusterShapeCache = cms.EDProducer("SiPixelClusterShapeCacheProducer", + mightGet = cms.optional.untracked.vstring, + onDemand = cms.bool(False), + src = cms.InputTag("hltSiPixelClusters") +) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/siPixelClusters_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltSiPixelClusters_cfi.py similarity index 93% rename from HLTrigger/Configuration/python/HLT_75e33/modules/siPixelClusters_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltSiPixelClusters_cfi.py index 52eeaa24c0199..e011813087483 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/siPixelClusters_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltSiPixelClusters_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -siPixelClusters = cms.EDProducer("SiPixelClusterProducer", +hltSiPixelClusters = cms.EDProducer("SiPixelClusterProducer", ChannelThreshold = cms.int32(1000), ClusterMode = cms.string('PixelThresholdClusterizer'), ClusterThreshold = cms.int32(4000), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/siPixelRecHits_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltSiPixelRecHits_cfi.py similarity index 54% rename from HLTrigger/Configuration/python/HLT_75e33/modules/siPixelRecHits_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltSiPixelRecHits_cfi.py index 7efd9f88b0cca..cc748f6f627b0 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/siPixelRecHits_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltSiPixelRecHits_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -siPixelRecHits = cms.EDProducer("SiPixelRecHitConverter", +hltSiPixelRecHits = cms.EDProducer("SiPixelRecHitConverter", CPE = cms.string('PixelCPEGeneric'), VerboseLevel = cms.untracked.int32(0), - src = cms.InputTag("siPixelClusters") + src = cms.InputTag("hltSiPixelClusters") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltTauPFJets08Region_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTauPFJets08Region_cfi.py index 2776051220df6..04e26628a980e 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltTauPFJets08Region_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTauPFJets08Region_cfi.py @@ -5,7 +5,7 @@ maxJetAbsEta = cms.double(99.0), minJetPt = cms.double(-1.0), pfCandAssocMapSrc = cms.InputTag(""), - pfCandSrc = cms.InputTag("particleFlowTmp"), + pfCandSrc = cms.InputTag("hltParticleFlowTmp"), src = cms.InputTag("hltAK4PFJets"), verbosity = cms.int32(0) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclCandidate_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclCandidate_cfi.py index b9951d537f43a..2f108c32757b9 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclCandidate_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclCandidate_cfi.py @@ -15,15 +15,15 @@ timing_quality_threshold = cms.double(0.5), type = cms.string('General') ), - layer_clusters = cms.InputTag("hgcalMergeLayerClusters"), - layer_clustersTime = cms.InputTag("hgcalMergeLayerClusters","timeLayerCluster"), + layer_clusters = cms.InputTag("hltHgcalMergeLayerClusters"), + layer_clustersTime = cms.InputTag("hltHgcalMergeLayerClusters","timeLayerCluster"), mightGet = cms.optional.untracked.vstring, muons = cms.InputTag("hltPhase2L3Muons"), - original_masks = cms.VInputTag("hgcalMergeLayerClusters:InitialLayerClustersMask"), + original_masks = cms.VInputTag("hltHgcalMergeLayerClusters:InitialLayerClustersMask"), propagator = cms.string('PropagatorWithMaterial'), timingQualityThreshold = cms.double(0.5), timingSoA = cms.InputTag("mtdSoA"), - tracks = cms.InputTag("generalTracks"), + tracks = cms.InputTag("hltGeneralTracks"), useMTDTiming = cms.bool(False), useTimingAverage = cms.bool(False) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/ticlLayerTileProducerL1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclLayerTileProducerL1Seeded_cfi.py similarity index 56% rename from HLTrigger/Configuration/python/HLT_75e33/modules/ticlLayerTileProducerL1Seeded_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclLayerTileProducerL1Seeded_cfi.py index 2e6f82b170cd6..b1a795121797e 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/ticlLayerTileProducerL1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclLayerTileProducerL1Seeded_cfi.py @@ -1,8 +1,8 @@ import FWCore.ParameterSet.Config as cms -ticlLayerTileProducerL1Seeded = cms.EDProducer("TICLLayerTileProducer", +hltTiclLayerTileProducerL1Seeded = cms.EDProducer("TICLLayerTileProducer", detector = cms.string('HGCAL'), layer_HFNose_clusters = cms.InputTag("hgcalLayerClustersHFNose"), - layer_clusters = cms.InputTag("hgcalMergeLayerClustersL1Seeded"), + layer_clusters = cms.InputTag("hltHgcalMergeLayerClustersL1Seeded"), mightGet = cms.optional.untracked.vstring ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/ticlLayerTileProducer_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclLayerTileProducer_cfi.py similarity index 59% rename from HLTrigger/Configuration/python/HLT_75e33/modules/ticlLayerTileProducer_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclLayerTileProducer_cfi.py index 09f49998b0e6b..822e2cd013447 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/ticlLayerTileProducer_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclLayerTileProducer_cfi.py @@ -1,8 +1,8 @@ import FWCore.ParameterSet.Config as cms -ticlLayerTileProducer = cms.EDProducer("TICLLayerTileProducer", +hltTiclLayerTileProducer = cms.EDProducer("TICLLayerTileProducer", detector = cms.string('HGCAL'), layer_HFNose_clusters = cms.InputTag("hgcalLayerClustersHFNose"), - layer_clusters = cms.InputTag("hgcalMergeLayerClusters"), + layer_clusters = cms.InputTag("hltHgcalMergeLayerClusters"), mightGet = cms.optional.untracked.vstring ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/ticlSeedingGlobal_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclSeedingGlobal_cfi.py similarity index 76% rename from HLTrigger/Configuration/python/HLT_75e33/modules/ticlSeedingGlobal_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclSeedingGlobal_cfi.py index 3b1362a9b719b..7e1e6cc76de4b 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/ticlSeedingGlobal_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclSeedingGlobal_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -ticlSeedingGlobal = cms.EDProducer("TICLSeedingRegionProducer", +hltTiclSeedingGlobal = cms.EDProducer("TICLSeedingRegionProducer", mightGet = cms.optional.untracked.vstring, seedingPSet = cms.PSet( algo_verbosity = cms.int32(0), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/ticlSeedingL1_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclSeedingL1_cfi.py similarity index 87% rename from HLTrigger/Configuration/python/HLT_75e33/modules/ticlSeedingL1_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclSeedingL1_cfi.py index d2677552f976f..87e82e1eb040c 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/ticlSeedingL1_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclSeedingL1_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -ticlSeedingL1 = cms.EDProducer("TICLSeedingRegionProducer", +hltTiclSeedingL1 = cms.EDProducer("TICLSeedingRegionProducer", seedingPSet = cms.PSet( algo_verbosity = cms.int32(0), l1GTCandColl = cms.InputTag("l1tGTProducer", "CL2Photons"), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTracksterLinks_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTracksterLinks_cfi.py index 4580d5be3a468..568d8e70d88ce 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTracksterLinks_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTracksterLinks_cfi.py @@ -8,8 +8,8 @@ eid_n_layers = cms.int32(50), eid_output_name_energy = cms.string('output/regressed_energy'), eid_output_name_id = cms.string('output/id_probabilities'), - layer_clusters = cms.InputTag("hgcalMergeLayerClusters"), - layer_clustersTime = cms.InputTag("hgcalMergeLayerClusters","timeLayerCluster"), + layer_clusters = cms.InputTag("hltHgcalMergeLayerClusters"), + layer_clustersTime = cms.InputTag("hltHgcalMergeLayerClusters","timeLayerCluster"), linkingPSet = cms.PSet( algo_verbosity = cms.int32(0), cylinder_radius_sqr = cms.vdouble(9, 9), @@ -26,9 +26,9 @@ wind = cms.double(0.036) ), mightGet = cms.optional.untracked.vstring, - original_masks = cms.VInputTag("hgcalMergeLayerClusters:InitialLayerClustersMask"), + original_masks = cms.VInputTag("hltHgcalMergeLayerClusters:InitialLayerClustersMask"), propagator = cms.string('PropagatorWithMaterial'), regressionAndPid = cms.bool(True), tfDnnLabel = cms.string('tracksterSelectionTf'), - tracksters_collections = cms.VInputTag("ticlTrackstersCLUE3DHigh", "hltTiclTrackstersPassthrough") + tracksters_collections = cms.VInputTag("hltTiclTrackstersCLUE3DHigh", "hltTiclTrackstersPassthrough") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/ticlTrackstersCLUE3DHighL1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTrackstersCLUE3DHighL1Seeded_cfi.py similarity index 84% rename from HLTrigger/Configuration/python/HLT_75e33/modules/ticlTrackstersCLUE3DHighL1Seeded_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTrackstersCLUE3DHighL1Seeded_cfi.py index b27f0bb29b271..673f0d83e7d1d 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/ticlTrackstersCLUE3DHighL1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTrackstersCLUE3DHighL1Seeded_cfi.py @@ -1,14 +1,14 @@ import FWCore.ParameterSet.Config as cms -ticlTrackstersCLUE3DHighL1Seeded = cms.EDProducer("TrackstersProducer", +hltTiclTrackstersCLUE3DHighL1Seeded = cms.EDProducer("TrackstersProducer", detector = cms.string('HGCAL'), - filtered_mask = cms.InputTag("filteredLayerClustersCLUE3DHighL1Seeded","CLUE3DHigh"), + filtered_mask = cms.InputTag("hltFilteredLayerClustersCLUE3DHighL1Seeded","CLUE3DHigh"), itername = cms.string('CLUE3DHigh'), - layer_clusters = cms.InputTag("hgcalMergeLayerClustersL1Seeded"), + layer_clusters = cms.InputTag("hltHgcalMergeLayerClustersL1Seeded"), layer_clusters_hfnose_tiles = cms.InputTag("ticlLayerTileHFNose"), - layer_clusters_tiles = cms.InputTag("ticlLayerTileProducerL1Seeded"), + layer_clusters_tiles = cms.InputTag("hltTiclLayerTileProducerL1Seeded"), mightGet = cms.optional.untracked.vstring, - original_mask = cms.InputTag("hgcalMergeLayerClustersL1Seeded","InitialLayerClustersMask"), + original_mask = cms.InputTag("hltHgcalMergeLayerClustersL1Seeded","InitialLayerClustersMask"), patternRecognitionBy = cms.string('CLUE3D'), pluginPatternRecognitionByCA = cms.PSet( algo_verbosity = cms.int32(0), @@ -124,10 +124,10 @@ minNumLayerCluster = cms.int32(5), type = cms.string('FastJet') ), - seeding_regions = cms.InputTag("ticlSeedingL1"), + seeding_regions = cms.InputTag("hltTiclSeedingL1"), tfDnnLabel = cms.string('tracksterSelectionTf'), - time_layerclusters = cms.InputTag("hgcalMergeLayerClustersL1Seeded","timeLayerCluster") + time_layerclusters = cms.InputTag("hltHgcalMergeLayerClustersL1Seeded","timeLayerCluster") ) from Configuration.ProcessModifiers.ticl_v5_cff import ticl_v5 -ticl_v5.toModify(ticlTrackstersCLUE3DHighL1Seeded.pluginPatternRecognitionByCLUE3D, computeLocalTime = cms.bool(True), doPidCut = cms.bool(False)) +ticl_v5.toModify(hltTiclTrackstersCLUE3DHighL1Seeded.pluginPatternRecognitionByCLUE3D, computeLocalTime = cms.bool(True), doPidCut = cms.bool(False)) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/ticlTrackstersCLUE3DHigh_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTrackstersCLUE3DHigh_cfi.py similarity index 85% rename from HLTrigger/Configuration/python/HLT_75e33/modules/ticlTrackstersCLUE3DHigh_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTrackstersCLUE3DHigh_cfi.py index 18337be675dfd..57436cfbfbd87 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/ticlTrackstersCLUE3DHigh_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTrackstersCLUE3DHigh_cfi.py @@ -1,14 +1,14 @@ import FWCore.ParameterSet.Config as cms -ticlTrackstersCLUE3DHigh = cms.EDProducer("TrackstersProducer", +hltTiclTrackstersCLUE3DHigh = cms.EDProducer("TrackstersProducer", detector = cms.string('HGCAL'), - filtered_mask = cms.InputTag("filteredLayerClustersCLUE3DHigh","CLUE3DHigh"), + filtered_mask = cms.InputTag("hltFilteredLayerClustersCLUE3DHigh","CLUE3DHigh"), itername = cms.string('CLUE3DHigh'), - layer_clusters = cms.InputTag("hgcalMergeLayerClusters"), + layer_clusters = cms.InputTag("hltHgcalMergeLayerClusters"), layer_clusters_hfnose_tiles = cms.InputTag("ticlLayerTileHFNose"), - layer_clusters_tiles = cms.InputTag("ticlLayerTileProducer"), + layer_clusters_tiles = cms.InputTag("hltTiclLayerTileProducer"), mightGet = cms.optional.untracked.vstring, - original_mask = cms.InputTag("hgcalMergeLayerClusters","InitialLayerClustersMask"), + original_mask = cms.InputTag("hltHgcalMergeLayerClusters","InitialLayerClustersMask"), patternRecognitionBy = cms.string('CLUE3D'), pluginPatternRecognitionByCA = cms.PSet( algo_verbosity = cms.int32(0), @@ -124,10 +124,10 @@ minNumLayerCluster = cms.int32(5), type = cms.string('FastJet') ), - seeding_regions = cms.InputTag("ticlSeedingGlobal"), + seeding_regions = cms.InputTag("hltTiclSeedingGlobal"), tfDnnLabel = cms.string('tracksterSelectionTf'), - time_layerclusters = cms.InputTag("hgcalMergeLayerClusters","timeLayerCluster") + time_layerclusters = cms.InputTag("hltHgcalMergeLayerClusters","timeLayerCluster") ) from Configuration.ProcessModifiers.ticl_v5_cff import ticl_v5 -ticl_v5.toModify(ticlTrackstersCLUE3DHigh.pluginPatternRecognitionByCLUE3D, computeLocalTime = cms.bool(True), doPidCut = cms.bool(False)) +ticl_v5.toModify(hltTiclTrackstersCLUE3DHigh.pluginPatternRecognitionByCLUE3D, computeLocalTime = cms.bool(True), doPidCut = cms.bool(False)) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/ticlTrackstersMerge_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTrackstersMerge_cfi.py similarity index 85% rename from HLTrigger/Configuration/python/HLT_75e33/modules/ticlTrackstersMerge_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTrackstersMerge_cfi.py index cec35d2dc3a6a..0873c68d9067a 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/ticlTrackstersMerge_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTrackstersMerge_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -ticlTrackstersMerge = cms.EDProducer("TrackstersMergeProducer", +hltTiclTrackstersMerge = cms.EDProducer("TrackstersMergeProducer", cosangle_align = cms.double(0.9945), detector = cms.string('HGCAL'), e_over_h_threshold = cms.double(1), @@ -12,8 +12,8 @@ eid_output_name_id = cms.string('output/id_probabilities'), eta_bin_window = cms.int32(1), halo_max_distance2 = cms.double(4), - layer_clusters = cms.InputTag("hgcalMergeLayerClusters"), - layer_clustersTime = cms.InputTag("hgcalMergeLayerClusters","timeLayerCluster"), + layer_clusters = cms.InputTag("hltHgcalMergeLayerClusters"), + layer_clustersTime = cms.InputTag("hltHgcalMergeLayerClusters","timeLayerCluster"), linkingPSet = cms.PSet( algo_verbosity = cms.int32(0), cutTk = cms.string('1.48 < abs(eta) < 3.0 && pt > 1. && quality("highPurity") && hitPattern().numberOfLostHits("MISSING_OUTER_HITS") < 5'), @@ -41,10 +41,10 @@ track_max_missing_outerhits = cms.int32(5), track_min_eta = cms.double(1.48), track_min_pt = cms.double(1), - tracks = cms.InputTag("generalTracks"), + tracks = cms.InputTag("hltGeneralTracks"), tracksTime = cms.InputTag("tofPID","t0"), tracksTimeErr = cms.InputTag("tofPID","sigmat0"), tracksTimeQual = cms.InputTag("mtdTrackQualityMVA","mtdQualMVA"), - trackstersclue3d = cms.InputTag("ticlTrackstersCLUE3DHigh"), + trackstersclue3d = cms.InputTag("hltTiclTrackstersCLUE3DHigh"), useMTDTiming = cms.bool(False) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTrackstersPassthrough_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTrackstersPassthrough_cfi.py index 5c2d5c379031a..4fedc0e0b1d41 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTrackstersPassthrough_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTrackstersPassthrough_cfi.py @@ -4,11 +4,11 @@ detector = cms.string('HGCAL'), filtered_mask = cms.InputTag("hltFilteredLayerClustersPassthrough","Passthrough"), itername = cms.string('PassThrough'), - layer_clusters = cms.InputTag("hgcalMergeLayerClusters"), + layer_clusters = cms.InputTag("hltHgcalMergeLayerClusters"), layer_clusters_hfnose_tiles = cms.InputTag("ticlLayerTileHFNose"), - layer_clusters_tiles = cms.InputTag("ticlLayerTileProducer"), + layer_clusters_tiles = cms.InputTag("hltTiclLayerTileProducer"), mightGet = cms.optional.untracked.vstring, - original_mask = cms.InputTag("ticlTrackstersCLUE3DHigh"), + original_mask = cms.InputTag("hltTiclTrackstersCLUE3DHigh"), patternRecognitionBy = cms.string('Passthrough'), pluginPatternRecognitionByCA = cms.PSet( algo_verbosity = cms.int32(0), @@ -85,7 +85,7 @@ algo_verbosity = cms.int32(0), type = cms.string('Passthrough') ), - seeding_regions = cms.InputTag("ticlSeedingGlobal"), + seeding_regions = cms.InputTag("hltTiclSeedingGlobal"), tfDnnLabel = cms.string('tracksterSelectionTf'), - time_layerclusters = cms.InputTag("hgcalMergeLayerClusters","timeLayerCluster") + time_layerclusters = cms.InputTag("hltHgcalMergeLayerClusters","timeLayerCluster") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/towerMaker_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTowerMaker_cfi.py similarity index 98% rename from HLTrigger/Configuration/python/HLT_75e33/modules/towerMaker_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltTowerMaker_cfi.py index 9581379798f9b..7b69716188c6e 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/towerMaker_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTowerMaker_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -towerMaker = cms.EDProducer("CaloTowersCreator", +hltTowerMaker = cms.EDProducer("CaloTowersCreator", AllowMissingInputs = cms.bool(False), EBGrid = cms.vdouble(-1.0, 1.0, 10.0, 100.0, 1000.0), EBSumThreshold = cms.double(0.2), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltTrackRefsForJetsBeforeSorting_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTrackRefsForJetsBeforeSorting_cfi.py new file mode 100644 index 0000000000000..8d5cb1edd9f84 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTrackRefsForJetsBeforeSorting_cfi.py @@ -0,0 +1,6 @@ +import FWCore.ParameterSet.Config as cms + +hltTrackRefsForJetsBeforeSorting = cms.EDProducer("ChargedRefCandidateProducer", + particleType = cms.string('pi+'), + src = cms.InputTag("hltTrackWithVertexRefSelectorBeforeSorting") +) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/trackWithVertexRefSelectorBeforeSorting_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTrackWithVertexRefSelectorBeforeSorting_cfi.py similarity index 80% rename from HLTrigger/Configuration/python/HLT_75e33/modules/trackWithVertexRefSelectorBeforeSorting_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltTrackWithVertexRefSelectorBeforeSorting_cfi.py index 612e6592ae178..dbdbf4e52a584 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/trackWithVertexRefSelectorBeforeSorting_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTrackWithVertexRefSelectorBeforeSorting_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -trackWithVertexRefSelectorBeforeSorting = cms.EDProducer("TrackWithVertexRefSelector", +hltTrackWithVertexRefSelectorBeforeSorting = cms.EDProducer("TrackWithVertexRefSelector", copyExtras = cms.untracked.bool(False), copyTrajectories = cms.untracked.bool(False), d0Max = cms.double(999.0), @@ -18,11 +18,11 @@ ptMin = cms.double(0.9), quality = cms.string('highPurity'), rhoVtx = cms.double(0.2), - src = cms.InputTag("generalTracks"), + src = cms.InputTag("hltGeneralTracks"), timeResosTag = cms.InputTag(""), timesTag = cms.InputTag(""), useVtx = cms.bool(True), - vertexTag = cms.InputTag("unsortedOfflinePrimaryVertices"), + vertexTag = cms.InputTag("hltUnsortedOfflinePrimaryVertices"), vtxFallback = cms.bool(True), zetaVtx = cms.double(1.0) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/trackerClusterCheck_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTrackerClusterCheck_cfi.py similarity index 76% rename from HLTrigger/Configuration/python/HLT_75e33/modules/trackerClusterCheck_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltTrackerClusterCheck_cfi.py index 662c5f5bd2c26..4b954a565fbd4 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/trackerClusterCheck_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTrackerClusterCheck_cfi.py @@ -1,10 +1,10 @@ import FWCore.ParameterSet.Config as cms -trackerClusterCheck = cms.EDProducer("ClusterCheckerEDProducer", +hltTrackerClusterCheck = cms.EDProducer("ClusterCheckerEDProducer", ClusterCollectionLabel = cms.InputTag("siStripClusters"), MaxNumberOfPixelClusters = cms.uint32(40000), MaxNumberOfStripClusters = cms.uint32(400000), - PixelClusterCollectionLabel = cms.InputTag("siPixelClusters"), + PixelClusterCollectionLabel = cms.InputTag("hltSiPixelClusters"), cut = cms.string('strip < 400000 && pixel < 40000 && (strip < 50000 + 10*pixel) && (pixel < 5000 + 0.1*strip)'), doClusterCheck = cms.bool(False), mightGet = cms.optional.untracked.vstring, diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/unsortedOfflinePrimaryVertices_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltUnsortedOfflinePrimaryVertices_cfi.py similarity index 92% rename from HLTrigger/Configuration/python/HLT_75e33/modules/unsortedOfflinePrimaryVertices_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltUnsortedOfflinePrimaryVertices_cfi.py index ac4236c81eb81..bb9c7a9989904 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/unsortedOfflinePrimaryVertices_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltUnsortedOfflinePrimaryVertices_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -unsortedOfflinePrimaryVertices = cms.EDProducer("PrimaryVertexProducer", +hltUnsortedOfflinePrimaryVertices = cms.EDProducer("PrimaryVertexProducer", TkClusParameters = cms.PSet( TkDAClusParameters = cms.PSet( Tmin = cms.double(2.0), @@ -25,7 +25,7 @@ minSiliconLayersWithHits = cms.int32(5), trackQuality = cms.string('any') ), - TrackLabel = cms.InputTag("generalTracks"), + TrackLabel = cms.InputTag("hltGeneralTracks"), beamSpotLabel = cms.InputTag("hltOnlineBeamSpot"), verbose = cms.untracked.bool(False), vertexCollections = cms.VPSet( diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/initialStepTrackSelectionHighPurity_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/initialStepTrackSelectionHighPurity_cfi.py deleted file mode 100644 index 33ca252b82c97..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/initialStepTrackSelectionHighPurity_cfi.py +++ /dev/null @@ -1,10 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -initialStepTrackSelectionHighPurity = cms.EDProducer("TrackCollectionFilterCloner", - copyExtras = cms.untracked.bool(True), - copyTrajectories = cms.untracked.bool(False), - minQuality = cms.string('highPurity'), - originalMVAVals = cms.InputTag("initialStepTrackCutClassifier","MVAValues"), - originalQualVals = cms.InputTag("initialStepTrackCutClassifier","QualityMasks"), - originalSource = cms.InputTag("initialStepTracks") -) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowPtrs_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowPtrs_cfi.py deleted file mode 100644 index b0f290146405e..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowPtrs_cfi.py +++ /dev/null @@ -1,5 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -particleFlowPtrs = cms.EDProducer("PFCandidateFwdPtrProducer", - src = cms.InputTag("particleFlowTmp") -) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowTimeAssignerECAL_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowTimeAssignerECAL_cfi.py deleted file mode 100644 index 561ad5b9fe8ec..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowTimeAssignerECAL_cfi.py +++ /dev/null @@ -1,8 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -particleFlowTimeAssignerECAL = cms.EDProducer("PFClusterTimeAssigner", - mightGet = cms.optional.untracked.vstring, - src = cms.InputTag("particleFlowClusterECALUncorrected"), - timeResoSrc = cms.InputTag("ecalBarrelClusterFastTimer","PerfectResolutionModelResolution"), - timeSrc = cms.InputTag("ecalBarrelClusterFastTimer","PerfectResolutionModel") -) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowTmp_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowTmp_cfi.py deleted file mode 100644 index 02361c9ac98e2..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowTmp_cfi.py +++ /dev/null @@ -1,5 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -particleFlowTmp = cms.EDProducer("PFCandidateListMerger", - src = cms.VInputTag("particleFlowTmpBarrel", "pfTICL") -) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/pfClusterRefsForJetsECAL_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/pfClusterRefsForJetsECAL_cfi.py deleted file mode 100644 index 3b1d1e6bc89b3..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/pfClusterRefsForJetsECAL_cfi.py +++ /dev/null @@ -1,6 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -pfClusterRefsForJetsECAL = cms.EDProducer("PFClusterRefCandidateProducer", - particleType = cms.string('pi+'), - src = cms.InputTag("particleFlowClusterECAL") -) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/pfClusterRefsForJetsHF_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/pfClusterRefsForJetsHF_cfi.py deleted file mode 100644 index 93f4405b7f8b5..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/pfClusterRefsForJetsHF_cfi.py +++ /dev/null @@ -1,6 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -pfClusterRefsForJetsHF = cms.EDProducer("PFClusterRefCandidateProducer", - particleType = cms.string('pi+'), - src = cms.InputTag("particleFlowClusterHF") -) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/pfClusterRefsForJetsHGCAL_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/pfClusterRefsForJetsHGCAL_cfi.py deleted file mode 100644 index 32959bdbd3616..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/pfClusterRefsForJetsHGCAL_cfi.py +++ /dev/null @@ -1,6 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -pfClusterRefsForJetsHGCAL = cms.EDProducer("PFClusterRefCandidateProducer", - particleType = cms.string('pi+'), - src = cms.InputTag("particleFlowClusterHGCal") -) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/pfClusterRefsForJetsHO_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/pfClusterRefsForJetsHO_cfi.py deleted file mode 100644 index 23b92633e120d..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/pfClusterRefsForJetsHO_cfi.py +++ /dev/null @@ -1,6 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -pfClusterRefsForJetsHO = cms.EDProducer("PFClusterRefCandidateProducer", - particleType = cms.string('pi+'), - src = cms.InputTag("particleFlowClusterHO") -) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/pfClusterRefsForJets_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/pfClusterRefsForJets_cfi.py deleted file mode 100644 index cb2ce878731d0..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/pfClusterRefsForJets_cfi.py +++ /dev/null @@ -1,5 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -pfClusterRefsForJets = cms.EDProducer("PFClusterRefCandidateMerger", - src = cms.VInputTag("pfClusterRefsForJetsHCAL", "pfClusterRefsForJetsECAL", "pfClusterRefsForJetsHF", "pfClusterRefsForJetsHO", "pfClusterRefsForJetsHGCAL") -) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/pfNoPileUpJME_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/pfNoPileUpJME_cfi.py deleted file mode 100644 index 3849753a50d5d..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/pfNoPileUpJME_cfi.py +++ /dev/null @@ -1,8 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -pfNoPileUpJME = cms.EDProducer("TPPFCandidatesOnPFCandidates", - bottomCollection = cms.InputTag("particleFlowPtrs"), - enable = cms.bool(True), - name = cms.untracked.string('pileUpOnPFCandidates'), - topCollection = cms.InputTag("pfPileUpJME") -) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/siPixelClusterShapeCache_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/siPixelClusterShapeCache_cfi.py deleted file mode 100644 index 064cb0c46e512..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/siPixelClusterShapeCache_cfi.py +++ /dev/null @@ -1,7 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -siPixelClusterShapeCache = cms.EDProducer("SiPixelClusterShapeCacheProducer", - mightGet = cms.optional.untracked.vstring, - onDemand = cms.bool(False), - src = cms.InputTag("siPixelClusters") -) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/trackRefsForJetsBeforeSorting_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/trackRefsForJetsBeforeSorting_cfi.py deleted file mode 100644 index d9d16c15a33be..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/trackRefsForJetsBeforeSorting_cfi.py +++ /dev/null @@ -1,6 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -trackRefsForJetsBeforeSorting = cms.EDProducer("ChargedRefCandidateProducer", - particleType = cms.string('pi+'), - src = cms.InputTag("trackWithVertexRefSelectorBeforeSorting") -) diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_AK4PFPuppiJet520_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_AK4PFPuppiJet520_cfi.py index 446525921b7db..c75c77b387b54 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_AK4PFPuppiJet520_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_AK4PFPuppiJet520_cfi.py @@ -2,14 +2,14 @@ from ..modules.hltSingleAK4PFPuppiJet520_cfi import * from ..modules.hltL1SeedsForPuppiJetFilter_cfi import * -from ..sequences.hgcalLocalRecoSequence_cfi import * +from ..sequences.HLTHgcalLocalRecoSequence_cfi import * from ..sequences.HLTAK4PFPuppiJetsReconstruction_cfi import * from ..sequences.HLTBeginSequence_cfi import * from ..sequences.HLTEndSequence_cfi import * from ..sequences.HLTMuonsSequence_cfi import * from ..sequences.HLTParticleFlowSequence_cfi import * from ..sequences.HLTTrackingV61Sequence_cfi import * -from ..sequences.localrecoSequence_cfi import * -from ..sequences.RawToDigiSequence_cfi import * +from ..sequences.HLTLocalrecoSequence_cfi import * +from ..sequences.HLTRawToDigiSequence_cfi import * -HLT_AK4PFPuppiJet520 = cms.Path(HLTBeginSequence+hltL1SeedsForPuppiJetFilter+RawToDigiSequence+hgcalLocalRecoSequence+localrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTAK4PFPuppiJetsReconstruction+hltSingleAK4PFPuppiJet520+HLTEndSequence) +HLT_AK4PFPuppiJet520 = cms.Path(HLTBeginSequence+hltL1SeedsForPuppiJetFilter+HLTRawToDigiSequence+HLTHgcalLocalRecoSequence+HLTLocalrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTAK4PFPuppiJetsReconstruction+hltSingleAK4PFPuppiJet520+HLTEndSequence) diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_DoubleMediumChargedIsoPFTauHPS40_eta2p1_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_DoubleMediumChargedIsoPFTauHPS40_eta2p1_cfi.py index d2c6c66556d10..92836e69259a3 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_DoubleMediumChargedIsoPFTauHPS40_eta2p1_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_DoubleMediumChargedIsoPFTauHPS40_eta2p1_cfi.py @@ -4,7 +4,7 @@ from ..modules.hltHpsDoublePFTau40TrackPt1MediumChargedIsolation_cfi import * from ..modules.hltHpsSelectedPFTausTrackPt1MediumChargedIsolation_cfi import * from ..modules.hltPreDoublePFTauHPS_cfi import * -from ..sequences.hgcalLocalRecoSequence_cfi import * +from ..sequences.HLTHgcalLocalRecoSequence_cfi import * from ..sequences.HLTAK4PFJetsReconstruction_cfi import * from ..sequences.HLTBeginSequence_cfi import * from ..sequences.HLTEndSequence_cfi import * @@ -13,8 +13,8 @@ from ..sequences.HLTParticleFlowSequence_cfi import * from ..sequences.HLTPFTauHPS_cfi import * from ..sequences.HLTTrackingV61Sequence_cfi import * -from ..sequences.localrecoSequence_cfi import * -from ..sequences.RawToDigiSequence_cfi import * +from ..sequences.HLTLocalrecoSequence_cfi import * +from ..sequences.HLTRawToDigiSequence_cfi import * from ..modules.hltL1SeedForDoublePuppiTau_cfi import * -HLT_DoubleMediumChargedIsoPFTauHPS40_eta2p1 = cms.Path(HLTBeginSequence+hltL1SeedForDoublePuppiTau+hltPreDoublePFTauHPS+RawToDigiSequence+hgcalLocalRecoSequence+localrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTAK4PFJetsReconstruction+hltAK4PFJetsForTaus+HLTPFTauHPS+HLTHPSMediumChargedIsoPFTauSequence+hltHpsSelectedPFTausTrackPt1MediumChargedIsolation+hltHpsDoublePFTau40TrackPt1MediumChargedIsolation+HLTEndSequence) +HLT_DoubleMediumChargedIsoPFTauHPS40_eta2p1 = cms.Path(HLTBeginSequence+hltL1SeedForDoublePuppiTau+hltPreDoublePFTauHPS+HLTRawToDigiSequence+HLTHgcalLocalRecoSequence+HLTLocalrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTAK4PFJetsReconstruction+hltAK4PFJetsForTaus+HLTPFTauHPS+HLTHPSMediumChargedIsoPFTauSequence+hltHpsSelectedPFTausTrackPt1MediumChargedIsolation+hltHpsDoublePFTau40TrackPt1MediumChargedIsolation+HLTEndSequence) diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_DoubleMediumDeepTauPFTauHPS35_eta2p1_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_DoubleMediumDeepTauPFTauHPS35_eta2p1_cfi.py index 1da4e066bd723..2e43a58e60c58 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_DoubleMediumDeepTauPFTauHPS35_eta2p1_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_DoubleMediumDeepTauPFTauHPS35_eta2p1_cfi.py @@ -4,7 +4,7 @@ from ..modules.hltHpsDoublePFTau35MediumDitauWPDeepTau_cfi import * from ..modules.hltHpsSelectedPFTausMediumDitauWPDeepTau_cfi import * from ..modules.hltPreDoublePFTauHPS_cfi import * -from ..sequences.hgcalLocalRecoSequence_cfi import * +from ..sequences.HLTHgcalLocalRecoSequence_cfi import * from ..sequences.HLTAK4PFJetsReconstruction_cfi import * from ..sequences.HLTBeginSequence_cfi import * from ..sequences.HLTEndSequence_cfi import * @@ -13,8 +13,8 @@ from ..sequences.HLTParticleFlowSequence_cfi import * from ..sequences.HLTPFTauHPS_cfi import * from ..sequences.HLTTrackingV61Sequence_cfi import * -from ..sequences.localrecoSequence_cfi import * -from ..sequences.RawToDigiSequence_cfi import * +from ..sequences.HLTLocalrecoSequence_cfi import * +from ..sequences.HLTRawToDigiSequence_cfi import * from ..modules.hltL1SeedForDoublePuppiTau_cfi import * -HLT_DoubleMediumDeepTauPFTauHPS35_eta2p1 = cms.Path(HLTBeginSequence+hltL1SeedForDoublePuppiTau+hltPreDoublePFTauHPS+RawToDigiSequence+hgcalLocalRecoSequence+localrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTAK4PFJetsReconstruction+hltAK4PFJetsForTaus+HLTPFTauHPS+HLTHPSDeepTauPFTauSequence+hltHpsSelectedPFTausMediumDitauWPDeepTau+hltHpsDoublePFTau35MediumDitauWPDeepTau+HLTEndSequence) +HLT_DoubleMediumDeepTauPFTauHPS35_eta2p1 = cms.Path(HLTBeginSequence+hltL1SeedForDoublePuppiTau+hltPreDoublePFTauHPS+HLTRawToDigiSequence+HLTHgcalLocalRecoSequence+HLTLocalrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTAK4PFJetsReconstruction+hltAK4PFJetsForTaus+HLTPFTauHPS+HLTHPSDeepTauPFTauSequence+hltHpsSelectedPFTausMediumDitauWPDeepTau+hltHpsDoublePFTau35MediumDitauWPDeepTau+HLTEndSequence) diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_DoublePFPuppiJets128_DoublePFPuppiBTagDeepCSV_2p4_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_DoublePFPuppiJets128_DoublePFPuppiBTagDeepCSV_2p4_cfi.py index bfb684df6da2b..a81a315dd5dc4 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_DoublePFPuppiJets128_DoublePFPuppiBTagDeepCSV_2p4_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_DoublePFPuppiJets128_DoublePFPuppiBTagDeepCSV_2p4_cfi.py @@ -4,7 +4,7 @@ from ..modules.hltDoublePFPuppiJets128Eta2p4MaxDeta1p6_cfi import * from ..modules.hltDoublePFPuppiJets128MaxEta2p4_cfi import * from ..modules.hltL1SeedsForDoublePuppiJetBtagFilter_cfi import * -from ..sequences.hgcalLocalRecoSequence_cfi import * +from ..sequences.HLTHgcalLocalRecoSequence_cfi import * from ..sequences.HLTAK4PFPuppiJetsReconstruction_cfi import * from ..sequences.HLTBeginSequence_cfi import * from ..sequences.HLTBtagDeepCSVSequencePFPuppiModEta2p4_cfi import * @@ -12,7 +12,7 @@ from ..sequences.HLTMuonsSequence_cfi import * from ..sequences.HLTParticleFlowSequence_cfi import * from ..sequences.HLTTrackingV61Sequence_cfi import * -from ..sequences.localrecoSequence_cfi import * -from ..sequences.RawToDigiSequence_cfi import * +from ..sequences.HLTLocalrecoSequence_cfi import * +from ..sequences.HLTRawToDigiSequence_cfi import * -HLT_DoublePFPuppiJets128_DoublePFPuppiBTagDeepCSV_2p4 = cms.Path(HLTBeginSequence+hltL1SeedsForDoublePuppiJetBtagFilter+RawToDigiSequence+hgcalLocalRecoSequence+localrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTAK4PFPuppiJetsReconstruction+hltDoublePFPuppiJets128MaxEta2p4+hltDoublePFPuppiJets128Eta2p4MaxDeta1p6+HLTBtagDeepCSVSequencePFPuppiModEta2p4+hltBTagPFPuppiDeepCSV0p865DoubleEta2p4+HLTEndSequence) +HLT_DoublePFPuppiJets128_DoublePFPuppiBTagDeepCSV_2p4 = cms.Path(HLTBeginSequence+hltL1SeedsForDoublePuppiJetBtagFilter+HLTRawToDigiSequence+HLTHgcalLocalRecoSequence+HLTLocalrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTAK4PFPuppiJetsReconstruction+hltDoublePFPuppiJets128MaxEta2p4+hltDoublePFPuppiJets128Eta2p4MaxDeta1p6+HLTBtagDeepCSVSequencePFPuppiModEta2p4+hltBTagPFPuppiDeepCSV0p865DoubleEta2p4+HLTEndSequence) diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_DoublePFPuppiJets128_DoublePFPuppiBTagDeepFlavour_2p4_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_DoublePFPuppiJets128_DoublePFPuppiBTagDeepFlavour_2p4_cfi.py index dc0d2517a6804..72fb6c9aeac5a 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_DoublePFPuppiJets128_DoublePFPuppiBTagDeepFlavour_2p4_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_DoublePFPuppiJets128_DoublePFPuppiBTagDeepFlavour_2p4_cfi.py @@ -4,7 +4,7 @@ from ..modules.hltDoublePFPuppiJets128Eta2p4MaxDeta1p6_cfi import * from ..modules.hltDoublePFPuppiJets128MaxEta2p4_cfi import * from ..modules.hltL1SeedsForDoublePuppiJetBtagFilter_cfi import * -from ..sequences.hgcalLocalRecoSequence_cfi import * +from ..sequences.HLTHgcalLocalRecoSequence_cfi import * from ..sequences.HLTAK4PFPuppiJetsReconstruction_cfi import * from ..sequences.HLTBeginSequence_cfi import * from ..sequences.HLTBtagDeepFlavourSequencePFPuppiModEta2p4_cfi import * @@ -12,7 +12,7 @@ from ..sequences.HLTMuonsSequence_cfi import * from ..sequences.HLTParticleFlowSequence_cfi import * from ..sequences.HLTTrackingV61Sequence_cfi import * -from ..sequences.localrecoSequence_cfi import * -from ..sequences.RawToDigiSequence_cfi import * +from ..sequences.HLTLocalrecoSequence_cfi import * +from ..sequences.HLTRawToDigiSequence_cfi import * -HLT_DoublePFPuppiJets128_DoublePFPuppiBTagDeepFlavour_2p4 = cms.Path(HLTBeginSequence+hltL1SeedsForDoublePuppiJetBtagFilter+RawToDigiSequence+hgcalLocalRecoSequence+localrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTAK4PFPuppiJetsReconstruction+hltDoublePFPuppiJets128MaxEta2p4+hltDoublePFPuppiJets128Eta2p4MaxDeta1p6+HLTBtagDeepFlavourSequencePFPuppiModEta2p4+hltBTagPFPuppiDeepFlavour0p935DoubleEta2p4+HLTEndSequence) +HLT_DoublePFPuppiJets128_DoublePFPuppiBTagDeepFlavour_2p4 = cms.Path(HLTBeginSequence+hltL1SeedsForDoublePuppiJetBtagFilter+HLTRawToDigiSequence+HLTHgcalLocalRecoSequence+HLTLocalrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTAK4PFPuppiJetsReconstruction+hltDoublePFPuppiJets128MaxEta2p4+hltDoublePFPuppiJets128Eta2p4MaxDeta1p6+HLTBtagDeepFlavourSequencePFPuppiModEta2p4+hltBTagPFPuppiDeepFlavour0p935DoubleEta2p4+HLTEndSequence) diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_IsoMu24_FromL1TkMuon_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_IsoMu24_FromL1TkMuon_cfi.py index b9a5fb3a9a4ed..189e9781c5f46 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_IsoMu24_FromL1TkMuon_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_IsoMu24_FromL1TkMuon_cfi.py @@ -2,16 +2,16 @@ from ..sequences.HLTBeginSequence_cfi import * from ..sequences.HLTEndSequence_cfi import * -from ..sequences.RawToDigiSequence_cfi import * -from ..sequences.itLocalRecoSequence_cfi import * -from ..sequences.otLocalRecoSequence_cfi import * -from ..sequences.hgcalLocalRecoSequence_cfi import * +from ..sequences.HLTRawToDigiSequence_cfi import * +from ..sequences.HLTItLocalRecoSequence_cfi import * +from ..sequences.HLTOtLocalRecoSequence_cfi import * +from ..sequences.HLTHgcalLocalRecoSequence_cfi import * from ..sequences.HLTDoLocalHcalSequence_cfi import * from ..sequences.HLTDoFullUnpackingEgammaEcalSequence_cfi import * from ..sequences.HLTFastJetForEgammaSequence_cfi import * from ..sequences.HLTIter0Phase2L3FromL1TkSequence_cfi import * from ..sequences.HLTIter2Phase2L3FromL1TkSequence_cfi import * -from ..sequences.pfClusteringHBHEHFSequence_cfi import * +from ..sequences.HLTPfClusteringHBHEHFSequence_cfi import * from ..sequences.HLTPhase2L3FromL1TkSequence_cfi import * from ..sequences.HLTPhase2L3OISequence_cfi import * from ..sequences.HLTPhase2L3MuonsSequence_cfi import * @@ -35,9 +35,9 @@ HLT_IsoMu24_FromL1TkMuon = cms.Path(HLTBeginSequence +hltSingleTkMuon22L1TkMuonFilter - +RawToDigiSequence - +itLocalRecoSequence - +otLocalRecoSequence + +HLTRawToDigiSequence + +HLTItLocalRecoSequence + +HLTOtLocalRecoSequence +HLTL2MuonsFromL1TkSequence +HLTPhase2L3OISequence +hltPhase2PixelFitterByHelixProjections @@ -47,11 +47,11 @@ +HLTIter2Phase2L3FromL1TkSequence +HLTPhase2L3MuonsSequence +hltL3fL1TkSingleMu22L3Filtered24Q - +hgcalLocalRecoSequence + +HLTHgcalLocalRecoSequence +HLTDoLocalHcalSequence +HLTDoFullUnpackingEgammaEcalSequence +HLTFastJetForEgammaSequence - +pfClusteringHBHEHFSequence + +HLTPfClusteringHBHEHFSequence +HLTPFClusteringForEgammaUnseededSequence +hltPhase2L3MuonsEcalIsodR0p3dRVeto0p000 +hltPhase2L3MuonsHcalIsodR0p3dRVeto0p000 diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_DZ_FromL1TkMuon_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_DZ_FromL1TkMuon_cfi.py index fdcac0d095d05..50f0dea249ccf 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_DZ_FromL1TkMuon_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_DZ_FromL1TkMuon_cfi.py @@ -2,16 +2,16 @@ from ..sequences.HLTBeginSequence_cfi import * from ..sequences.HLTEndSequence_cfi import * -from ..sequences.RawToDigiSequence_cfi import * -from ..sequences.itLocalRecoSequence_cfi import * -from ..sequences.otLocalRecoSequence_cfi import * -from ..sequences.hgcalLocalRecoSequence_cfi import * +from ..sequences.HLTRawToDigiSequence_cfi import * +from ..sequences.HLTItLocalRecoSequence_cfi import * +from ..sequences.HLTOtLocalRecoSequence_cfi import * +from ..sequences.HLTHgcalLocalRecoSequence_cfi import * from ..sequences.HLTDoLocalHcalSequence_cfi import * from ..sequences.HLTDoFullUnpackingEgammaEcalSequence_cfi import * from ..sequences.HLTFastJetForEgammaSequence_cfi import * from ..sequences.HLTIter0Phase2L3FromL1TkSequence_cfi import * from ..sequences.HLTIter2Phase2L3FromL1TkSequence_cfi import * -from ..sequences.pfClusteringHBHEHFSequence_cfi import * +from ..sequences.HLTPfClusteringHBHEHFSequence_cfi import * from ..sequences.HLTPhase2L3FromL1TkSequence_cfi import * from ..sequences.HLTPhase2L3OISequence_cfi import * from ..sequences.HLTPhase2L3MuonsSequence_cfi import * @@ -33,9 +33,9 @@ HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_DZ_FromL1TkMuon = cms.Path(HLTBeginSequence +hltDoubleTkMuon157L1TkMuonFilter +hltDoubleMuon7DZ1p0 - +RawToDigiSequence - +itLocalRecoSequence - +otLocalRecoSequence + +HLTRawToDigiSequence + +HLTItLocalRecoSequence + +HLTOtLocalRecoSequence +HLTL2MuonsFromL1TkSequence +HLTPhase2L3OISequence +hltPhase2PixelFitterByHelixProjections diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Mu37_Mu27_FromL1TkMuon_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Mu37_Mu27_FromL1TkMuon_cfi.py index d309a2fdce020..bb9d916d1b20e 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Mu37_Mu27_FromL1TkMuon_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Mu37_Mu27_FromL1TkMuon_cfi.py @@ -9,15 +9,15 @@ from ..sequences.HLTBeginSequence_cfi import * from ..sequences.HLTEndSequence_cfi import * from ..sequences.HLTMuonsSequence_cfi import * -from ..sequences.itLocalRecoSequence_cfi import * -from ..sequences.muonlocalrecoSequence_cfi import * -from ..sequences.otLocalRecoSequence_cfi import * +from ..sequences.HLTItLocalRecoSequence_cfi import * +from ..sequences.HLTMuonlocalrecoSequence_cfi import * +from ..sequences.HLTOtLocalRecoSequence_cfi import * HLT_Mu37_Mu27_FromL1TkMuon = cms.Path(HLTBeginSequence +hltDoubleMuon7DZ1p0 -+muonlocalrecoSequence -+itLocalRecoSequence -+otLocalRecoSequence ++HLTMuonlocalrecoSequence ++HLTItLocalRecoSequence ++HLTOtLocalRecoSequence +hltPhase2PixelFitterByHelixProjections +hltPhase2PixelTrackFilterByKinematics +HLTMuonsSequence diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Mu50_FromL1TkMuon_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Mu50_FromL1TkMuon_cfi.py index 5ba6afecf70b1..fe3dd25eaa47f 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Mu50_FromL1TkMuon_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Mu50_FromL1TkMuon_cfi.py @@ -9,15 +9,15 @@ from ..sequences.HLTEndSequence_cfi import * from ..sequences.HLTMuonsSequence_cfi import * from ..sequences.HLTTrackingV61Sequence_cfi import * -from ..sequences.itLocalRecoSequence_cfi import * -from ..sequences.muonlocalrecoSequence_cfi import * -from ..sequences.otLocalRecoSequence_cfi import * +from ..sequences.HLTItLocalRecoSequence_cfi import * +from ..sequences.HLTMuonlocalrecoSequence_cfi import * +from ..sequences.HLTOtLocalRecoSequence_cfi import * HLT_Mu50_FromL1TkMuon = cms.Path(HLTBeginSequence +hltSingleTkMuon22L1TkMuonFilter - +muonlocalrecoSequence - +itLocalRecoSequence - +otLocalRecoSequence + +HLTMuonlocalrecoSequence + +HLTItLocalRecoSequence + +HLTOtLocalRecoSequence +hltPhase2PixelFitterByHelixProjections +hltPhase2PixelTrackFilterByKinematics +HLTMuonsSequence diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFHT200PT30_QuadPFPuppiJet_70_40_30_30_TriplePFPuppiBTagDeepCSV_2p4_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFHT200PT30_QuadPFPuppiJet_70_40_30_30_TriplePFPuppiBTagDeepCSV_2p4_cfi.py index 7f467becb7e82..3852cc01b3e7a 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFHT200PT30_QuadPFPuppiJet_70_40_30_30_TriplePFPuppiBTagDeepCSV_2p4_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFHT200PT30_QuadPFPuppiJet_70_40_30_30_TriplePFPuppiBTagDeepCSV_2p4_cfi.py @@ -7,7 +7,7 @@ from ..modules.hltPFPuppiCentralJetQuad30MaxEta2p4_cfi import * from ..modules.hltPFPuppiCentralJetsQuad30HT200MaxEta2p4_cfi import * from ..modules.hltL1SeedsForQuadPuppiJetTripleBtagFilter_cfi import * -from ..sequences.hgcalLocalRecoSequence_cfi import * +from ..sequences.HLTHgcalLocalRecoSequence_cfi import * from ..sequences.HLTAK4PFPuppiJetsReconstruction_cfi import * from ..sequences.HLTBeginSequence_cfi import * from ..sequences.HLTBtagDeepCSVSequencePFPuppiModEta2p4_cfi import * @@ -15,7 +15,7 @@ from ..sequences.HLTMuonsSequence_cfi import * from ..sequences.HLTParticleFlowSequence_cfi import * from ..sequences.HLTTrackingV61Sequence_cfi import * -from ..sequences.localrecoSequence_cfi import * -from ..sequences.RawToDigiSequence_cfi import * +from ..sequences.HLTLocalrecoSequence_cfi import * +from ..sequences.HLTRawToDigiSequence_cfi import * -HLT_PFHT200PT30_QuadPFPuppiJet_70_40_30_30_TriplePFPuppiBTagDeepCSV_2p4 = cms.Path(HLTBeginSequence+hltL1SeedsForQuadPuppiJetTripleBtagFilter+RawToDigiSequence+hgcalLocalRecoSequence+localrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTAK4PFPuppiJetsReconstruction+hltPFPuppiCentralJetQuad30MaxEta2p4+hlt1PFPuppiCentralJet70MaxEta2p4+hlt2PFPuppiCentralJet40MaxEta2p4+hltHtMhtPFPuppiCentralJetsQuadC30MaxEta2p4+hltPFPuppiCentralJetsQuad30HT200MaxEta2p4+HLTBtagDeepCSVSequencePFPuppiModEta2p4+hltBTagPFPuppiDeepCSV0p38Eta2p4TripleEta2p4+HLTEndSequence) +HLT_PFHT200PT30_QuadPFPuppiJet_70_40_30_30_TriplePFPuppiBTagDeepCSV_2p4 = cms.Path(HLTBeginSequence+hltL1SeedsForQuadPuppiJetTripleBtagFilter+HLTRawToDigiSequence+HLTHgcalLocalRecoSequence+HLTLocalrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTAK4PFPuppiJetsReconstruction+hltPFPuppiCentralJetQuad30MaxEta2p4+hlt1PFPuppiCentralJet70MaxEta2p4+hlt2PFPuppiCentralJet40MaxEta2p4+hltHtMhtPFPuppiCentralJetsQuadC30MaxEta2p4+hltPFPuppiCentralJetsQuad30HT200MaxEta2p4+HLTBtagDeepCSVSequencePFPuppiModEta2p4+hltBTagPFPuppiDeepCSV0p38Eta2p4TripleEta2p4+HLTEndSequence) diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFHT200PT30_QuadPFPuppiJet_70_40_30_30_TriplePFPuppiBTagDeepFlavour_2p4_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFHT200PT30_QuadPFPuppiJet_70_40_30_30_TriplePFPuppiBTagDeepFlavour_2p4_cfi.py index b7f68ccc40bc5..fff610e0e381b 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFHT200PT30_QuadPFPuppiJet_70_40_30_30_TriplePFPuppiBTagDeepFlavour_2p4_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFHT200PT30_QuadPFPuppiJet_70_40_30_30_TriplePFPuppiBTagDeepFlavour_2p4_cfi.py @@ -7,7 +7,7 @@ from ..modules.hltPFPuppiCentralJetQuad30MaxEta2p4_cfi import * from ..modules.hltPFPuppiCentralJetsQuad30HT200MaxEta2p4_cfi import * from ..modules.hltL1SeedsForQuadPuppiJetTripleBtagFilter_cfi import * -from ..sequences.hgcalLocalRecoSequence_cfi import * +from ..sequences.HLTHgcalLocalRecoSequence_cfi import * from ..sequences.HLTAK4PFPuppiJetsReconstruction_cfi import * from ..sequences.HLTBeginSequence_cfi import * from ..sequences.HLTBtagDeepFlavourSequencePFPuppiModEta2p4_cfi import * @@ -15,7 +15,7 @@ from ..sequences.HLTMuonsSequence_cfi import * from ..sequences.HLTParticleFlowSequence_cfi import * from ..sequences.HLTTrackingV61Sequence_cfi import * -from ..sequences.localrecoSequence_cfi import * -from ..sequences.RawToDigiSequence_cfi import * +from ..sequences.HLTLocalrecoSequence_cfi import * +from ..sequences.HLTRawToDigiSequence_cfi import * -HLT_PFHT200PT30_QuadPFPuppiJet_70_40_30_30_TriplePFPuppiBTagDeepFlavour_2p4 = cms.Path(HLTBeginSequence+hltL1SeedsForQuadPuppiJetTripleBtagFilter+RawToDigiSequence+hgcalLocalRecoSequence+localrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTAK4PFPuppiJetsReconstruction+hltPFPuppiCentralJetQuad30MaxEta2p4+hlt1PFPuppiCentralJet70MaxEta2p4+hlt2PFPuppiCentralJet40MaxEta2p4+hltHtMhtPFPuppiCentralJetsQuadC30MaxEta2p4+hltPFPuppiCentralJetsQuad30HT200MaxEta2p4+HLTBtagDeepFlavourSequencePFPuppiModEta2p4+hltBTagPFPuppiDeepFlavour0p375Eta2p4TripleEta2p4+HLTEndSequence) +HLT_PFHT200PT30_QuadPFPuppiJet_70_40_30_30_TriplePFPuppiBTagDeepFlavour_2p4 = cms.Path(HLTBeginSequence+hltL1SeedsForQuadPuppiJetTripleBtagFilter+HLTRawToDigiSequence+HLTHgcalLocalRecoSequence+HLTLocalrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTAK4PFPuppiJetsReconstruction+hltPFPuppiCentralJetQuad30MaxEta2p4+hlt1PFPuppiCentralJet70MaxEta2p4+hlt2PFPuppiCentralJet40MaxEta2p4+hltHtMhtPFPuppiCentralJetsQuadC30MaxEta2p4+hltPFPuppiCentralJetsQuad30HT200MaxEta2p4+HLTBtagDeepFlavourSequencePFPuppiModEta2p4+hltBTagPFPuppiDeepFlavour0p375Eta2p4TripleEta2p4+HLTEndSequence) diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFHT330PT30_QuadPFPuppiJet_75_60_45_40_TriplePFPuppiBTagDeepCSV_2p4_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFHT330PT30_QuadPFPuppiJet_75_60_45_40_TriplePFPuppiBTagDeepCSV_2p4_cfi.py index 82fb7e2ec161a..ebd36ef894fb7 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFHT330PT30_QuadPFPuppiJet_75_60_45_40_TriplePFPuppiBTagDeepCSV_2p4_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFHT330PT30_QuadPFPuppiJet_75_60_45_40_TriplePFPuppiBTagDeepCSV_2p4_cfi.py @@ -9,7 +9,7 @@ from ..modules.hltPFPuppiCentralJetQuad30MaxEta2p4_cfi import * from ..modules.hltPFPuppiCentralJetsQuad30HT330MaxEta2p4_cfi import * from ..modules.hltL1SeedsForQuadPuppiJetTripleBtagFilter_cfi import * -from ..sequences.hgcalLocalRecoSequence_cfi import * +from ..sequences.HLTHgcalLocalRecoSequence_cfi import * from ..sequences.HLTAK4PFPuppiJetsReconstruction_cfi import * from ..sequences.HLTBeginSequence_cfi import * from ..sequences.HLTBtagDeepCSVSequencePFPuppiModEta2p4_cfi import * @@ -17,7 +17,7 @@ from ..sequences.HLTMuonsSequence_cfi import * from ..sequences.HLTParticleFlowSequence_cfi import * from ..sequences.HLTTrackingV61Sequence_cfi import * -from ..sequences.localrecoSequence_cfi import * -from ..sequences.RawToDigiSequence_cfi import * +from ..sequences.HLTLocalrecoSequence_cfi import * +from ..sequences.HLTRawToDigiSequence_cfi import * -HLT_PFHT330PT30_QuadPFPuppiJet_75_60_45_40_TriplePFPuppiBTagDeepCSV_2p4 = cms.Path(HLTBeginSequence+hltL1SeedsForQuadPuppiJetTripleBtagFilter+RawToDigiSequence+hgcalLocalRecoSequence+localrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTAK4PFPuppiJetsReconstruction+hltPFPuppiCentralJetQuad30MaxEta2p4+hlt1PFPuppiCentralJet75MaxEta2p4+hlt2PFPuppiCentralJet60MaxEta2p4+hlt3PFPuppiCentralJet45MaxEta2p4+hlt4PFPuppiCentralJet40MaxEta2p4+hltHtMhtPFPuppiCentralJetsQuadC30MaxEta2p4+hltPFPuppiCentralJetsQuad30HT330MaxEta2p4+HLTBtagDeepCSVSequencePFPuppiModEta2p4+hltBTagPFPuppiDeepCSV0p31Eta2p4TripleEta2p4+HLTEndSequence) +HLT_PFHT330PT30_QuadPFPuppiJet_75_60_45_40_TriplePFPuppiBTagDeepCSV_2p4 = cms.Path(HLTBeginSequence+hltL1SeedsForQuadPuppiJetTripleBtagFilter+HLTRawToDigiSequence+HLTHgcalLocalRecoSequence+HLTLocalrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTAK4PFPuppiJetsReconstruction+hltPFPuppiCentralJetQuad30MaxEta2p4+hlt1PFPuppiCentralJet75MaxEta2p4+hlt2PFPuppiCentralJet60MaxEta2p4+hlt3PFPuppiCentralJet45MaxEta2p4+hlt4PFPuppiCentralJet40MaxEta2p4+hltHtMhtPFPuppiCentralJetsQuadC30MaxEta2p4+hltPFPuppiCentralJetsQuad30HT330MaxEta2p4+HLTBtagDeepCSVSequencePFPuppiModEta2p4+hltBTagPFPuppiDeepCSV0p31Eta2p4TripleEta2p4+HLTEndSequence) diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFHT330PT30_QuadPFPuppiJet_75_60_45_40_TriplePFPuppiBTagDeepFlavour_2p4_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFHT330PT30_QuadPFPuppiJet_75_60_45_40_TriplePFPuppiBTagDeepFlavour_2p4_cfi.py index 3ba47d5231434..74039707ac3f2 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFHT330PT30_QuadPFPuppiJet_75_60_45_40_TriplePFPuppiBTagDeepFlavour_2p4_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFHT330PT30_QuadPFPuppiJet_75_60_45_40_TriplePFPuppiBTagDeepFlavour_2p4_cfi.py @@ -9,7 +9,7 @@ from ..modules.hltPFPuppiCentralJetQuad30MaxEta2p4_cfi import * from ..modules.hltPFPuppiCentralJetsQuad30HT330MaxEta2p4_cfi import * from ..modules.hltL1SeedsForQuadPuppiJetTripleBtagFilter_cfi import * -from ..sequences.hgcalLocalRecoSequence_cfi import * +from ..sequences.HLTHgcalLocalRecoSequence_cfi import * from ..sequences.HLTAK4PFPuppiJetsReconstruction_cfi import * from ..sequences.HLTBeginSequence_cfi import * from ..sequences.HLTBtagDeepFlavourSequencePFPuppiModEta2p4_cfi import * @@ -17,7 +17,7 @@ from ..sequences.HLTMuonsSequence_cfi import * from ..sequences.HLTParticleFlowSequence_cfi import * from ..sequences.HLTTrackingV61Sequence_cfi import * -from ..sequences.localrecoSequence_cfi import * -from ..sequences.RawToDigiSequence_cfi import * +from ..sequences.HLTLocalrecoSequence_cfi import * +from ..sequences.HLTRawToDigiSequence_cfi import * -HLT_PFHT330PT30_QuadPFPuppiJet_75_60_45_40_TriplePFPuppiBTagDeepFlavour_2p4 = cms.Path(HLTBeginSequence+hltL1SeedsForQuadPuppiJetTripleBtagFilter+RawToDigiSequence+hgcalLocalRecoSequence+localrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTAK4PFPuppiJetsReconstruction+hltPFPuppiCentralJetQuad30MaxEta2p4+hlt1PFPuppiCentralJet75MaxEta2p4+hlt2PFPuppiCentralJet60MaxEta2p4+hlt3PFPuppiCentralJet45MaxEta2p4+hlt4PFPuppiCentralJet40MaxEta2p4+hltHtMhtPFPuppiCentralJetsQuadC30MaxEta2p4+hltPFPuppiCentralJetsQuad30HT330MaxEta2p4+HLTBtagDeepFlavourSequencePFPuppiModEta2p4+hltBTagPFPuppiDeepFlavour0p275Eta2p4TripleEta2p4+HLTEndSequence) +HLT_PFHT330PT30_QuadPFPuppiJet_75_60_45_40_TriplePFPuppiBTagDeepFlavour_2p4 = cms.Path(HLTBeginSequence+hltL1SeedsForQuadPuppiJetTripleBtagFilter+HLTRawToDigiSequence+HLTHgcalLocalRecoSequence+HLTLocalrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTAK4PFPuppiJetsReconstruction+hltPFPuppiCentralJetQuad30MaxEta2p4+hlt1PFPuppiCentralJet75MaxEta2p4+hlt2PFPuppiCentralJet60MaxEta2p4+hlt3PFPuppiCentralJet45MaxEta2p4+hlt4PFPuppiCentralJet40MaxEta2p4+hltHtMhtPFPuppiCentralJetsQuadC30MaxEta2p4+hltPFPuppiCentralJetsQuad30HT330MaxEta2p4+HLTBtagDeepFlavourSequencePFPuppiModEta2p4+hltBTagPFPuppiDeepFlavour0p275Eta2p4TripleEta2p4+HLTEndSequence) diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFPuppiHT1070_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFPuppiHT1070_cfi.py index e389a3bfaa69b..f488b89ec23ea 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFPuppiHT1070_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFPuppiHT1070_cfi.py @@ -3,14 +3,14 @@ from ..modules.hltPFPuppiHT_cfi import * from ..modules.hltPFPuppiHT1070_cfi import * from ..modules.hltL1SeedsForPuppiHTFilter_cfi import * -from ..sequences.hgcalLocalRecoSequence_cfi import * +from ..sequences.HLTHgcalLocalRecoSequence_cfi import * from ..sequences.HLTAK4PFPuppiJetsReconstruction_cfi import * from ..sequences.HLTBeginSequence_cfi import * from ..sequences.HLTEndSequence_cfi import * from ..sequences.HLTMuonsSequence_cfi import * from ..sequences.HLTParticleFlowSequence_cfi import * from ..sequences.HLTTrackingV61Sequence_cfi import * -from ..sequences.localrecoSequence_cfi import * -from ..sequences.RawToDigiSequence_cfi import * +from ..sequences.HLTLocalrecoSequence_cfi import * +from ..sequences.HLTRawToDigiSequence_cfi import * -HLT_PFPuppiHT1070 = cms.Path(HLTBeginSequence+hltL1SeedsForPuppiHTFilter+RawToDigiSequence+hgcalLocalRecoSequence+localrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTAK4PFPuppiJetsReconstruction+hltPFPuppiHT+hltPFPuppiHT1070+HLTEndSequence) +HLT_PFPuppiHT1070 = cms.Path(HLTBeginSequence+hltL1SeedsForPuppiHTFilter+HLTRawToDigiSequence+HLTHgcalLocalRecoSequence+HLTLocalrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTAK4PFPuppiJetsReconstruction+hltPFPuppiHT+hltPFPuppiHT1070+HLTEndSequence) diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFPuppiMETTypeOne140_PFPuppiMHT140_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFPuppiMETTypeOne140_PFPuppiMHT140_cfi.py index 7c998d35370a7..b22e829ce869a 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFPuppiMETTypeOne140_PFPuppiMHT140_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFPuppiMETTypeOne140_PFPuppiMHT140_cfi.py @@ -6,7 +6,7 @@ from ..modules.hltPFPuppiMHT_cfi import * from ..modules.hltPFPuppiMHT140_cfi import * from ..modules.hltL1SeedsForPuppiMETFilter_cfi import * -from ..sequences.hgcalLocalRecoSequence_cfi import * +from ..sequences.HLTHgcalLocalRecoSequence_cfi import * from ..sequences.HLTAK4PFPuppiJetsReconstruction_cfi import * from ..sequences.HLTBeginSequence_cfi import * from ..sequences.HLTEndSequence_cfi import * @@ -14,7 +14,7 @@ from ..sequences.HLTParticleFlowSequence_cfi import * from ..sequences.HLTPFPuppiMETReconstruction_cfi import * from ..sequences.HLTTrackingV61Sequence_cfi import * -from ..sequences.localrecoSequence_cfi import * -from ..sequences.RawToDigiSequence_cfi import * +from ..sequences.HLTLocalrecoSequence_cfi import * +from ..sequences.HLTRawToDigiSequence_cfi import * -HLT_PFPuppiMETTypeOne140_PFPuppiMHT140 = cms.Path(HLTBeginSequence+hltL1SeedsForPuppiMETFilter+RawToDigiSequence+hgcalLocalRecoSequence+localrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTAK4PFPuppiJetsReconstruction+HLTPFPuppiMETReconstruction+hltPFPuppiMETTypeOneCorrector+hltPFPuppiMETTypeOne+hltPFPuppiMETTypeOne140+hltPFPuppiMHT+hltPFPuppiMHT140+HLTEndSequence) +HLT_PFPuppiMETTypeOne140_PFPuppiMHT140 = cms.Path(HLTBeginSequence+hltL1SeedsForPuppiMETFilter+HLTRawToDigiSequence+HLTHgcalLocalRecoSequence+HLTLocalrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTAK4PFPuppiJetsReconstruction+HLTPFPuppiMETReconstruction+hltPFPuppiMETTypeOneCorrector+hltPFPuppiMETTypeOne+hltPFPuppiMETTypeOne140+hltPFPuppiMHT+hltPFPuppiMHT140+HLTEndSequence) diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_TriMu_10_5_5_DZ_FromL1TkMuon_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_TriMu_10_5_5_DZ_FromL1TkMuon_cfi.py index defe0c1e3f643..cd79298adc31b 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_TriMu_10_5_5_DZ_FromL1TkMuon_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_TriMu_10_5_5_DZ_FromL1TkMuon_cfi.py @@ -2,16 +2,16 @@ from ..sequences.HLTBeginSequence_cfi import * from ..sequences.HLTEndSequence_cfi import * -from ..sequences.RawToDigiSequence_cfi import * -from ..sequences.itLocalRecoSequence_cfi import * -from ..sequences.otLocalRecoSequence_cfi import * -from ..sequences.hgcalLocalRecoSequence_cfi import * +from ..sequences.HLTRawToDigiSequence_cfi import * +from ..sequences.HLTItLocalRecoSequence_cfi import * +from ..sequences.HLTOtLocalRecoSequence_cfi import * +from ..sequences.HLTHgcalLocalRecoSequence_cfi import * from ..sequences.HLTDoLocalHcalSequence_cfi import * from ..sequences.HLTDoFullUnpackingEgammaEcalSequence_cfi import * from ..sequences.HLTFastJetForEgammaSequence_cfi import * from ..sequences.HLTIter0Phase2L3FromL1TkSequence_cfi import * from ..sequences.HLTIter2Phase2L3FromL1TkSequence_cfi import * -from ..sequences.pfClusteringHBHEHFSequence_cfi import * +from ..sequences.HLTPfClusteringHBHEHFSequence_cfi import * from ..sequences.HLTPhase2L3FromL1TkSequence_cfi import * from ..sequences.HLTPhase2L3OISequence_cfi import * from ..sequences.HLTPhase2L3MuonsSequence_cfi import * @@ -28,9 +28,9 @@ HLT_TriMu_10_5_5_DZ_FromL1TkMuon = cms.Path(HLTBeginSequence +hltTripleMuon3DZ1p0 +hltTripleMuon3DR0 - +RawToDigiSequence - +itLocalRecoSequence - +otLocalRecoSequence + +HLTRawToDigiSequence + +HLTItLocalRecoSequence + +HLTOtLocalRecoSequence +HLTL2MuonsFromL1TkSequence +HLTPhase2L3MuonsSequence +hltL3fL1TkTripleMu533PreFiltered555 diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/MC_BTV_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/MC_BTV_cfi.py index a5975323e16f3..4d44642abce49 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/MC_BTV_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/MC_BTV_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -from ..sequences.hgcalLocalRecoSequence_cfi import * +from ..sequences.HLTHgcalLocalRecoSequence_cfi import * from ..sequences.HLTAK4PFPuppiJetsReconstruction_cfi import * from ..sequences.HLTBeginSequence_cfi import * from ..sequences.HLTBtagDeepCSVSequencePFPuppi_cfi import * @@ -8,7 +8,7 @@ from ..sequences.HLTMuonsSequence_cfi import * from ..sequences.HLTParticleFlowSequence_cfi import * from ..sequences.HLTTrackingV61Sequence_cfi import * -from ..sequences.localrecoSequence_cfi import * -from ..sequences.RawToDigiSequence_cfi import * +from ..sequences.HLTLocalrecoSequence_cfi import * +from ..sequences.HLTRawToDigiSequence_cfi import * -MC_BTV = cms.Path(HLTBeginSequence+RawToDigiSequence+hgcalLocalRecoSequence+localrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTAK4PFPuppiJetsReconstruction+HLTBtagDeepCSVSequencePFPuppi+HLTBtagDeepFlavourSequencePFPuppi) +MC_BTV = cms.Path(HLTBeginSequence+HLTRawToDigiSequence+HLTHgcalLocalRecoSequence+HLTLocalrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTAK4PFPuppiJetsReconstruction+HLTBtagDeepCSVSequencePFPuppi+HLTBtagDeepFlavourSequencePFPuppi) diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/MC_JME_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/MC_JME_cfi.py index 276cceb1c60a8..64344d4ec2d5d 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/MC_JME_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/MC_JME_cfi.py @@ -2,14 +2,14 @@ from ..modules.hltPFPuppiHT_cfi import * from ..modules.hltPFPuppiMHT_cfi import * -from ..sequences.hgcalLocalRecoSequence_cfi import * +from ..sequences.HLTHgcalLocalRecoSequence_cfi import * from ..sequences.HLTBeginSequence_cfi import * from ..sequences.HLTHgcalTiclPFClusteringForEgamma_cfi import * from ..sequences.HLTJMESequence_cfi import * from ..sequences.HLTMuonsSequence_cfi import * from ..sequences.HLTParticleFlowSequence_cfi import * from ..sequences.HLTTrackingV61Sequence_cfi import * -from ..sequences.localrecoSequence_cfi import * -from ..sequences.RawToDigiSequence_cfi import * +from ..sequences.HLTLocalrecoSequence_cfi import * +from ..sequences.HLTRawToDigiSequence_cfi import * -MC_JME = cms.Path(HLTBeginSequence+RawToDigiSequence+hgcalLocalRecoSequence+localrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTHgcalTiclPFClusteringForEgamma+HLTJMESequence+hltPFPuppiHT+hltPFPuppiMHT) +MC_JME = cms.Path(HLTBeginSequence+HLTRawToDigiSequence+HLTHgcalLocalRecoSequence+HLTLocalrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTHgcalTiclPFClusteringForEgamma+HLTJMESequence+hltPFPuppiHT+hltPFPuppiMHT) diff --git a/HLTrigger/Configuration/python/HLT_75e33/psets/ClusterShapeTrajectoryFilter_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/psets/ClusterShapeTrajectoryFilter_cfi.py index 634377708be3f..239b4a0662e10 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/psets/ClusterShapeTrajectoryFilter_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/psets/ClusterShapeTrajectoryFilter_cfi.py @@ -2,5 +2,5 @@ ClusterShapeTrajectoryFilter = cms.PSet( ComponentType = cms.string('ClusterShapeTrajectoryFilter'), - cacheSrc = cms.InputTag("siPixelClusterShapeCache") -) \ No newline at end of file + cacheSrc = cms.InputTag("hltSiPixelClusterShapeCache") +) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTAK4PFPuppiJetsReconstruction_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTAK4PFPuppiJetsReconstruction_cfi.py index 057f9a8e4dc61..43f7a0a32b06d 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTAK4PFPuppiJetsReconstruction_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTAK4PFPuppiJetsReconstruction_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -from ..modules.goodOfflinePrimaryVertices_cfi import * +from ..modules.hltGoodOfflinePrimaryVertices_cfi import * from ..modules.hltAK4PFPuppiJetCorrector_cfi import * from ..modules.hltAK4PFPuppiJetCorrectorL1_cfi import * from ..modules.hltAK4PFPuppiJetCorrectorL2_cfi import * @@ -10,4 +10,4 @@ from ..modules.hltPFPuppi_cfi import * from ..modules.hltPixelClustersMultiplicity_cfi import * -HLTAK4PFPuppiJetsReconstruction = cms.Sequence(goodOfflinePrimaryVertices+hltPixelClustersMultiplicity+hltPFPuppi+hltAK4PFPuppiJets+hltAK4PFPuppiJetCorrectorL1+hltAK4PFPuppiJetCorrectorL2+hltAK4PFPuppiJetCorrectorL3+hltAK4PFPuppiJetCorrector+hltAK4PFPuppiJetsCorrected) +HLTAK4PFPuppiJetsReconstruction = cms.Sequence(hltGoodOfflinePrimaryVertices+hltPixelClustersMultiplicity+hltPFPuppi+hltAK4PFPuppiJets+hltAK4PFPuppiJetCorrectorL1+hltAK4PFPuppiJetCorrectorL2+hltAK4PFPuppiJetCorrectorL3+hltAK4PFPuppiJetCorrector+hltAK4PFPuppiJetsCorrected) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTCaloTowersRecSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTCaloTowersRecSequence_cfi.py new file mode 100644 index 0000000000000..27be42963e8f2 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTCaloTowersRecSequence_cfi.py @@ -0,0 +1,5 @@ +import FWCore.ParameterSet.Config as cms + +from ..modules.hltTowerMaker_cfi import * + +HLTCaloTowersRecSequence = cms.Sequence(hltTowerMaker) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/calolocalrecoSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTCalolocalrecoSequence_cfi.py similarity index 61% rename from HLTrigger/Configuration/python/HLT_75e33/sequences/calolocalrecoSequence_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/sequences/HLTCalolocalrecoSequence_cfi.py index ef918a5277afe..cea45a90c2979 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/calolocalrecoSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTCalolocalrecoSequence_cfi.py @@ -3,4 +3,4 @@ from ..sequences.HLTDoFullUnpackingEgammaEcalSequence_cfi import * from ..sequences.HLTDoLocalHcalSequence_cfi import * -calolocalrecoSequence = cms.Sequence(HLTDoFullUnpackingEgammaEcalSequence+HLTDoLocalHcalSequence) +HLTCalolocalrecoSequence = cms.Sequence(HLTDoFullUnpackingEgammaEcalSequence+HLTDoLocalHcalSequence) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/csclocalrecoSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTCsclocalrecoSequence_cfi.py similarity index 64% rename from HLTrigger/Configuration/python/HLT_75e33/sequences/csclocalrecoSequence_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/sequences/HLTCsclocalrecoSequence_cfi.py index d67b58cf8722d..d9927867dcbf8 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/csclocalrecoSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTCsclocalrecoSequence_cfi.py @@ -3,4 +3,4 @@ from ..modules.hltCsc2DRecHits_cfi import * from ..modules.hltCscSegments_cfi import * -csclocalrecoSequence = cms.Sequence(hltCsc2DRecHits+hltCscSegments) +HLTCsclocalrecoSequence = cms.Sequence(hltCsc2DRecHits+hltCscSegments) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDoFullUnpackingEgammaEcalL1SeededSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDoFullUnpackingEgammaEcalL1SeededSequence_cfi.py index 0a573349aa350..b8b097206fdda 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDoFullUnpackingEgammaEcalL1SeededSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDoFullUnpackingEgammaEcalL1SeededSequence_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -from ..modules.bunchSpacingProducer_cfi import * +from ..modules.hltBunchSpacingProducer_cfi import * from ..modules.hltEcalBarrelDigisInRegions_cfi import * from ..modules.hltEcalDetIdToBeRecovered_cfi import * from ..modules.hltEcalDigis_cfi import * diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDoFullUnpackingEgammaEcalSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDoFullUnpackingEgammaEcalSequence_cfi.py index b17e334985f4e..e85c19c282a53 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDoFullUnpackingEgammaEcalSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDoFullUnpackingEgammaEcalSequence_cfi.py @@ -1,10 +1,10 @@ import FWCore.ParameterSet.Config as cms -from ..modules.bunchSpacingProducer_cfi import * -from ..modules.ecalDetailedTimeRecHit_cfi import * -from ..modules.ecalMultiFitUncalibRecHit_cfi import * +from ..modules.hltBunchSpacingProducer_cfi import * +from ..modules.hltEcalDetailedTimeRecHit_cfi import * +from ..modules.hltEcalMultiFitUncalibRecHit_cfi import * from ..modules.hltEcalDetIdToBeRecovered_cfi import * from ..modules.hltEcalDigis_cfi import * from ..modules.hltEcalRecHit_cfi import * -HLTDoFullUnpackingEgammaEcalSequence = cms.Sequence(hltEcalDigis+bunchSpacingProducer+hltEcalDetIdToBeRecovered+ecalMultiFitUncalibRecHit+hltEcalRecHit+ecalDetailedTimeRecHit) +HLTDoFullUnpackingEgammaEcalSequence = cms.Sequence(hltEcalDigis+bunchSpacingProducer+hltEcalDetIdToBeRecovered+hltEcalMultiFitUncalibRecHit+hltEcalRecHit+hltEcalDetailedTimeRecHit) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDoLocalPixelSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDoLocalPixelSequence_cfi.py index 0748b1dd59250..26ee115162b49 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDoLocalPixelSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDoLocalPixelSequence_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -from ..modules.siPixelClusters_cfi import * -from ..modules.siPixelRecHits_cfi import * +from ..modules.hltSiPixelClusters_cfi import * +from ..modules.hltSiPixelRecHits_cfi import * -HLTDoLocalPixelSequence = cms.Sequence(siPixelClusters+siPixelRecHits) +HLTDoLocalPixelSequence = cms.Sequence(hltSiPixelClusters+hltSiPixelRecHits) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDoLocalStripSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDoLocalStripSequence_cfi.py index be962077a03ae..ebe08b71f08f9 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDoLocalStripSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDoLocalStripSequence_cfi.py @@ -1,5 +1,5 @@ import FWCore.ParameterSet.Config as cms -from ..modules.siPhase2Clusters_cfi import * +from ..modules.hltSiPhase2Clusters_cfi import * -HLTDoLocalStripSequence = cms.Sequence(siPhase2Clusters) +HLTDoLocalStripSequence = cms.Sequence(hltSiPhase2Clusters) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/dtlocalrecoSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDtlocalrecoSequence_cfi.py similarity index 65% rename from HLTrigger/Configuration/python/HLT_75e33/sequences/dtlocalrecoSequence_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDtlocalrecoSequence_cfi.py index 8fac65d517bc3..7e0b7b69f1a88 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/dtlocalrecoSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDtlocalrecoSequence_cfi.py @@ -3,4 +3,4 @@ from ..modules.hltDt1DRecHits_cfi import * from ..modules.hltDt4DSegments_cfi import * -dtlocalrecoSequence = cms.Sequence(hltDt1DRecHits+hltDt4DSegments) +HLTDtlocalrecoSequence = cms.Sequence(hltDt1DRecHits+hltDt4DSegments) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/hltEcalDigisSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTEcalDigisSequence_cfi.py similarity index 62% rename from HLTrigger/Configuration/python/HLT_75e33/sequences/hltEcalDigisSequence_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/sequences/HLTEcalDigisSequence_cfi.py index 8736766a5886a..8411120eecee2 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/hltEcalDigisSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTEcalDigisSequence_cfi.py @@ -2,4 +2,4 @@ from ..modules.hltEcalDigis_cfi import * -hltEcalDigisSequence = cms.Sequence(hltEcalDigis) +HLTEcalDigisSequence = cms.Sequence(hltEcalDigis) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTElePixelMatchL1SeededSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTElePixelMatchL1SeededSequence_cfi.py index 08f496ed6b6e4..9aaf0175e2eef 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTElePixelMatchL1SeededSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTElePixelMatchL1SeededSequence_cfi.py @@ -14,13 +14,13 @@ from ..modules.hltEleSeedsTrackingRegionsL1Seeded_cfi import * from ..modules.hltPixelLayerPairsL1Seeded_cfi import * from ..modules.hltPixelLayerTriplets_cfi import * -from ..modules.MeasurementTrackerEvent_cfi import * +from ..modules.hltMeasurementTrackerEvent_cfi import * from ..sequences.HLTDoLocalPixelSequence_cfi import * from ..sequences.HLTDoLocalStripSequence_cfi import * HLTElePixelMatchL1SeededSequence = cms.Sequence(HLTDoLocalPixelSequence +HLTDoLocalStripSequence - +(MeasurementTrackerEvent + +(hltMeasurementTrackerEvent +hltPixelLayerTriplets +hltEgammaHoverEL1Seeded +hltEgammaSuperClustersToPixelMatchL1Seeded diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTElePixelMatchUnseededSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTElePixelMatchUnseededSequence_cfi.py index d571989d4d224..324b972a58db1 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTElePixelMatchUnseededSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTElePixelMatchUnseededSequence_cfi.py @@ -15,8 +15,8 @@ from ..modules.hltEleSeedsTrackingRegionsUnseeded_cfi import * from ..modules.hltPixelLayerPairsUnseeded_cfi import * from ..modules.hltPixelLayerTriplets_cfi import * -from ..modules.MeasurementTrackerEvent_cfi import * +from ..modules.hltMeasurementTrackerEvent_cfi import * from ..sequences.HLTDoLocalPixelSequence_cfi import * from ..sequences.HLTDoLocalStripSequence_cfi import * -HLTElePixelMatchUnseededSequence = cms.Sequence(HLTDoLocalPixelSequence+HLTDoLocalStripSequence+(hltEgammaCandidatesUnseeded+hltEgammaHoverEUnseeded+MeasurementTrackerEvent+hltPixelLayerTriplets+hltEgammaSuperClustersToPixelMatchUnseeded+hltEleSeedsTrackingRegionsUnseeded+hltElePixelHitDoubletsForTripletsUnseeded+hltElePixelHitTripletsUnseeded+hltElePixelSeedsTripletsUnseeded+hltElePixelHitTripletsClusterRemoverUnseeded+hltPixelLayerPairsUnseeded+hltElePixelHitDoubletsUnseeded+hltElePixelSeedsDoubletsUnseeded+hltElePixelSeedsCombinedUnseeded+hltEgammaElectronPixelSeedsUnseeded+hltEgammaPixelMatchVarsUnseeded)) +HLTElePixelMatchUnseededSequence = cms.Sequence(HLTDoLocalPixelSequence+HLTDoLocalStripSequence+(hltEgammaCandidatesUnseeded+hltEgammaHoverEUnseeded+hltMeasurementTrackerEvent+hltPixelLayerTriplets+hltEgammaSuperClustersToPixelMatchUnseeded+hltEleSeedsTrackingRegionsUnseeded+hltElePixelHitDoubletsForTripletsUnseeded+hltElePixelHitTripletsUnseeded+hltElePixelSeedsTripletsUnseeded+hltElePixelHitTripletsClusterRemoverUnseeded+hltPixelLayerPairsUnseeded+hltElePixelHitDoubletsUnseeded+hltElePixelSeedsDoubletsUnseeded+hltElePixelSeedsCombinedUnseeded+hltEgammaElectronPixelSeedsUnseeded+hltEgammaPixelMatchVarsUnseeded)) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/endOfProcess_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTEndOfProcess_cfi.py similarity index 64% rename from HLTrigger/Configuration/python/HLT_75e33/sequences/endOfProcess_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/sequences/HLTEndOfProcess_cfi.py index e59bafca82ffc..c341880fda0a9 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/endOfProcess_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTEndOfProcess_cfi.py @@ -2,4 +2,4 @@ from ..modules.MEtoEDMConverter_cfi import * -endOfProcess = cms.Sequence(MEtoEDMConverter) +HLTEndOfProcess = cms.Sequence(MEtoEDMConverter) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTFastJetForEgammaSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTFastJetForEgammaSequence_cfi.py index ce96f72c35f08..41cd44a3aee3a 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTFastJetForEgammaSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTFastJetForEgammaSequence_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -from ..modules.ecalMultiFitUncalibRecHit_cfi import * +from ..modules.hltEcalMultiFitUncalibRecHit_cfi import * from ..modules.hltEcalRecHit_cfi import * from ..modules.hltFixedGridRhoFastjetAllCaloForEGamma_cfi import * -HLTFastJetForEgammaSequence = cms.Sequence(ecalMultiFitUncalibRecHit+hltEcalRecHit+hltFixedGridRhoFastjetAllCaloForEGamma) +HLTFastJetForEgammaSequence = cms.Sequence(hltEcalMultiFitUncalibRecHit+hltEcalRecHit+hltFixedGridRhoFastjetAllCaloForEGamma) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/gemLocalRecoSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTGemLocalRecoSequence_cfi.py similarity index 64% rename from HLTrigger/Configuration/python/HLT_75e33/sequences/gemLocalRecoSequence_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/sequences/HLTGemLocalRecoSequence_cfi.py index c8ac63914c289..4ef704c937e04 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/gemLocalRecoSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTGemLocalRecoSequence_cfi.py @@ -3,4 +3,4 @@ from ..modules.hltGemRecHits_cfi import * from ..modules.hltGemSegments_cfi import * -gemLocalRecoSequence = cms.Sequence(hltGemRecHits+hltGemSegments) +HLTGemLocalRecoSequence = cms.Sequence(hltGemRecHits+hltGemSegments) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalLocalRecoSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalLocalRecoSequence_cfi.py new file mode 100644 index 0000000000000..c3a866029ea08 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalLocalRecoSequence_cfi.py @@ -0,0 +1,38 @@ +import FWCore.ParameterSet.Config as cms + +from ..modules.hltHgcalLayerClustersEE_cfi import * +from ..modules.hltHgcalLayerClustersHSci_cfi import * +from ..modules.hltHgcalLayerClustersHSi_cfi import * +from ..modules.hltHgcalMergeLayerClusters_cfi import * +from ..modules.hltHGCalRecHit_cfi import * +from ..modules.hltHGCalUncalibRecHit_cfi import * +# Heterogeneous HGCAL EE layer clusters +from ..modules.hltHgcalSoARecHitsProducer_cfi import * +from ..modules.hltHgcalSoARecHitsLayerClustersProducer_cfi import * +from ..modules.hltHgcalSoALayerClustersProducer_cfi import * +from ..modules.hltHgcalLayerClustersFromSoAProducer_cfi import * + +HLTHgcalLocalRecoSequence = cms.Sequence( + hltHGCalUncalibRecHit+ + hltHGCalRecHit+ + hltHgcalLayerClustersEE+ + hltHgcalLayerClustersHSci+ + hltHgcalLayerClustersHSi+ + hltHgcalMergeLayerClusters) + +_HLTHgcalLocalRecoSequence_heterogeneous = cms.Sequence( + hltHGCalUncalibRecHit+ + hltHGCalRecHit+ + hltHgcalSoARecHitsProducer+ + hltHgcalSoARecHitsLayerClustersProducer+ + hltHgcalSoALayerClustersProducer+ + hltHgCalLayerClustersFromSoAProducer+ + hltHgcalLayerClustersHSci+ + hltHgcalLayerClustersHSi+ + hltHgcalMergeLayerClusters) + +from Configuration.ProcessModifiers.alpaka_cff import alpaka +alpaka.toReplaceWith(HLTHgcalLocalRecoSequence, _HLTHgcalLocalRecoSequence_heterogeneous) +alpaka.toModify(hltHgcalMergeLayerClusters, + layerClustersEE = cms.InputTag("hltHgCalLayerClustersFromSoAProducer"), + time_layerclustersEE = cms.InputTag("hltHgCalLayerClustersFromSoAProducer", "timeLayerCluster")) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_cfi.py index ee73d234b72c8..53faf7266150d 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_cfi.py @@ -1,21 +1,21 @@ import FWCore.ParameterSet.Config as cms -from ..modules.filteredLayerClustersCLUE3DHighL1Seeded_cfi import * -from ..modules.hgcalDigis_cfi import * -from ..modules.hgcalDigisL1Seeded_cfi import * -from ..modules.hgcalLayerClustersEEL1Seeded_cfi import * -from ..modules.hgcalLayerClustersHSciL1Seeded_cfi import * -from ..modules.hgcalLayerClustersHSiL1Seeded_cfi import * -from ..modules.hgcalMergeLayerClustersL1Seeded_cfi import * -from ..modules.HGCalRecHitL1Seeded_cfi import * -from ..modules.HGCalUncalibRecHitL1Seeded_cfi import * +from ..modules.hltFilteredLayerClustersCLUE3DHighL1Seeded_cfi import * +from ..modules.hltHgcalDigis_cfi import * +from ..modules.hltHgcalDigisL1Seeded_cfi import * +from ..modules.hltHgcalLayerClustersEEL1Seeded_cfi import * +from ..modules.hltHgcalLayerClustersHSciL1Seeded_cfi import * +from ..modules.hltHgcalLayerClustersHSiL1Seeded_cfi import * +from ..modules.hltHgcalMergeLayerClustersL1Seeded_cfi import * +from ..modules.hltHGCalRecHitL1Seeded_cfi import * +from ..modules.hltHGCalUncalibRecHitL1Seeded_cfi import * from ..modules.hltL1TEGammaHGCFilteredCollectionProducer_cfi import * from ..modules.hltRechitInRegionsHGCAL_cfi import * -from ..modules.particleFlowClusterHGCalFromTICLL1Seeded_cfi import * -from ..modules.particleFlowRecHitHGCL1Seeded_cfi import * -from ..modules.particleFlowSuperClusterHGCalFromTICLL1Seeded_cfi import * -from ..modules.ticlLayerTileProducerL1Seeded_cfi import * -from ..modules.ticlSeedingL1_cfi import * -from ..modules.ticlTrackstersCLUE3DHighL1Seeded_cfi import * +from ..modules.hltParticleFlowClusterHGCalFromTICLL1Seeded_cfi import * +from ..modules.hltParticleFlowRecHitHGCL1Seeded_cfi import * +from ..modules.hltParticleFlowSuperClusterHGCalFromTICLL1Seeded_cfi import * +from ..modules.hltTiclLayerTileProducerL1Seeded_cfi import * +from ..modules.hltTiclSeedingL1_cfi import * +from ..modules.hltTiclTrackstersCLUE3DHighL1Seeded_cfi import * -HLTHgcalTiclPFClusteringForEgammaL1SeededSequence = cms.Sequence(hgcalDigis+hltL1TEGammaHGCFilteredCollectionProducer+hgcalDigisL1Seeded+HGCalUncalibRecHitL1Seeded+HGCalRecHitL1Seeded+particleFlowRecHitHGCL1Seeded+hltRechitInRegionsHGCAL+hgcalLayerClustersEEL1Seeded+hgcalLayerClustersHSciL1Seeded+hgcalLayerClustersHSiL1Seeded+hgcalMergeLayerClustersL1Seeded+filteredLayerClustersCLUE3DHighL1Seeded+ticlSeedingL1+ticlLayerTileProducerL1Seeded+ticlTrackstersCLUE3DHighL1Seeded+particleFlowClusterHGCalFromTICLL1Seeded+particleFlowSuperClusterHGCalFromTICLL1Seeded) +HLTHgcalTiclPFClusteringForEgammaL1SeededSequence = cms.Sequence(hltHgcalDigis+hltL1TEGammaHGCFilteredCollectionProducer+hltHgcalDigisL1Seeded+hltHGCalUncalibRecHitL1Seeded+hltHGCalRecHitL1Seeded+hltParticleFlowRecHitHGCL1Seeded+hltRechitInRegionsHGCAL+hltHgcalLayerClustersEEL1Seeded+hltHgcalLayerClustersHSciL1Seeded+hltHgcalLayerClustersHSiL1Seeded+hltHgcalMergeLayerClustersL1Seeded+hltFilteredLayerClustersCLUE3DHighL1Seeded+hltTiclSeedingL1+hltTiclLayerTileProducerL1Seeded+hltTiclTrackstersCLUE3DHighL1Seeded+hltParticleFlowClusterHGCalFromTICLL1Seeded+hltParticleFlowSuperClusterHGCalFromTICLL1Seeded) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaUnseededSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaUnseededSequence_cfi.py index 55bf8fd3f4bc5..98bd6184ca196 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaUnseededSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaUnseededSequence_cfi.py @@ -1,30 +1,30 @@ import FWCore.ParameterSet.Config as cms -from ..modules.filteredLayerClustersCLUE3DHigh_cfi import * -from ..modules.hgcalDigis_cfi import * -from ..modules.hgcalLayerClustersEE_cfi import * -from ..modules.hgcalLayerClustersHSci_cfi import * -from ..modules.hgcalLayerClustersHSi_cfi import * -from ..modules.hgcalMergeLayerClusters_cfi import * -from ..modules.HGCalRecHit_cfi import * -from ..modules.HGCalUncalibRecHit_cfi import * -from ..modules.particleFlowClusterHGCalFromTICLUnseeded_cfi import * -from ..modules.particleFlowRecHitHGC_cfi import * -from ..modules.particleFlowSuperClusterHGCalFromTICLUnseeded_cfi import * -from ..modules.ticlLayerTileProducer_cfi import * -from ..modules.ticlSeedingGlobal_cfi import * -from ..modules.ticlTrackstersCLUE3DHigh_cfi import * +from ..modules.hltFilteredLayerClustersCLUE3DHigh_cfi import * +from ..modules.hltHgcalDigis_cfi import * +from ..modules.hltHgcalLayerClustersEE_cfi import * +from ..modules.hltHgcalLayerClustersHSci_cfi import * +from ..modules.hltHgcalLayerClustersHSi_cfi import * +from ..modules.hltHgcalMergeLayerClusters_cfi import * +from ..modules.hltHGCalRecHit_cfi import * +from ..modules.hltHGCalUncalibRecHit_cfi import * +from ..modules.hltParticleFlowClusterHGCalFromTICLUnseeded_cfi import * +from ..modules.hltParticleFlowRecHitHGC_cfi import * +from ..modules.hltParticleFlowSuperClusterHGCalFromTICLUnseeded_cfi import * +from ..modules.hltTiclLayerTileProducer_cfi import * +from ..modules.hltTiclSeedingGlobal_cfi import * +from ..modules.hltTiclTrackstersCLUE3DHigh_cfi import * from ..modules.hltHgcalSoARecHitsProducer_cfi import * from ..modules.hltHgcalSoARecHitsLayerClustersProducer_cfi import * from ..modules.hltHgcalSoALayerClustersProducer_cfi import * from ..modules.hltHgcalLayerClustersFromSoAProducer_cfi import * -HLTHgcalTiclPFClusteringForEgammaUnseededSequence = cms.Sequence(hgcalDigis+HGCalUncalibRecHit+HGCalRecHit+particleFlowRecHitHGC+hgcalLayerClustersEE+hgcalLayerClustersHSci+hgcalLayerClustersHSi+hgcalMergeLayerClusters+filteredLayerClustersCLUE3DHigh+ticlSeedingGlobal+ticlLayerTileProducer+ticlTrackstersCLUE3DHigh+particleFlowClusterHGCalFromTICLUnseeded+particleFlowSuperClusterHGCalFromTICLUnseeded) +HLTHgcalTiclPFClusteringForEgammaUnseededSequence = cms.Sequence(hltHgcalDigis+hltHGCalUncalibRecHit+hltHGCalRecHit+hltParticleFlowRecHitHGC+hltHgcalLayerClustersEE+hltHgcalLayerClustersHSci+hltHgcalLayerClustersHSi+hltHgcalMergeLayerClusters+hltFilteredLayerClustersCLUE3DHigh+hltTiclSeedingGlobal+hltTiclLayerTileProducer+hltTiclTrackstersCLUE3DHigh+hltParticleFlowClusterHGCalFromTICLUnseeded+hltParticleFlowSuperClusterHGCalFromTICLUnseeded) -_HLTHgcalTiclPFClusteringForEgammaUnseededSequence_heterogeneous = cms.Sequence(hgcalDigis+HGCalUncalibRecHit+HGCalRecHit+particleFlowRecHitHGC+hltHgcalSoARecHitsProducer+hltHgcalSoARecHitsLayerClustersProducer+hltHgcalSoALayerClustersProducer+hltHgCalLayerClustersFromSoAProducer+hgcalLayerClustersHSci+hgcalLayerClustersHSi+hgcalMergeLayerClusters+filteredLayerClustersCLUE3DHigh+ticlSeedingGlobal+ticlLayerTileProducer+ticlTrackstersCLUE3DHigh+particleFlowClusterHGCalFromTICLUnseeded+particleFlowSuperClusterHGCalFromTICLUnseeded) +_HLTHgcalTiclPFClusteringForEgammaUnseededSequence_heterogeneous = cms.Sequence(hltHgcalDigis+hltHGCalUncalibRecHit+hltHGCalRecHit+hltParticleFlowRecHitHGC+hltHgcalSoARecHitsProducer+hltHgcalSoARecHitsLayerClustersProducer+hltHgcalSoALayerClustersProducer+hltHgCalLayerClustersFromSoAProducer+hltHgcalLayerClustersHSci+hltHgcalLayerClustersHSi+hltHgcalMergeLayerClusters+hltFilteredLayerClustersCLUE3DHigh+hltTiclSeedingGlobal+hltTiclLayerTileProducer+hltTiclTrackstersCLUE3DHigh+hltParticleFlowClusterHGCalFromTICLUnseeded+hltParticleFlowSuperClusterHGCalFromTICLUnseeded) from Configuration.ProcessModifiers.alpaka_cff import alpaka alpaka.toReplaceWith(HLTHgcalTiclPFClusteringForEgammaUnseededSequence, _HLTHgcalTiclPFClusteringForEgammaUnseededSequence_heterogeneous) -alpaka.toModify(hgcalMergeLayerClusters, +alpaka.toModify(hltHgcalMergeLayerClusters, layerClustersEE = cms.InputTag("hltHgCalLayerClustersFromSoAProducer"), time_layerclustersEE = cms.InputTag("hltHgCalLayerClustersFromSoAProducer", "timeLayerCluster")) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgamma_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgamma_cfi.py index 3d2e6c9ce0aa5..0bd5de832249d 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgamma_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgamma_cfi.py @@ -1,18 +1,18 @@ import FWCore.ParameterSet.Config as cms -from ..modules.filteredLayerClustersCLUE3DHigh_cfi import * -from ..modules.hgcalDigis_cfi import * -from ..modules.hgcalLayerClustersEE_cfi import * -from ..modules.hgcalLayerClustersHSci_cfi import * -from ..modules.hgcalLayerClustersHSi_cfi import * -from ..modules.hgcalMergeLayerClusters_cfi import * -from ..modules.HGCalRecHit_cfi import * -from ..modules.HGCalUncalibRecHit_cfi import * -from ..modules.particleFlowClusterHGCal_cfi import * -from ..modules.particleFlowRecHitHGC_cfi import * -from ..modules.particleFlowSuperClusterHGCal_cfi import * -from ..modules.ticlLayerTileProducer_cfi import * -from ..modules.ticlSeedingGlobal_cfi import * -from ..modules.ticlTrackstersCLUE3DHigh_cfi import * +from ..modules.hltFilteredLayerClustersCLUE3DHigh_cfi import * +from ..modules.hltHgcalDigis_cfi import * +from ..modules.hltHgcalLayerClustersEE_cfi import * +from ..modules.hltHgcalLayerClustersHSci_cfi import * +from ..modules.hltHgcalLayerClustersHSi_cfi import * +from ..modules.hltHgcalMergeLayerClusters_cfi import * +from ..modules.hltHGCalRecHit_cfi import * +from ..modules.hltHGCalUncalibRecHit_cfi import * +from ..modules.hltParticleFlowClusterHGCal_cfi import * +from ..modules.hltParticleFlowRecHitHGC_cfi import * +from ..modules.hltParticleFlowSuperClusterHGCal_cfi import * +from ..modules.hltTiclLayerTileProducer_cfi import * +from ..modules.hltTiclSeedingGlobal_cfi import * +from ..modules.hltTiclTrackstersCLUE3DHigh_cfi import * -HLTHgcalTiclPFClusteringForEgamma = cms.Sequence((hgcalDigis+HGCalUncalibRecHit+HGCalRecHit+particleFlowRecHitHGC+hgcalLayerClustersEE+hgcalLayerClustersHSci+hgcalLayerClustersHSi+hgcalMergeLayerClusters+filteredLayerClustersCLUE3DHigh+ticlSeedingGlobal+ticlLayerTileProducer+ticlTrackstersCLUE3DHigh+particleFlowClusterHGCal+particleFlowSuperClusterHGCal)) +HLTHgcalTiclPFClusteringForEgamma = cms.Sequence((hltHgcalDigis+hltHGCalUncalibRecHit+hltHGCalRecHit+hltParticleFlowRecHitHGC+hltHgcalLayerClustersEE+hltHgcalLayerClustersHSci+hltHgcalLayerClustersHSi+hltHgcalMergeLayerClusters+hltFilteredLayerClustersCLUE3DHigh+hltTiclSeedingGlobal+hltTiclLayerTileProducer+hltTiclTrackstersCLUE3DHigh+hltParticleFlowClusterHGCal+hltParticleFlowSuperClusterHGCal)) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHighPtTripletStepSeedingSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHighPtTripletStepSeedingSequence_cfi.py new file mode 100644 index 0000000000000..d0094388d04d1 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHighPtTripletStepSeedingSequence_cfi.py @@ -0,0 +1,9 @@ +import FWCore.ParameterSet.Config as cms + +from ..modules.hltHighPtTripletStepClusters_cfi import * +from ..modules.hltHighPtTripletStepHitDoublets_cfi import * +from ..modules.hltHighPtTripletStepHitTriplets_cfi import * +from ..modules.hltHighPtTripletStepSeedLayers_cfi import * +from ..modules.hltHighPtTripletStepSeeds_cfi import * + +HLTHighPtTripletStepSeedingSequence = cms.Sequence(hltHighPtTripletStepClusters+hltHighPtTripletStepSeedLayers+hltHighPtTripletStepHitDoublets+hltHighPtTripletStepHitTriplets+hltHighPtTripletStepSeeds) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHighPtTripletStepSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHighPtTripletStepSequence_cfi.py new file mode 100644 index 0000000000000..6f168f3abbc63 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHighPtTripletStepSequence_cfi.py @@ -0,0 +1,9 @@ +import FWCore.ParameterSet.Config as cms + +from ..modules.hltHighPtTripletStepTrackCandidates_cfi import * +from ..modules.hltHighPtTripletStepTrackCutClassifier_cfi import * +from ..modules.hltHighPtTripletStepTracks_cfi import * +from ..modules.hltHighPtTripletStepTrackSelectionHighPurity_cfi import * +from ..sequences.HLTHighPtTripletStepSeedingSequence_cfi import * + +HLTHighPtTripletStepSequence = cms.Sequence(HLTHighPtTripletStepSeedingSequence+hltHighPtTripletStepTrackCandidates+hltHighPtTripletStepTracks+hltHighPtTripletStepTrackCutClassifier+hltHighPtTripletStepTrackSelectionHighPurity) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTInitialStepPVSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTInitialStepPVSequence_cfi.py new file mode 100644 index 0000000000000..846e64a2954bf --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTInitialStepPVSequence_cfi.py @@ -0,0 +1,7 @@ +import FWCore.ParameterSet.Config as cms + +from ..modules.hltAk4CaloJetsForTrk_cfi import * +from ..modules.hltFirstStepPrimaryVerticesUnsorted_cfi import * +from ..modules.hltPhase2TowerMakerForAll_cfi import * + +HLTInitialStepPVSequence = cms.Sequence(hltFirstStepPrimaryVerticesUnsorted+hltPhase2TowerMakerForAll+hltAk4CaloJetsForTrk) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTInitialStepSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTInitialStepSequence_cfi.py new file mode 100644 index 0000000000000..f674cf77fe168 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTInitialStepSequence_cfi.py @@ -0,0 +1,9 @@ +import FWCore.ParameterSet.Config as cms + +from ..modules.hltInitialStepSeeds_cfi import * +from ..modules.hltInitialStepTrackCandidates_cfi import * +from ..modules.hltInitialStepTrackCutClassifier_cfi import * +from ..modules.hltInitialStepTracks_cfi import * +from ..modules.hltInitialStepTrackSelectionHighPurity_cfi import * + +HLTInitialStepSequence = cms.Sequence(hltInitialStepSeeds+hltInitialStepTrackCandidates+hltInitialStepTracks+hltInitialStepTrackCutClassifier+hltInitialStepTrackSelectionHighPurity) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTItLocalRecoSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTItLocalRecoSequence_cfi.py new file mode 100644 index 0000000000000..760cabfbd069e --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTItLocalRecoSequence_cfi.py @@ -0,0 +1,8 @@ +import FWCore.ParameterSet.Config as cms + +from ..modules.hltSiPhase2Clusters_cfi import * +from ..modules.hltSiPixelClusters_cfi import * +from ..modules.hltSiPixelClusterShapeCache_cfi import * +from ..modules.hltSiPixelRecHits_cfi import * + +HLTItLocalRecoSequence = cms.Sequence(hltSiPhase2Clusters+hltSiPixelClusters+hltSiPixelClusterShapeCache+hltSiPixelRecHits) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTIterTICLSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTIterTICLSequence_cfi.py new file mode 100644 index 0000000000000..f9538266eaa05 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTIterTICLSequence_cfi.py @@ -0,0 +1,14 @@ +import FWCore.ParameterSet.Config as cms + +from ..sequences.HLTTiclLayerTileSequence_cfi import * +from ..sequences.HLTTiclPFSequence_cfi import * +from ..sequences.HLTTiclTracksterMergeSequence_cfi import * +from ..sequences.HLTTiclTrackstersCLUE3DHighStepSequence_cfi import * +from ..sequences.HLTTiclTrackstersPassthroughSequence_cfi import * +from ..sequences.HLTTiclTracksterLinksSequence_cfi import * +from ..sequences.HLTTiclCandidateSequence_cfi import * + +HLTIterTICLSequence = cms.Sequence(HLTTiclLayerTileSequence+HLTTiclTrackstersCLUE3DHighStepSequence+HLTTiclTracksterMergeSequence+HLTTiclPFSequence) + +from Configuration.ProcessModifiers.ticl_v5_cff import ticl_v5 +ticl_v5.toReplaceWith(HLTIterTICLSequence, cms.Sequence(HLTTiclLayerTileSequence+HLTTiclTrackstersCLUE3DHighStepSequence+HLTTiclTrackstersPassthroughSequence+HLTTiclTracksterLinksSequence+HLTTiclCandidateSequence+HLTTiclPFSequence)) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTL2MuonsFromL1TkSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTL2MuonsFromL1TkSequence_cfi.py index 3f35e2520c627..eca9f9f91d8c3 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTL2MuonsFromL1TkSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTL2MuonsFromL1TkSequence_cfi.py @@ -3,6 +3,6 @@ from ..modules.hltL2MuonSeedsFromL1TkMuon_cfi import * from ..modules.hltL2MuonsFromL1TkMuon_cfi import * from ..modules.hltL2OfflineMuonSeeds_cfi import * -from ..sequences.muonlocalrecoSequence_cfi import * +from ..sequences.HLTMuonlocalrecoSequence_cfi import * -HLTL2MuonsFromL1TkSequence = cms.Sequence(muonlocalrecoSequence+hltL2OfflineMuonSeeds+hltL2MuonSeedsFromL1TkMuon+hltL2MuonsFromL1TkMuon) +HLTL2MuonsFromL1TkSequence = cms.Sequence(HLTMuonlocalrecoSequence+hltL2OfflineMuonSeeds+hltL2MuonSeedsFromL1TkMuon+hltL2MuonsFromL1TkMuon) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTLocalrecoSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTLocalrecoSequence_cfi.py new file mode 100644 index 0000000000000..92655cb738938 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTLocalrecoSequence_cfi.py @@ -0,0 +1,6 @@ +import FWCore.ParameterSet.Config as cms + +from ..modules.hltBunchSpacingProducer_cfi import * +from ..sequences.HLTCalolocalrecoSequence_cfi import * + +HLTLocalrecoSequence = cms.Sequence(bunchSpacingProducer+HLTCalolocalrecoSequence) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTMuonlocalrecoSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTMuonlocalrecoSequence_cfi.py new file mode 100644 index 0000000000000..e8f9cd928de66 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTMuonlocalrecoSequence_cfi.py @@ -0,0 +1,8 @@ +import FWCore.ParameterSet.Config as cms + +from ..modules.hltRpcRecHits_cfi import * +from ..sequences.HLTCsclocalrecoSequence_cfi import * +from ..sequences.HLTDtlocalrecoSequence_cfi import * +from ..sequences.HLTGemLocalRecoSequence_cfi import * + +HLTMuonlocalrecoSequence = cms.Sequence(HLTCsclocalrecoSequence+HLTDtlocalrecoSequence+HLTGemLocalRecoSequence+hltRpcRecHits) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTOtLocalRecoSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTOtLocalRecoSequence_cfi.py new file mode 100644 index 0000000000000..74591b451f439 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTOtLocalRecoSequence_cfi.py @@ -0,0 +1,5 @@ +import FWCore.ParameterSet.Config as cms + +from ..modules.hltMeasurementTrackerEvent_cfi import * + +HLTOtLocalRecoSequence = cms.Sequence(hltMeasurementTrackerEvent) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPFClusterJMEReconstruction_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPFClusterJMEReconstruction_cfi.py index 1e96fff9560d1..cb0703b4be453 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPFClusterJMEReconstruction_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPFClusterJMEReconstruction_cfi.py @@ -3,6 +3,6 @@ from ..modules.hltAK4PFClusterJets_cfi import * from ..modules.hltAK8PFClusterJets_cfi import * from ..modules.hltPFClusterMET_cfi import * -from ..sequences.pfClusterRefsForJetsSequence_cfi import * +from ..sequences.HLTPfClusterRefsForJetsSequence_cfi import * -HLTPFClusterJMEReconstruction = cms.Sequence(pfClusterRefsForJetsSequence+hltAK4PFClusterJets+hltAK8PFClusterJets+hltPFClusterMET) +HLTPFClusterJMEReconstruction = cms.Sequence(HLTPfClusterRefsForJetsSequence+hltAK4PFClusterJets+hltAK8PFClusterJets+hltPFClusterMET) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPFJetsCHSReconstruction_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPFJetsCHSReconstruction_cfi.py index 7e35cb7d13ffe..4734ac3bf88a5 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPFJetsCHSReconstruction_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPFJetsCHSReconstruction_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -from ..modules.goodOfflinePrimaryVertices_cfi import * +from ..modules.hltGoodOfflinePrimaryVertices_cfi import * from ..modules.hltAK4PFCHSJetCorrector_cfi import * from ..modules.hltAK4PFCHSJetCorrectorL1_cfi import * from ..modules.hltAK4PFCHSJetCorrectorL2_cfi import * @@ -13,8 +13,8 @@ from ..modules.hltAK8PFCHSJetCorrectorL3_cfi import * from ..modules.hltAK8PFCHSJets_cfi import * from ..modules.hltAK8PFCHSJetsCorrected_cfi import * -from ..modules.particleFlowPtrs_cfi import * -from ..modules.pfNoPileUpJME_cfi import * -from ..modules.pfPileUpJME_cfi import * +from ..modules.hltParticleFlowPtrs_cfi import * +from ..modules.hltPfNoPileUpJME_cfi import * +from ..modules.hltPfPileUpJME_cfi import * -HLTPFJetsCHSReconstruction = cms.Sequence(particleFlowPtrs+goodOfflinePrimaryVertices+pfPileUpJME+pfNoPileUpJME+hltAK4PFCHSJets+hltAK4PFCHSJetCorrectorL1+hltAK4PFCHSJetCorrectorL2+hltAK4PFCHSJetCorrectorL3+hltAK4PFCHSJetCorrector+hltAK4PFCHSJetsCorrected+hltAK8PFCHSJets+hltAK8PFCHSJetCorrectorL1+hltAK8PFCHSJetCorrectorL2+hltAK8PFCHSJetCorrectorL3+hltAK8PFCHSJetCorrector+hltAK8PFCHSJetsCorrected) +HLTPFJetsCHSReconstruction = cms.Sequence(hltParticleFlowPtrs+hltGoodOfflinePrimaryVertices+hltPfPileUpJME+hltPfNoPileUpJME+hltAK4PFCHSJets+hltAK4PFCHSJetCorrectorL1+hltAK4PFCHSJetCorrectorL2+hltAK4PFCHSJetCorrectorL3+hltAK4PFCHSJetCorrector+hltAK4PFCHSJetsCorrected+hltAK8PFCHSJets+hltAK8PFCHSJetCorrectorL1+hltAK8PFCHSJetCorrectorL2+hltAK8PFCHSJetCorrectorL3+hltAK8PFCHSJetCorrector+hltAK8PFCHSJetsCorrected) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPFPuppiMETReconstruction_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPFPuppiMETReconstruction_cfi.py index 5b63f23d74c1b..ec53a4d9a1bce 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPFPuppiMETReconstruction_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPFPuppiMETReconstruction_cfi.py @@ -1,8 +1,8 @@ import FWCore.ParameterSet.Config as cms -from ..modules.goodOfflinePrimaryVertices_cfi import * +from ..modules.hltGoodOfflinePrimaryVertices_cfi import * from ..modules.hltPFPuppiMET_cfi import * from ..modules.hltPFPuppiNoLep_cfi import * from ..modules.hltPixelClustersMultiplicity_cfi import * -HLTPFPuppiMETReconstruction = cms.Sequence(goodOfflinePrimaryVertices+hltPixelClustersMultiplicity+hltPFPuppiNoLep+hltPFPuppiMET) +HLTPFPuppiMETReconstruction = cms.Sequence(hltGoodOfflinePrimaryVertices+hltPixelClustersMultiplicity+hltPFPuppiNoLep+hltPFPuppiMET) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTParticleFlowClusterECALSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTParticleFlowClusterECALSequence_cfi.py new file mode 100644 index 0000000000000..e6578bf2452f2 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTParticleFlowClusterECALSequence_cfi.py @@ -0,0 +1,7 @@ +import FWCore.ParameterSet.Config as cms + +from ..modules.hltEcalBarrelClusterFastTimer_cfi import * +from ..modules.hltParticleFlowClusterECAL_cfi import * +from ..modules.hltParticleFlowTimeAssignerECAL_cfi import * + +HLTParticleFlowClusterECALSequence = cms.Sequence(hltEcalBarrelClusterFastTimer+hltParticleFlowTimeAssignerECAL+hltParticleFlowClusterECAL) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTParticleFlowClusterSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTParticleFlowClusterSequence_cfi.py new file mode 100644 index 0000000000000..2c62402419129 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTParticleFlowClusterSequence_cfi.py @@ -0,0 +1,8 @@ +import FWCore.ParameterSet.Config as cms + +from ..modules.hltParticleFlowBadHcalPseudoCluster_cfi import * +from ..sequences.HLTPfClusteringECALSequence_cfi import * +from ..sequences.HLTPfClusteringHBHEHFSequence_cfi import * +from ..sequences.HLTPfClusteringHOSequence_cfi import * + +HLTParticleFlowClusterSequence = cms.Sequence(hltParticleFlowBadHcalPseudoCluster+HLTPfClusteringECALSequence+HLTPfClusteringHBHEHFSequence+HLTPfClusteringHOSequence) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTParticleFlowRecoSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTParticleFlowRecoSequence_cfi.py new file mode 100644 index 0000000000000..cae245069bed6 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTParticleFlowRecoSequence_cfi.py @@ -0,0 +1,9 @@ +import FWCore.ParameterSet.Config as cms + +from ..modules.hltFixedGridRhoFastjetAllTmp_cfi import * +from ..modules.hltParticleFlowBlock_cfi import * +from ..modules.hltParticleFlowTmp_cfi import * +from ..modules.hltParticleFlowTmpBarrel_cfi import * +from ..modules.hltPfTrack_cfi import * + +HLTParticleFlowRecoSequence = cms.Sequence(hltPfTrack+hltParticleFlowBlock+hltParticleFlowTmpBarrel+hltParticleFlowTmp+hltFixedGridRhoFastjetAllTmp) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTParticleFlowSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTParticleFlowSequence_cfi.py index e8e6f52365773..151c3de1d78d0 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTParticleFlowSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTParticleFlowSequence_cfi.py @@ -1,10 +1,10 @@ import FWCore.ParameterSet.Config as cms -from ..sequences.caloTowersRecSequence_cfi import * -from ..sequences.iterTICLSequence_cfi import * -from ..sequences.particleFlowClusterSequence_cfi import * -from ..sequences.particleFlowRecoSequence_cfi import * -from ..sequences.particleFlowSuperClusteringSequence_cfi import * -from ..sequences.vertexRecoSequence_cfi import * +from ..sequences.HLTCaloTowersRecSequence_cfi import * +from ..sequences.HLTIterTICLSequence_cfi import * +from ..sequences.HLTParticleFlowClusterSequence_cfi import * +from ..sequences.HLTParticleFlowRecoSequence_cfi import * +from ..sequences.HLTParticleFlowSuperClusteringSequence_cfi import * +from ..sequences.HLTVertexRecoSequence_cfi import * -HLTParticleFlowSequence = cms.Sequence(particleFlowClusterSequence+iterTICLSequence+vertexRecoSequence+particleFlowSuperClusteringSequence+caloTowersRecSequence+particleFlowRecoSequence) +HLTParticleFlowSequence = cms.Sequence(HLTParticleFlowClusterSequence+HLTIterTICLSequence+HLTVertexRecoSequence+HLTParticleFlowSuperClusteringSequence+HLTCaloTowersRecSequence+HLTParticleFlowRecoSequence) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTParticleFlowSuperClusteringSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTParticleFlowSuperClusteringSequence_cfi.py new file mode 100644 index 0000000000000..11c336dc9d706 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTParticleFlowSuperClusteringSequence_cfi.py @@ -0,0 +1,5 @@ +import FWCore.ParameterSet.Config as cms + +from ..modules.hltParticleFlowSuperClusterECAL_cfi import * + +HLTParticleFlowSuperClusteringSequence = cms.Sequence(hltParticleFlowSuperClusterECAL) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPfClusterRefsForJetsSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPfClusterRefsForJetsSequence_cfi.py new file mode 100644 index 0000000000000..61df322ffc3fb --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPfClusterRefsForJetsSequence_cfi.py @@ -0,0 +1,20 @@ +import FWCore.ParameterSet.Config as cms + +from ..modules.hltParticleFlowClusterHBHE_cfi import * +from ..modules.hltParticleFlowClusterHCAL_cfi import * +from ..modules.hltParticleFlowRecHitHBHE_cfi import * +from ..modules.hltParticleFlowClusterECAL_cfi import * +from ..modules.hltParticleFlowClusterECALUncorrected_cfi import * +from ..modules.hltParticleFlowClusterHF_cfi import * +from ..modules.hltParticleFlowClusterHO_cfi import * +from ..modules.hltParticleFlowRecHitECAL_cfi import * +from ..modules.hltParticleFlowRecHitHF_cfi import * +from ..modules.hltParticleFlowRecHitHO_cfi import * +from ..modules.hltPfClusterRefsForJets_cfi import * +from ..modules.hltPfClusterRefsForJetsECAL_cfi import * +from ..modules.hltPfClusterRefsForJetsHCAL_cfi import * +from ..modules.hltPfClusterRefsForJetsHF_cfi import * +from ..modules.hltPfClusterRefsForJetsHGCAL_cfi import * +from ..modules.hltPfClusterRefsForJetsHO_cfi import * + +HLTPfClusterRefsForJetsSequence = cms.Sequence(hltParticleFlowRecHitECAL+hltParticleFlowRecHitHF+hltParticleFlowRecHitHO+hltParticleFlowRecHitHBHE+hltParticleFlowClusterHBHE+hltParticleFlowClusterHCAL+hltParticleFlowClusterECAL+hltParticleFlowClusterECALUncorrected+hltParticleFlowClusterHF+hltParticleFlowClusterHO+hltPfClusterRefsForJetsECAL+hltPfClusterRefsForJetsHCAL+hltPfClusterRefsForJetsHF+hltPfClusterRefsForJetsHGCAL+hltPfClusterRefsForJetsHO+hltPfClusterRefsForJets) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPfClusteringECALSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPfClusteringECALSequence_cfi.py new file mode 100644 index 0000000000000..13ca75f63737d --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPfClusteringECALSequence_cfi.py @@ -0,0 +1,7 @@ +import FWCore.ParameterSet.Config as cms + +from ..modules.hltParticleFlowClusterECALUncorrected_cfi import * +from ..modules.hltParticleFlowRecHitECAL_cfi import * +from ..sequences.HLTParticleFlowClusterECALSequence_cfi import * + +HLTPfClusteringECALSequence = cms.Sequence(hltParticleFlowRecHitECAL+hltParticleFlowClusterECALUncorrected+HLTParticleFlowClusterECALSequence) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPfClusteringHBHEHFSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPfClusteringHBHEHFSequence_cfi.py new file mode 100644 index 0000000000000..c07456d49f741 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPfClusteringHBHEHFSequence_cfi.py @@ -0,0 +1,9 @@ +import FWCore.ParameterSet.Config as cms + +from ..modules.hltParticleFlowClusterHBHE_cfi import * +from ..modules.hltParticleFlowClusterHCAL_cfi import * +from ..modules.hltParticleFlowRecHitHBHE_cfi import * +from ..modules.hltParticleFlowClusterHF_cfi import * +from ..modules.hltParticleFlowRecHitHF_cfi import * + +HLTPfClusteringHBHEHFSequence = cms.Sequence(hltParticleFlowRecHitHBHE+hltParticleFlowClusterHBHE+hltParticleFlowClusterHCAL+hltParticleFlowRecHitHF+hltParticleFlowClusterHF) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPfClusteringHOSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPfClusteringHOSequence_cfi.py new file mode 100644 index 0000000000000..98ca633f86a0d --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPfClusteringHOSequence_cfi.py @@ -0,0 +1,6 @@ +import FWCore.ParameterSet.Config as cms + +from ..modules.hltParticleFlowClusterHO_cfi import * +from ..modules.hltParticleFlowRecHitHO_cfi import * + +HLTPfClusteringHOSequence = cms.Sequence(hltParticleFlowRecHitHO+hltParticleFlowClusterHO) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPhase2L3MuonGeneralTracksSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPhase2L3MuonGeneralTracksSequence_cfi.py index a414b3094f11f..1c9fbc4419dc4 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPhase2L3MuonGeneralTracksSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPhase2L3MuonGeneralTracksSequence_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -from ..modules.trackerClusterCheck_cfi import * +from ..modules.hltTrackerClusterCheck_cfi import * from ..modules.hltPhase2L3MuonPixelTracksTrackingRegions_cfi import * from ..modules.hltPhase2L3MuonPixelTracksSeedLayers_cfi import * from ..modules.hltPhase2L3MuonPixelTracksHitDoublets_cfi import * @@ -26,7 +26,7 @@ HLTPhase2L3MuonGeneralTracksSequence = cms.Sequence( - trackerClusterCheck + hltTrackerClusterCheck +hltPhase2L3MuonPixelTracksTrackingRegions +hltPhase2L3MuonPixelTracksSeedLayers +hltPhase2L3MuonPixelTracksHitDoublets diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/hltPhase2PixelTracksSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPhase2PixelTracksSequence_cfi.py similarity index 91% rename from HLTrigger/Configuration/python/HLT_75e33/sequences/hltPhase2PixelTracksSequence_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPhase2PixelTracksSequence_cfi.py index 1d5680c555205..b790cfca18f05 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/hltPhase2PixelTracksSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPhase2PixelTracksSequence_cfi.py @@ -8,4 +8,4 @@ from ..modules.hltPhase2PixelTracksHitSeeds_cfi import * from ..modules.hltPhase2PixelTracksSeedLayers_cfi import * -hltPhase2PixelTracksSequence = cms.Sequence(hltPhase2PixelTracksSeedLayers+hltPhase2PixelTracksAndHighPtStepTrackingRegions+hltPhase2PixelTracksHitDoublets+hltPhase2PixelTracksHitSeeds+hltPhase2PixelFitterByHelixProjections+hltPhase2PixelTrackFilterByKinematics+hltPhase2PixelTracks) +HLTPhase2PixelTracksSequence = cms.Sequence(hltPhase2PixelTracksSeedLayers+hltPhase2PixelTracksAndHighPtStepTrackingRegions+hltPhase2PixelTracksHitDoublets+hltPhase2PixelTracksHitSeeds+hltPhase2PixelFitterByHelixProjections+hltPhase2PixelTrackFilterByKinematics+hltPhase2PixelTracks) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTRawToDigiSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTRawToDigiSequence_cfi.py new file mode 100644 index 0000000000000..1ee1b9b276015 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTRawToDigiSequence_cfi.py @@ -0,0 +1,10 @@ +import FWCore.ParameterSet.Config as cms + +from ..modules.hltHgcalDigis_cfi import * +from ..modules.hltHcalDigis_cfi import * +from ..modules.hltMuonCSCDigis_cfi import * +from ..modules.hltMuonDTDigis_cfi import * +from ..modules.hltMuonGEMDigis_cfi import * +from ..sequences.HLTEcalDigisSequence_cfi import * + +HLTRawToDigiSequence = cms.Sequence(hltHgcalDigis+HLTEcalDigisSequence+hltHcalDigis+hltMuonCSCDigis+hltMuonDTDigis+hltMuonGEMDigis) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTTiclLayerTileSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTTiclLayerTileSequence_cfi.py new file mode 100644 index 0000000000000..96d22fd3b0a7a --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTTiclLayerTileSequence_cfi.py @@ -0,0 +1,5 @@ +import FWCore.ParameterSet.Config as cms + +from ..modules.hltTiclLayerTileProducer_cfi import * + +HLTTiclLayerTileSequence = cms.Sequence(hltTiclLayerTileProducer) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTTiclPFSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTTiclPFSequence_cfi.py new file mode 100644 index 0000000000000..8f6f8ed91e81a --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTTiclPFSequence_cfi.py @@ -0,0 +1,5 @@ +import FWCore.ParameterSet.Config as cms + +from ..modules.hltPfTICL_cfi import * + +HLTTiclPFSequence = cms.Sequence(hltPfTICL) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTTiclTracksterMergeSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTTiclTracksterMergeSequence_cfi.py new file mode 100644 index 0000000000000..41da827680889 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTTiclTracksterMergeSequence_cfi.py @@ -0,0 +1,5 @@ +import FWCore.ParameterSet.Config as cms + +from ..modules.hltTiclTrackstersMerge_cfi import * + +HLTTiclTracksterMergeSequence = cms.Sequence(hltTiclTrackstersMerge) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTTiclTrackstersCLUE3DHighStepSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTTiclTrackstersCLUE3DHighStepSequence_cfi.py new file mode 100644 index 0000000000000..6b770822829d1 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTTiclTrackstersCLUE3DHighStepSequence_cfi.py @@ -0,0 +1,7 @@ +import FWCore.ParameterSet.Config as cms + +from ..modules.hltFilteredLayerClustersCLUE3DHigh_cfi import * +from ..modules.hltTiclSeedingGlobal_cfi import * +from ..modules.hltTiclTrackstersCLUE3DHigh_cfi import * + +HLTTiclTrackstersCLUE3DHighStepSequence = cms.Sequence(hltFilteredLayerClustersCLUE3DHigh+hltTiclSeedingGlobal+hltTiclTrackstersCLUE3DHigh) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTTrackingV61Sequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTTrackingV61Sequence_cfi.py index 835ea0ffb0858..e10294c40bb74 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTTrackingV61Sequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTTrackingV61Sequence_cfi.py @@ -1,12 +1,12 @@ import FWCore.ParameterSet.Config as cms -from ..modules.generalTracks_cfi import * +from ..modules.hltGeneralTracks_cfi import * from ..modules.hltPhase2PixelVertices_cfi import * -from ..modules.trackerClusterCheck_cfi import * -from ..sequences.highPtTripletStepSequence_cfi import * -from ..sequences.hltPhase2PixelTracksSequence_cfi import * -from ..sequences.initialStepSequence_cfi import * -from ..sequences.itLocalRecoSequence_cfi import * -from ..sequences.otLocalRecoSequence_cfi import * +from ..modules.hltTrackerClusterCheck_cfi import * +from ..sequences.HLTHighPtTripletStepSequence_cfi import * +from ..sequences.HLTPhase2PixelTracksSequence_cfi import * +from ..sequences.HLTInitialStepSequence_cfi import * +from ..sequences.HLTItLocalRecoSequence_cfi import * +from ..sequences.HLTOtLocalRecoSequence_cfi import * -HLTTrackingV61Sequence = cms.Sequence((itLocalRecoSequence+otLocalRecoSequence+trackerClusterCheck+hltPhase2PixelTracksSequence+hltPhase2PixelVertices+initialStepSequence+highPtTripletStepSequence+generalTracks)) +HLTTrackingV61Sequence = cms.Sequence((HLTItLocalRecoSequence+HLTOtLocalRecoSequence+hltTrackerClusterCheck+HLTPhase2PixelTracksSequence+hltPhase2PixelVertices+HLTInitialStepSequence+HLTHighPtTripletStepSequence+hltGeneralTracks)) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTVertexRecoSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTVertexRecoSequence_cfi.py new file mode 100644 index 0000000000000..673bd6acaa3b2 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTVertexRecoSequence_cfi.py @@ -0,0 +1,9 @@ +import FWCore.ParameterSet.Config as cms + +from ..modules.hltOfflinePrimaryVertices_cfi import * +from ..modules.hltTrackRefsForJetsBeforeSorting_cfi import * +from ..modules.hltTrackWithVertexRefSelectorBeforeSorting_cfi import * +from ..modules.hltUnsortedOfflinePrimaryVertices_cfi import * +from ..sequences.HLTInitialStepPVSequence_cfi import * + +HLTVertexRecoSequence = cms.Sequence(HLTInitialStepPVSequence+hltUnsortedOfflinePrimaryVertices+hltTrackWithVertexRefSelectorBeforeSorting+hltTrackRefsForJetsBeforeSorting+hltOfflinePrimaryVertices) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/RawToDigiSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/RawToDigiSequence_cfi.py deleted file mode 100644 index 0ba8bc2fa3bc9..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/RawToDigiSequence_cfi.py +++ /dev/null @@ -1,10 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from ..modules.hgcalDigis_cfi import * -from ..modules.hltHcalDigis_cfi import * -from ..modules.muonCSCDigis_cfi import * -from ..modules.muonDTDigis_cfi import * -from ..modules.muonGEMDigis_cfi import * -from ..sequences.hltEcalDigisSequence_cfi import * - -RawToDigiSequence = cms.Sequence(hgcalDigis+hltEcalDigisSequence+hltHcalDigis+muonCSCDigis+muonDTDigis+muonGEMDigis) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/caloTowersRecSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/caloTowersRecSequence_cfi.py deleted file mode 100644 index 95ddc8b49e0fb..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/caloTowersRecSequence_cfi.py +++ /dev/null @@ -1,5 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from ..modules.towerMaker_cfi import * - -caloTowersRecSequence = cms.Sequence(towerMaker) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/hgcalLocalRecoSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/hgcalLocalRecoSequence_cfi.py deleted file mode 100644 index ce20d60171141..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/hgcalLocalRecoSequence_cfi.py +++ /dev/null @@ -1,38 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from ..modules.hgcalLayerClustersEE_cfi import * -from ..modules.hgcalLayerClustersHSci_cfi import * -from ..modules.hgcalLayerClustersHSi_cfi import * -from ..modules.hgcalMergeLayerClusters_cfi import * -from ..modules.HGCalRecHit_cfi import * -from ..modules.HGCalUncalibRecHit_cfi import * -# Heterogeneous HGCAL EE layer clusters -from ..modules.hltHgcalSoARecHitsProducer_cfi import * -from ..modules.hltHgcalSoARecHitsLayerClustersProducer_cfi import * -from ..modules.hltHgcalSoALayerClustersProducer_cfi import * -from ..modules.hltHgcalLayerClustersFromSoAProducer_cfi import * - -hgcalLocalRecoSequence = cms.Sequence( - HGCalUncalibRecHit+ - HGCalRecHit+ - hgcalLayerClustersEE+ - hgcalLayerClustersHSci+ - hgcalLayerClustersHSi+ - hgcalMergeLayerClusters) - -_hgcalLocalRecoSequence_heterogeneous = cms.Sequence( - HGCalUncalibRecHit+ - HGCalRecHit+ - hltHgcalSoARecHitsProducer+ - hltHgcalSoARecHitsLayerClustersProducer+ - hltHgcalSoALayerClustersProducer+ - hltHgCalLayerClustersFromSoAProducer+ - hgcalLayerClustersHSci+ - hgcalLayerClustersHSi+ - hgcalMergeLayerClusters) - -from Configuration.ProcessModifiers.alpaka_cff import alpaka -alpaka.toReplaceWith(hgcalLocalRecoSequence, _hgcalLocalRecoSequence_heterogeneous) -alpaka.toModify(hgcalMergeLayerClusters, - layerClustersEE = cms.InputTag("hltHgCalLayerClustersFromSoAProducer"), - time_layerclustersEE = cms.InputTag("hltHgCalLayerClustersFromSoAProducer", "timeLayerCluster")) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/highPtTripletStepSeedingSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/highPtTripletStepSeedingSequence_cfi.py deleted file mode 100644 index 0282723730411..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/highPtTripletStepSeedingSequence_cfi.py +++ /dev/null @@ -1,9 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from ..modules.highPtTripletStepClusters_cfi import * -from ..modules.highPtTripletStepHitDoublets_cfi import * -from ..modules.highPtTripletStepHitTriplets_cfi import * -from ..modules.highPtTripletStepSeedLayers_cfi import * -from ..modules.highPtTripletStepSeeds_cfi import * - -highPtTripletStepSeedingSequence = cms.Sequence(highPtTripletStepClusters+highPtTripletStepSeedLayers+highPtTripletStepHitDoublets+highPtTripletStepHitTriplets+highPtTripletStepSeeds) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/highPtTripletStepSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/highPtTripletStepSequence_cfi.py deleted file mode 100644 index 08627a0c004e7..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/highPtTripletStepSequence_cfi.py +++ /dev/null @@ -1,9 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from ..modules.highPtTripletStepTrackCandidates_cfi import * -from ..modules.highPtTripletStepTrackCutClassifier_cfi import * -from ..modules.highPtTripletStepTracks_cfi import * -from ..modules.highPtTripletStepTrackSelectionHighPurity_cfi import * -from ..sequences.highPtTripletStepSeedingSequence_cfi import * - -highPtTripletStepSequence = cms.Sequence(highPtTripletStepSeedingSequence+highPtTripletStepTrackCandidates+highPtTripletStepTracks+highPtTripletStepTrackCutClassifier+highPtTripletStepTrackSelectionHighPurity) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/initialStepPVSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/initialStepPVSequence_cfi.py deleted file mode 100644 index bb4f43aec0079..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/initialStepPVSequence_cfi.py +++ /dev/null @@ -1,7 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from ..modules.ak4CaloJetsForTrk_cfi import * -from ..modules.firstStepPrimaryVerticesUnsorted_cfi import * -from ..modules.hltPhase2TowerMakerForAll_cfi import * - -initialStepPVSequence = cms.Sequence(firstStepPrimaryVerticesUnsorted+hltPhase2TowerMakerForAll+ak4CaloJetsForTrk) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/initialStepSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/initialStepSequence_cfi.py deleted file mode 100644 index bae62566de328..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/initialStepSequence_cfi.py +++ /dev/null @@ -1,9 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from ..modules.initialStepSeeds_cfi import * -from ..modules.initialStepTrackCandidates_cfi import * -from ..modules.initialStepTrackCutClassifier_cfi import * -from ..modules.initialStepTracks_cfi import * -from ..modules.initialStepTrackSelectionHighPurity_cfi import * - -initialStepSequence = cms.Sequence(initialStepSeeds+initialStepTrackCandidates+initialStepTracks+initialStepTrackCutClassifier+initialStepTrackSelectionHighPurity) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/itLocalRecoSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/itLocalRecoSequence_cfi.py deleted file mode 100644 index 05d40c62d4ec7..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/itLocalRecoSequence_cfi.py +++ /dev/null @@ -1,8 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from ..modules.siPhase2Clusters_cfi import * -from ..modules.siPixelClusters_cfi import * -from ..modules.siPixelClusterShapeCache_cfi import * -from ..modules.siPixelRecHits_cfi import * - -itLocalRecoSequence = cms.Sequence(siPhase2Clusters+siPixelClusters+siPixelClusterShapeCache+siPixelRecHits) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/iterTICLSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/iterTICLSequence_cfi.py deleted file mode 100644 index 4607f7662eebd..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/iterTICLSequence_cfi.py +++ /dev/null @@ -1,14 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from ..sequences.ticlLayerTileSequence_cfi import * -from ..sequences.ticlPFSequence_cfi import * -from ..sequences.ticlTracksterMergeSequence_cfi import * -from ..sequences.ticlTrackstersCLUE3DHighStepSequence_cfi import * -from ..sequences.HLTTiclTrackstersPassthroughSequence_cfi import * -from ..sequences.HLTTiclTracksterLinksSequence_cfi import * -from ..sequences.HLTTiclCandidateSequence_cfi import * - -iterTICLSequence = cms.Sequence(ticlLayerTileSequence+ticlTrackstersCLUE3DHighStepSequence+ticlTracksterMergeSequence+ticlPFSequence) - -from Configuration.ProcessModifiers.ticl_v5_cff import ticl_v5 -ticl_v5.toReplaceWith(iterTICLSequence, cms.Sequence(ticlLayerTileSequence+ticlTrackstersCLUE3DHighStepSequence+HLTTiclTrackstersPassthroughSequence+HLTTiclTracksterLinksSequence+HLTTiclCandidateSequence+ticlPFSequence)) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/localrecoSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/localrecoSequence_cfi.py deleted file mode 100644 index 1b674911e3f6a..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/localrecoSequence_cfi.py +++ /dev/null @@ -1,6 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from ..modules.bunchSpacingProducer_cfi import * -from ..sequences.calolocalrecoSequence_cfi import * - -localrecoSequence = cms.Sequence(bunchSpacingProducer+calolocalrecoSequence) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/muonlocalrecoSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/muonlocalrecoSequence_cfi.py deleted file mode 100644 index a925367e33221..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/muonlocalrecoSequence_cfi.py +++ /dev/null @@ -1,8 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from ..modules.hltRpcRecHits_cfi import * -from ..sequences.csclocalrecoSequence_cfi import * -from ..sequences.dtlocalrecoSequence_cfi import * -from ..sequences.gemLocalRecoSequence_cfi import * - -muonlocalrecoSequence = cms.Sequence(csclocalrecoSequence+dtlocalrecoSequence+gemLocalRecoSequence+hltRpcRecHits) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/otLocalRecoSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/otLocalRecoSequence_cfi.py deleted file mode 100644 index f764321ac3507..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/otLocalRecoSequence_cfi.py +++ /dev/null @@ -1,5 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from ..modules.MeasurementTrackerEvent_cfi import * - -otLocalRecoSequence = cms.Sequence(MeasurementTrackerEvent) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/particleFlowClusterECALSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/particleFlowClusterECALSequence_cfi.py deleted file mode 100644 index 9e9316f82399e..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/particleFlowClusterECALSequence_cfi.py +++ /dev/null @@ -1,7 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from ..modules.ecalBarrelClusterFastTimer_cfi import * -from ..modules.particleFlowClusterECAL_cfi import * -from ..modules.particleFlowTimeAssignerECAL_cfi import * - -particleFlowClusterECALSequence = cms.Sequence(ecalBarrelClusterFastTimer+particleFlowTimeAssignerECAL+particleFlowClusterECAL) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/particleFlowClusterSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/particleFlowClusterSequence_cfi.py deleted file mode 100644 index d342d1ed84374..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/particleFlowClusterSequence_cfi.py +++ /dev/null @@ -1,8 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from ..modules.particleFlowBadHcalPseudoCluster_cfi import * -from ..sequences.pfClusteringECALSequence_cfi import * -from ..sequences.pfClusteringHBHEHFSequence_cfi import * -from ..sequences.pfClusteringHOSequence_cfi import * - -particleFlowClusterSequence = cms.Sequence(particleFlowBadHcalPseudoCluster+pfClusteringECALSequence+pfClusteringHBHEHFSequence+pfClusteringHOSequence) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/particleFlowRecoSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/particleFlowRecoSequence_cfi.py deleted file mode 100644 index cf2f815ec1f32..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/particleFlowRecoSequence_cfi.py +++ /dev/null @@ -1,9 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from ..modules.fixedGridRhoFastjetAllTmp_cfi import * -from ..modules.particleFlowBlock_cfi import * -from ..modules.particleFlowTmp_cfi import * -from ..modules.particleFlowTmpBarrel_cfi import * -from ..modules.pfTrack_cfi import * - -particleFlowRecoSequence = cms.Sequence(pfTrack+particleFlowBlock+particleFlowTmpBarrel+particleFlowTmp+fixedGridRhoFastjetAllTmp) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/particleFlowSuperClusteringSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/particleFlowSuperClusteringSequence_cfi.py deleted file mode 100644 index ca1230457c8e2..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/particleFlowSuperClusteringSequence_cfi.py +++ /dev/null @@ -1,5 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from ..modules.particleFlowSuperClusterECAL_cfi import * - -particleFlowSuperClusteringSequence = cms.Sequence(particleFlowSuperClusterECAL) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/pfClusterRefsForJetsSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/pfClusterRefsForJetsSequence_cfi.py deleted file mode 100644 index 18e04d108a4c1..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/pfClusterRefsForJetsSequence_cfi.py +++ /dev/null @@ -1,20 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from ..modules.hltParticleFlowClusterHBHE_cfi import * -from ..modules.hltParticleFlowClusterHCAL_cfi import * -from ..modules.hltParticleFlowRecHitHBHE_cfi import * -from ..modules.particleFlowClusterECAL_cfi import * -from ..modules.particleFlowClusterECALUncorrected_cfi import * -from ..modules.particleFlowClusterHF_cfi import * -from ..modules.particleFlowClusterHO_cfi import * -from ..modules.particleFlowRecHitECAL_cfi import * -from ..modules.particleFlowRecHitHF_cfi import * -from ..modules.particleFlowRecHitHO_cfi import * -from ..modules.pfClusterRefsForJets_cfi import * -from ..modules.pfClusterRefsForJetsECAL_cfi import * -from ..modules.pfClusterRefsForJetsHCAL_cfi import * -from ..modules.pfClusterRefsForJetsHF_cfi import * -from ..modules.pfClusterRefsForJetsHGCAL_cfi import * -from ..modules.pfClusterRefsForJetsHO_cfi import * - -pfClusterRefsForJetsSequence = cms.Sequence(particleFlowRecHitECAL+particleFlowRecHitHF+particleFlowRecHitHO+hltParticleFlowRecHitHBHE+hltParticleFlowClusterHBHE+hltParticleFlowClusterHCAL+particleFlowClusterECAL+particleFlowClusterECALUncorrected+particleFlowClusterHF+particleFlowClusterHO+pfClusterRefsForJetsECAL+pfClusterRefsForJetsHCAL+pfClusterRefsForJetsHF+pfClusterRefsForJetsHGCAL+pfClusterRefsForJetsHO+pfClusterRefsForJets) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/pfClusteringECALSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/pfClusteringECALSequence_cfi.py deleted file mode 100644 index 305376e29656e..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/pfClusteringECALSequence_cfi.py +++ /dev/null @@ -1,7 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from ..modules.particleFlowClusterECALUncorrected_cfi import * -from ..modules.particleFlowRecHitECAL_cfi import * -from ..sequences.particleFlowClusterECALSequence_cfi import * - -pfClusteringECALSequence = cms.Sequence(particleFlowRecHitECAL+particleFlowClusterECALUncorrected+particleFlowClusterECALSequence) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/pfClusteringHBHEHFSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/pfClusteringHBHEHFSequence_cfi.py deleted file mode 100644 index 4cd50687cdea8..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/pfClusteringHBHEHFSequence_cfi.py +++ /dev/null @@ -1,9 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from ..modules.hltParticleFlowClusterHBHE_cfi import * -from ..modules.hltParticleFlowClusterHCAL_cfi import * -from ..modules.hltParticleFlowRecHitHBHE_cfi import * -from ..modules.particleFlowClusterHF_cfi import * -from ..modules.particleFlowRecHitHF_cfi import * - -pfClusteringHBHEHFSequence = cms.Sequence(hltParticleFlowRecHitHBHE+hltParticleFlowClusterHBHE+hltParticleFlowClusterHCAL+particleFlowRecHitHF+particleFlowClusterHF) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/pfClusteringHOSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/pfClusteringHOSequence_cfi.py deleted file mode 100644 index 363a6a249264f..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/pfClusteringHOSequence_cfi.py +++ /dev/null @@ -1,6 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from ..modules.particleFlowClusterHO_cfi import * -from ..modules.particleFlowRecHitHO_cfi import * - -pfClusteringHOSequence = cms.Sequence(particleFlowRecHitHO+particleFlowClusterHO) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/ticlLayerTileSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/ticlLayerTileSequence_cfi.py deleted file mode 100644 index 41c6ef4be1de4..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/ticlLayerTileSequence_cfi.py +++ /dev/null @@ -1,5 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from ..modules.ticlLayerTileProducer_cfi import * - -ticlLayerTileSequence = cms.Sequence(ticlLayerTileProducer) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/ticlPFSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/ticlPFSequence_cfi.py deleted file mode 100644 index f16eaacb00c97..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/ticlPFSequence_cfi.py +++ /dev/null @@ -1,5 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from ..modules.pfTICL_cfi import * - -ticlPFSequence = cms.Sequence(pfTICL) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/ticlTracksterMergeSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/ticlTracksterMergeSequence_cfi.py deleted file mode 100644 index 9b536032427e8..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/ticlTracksterMergeSequence_cfi.py +++ /dev/null @@ -1,5 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from ..modules.ticlTrackstersMerge_cfi import * - -ticlTracksterMergeSequence = cms.Sequence(ticlTrackstersMerge) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/ticlTrackstersCLUE3DHighStepSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/ticlTrackstersCLUE3DHighStepSequence_cfi.py deleted file mode 100644 index 81e2faa44318b..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/ticlTrackstersCLUE3DHighStepSequence_cfi.py +++ /dev/null @@ -1,7 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from ..modules.filteredLayerClustersCLUE3DHigh_cfi import * -from ..modules.ticlSeedingGlobal_cfi import * -from ..modules.ticlTrackstersCLUE3DHigh_cfi import * - -ticlTrackstersCLUE3DHighStepSequence = cms.Sequence(filteredLayerClustersCLUE3DHigh+ticlSeedingGlobal+ticlTrackstersCLUE3DHigh) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/vertexRecoSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/vertexRecoSequence_cfi.py deleted file mode 100644 index 7fa8ee2aa9fc1..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/vertexRecoSequence_cfi.py +++ /dev/null @@ -1,9 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from ..modules.offlinePrimaryVertices_cfi import * -from ..modules.trackRefsForJetsBeforeSorting_cfi import * -from ..modules.trackWithVertexRefSelectorBeforeSorting_cfi import * -from ..modules.unsortedOfflinePrimaryVertices_cfi import * -from ..sequences.initialStepPVSequence_cfi import * - -vertexRecoSequence = cms.Sequence(initialStepPVSequence+unsortedOfflinePrimaryVertices+trackWithVertexRefSelectorBeforeSorting+trackRefsForJetsBeforeSorting+offlinePrimaryVertices) diff --git a/HLTrigger/Configuration/python/HLT_75e33_cff.py b/HLTrigger/Configuration/python/HLT_75e33_cff.py index 743004903dda5..0d05897484fe8 100644 --- a/HLTrigger/Configuration/python/HLT_75e33_cff.py +++ b/HLTrigger/Configuration/python/HLT_75e33_cff.py @@ -232,14 +232,14 @@ fragment.load("HLTrigger/Configuration/HLT_75e33/psets/TrajectoryFilterForConversions_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/psets/TrajectoryFilterForElectrons_cfi") -fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/calolocalrecoSequence_cfi") -fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/caloTowersRecSequence_cfi") -fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/csclocalrecoSequence_cfi") -fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/dtlocalrecoSequence_cfi") -fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/gemLocalRecoSequence_cfi") -fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/hgcalLocalRecoSequence_cfi") -fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/highPtTripletStepSeedingSequence_cfi") -fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/highPtTripletStepSequence_cfi") +fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTCalolocalrecoSequence_cfi") +fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTCaloTowersRecSequence_cfi") +fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTCsclocalrecoSequence_cfi") +fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTDtlocalrecoSequence_cfi") +fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTGemLocalRecoSequence_cfi") +fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTHgcalLocalRecoSequence_cfi") +fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTHighPtTripletStepSeedingSequence_cfi") +fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTHighPtTripletStepSequence_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTAK4PFJetsReconstruction_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTAK4PFPuppiJetsReconstruction_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTAK8PFJetsReconstruction_cfi") @@ -260,7 +260,7 @@ fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTDoubleEle2312IsoL1SeededSequence_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTDoubleEle25CaloIdLPMS2L1SeededSequence_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTDoubleEle25CaloIdLPMS2UnseededSequence_cfi") -fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/hltEcalDigisSequence_cfi") +fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTEcalDigisSequence_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTEGammaDoLocalHcalSequence_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTEle115NonIsoL1SeededGsfElectronL1SeededSequence_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTEle115NonIsoL1SeededSequence_cfi") @@ -301,16 +301,16 @@ fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTPhase2L3FromL1TkSequence_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTPhase2L3MuonsSequence_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTPhase2L3OISequence_cfi") -fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/hltPhase2PixelTracksSequence_cfi") +fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTPhase2PixelTracksSequence_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTPhoton108EBTightIDTightIsoL1SeededSequence_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTPhoton108EBTightIDTightIsoUnseededSequence_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTPhoton187L1SeededSequence_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTPhoton187UnseededSequence_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTTrackingV61Sequence_cfi") -fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/initialStepPVSequence_cfi") -fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/initialStepSequence_cfi") -fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/iterTICLSequence_cfi") -fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/itLocalRecoSequence_cfi") +fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTInitialStepPVSequence_cfi") +fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTInitialStepSequence_cfi") +fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTIterTICLSequence_cfi") +fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTItLocalRecoSequence_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/L1TTkEle25TkEle12Sequence_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/L1TTkEle36Sequence_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/L1TTkEm37TkEm24Sequence_cfi") @@ -319,23 +319,23 @@ fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/L1TTkIsoEle28Sequence_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/L1TTkIsoEm22TkIsoEm12Sequence_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/L1TTkIsoEm36Sequence_cfi") -fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/localrecoSequence_cfi") -fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/muonlocalrecoSequence_cfi") -fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/otLocalRecoSequence_cfi") -fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/particleFlowClusterECALSequence_cfi") -fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/particleFlowClusterSequence_cfi") -fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/particleFlowRecoSequence_cfi") -fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/particleFlowSuperClusteringSequence_cfi") -fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/pfClusteringECALSequence_cfi") -fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/pfClusteringHBHEHFSequence_cfi") -fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/pfClusteringHOSequence_cfi") -fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/pfClusterRefsForJetsSequence_cfi") -fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/RawToDigiSequence_cfi") -fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/ticlLayerTileSequence_cfi") -fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/ticlPFSequence_cfi") -fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/ticlTracksterMergeSequence_cfi") -fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/ticlTrackstersCLUE3DHighStepSequence_cfi") -fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/vertexRecoSequence_cfi") +fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTLocalrecoSequence_cfi") +fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTMuonlocalrecoSequence_cfi") +fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTOtLocalRecoSequence_cfi") +fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTParticleFlowClusterECALSequence_cfi") +fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTParticleFlowClusterSequence_cfi") +fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTParticleFlowRecoSequence_cfi") +fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTParticleFlowSuperClusteringSequence_cfi") +fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTPfClusteringECALSequence_cfi") +fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTPfClusteringHBHEHFSequence_cfi") +fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTPfClusteringHOSequence_cfi") +fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTPfClusterRefsForJetsSequence_cfi") +fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTRawToDigiSequence_cfi") +fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTTiclLayerTileSequence_cfi") +fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTTiclPFSequence_cfi") +fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTTiclTracksterMergeSequence_cfi") +fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTTiclTrackstersCLUE3DHighStepSequence_cfi") +fragment.load("HLTrigger/Configuration/HLT_75e33/sequences/HLTVertexRecoSequence_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/services/DQMStore_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/services/FastTimerService_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/services/MessageLogger_cfi") diff --git a/HLTriggerOffline/Common/python/HLTValidation_cff.py b/HLTriggerOffline/Common/python/HLTValidation_cff.py index 81781070d2361..fd92252babbf6 100644 --- a/HLTriggerOffline/Common/python/HLTValidation_cff.py +++ b/HLTriggerOffline/Common/python/HLTValidation_cff.py @@ -22,9 +22,9 @@ from Validation.HGCalValidation.hgcalHitCalibrationDefault_cfi import hgcalHitCalibrationDefault as _hgcalHitCalibrationDefault hgcalHitCalibrationHLT = _hgcalHitCalibrationDefault.clone() hgcalHitCalibrationHLT.folder = "HGCalHitCalibrationHLT" -hgcalHitCalibrationHLT.recHitsEE = cms.InputTag("HGCalRecHit", "HGCEERecHits", "HLT") -hgcalHitCalibrationHLT.recHitsFH = cms.InputTag("HGCalRecHit", "HGCHEFRecHits", "HLT") -hgcalHitCalibrationHLT.recHitsBH = cms.InputTag("HGCalRecHit", "HGCHEBRecHits", "HLT") +hgcalHitCalibrationHLT.recHitsEE = cms.InputTag("hltHGCalRecHit", "HGCEERecHits", "HLT") +hgcalHitCalibrationHLT.recHitsFH = cms.InputTag("hltHGCalRecHit", "HGCHEFRecHits", "HLT") +hgcalHitCalibrationHLT.recHitsBH = cms.InputTag("hltHGCalRecHit", "HGCHEBRecHits", "HLT") hgcalHitCalibrationHLT.hgcalMultiClusters = cms.InputTag("None") hgcalHitCalibrationHLT.electrons = cms.InputTag("None") hgcalHitCalibrationHLT.photons = cms.InputTag("None") diff --git a/RecoHGCal/Configuration/python/RecoHGCal_EventContent_cff.py b/RecoHGCal/Configuration/python/RecoHGCal_EventContent_cff.py index 4952089002906..2616e1c66589a 100644 --- a/RecoHGCal/Configuration/python/RecoHGCal_EventContent_cff.py +++ b/RecoHGCal/Configuration/python/RecoHGCal_EventContent_cff.py @@ -3,6 +3,7 @@ from RecoHGCal.TICL.iterativeTICL_cff import ticlIterLabelsMerge trackstersIters = ['keep *_ticlTracksters'+iteration+'_*_*' for iteration in ticlIterLabelsMerge] +trackstersHLTIters = ['keep *_hltTiclTracksters'+iteration+'_*_*' for iteration in ticlIterLabelsMerge] #AOD content TICL_AOD = cms.PSet( @@ -33,8 +34,7 @@ outputCommands = cms.untracked.vstring( [ 'drop *_ticlTracksters*_*_*', - 'keep *_ticlTrackstersCLUE3DEM_*_*', - 'keep *_ticlTrackstersCLUE3DHAD_*_*', + 'keep *_ticlTrackstersCLUE3DHigh_*_*', 'keep *_ticlTracksterLinks_*_*', 'keep *_ticlCandidate_*_*', ] @@ -65,9 +65,28 @@ TICLv5_FEVT.outputCommands.extend(TICLv5_RECO.outputCommands) +TICL_FEVTHLT = cms.PSet( + outputCommands = cms.untracked.vstring( + trackstersHLTIters + + ['keep *_hltPfTICL_*_*'] + ) +) +TICL_FEVTHLT.outputCommands.extend(TICL_FEVT.outputCommands) +TICLv5_FEVTHLT = cms.PSet( + outputCommands = cms.untracked.vstring( + [ + 'drop *_hltTiclTracksters*_*_*', + 'keep *_hltTiclTrackstersCLUE3D*_*_*', + 'keep *_hltTiclTracksterLinks_*_*', + 'keep *_hltTiclCandidate_*_*', + 'keep *_hltPfTICL_*_*', + ] + ) +) +TICLv5_FEVTHLT.outputCommands.extend(TICLv5_FEVT.outputCommands) def customiseHGCalOnlyEventContent(process): def cleanOutputAndSet(outputModule, ticl_outputCommads): @@ -96,7 +115,7 @@ def cleanOutputAndSet(outputModule, ticl_outputCommads): if hasattr(process, 'FEVTDEBUGEventContent'): cleanOutputAndSet(process.FEVTDEBUGEventContent, TICL_FEVT.outputCommands) if hasattr(process, 'FEVTDEBUGHLToutput'): - cleanOutputAndSet(process.FEVTDEBUGHLToutput, TICL_FEVT.outputCommands) + cleanOutputAndSet(process.FEVTDEBUGHLToutput, TICL_FEVTHLT.outputCommands) return process @@ -109,7 +128,7 @@ def cleanOutputAndSet(outputModule, ticl_outputCommands): if hasattr(process, 'FEVTDEBUGEventContent'): cleanOutputAndSet(process.FEVTDEBUGEventContent, TICLv5_FEVT.outputCommands) if hasattr(process, 'FEVTDEBUGHLToutput'): - cleanOutputAndSet(process.FEVTDEBUGHLToutput, TICLv5_FEVT.outputCommands) + cleanOutputAndSet(process.FEVTDEBUGHLToutput, TICLv5_FEVTHLT.outputCommands) if hasattr(process, 'FEVTEventContent'): cleanOutputAndSet(process.FEVTEventContent, TICLv5_FEVT.outputCommands) diff --git a/Validation/RecoTrack/python/HLTmultiTrackValidator_cff.py b/Validation/RecoTrack/python/HLTmultiTrackValidator_cff.py index 5f90844c6f01b..f594a6d0b475f 100644 --- a/Validation/RecoTrack/python/HLTmultiTrackValidator_cff.py +++ b/Validation/RecoTrack/python/HLTmultiTrackValidator_cff.py @@ -32,7 +32,7 @@ def _modifyForRun3(trackvalidator): run3_common.toModify(hltTrackValidator, _modifyForRun3) def _modifyForPhase2(trackvalidator): - trackvalidator.label = ["generalTracks::HLT","hltPhase2PixelTracks"] + trackvalidator.label = ["hltGeneralTracks","hltPhase2PixelTracks"] from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker phase2_tracker.toModify(hltTrackValidator, _modifyForPhase2) diff --git a/Validation/RecoTrack/python/associators_cff.py b/Validation/RecoTrack/python/associators_cff.py index 2b888e98d55f3..6f69b9e8e7fd5 100644 --- a/Validation/RecoTrack/python/associators_cff.py +++ b/Validation/RecoTrack/python/associators_cff.py @@ -14,8 +14,8 @@ ) def _modifyForPhase2(tpClusterProducer): - tpClusterProducer.pixelClusterSrc = "siPixelClusters::HLT" - tpClusterProducer.phase2OTClusterSrc = "siPhase2Clusters::HLT" + tpClusterProducer.pixelClusterSrc = "hltSiPixelClusters" + tpClusterProducer.phase2OTClusterSrc = "hltSiPhase2Clusters" from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker phase2_tracker.toModify(hltTPClusterProducer, _modifyForPhase2) diff --git a/Validation/RecoVertex/python/HLTmultiPVvalidator_cff.py b/Validation/RecoVertex/python/HLTmultiPVvalidator_cff.py index f065f1b0815bc..6276de92035d8 100644 --- a/Validation/RecoVertex/python/HLTmultiPVvalidator_cff.py +++ b/Validation/RecoVertex/python/HLTmultiPVvalidator_cff.py @@ -48,14 +48,14 @@ def _modifyPixelPVanalysisForPhase2(pvanalysis): ) tpToHLTphase2TrackAssociation = tpToHLTpixelTrackAssociation.clone( - label_tr = "generalTracks::HLT" + label_tr = "hltGeneralTracks" ) vertexAssociatorByPositionAndTracks4phase2HLTTracks = _VertexAssociatorByPositionAndTracks.clone( trackAssociation = "tpToHLTphase2TrackAssociation" ) def _modifyFullPVanalysisForPhase2(pvanalysis): - pvanalysis.vertexRecoCollections = ["offlinePrimaryVertices::HLT"] + pvanalysis.vertexRecoCollections = ["hltOfflinePrimaryVertices"] pvanalysis.trackAssociatorMap = "tpToHLTphase2TrackAssociation" pvanalysis.vertexAssociator = "vertexAssociatorByPositionAndTracks4phase2HLTTracks"