diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/ak4CaloJetsForTrk_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/ak4CaloJetsForTrk_cfi.py index d123580d98620..5b4a7c10be22f 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/ak4CaloJetsForTrk_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/ak4CaloJetsForTrk_cfi.py @@ -26,7 +26,7 @@ puPtMin = cms.double(10), rParam = cms.double(0.4), radiusPU = cms.double(0.5), - src = cms.InputTag("caloTowerForTrk"), + src = cms.InputTag("hltPhase2TowerMakerForAll"), srcPVs = cms.InputTag("firstStepPrimaryVerticesUnsorted"), useDeterministicSeed = cms.bool(True), voronoiRfact = cms.double(-0.9) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/caloTowerForTrk_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/caloTowerForTrk_cfi.py deleted file mode 100644 index 003aa63bcf3a5..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/caloTowerForTrk_cfi.py +++ /dev/null @@ -1,78 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -caloTowerForTrk = 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), - EBThreshold = cms.double(0.07), - EBWeight = cms.double(1.0), - EBWeights = cms.vdouble(1.0, 1.0, 1.0, 1.0, 1.0), - EEGrid = cms.vdouble(-1.0, 1.0, 10.0, 100.0, 1000.0), - EESumThreshold = cms.double(0.45), - EEThreshold = cms.double(0.3), - EEWeight = cms.double(1.0), - EEWeights = cms.vdouble(1.0, 1.0, 1.0, 1.0, 1.0), - EcalRecHitSeveritiesToBeExcluded = cms.vstring( - 'kTime', - 'kWeird', - 'kBad' - ), - EcalSeveritiesToBeUsedInBadTowers = cms.vstring(), - EcutTower = cms.double(-1000.0), - HBGrid = cms.vdouble(-1.0, 1.0, 10.0, 100.0, 1000.0), - HBThreshold = cms.double(1.2), - HBThreshold1 = cms.double(0.8), - HBThreshold2 = cms.double(1.2), - HBWeight = cms.double(1.0), - HBWeights = cms.vdouble(1.0, 1.0, 1.0, 1.0, 1.0), - HEDGrid = cms.vdouble(-1.0, 1.0, 10.0, 100.0, 1000.0), - HEDThreshold = cms.double(0.2), - HEDThreshold1 = cms.double(0.1), - HEDWeight = cms.double(1.0), - HEDWeights = cms.vdouble(1.0, 1.0, 1.0, 1.0, 1.0), - HESGrid = cms.vdouble(-1.0, 1.0, 10.0, 100.0, 1000.0), - HESThreshold = cms.double(0.2), - HESThreshold1 = cms.double(0.1), - HESWeight = cms.double(1.0), - HESWeights = cms.vdouble(1.0, 1.0, 1.0, 1.0, 1.0), - HF1Grid = cms.vdouble(-1.0, 1.0, 10.0, 100.0, 1000.0), - HF1Threshold = cms.double(0.5), - HF1Weight = cms.double(1.0), - HF1Weights = cms.vdouble(1.0, 1.0, 1.0, 1.0, 1.0), - HF2Grid = cms.vdouble(-1.0, 1.0, 10.0, 100.0, 1000.0), - HF2Threshold = cms.double(0.85), - HF2Weight = cms.double(1.0), - HF2Weights = cms.vdouble(1.0, 1.0, 1.0, 1.0, 1.0), - HOGrid = cms.vdouble(-1.0, 1.0, 10.0, 100.0, 1000.0), - HOThreshold0 = cms.double(1.1), - HOThresholdMinus1 = cms.double(3.5), - HOThresholdMinus2 = cms.double(3.5), - HOThresholdPlus1 = cms.double(3.5), - HOThresholdPlus2 = cms.double(3.5), - HOWeight = cms.double(1.0), - HOWeights = cms.vdouble(1.0, 1.0, 1.0, 1.0, 1.0), - HcalAcceptSeverityLevel = cms.uint32(9), - HcalAcceptSeverityLevelForRejectedHit = cms.uint32(9999), - HcalPhase = cms.int32(1), - HcalThreshold = cms.double(-1000.0), - MomConstrMethod = cms.int32(1), - MomEBDepth = cms.double(0.3), - MomEEDepth = cms.double(0.0), - MomHBDepth = cms.double(0.2), - MomHEDepth = cms.double(0.4), - UseEcalRecoveredHits = cms.bool(False), - UseEtEBTreshold = cms.bool(False), - UseEtEETreshold = cms.bool(False), - UseHO = cms.bool(True), - UseHcalRecoveredHits = cms.bool(True), - UseRejectedHitsOnly = cms.bool(False), - UseRejectedRecoveredEcalHits = cms.bool(False), - UseRejectedRecoveredHcalHits = cms.bool(True), - UseSymEBTreshold = cms.bool(True), - UseSymEETreshold = cms.bool(True), - ecalInputs = cms.VInputTag(cms.InputTag("ecalRecHit","EcalRecHitsEB"), cms.InputTag("ecalRecHit","EcalRecHitsEE")), - hbheInput = cms.InputTag("hltHbhereco"), - hfInput = cms.InputTag("hfreco"), - hoInput = cms.InputTag("horeco"), - missingHcalRescaleFactorForEcal = cms.double(0) -) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/highPtTripletStepHitDoublets_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/highPtTripletStepHitDoublets_cfi.py index 0e257d8f05c98..d145b5cd9e991 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/highPtTripletStepHitDoublets_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/highPtTripletStepHitDoublets_cfi.py @@ -9,6 +9,6 @@ produceIntermediateHitDoublets = cms.bool(True), produceSeedingHitSets = cms.bool(False), seedingLayers = cms.InputTag("highPtTripletStepSeedLayers"), - trackingRegions = cms.InputTag("highPtTripletStepTrackingRegions"), + trackingRegions = cms.InputTag("hltPhase2PixelTracksAndHighPtStepTrackingRegions"), trackingRegionsSeedingLayers = cms.InputTag("") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/highPtTripletStepTrackCutClassifier_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/highPtTripletStepTrackCutClassifier_cfi.py index 5eba55bef572b..7a9d90cde5e29 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/highPtTripletStepTrackCutClassifier_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/highPtTripletStepTrackCutClassifier_cfi.py @@ -30,5 +30,5 @@ ), qualityCuts = cms.vdouble(-0.7, 0.1, 0.7), src = cms.InputTag("highPtTripletStepTracks"), - vertices = cms.InputTag("pixelVertices") + vertices = cms.InputTag("hltPhase2PixelVertices") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL3MuonsPhase2L3OI_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL3MuonsPhase2L3OI_cfi.py index 6431aba0f2182..f86b6f0120b42 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL3MuonsPhase2L3OI_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL3MuonsPhase2L3OI_cfi.py @@ -72,7 +72,7 @@ input = cms.InputTag("hltL2MuonsFromL1TkMuon","UpdatedAtVtx"), maxRegions = cms.int32(2), precise = cms.bool(True), - vertexCollection = cms.InputTag("pixelVertices") + vertexCollection = cms.InputTag("hltPhase2PixelVertices") ), PCut = cms.double(2.5), PtCut = cms.double(1.0), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3FromL1TkMuonPixelTracks_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3FromL1TkMuonPixelTracks_cfi.py index d517e2e4fea95..03dc4c6978f2b 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3FromL1TkMuonPixelTracks_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3FromL1TkMuonPixelTracks_cfi.py @@ -2,8 +2,8 @@ hltPhase2L3FromL1TkMuonPixelTracks = cms.EDProducer("PixelTrackProducer", Cleaner = cms.string('hltPixelTracksCleanerBySharedHits'), - Filter = cms.InputTag("hltPhase2L3MuonPixelTracksFilter"), - Fitter = cms.InputTag("hltPhase2L3MuonPixelTracksFitter"), + Filter = cms.InputTag("hltPhase2PixelTrackFilterByKinematics"), + Fitter = cms.InputTag("hltPhase2PixelFitterByHelixProjections"), SeedingHitSets = cms.InputTag("hltPhase2L3FromL1TkMuonPixelTracksHitQuadruplets"), passLabel = cms.string('') ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3GlbMuon_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3GlbMuon_cfi.py index 65d61e39ad38b..fc8c849c3bf39 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3GlbMuon_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3GlbMuon_cfi.py @@ -72,7 +72,7 @@ input = cms.InputTag("hltL2MuonsFromL1TkMuon","UpdatedAtVtx"), maxRegions = cms.int32(2), precise = cms.bool(True), - vertexCollection = cms.InputTag("pixelVertices") + vertexCollection = cms.InputTag("hltPhase2PixelVertices") ), PCut = cms.double(2.5), PtCut = cms.double(1.0), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonPixelFitterByHelixProjections_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonPixelFitterByHelixProjections_cfi.py deleted file mode 100644 index 3dbd767425883..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonPixelFitterByHelixProjections_cfi.py +++ /dev/null @@ -1,6 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -hltPhase2L3MuonPixelFitterByHelixProjections = cms.EDProducer("PixelFitterByHelixProjectionsProducer", - scaleErrorsForBPix1 = cms.bool(False), - scaleFactor = cms.double(0.65) -) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonPixelTrackFilterByKinematics_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonPixelTrackFilterByKinematics_cfi.py deleted file mode 100644 index a6aae63a617c5..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonPixelTrackFilterByKinematics_cfi.py +++ /dev/null @@ -1,9 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -hltPhase2L3MuonPixelTrackFilterByKinematics = cms.EDProducer("PixelTrackFilterByKinematicsProducer", - chi2 = cms.double(1000.0), - nSigmaInvPtTolerance = cms.double(0.0), - nSigmaTipMaxTolerance = cms.double(0.0), - ptMin = cms.double(0.9), - tipMax = cms.double(1.0) -) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonPixelTracksFilter_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonPixelTracksFilter_cfi.py deleted file mode 100644 index e349670ade443..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonPixelTracksFilter_cfi.py +++ /dev/null @@ -1,9 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -hltPhase2L3MuonPixelTracksFilter = cms.EDProducer("PixelTrackFilterByKinematicsProducer", - chi2 = cms.double(1000.0), - nSigmaInvPtTolerance = cms.double(0.0), - nSigmaTipMaxTolerance = cms.double(0.0), - ptMin = cms.double(0.9), - tipMax = cms.double(1.0) -) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonPixelTracks_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonPixelTracks_cfi.py index e30ee2b6df9ce..263430869e8a0 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonPixelTracks_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonPixelTracks_cfi.py @@ -2,8 +2,8 @@ hltPhase2L3MuonPixelTracks = cms.EDProducer("PixelTrackProducer", Cleaner = cms.string('hltPhase2L3MuonPixelTrackCleanerBySharedHits'), - Filter = cms.InputTag("hltPhase2L3MuonPixelTrackFilterByKinematics"), - Fitter = cms.InputTag("hltPhase2L3MuonPixelFitterByHelixProjections"), + Filter = cms.InputTag("hltPhase2PixelTrackFilterByKinematics"), + Fitter = cms.InputTag("hltPhase2PixelFitterByHelixProjections"), SeedingHitSets = cms.InputTag("hltPhase2L3MuonPixelTracksHitQuadruplets"), mightGet = cms.optional.untracked.vstring, passLabel = cms.string('hltPhase2L3MuonPixelTracks') diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonsTrkIsoRegionalNewdR0p3dRVeto0p005dz0p25dr0p20ChisqInfPtMin0p0Cut0p07_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonsTrkIsoRegionalNewdR0p3dRVeto0p005dz0p25dr0p20ChisqInfPtMin0p0Cut0p07_cfi.py index b95a02c70fc64..9bdd9e617f0a6 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonsTrkIsoRegionalNewdR0p3dRVeto0p005dz0p25dr0p20ChisqInfPtMin0p0Cut0p07_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonsTrkIsoRegionalNewdR0p3dRVeto0p005dz0p25dr0p20ChisqInfPtMin0p0Cut0p07_cfi.py @@ -3,7 +3,7 @@ hltPhase2L3MuonsTrkIsoRegionalNewdR0p3dRVeto0p005dz0p25dr0p20ChisqInfPtMin0p0Cut0p07 = cms.EDProducer("L3MuonCombinedRelativeIsolationProducer", CaloDepositsLabel = cms.InputTag("notUsed"), CaloExtractorPSet = cms.PSet( - CaloTowerCollectionLabel = cms.InputTag("hltTowerMakerForAll"), + CaloTowerCollectionLabel = cms.InputTag("hltPhase2TowerMakerForAll"), ComponentName = cms.string('CaloExtractor'), DR_Max = cms.double(0.3), DR_Veto_E = cms.double(0.07), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonsTrkIsoRegionalNewdR0p3dRVeto0p005dz0p25dr0p20ChisqInfPtMin0p0Cut0p4_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonsTrkIsoRegionalNewdR0p3dRVeto0p005dz0p25dr0p20ChisqInfPtMin0p0Cut0p4_cfi.py index 6bfbc2ff765d9..d9a91fc9fec71 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonsTrkIsoRegionalNewdR0p3dRVeto0p005dz0p25dr0p20ChisqInfPtMin0p0Cut0p4_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonsTrkIsoRegionalNewdR0p3dRVeto0p005dz0p25dr0p20ChisqInfPtMin0p0Cut0p4_cfi.py @@ -3,7 +3,7 @@ hltPhase2L3MuonsTrkIsoRegionalNewdR0p3dRVeto0p005dz0p25dr0p20ChisqInfPtMin0p0Cut0p4 = cms.EDProducer("L3MuonCombinedRelativeIsolationProducer", CaloDepositsLabel = cms.InputTag("notUsed"), CaloExtractorPSet = cms.PSet( - CaloTowerCollectionLabel = cms.InputTag("hltTowerMakerForAll"), + CaloTowerCollectionLabel = cms.InputTag("hltPhase2TowerMakerForAll"), ComponentName = cms.string('CaloExtractor'), DR_Max = cms.double(0.3), DR_Veto_E = cms.double(0.07), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonPixelTracksFitter_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2PixelFitterByHelixProjections_cfi.py similarity index 55% rename from HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonPixelTracksFitter_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2PixelFitterByHelixProjections_cfi.py index ee575ca1a5c1a..f5163ab417252 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonPixelTracksFitter_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2PixelFitterByHelixProjections_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -hltPhase2L3MuonPixelTracksFitter = cms.EDProducer("PixelFitterByHelixProjectionsProducer", +hltPhase2PixelFitterByHelixProjections = cms.EDProducer("PixelFitterByHelixProjectionsProducer", scaleErrorsForBPix1 = cms.bool(False), scaleFactor = cms.double(0.65) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/pixelTrackFilterByKinematics_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2PixelTrackFilterByKinematics_cfi.py similarity index 70% rename from HLTrigger/Configuration/python/HLT_75e33/modules/pixelTrackFilterByKinematics_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2PixelTrackFilterByKinematics_cfi.py index 3104321f95a6f..c5ba325f4d514 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/pixelTrackFilterByKinematics_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2PixelTrackFilterByKinematics_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -pixelTrackFilterByKinematics = cms.EDProducer("PixelTrackFilterByKinematicsProducer", +hltPhase2PixelTrackFilterByKinematics = cms.EDProducer("PixelTrackFilterByKinematicsProducer", chi2 = cms.double(1000.0), nSigmaInvPtTolerance = cms.double(0.0), nSigmaTipMaxTolerance = cms.double(0.0), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/pixelTracksTrackingRegions_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2PixelTracksAndHighPtStepTrackingRegions_cfi.py similarity index 70% rename from HLTrigger/Configuration/python/HLT_75e33/modules/pixelTracksTrackingRegions_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2PixelTracksAndHighPtStepTrackingRegions_cfi.py index 00b71a9b1c64a..54e3db77053dc 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/pixelTracksTrackingRegions_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2PixelTracksAndHighPtStepTrackingRegions_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -pixelTracksTrackingRegions = cms.EDProducer("GlobalTrackingRegionFromBeamSpotEDProducer", +hltPhase2PixelTracksAndHighPtStepTrackingRegions = cms.EDProducer("GlobalTrackingRegionFromBeamSpotEDProducer", RegionPSet = cms.PSet( beamSpot = cms.InputTag("hltOnlineBeamSpot"), nSigmaZ = cms.double(4.0), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/pixelTracksHitDoublets_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2PixelTracksHitDoublets_cfi.py similarity index 60% rename from HLTrigger/Configuration/python/HLT_75e33/modules/pixelTracksHitDoublets_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2PixelTracksHitDoublets_cfi.py index 2a720e3e59c77..98336c9fba6c1 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/pixelTracksHitDoublets_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2PixelTracksHitDoublets_cfi.py @@ -1,13 +1,13 @@ import FWCore.ParameterSet.Config as cms -pixelTracksHitDoublets = cms.EDProducer("HitPairEDProducer", +hltPhase2PixelTracksHitDoublets = cms.EDProducer("HitPairEDProducer", clusterCheck = cms.InputTag(""), layerPairs = cms.vuint32(0, 1, 2), maxElement = cms.uint32(50000000), maxElementTotal = cms.uint32(50000000), produceIntermediateHitDoublets = cms.bool(True), produceSeedingHitSets = cms.bool(False), - seedingLayers = cms.InputTag("pixelTracksSeedLayers"), - trackingRegions = cms.InputTag("pixelTracksTrackingRegions"), + seedingLayers = cms.InputTag("hltPhase2PixelTracksSeedLayers"), + trackingRegions = cms.InputTag("hltPhase2PixelTracksAndHighPtStepTrackingRegions"), trackingRegionsSeedingLayers = cms.InputTag("") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/pixelTracksHitSeeds_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2PixelTracksHitSeeds_cfi.py similarity index 85% rename from HLTrigger/Configuration/python/HLT_75e33/modules/pixelTracksHitSeeds_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2PixelTracksHitSeeds_cfi.py index 67b97397fd1e6..413947c54f0d6 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/pixelTracksHitSeeds_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2PixelTracksHitSeeds_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -pixelTracksHitSeeds = cms.EDProducer("CAHitQuadrupletEDProducer", +hltPhase2PixelTracksHitSeeds = cms.EDProducer("CAHitQuadrupletEDProducer", CAHardPtCut = cms.double(0.0), CAPhiCut = cms.double(0.2), CAThetaCut = cms.double(0.0012), @@ -9,7 +9,7 @@ clusterShapeCacheSrc = cms.InputTag("siPixelClusterShapeCache"), clusterShapeHitFilter = cms.string('ClusterShapeHitFilter') ), - doublets = cms.InputTag("pixelTracksHitDoublets"), + doublets = cms.InputTag("hltPhase2PixelTracksHitDoublets"), extraHitRPhitolerance = cms.double(0.032), fitFastCircle = cms.bool(True), fitFastCircleChi2Cut = cms.bool(True), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/pixelTracksSeedLayers_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2PixelTracksSeedLayers_cfi.py similarity index 94% rename from HLTrigger/Configuration/python/HLT_75e33/modules/pixelTracksSeedLayers_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2PixelTracksSeedLayers_cfi.py index 12b57702f8b5b..308e66694b67c 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/pixelTracksSeedLayers_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2PixelTracksSeedLayers_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -pixelTracksSeedLayers = cms.EDProducer("SeedingLayersEDProducer", +hltPhase2PixelTracksSeedLayers = cms.EDProducer("SeedingLayersEDProducer", BPix = cms.PSet( HitProducer = cms.string('siPixelRecHits'), TTRHBuilder = cms.string('WithTrackAngle') diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2PixelTracks_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2PixelTracks_cfi.py new file mode 100644 index 0000000000000..65d93946e1f97 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2PixelTracks_cfi.py @@ -0,0 +1,10 @@ +import FWCore.ParameterSet.Config as cms + +hltPhase2PixelTracks = cms.EDProducer("PixelTrackProducer", + Cleaner = cms.string('pixelTrackCleanerBySharedHits'), + Filter = cms.InputTag("hltPhase2PixelTrackFilterByKinematics"), + Fitter = cms.InputTag("hltPhase2PixelFitterByHelixProjections"), + SeedingHitSets = cms.InputTag("hltPhase2PixelTracksHitSeeds"), + mightGet = cms.optional.untracked.vstring, + passLabel = cms.string('hltPhase2PixelTracks') +) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/pixelVertices_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2PixelVertices_cfi.py similarity index 79% rename from HLTrigger/Configuration/python/HLT_75e33/modules/pixelVertices_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2PixelVertices_cfi.py index daa6dc6694489..5706cfc2737e1 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/pixelVertices_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2PixelVertices_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -pixelVertices = cms.EDProducer("PixelVertexProducer", +hltPhase2PixelVertices = cms.EDProducer("PixelVertexProducer", Finder = cms.string('DivisiveVertexFinder'), Method2 = cms.bool(True), NTrkMin = cms.int32(2), @@ -8,7 +8,7 @@ refToPSet_ = cms.string('pSetPvClusterComparerForIT') ), PtMin = cms.double(1.0), - TrackCollection = cms.InputTag("pixelTracks"), + TrackCollection = cms.InputTag("hltPhase2PixelTracks"), UseError = cms.bool(True), Verbosity = cms.int32(0), WtAverage = cms.bool(True), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltTowerMakerForAll_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2TowerMakerForAll_cfi.py similarity index 98% rename from HLTrigger/Configuration/python/HLT_75e33/modules/hltTowerMakerForAll_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2TowerMakerForAll_cfi.py index d8f95c57b3c81..518be7794f490 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltTowerMakerForAll_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2TowerMakerForAll_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -hltTowerMakerForAll = cms.EDProducer("CaloTowersCreator", +hltPhase2TowerMakerForAll = 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/initialStepSeeds_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/initialStepSeeds_cfi.py index 69561be2fc0d5..8dcb08c540326 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/initialStepSeeds_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/initialStepSeeds_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms initialStepSeeds = cms.EDProducer("SeedGeneratorFromProtoTracksEDProducer", - InputCollection = cms.InputTag("pixelTracks"), + InputCollection = cms.InputTag("hltPhase2PixelTracks"), InputVertexCollection = cms.InputTag(""), SeedCreatorPSet = cms.PSet( refToPSet_ = cms.string('seedFromProtoTracks') diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/initialStepTrackCutClassifier_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/initialStepTrackCutClassifier_cfi.py index 07d748e6262d3..fd655b957822a 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/initialStepTrackCutClassifier_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/initialStepTrackCutClassifier_cfi.py @@ -30,5 +30,5 @@ ), qualityCuts = cms.vdouble(-0.7, 0.1, 0.7), src = cms.InputTag("initialStepTracks"), - vertices = cms.InputTag("pixelVertices") + vertices = cms.InputTag("hltPhase2PixelVertices") ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/pixelFitterByHelixProjections_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/pixelFitterByHelixProjections_cfi.py deleted file mode 100644 index 5f4c589dc0b3a..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/pixelFitterByHelixProjections_cfi.py +++ /dev/null @@ -1,6 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -pixelFitterByHelixProjections = cms.EDProducer("PixelFitterByHelixProjectionsProducer", - scaleErrorsForBPix1 = cms.bool(False), - scaleFactor = cms.double(0.65) -) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/pixelTracks_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/pixelTracks_cfi.py deleted file mode 100644 index 73f60a8d11e1f..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/pixelTracks_cfi.py +++ /dev/null @@ -1,10 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -pixelTracks = cms.EDProducer("PixelTrackProducer", - Cleaner = cms.string('pixelTrackCleanerBySharedHits'), - Filter = cms.InputTag("pixelTrackFilterByKinematics"), - Fitter = cms.InputTag("pixelFitterByHelixProjections"), - SeedingHitSets = cms.InputTag("pixelTracksHitSeeds"), - mightGet = cms.optional.untracked.vstring, - passLabel = cms.string('pixelTracks') -) 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 e51013611bdb4..4ca2d5dc8a494 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 @@ -86,11 +86,9 @@ from ..modules.hltPhase2L3MuonInitialStepTracks_cfi import * from ..modules.hltPhase2L3MuonInitialStepTracksSelectionHighPurity_cfi import * from ..modules.hltPhase2L3MuonMerged_cfi import * -from ..modules.hltPhase2L3MuonPixelFitterByHelixProjections_cfi import * -from ..modules.hltPhase2L3MuonPixelTrackFilterByKinematics_cfi import * +from ..modules.hltPhase2PixelFitterByHelixProjections_cfi import * +from ..modules.hltPhase2PixelTrackFilterByKinematics_cfi import * from ..modules.hltPhase2L3MuonPixelTracks_cfi import * -from ..modules.hltPhase2L3MuonPixelTracksFilter_cfi import * -from ..modules.hltPhase2L3MuonPixelTracksFitter_cfi import * from ..modules.hltPhase2L3MuonPixelTracksHitDoublets_cfi import * from ..modules.hltPhase2L3MuonPixelTracksHitQuadruplets_cfi import * from ..modules.hltPhase2L3MuonPixelTracksSeedLayers_cfi import * @@ -112,7 +110,7 @@ from ..modules.hltPhase2L3OISeedsFromL2Muons_cfi import * from ..modules.hltPhase2L3OITrackCandidates_cfi import * from ..modules.hltRpcRecHits_cfi import * -from ..modules.hltTowerMakerForAll_cfi import * +from ..modules.hltPhase2TowerMakerForAll_cfi import * from ..modules.MeasurementTrackerEvent_cfi import * from ..modules.siPhase2Clusters_cfi import * from ..modules.siPixelClusters_cfi import * @@ -216,11 +214,9 @@ hltPhase2L3MuonInitialStepTracks, hltPhase2L3MuonInitialStepTracksSelectionHighPurity, hltPhase2L3MuonMerged, - hltPhase2L3MuonPixelFitterByHelixProjections, - hltPhase2L3MuonPixelTrackFilterByKinematics, + hltPhase2PixelFitterByHelixProjections, + hltPhase2PixelTrackFilterByKinematics, hltPhase2L3MuonPixelTracks, - hltPhase2L3MuonPixelTracksFilter, - hltPhase2L3MuonPixelTracksFitter, hltPhase2L3MuonPixelTracksHitDoublets, hltPhase2L3MuonPixelTracksHitQuadruplets, hltPhase2L3MuonPixelTracksSeedLayers, @@ -242,7 +238,7 @@ hltPhase2L3OISeedsFromL2Muons, hltPhase2L3OITrackCandidates, hltRpcRecHits, - hltTowerMakerForAll, + hltPhase2TowerMakerForAll, siPhase2Clusters, siPixelClusterShapeCache, siPixelClusters, 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 2568c0779b2f2..5df2b67f573d5 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 @@ -64,11 +64,9 @@ from ..modules.hltPhase2L3MuonInitialStepTracks_cfi import * from ..modules.hltPhase2L3MuonInitialStepTracksSelectionHighPurity_cfi import * from ..modules.hltPhase2L3MuonMerged_cfi import * -from ..modules.hltPhase2L3MuonPixelFitterByHelixProjections_cfi import * -from ..modules.hltPhase2L3MuonPixelTrackFilterByKinematics_cfi import * +from ..modules.hltPhase2PixelTrackFilterByKinematics_cfi import * from ..modules.hltPhase2L3MuonPixelTracks_cfi import * -from ..modules.hltPhase2L3MuonPixelTracksFilter_cfi import * -from ..modules.hltPhase2L3MuonPixelTracksFitter_cfi import * +from ..modules.hltPhase2PixelFitterByHelixProjections_cfi import * from ..modules.hltPhase2L3MuonPixelTracksHitDoublets_cfi import * from ..modules.hltPhase2L3MuonPixelTracksHitQuadruplets_cfi import * from ..modules.hltPhase2L3MuonPixelTracksSeedLayers_cfi import * @@ -165,11 +163,9 @@ hltPhase2L3MuonInitialStepTracks, hltPhase2L3MuonInitialStepTracksSelectionHighPurity, hltPhase2L3MuonMerged, - hltPhase2L3MuonPixelFitterByHelixProjections, - hltPhase2L3MuonPixelTrackFilterByKinematics, + hltPhase2PixelFitterByHelixProjections, + hltPhase2PixelTrackFilterByKinematics, hltPhase2L3MuonPixelTracks, - hltPhase2L3MuonPixelTracksFilter, - hltPhase2L3MuonPixelTracksFitter, hltPhase2L3MuonPixelTracksHitDoublets, hltPhase2L3MuonPixelTracksHitQuadruplets, hltPhase2L3MuonPixelTracksSeedLayers, 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 fa55599f0ad49..173c303fba3e0 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 @@ -46,8 +46,8 @@ from ..modules.hltPhase2L3GlbMuon_cfi import * from ..modules.hltPhase2L3MuonCandidates_cfi import * from ..modules.hltPhase2L3MuonMerged_cfi import * -from ..modules.hltPhase2L3MuonPixelTracksFilter_cfi import * -from ..modules.hltPhase2L3MuonPixelTracksFitter_cfi import * +from ..modules.hltPhase2PixelTrackFilterByKinematics_cfi import * +from ..modules.hltPhase2PixelFitterByHelixProjections_cfi import * from ..modules.hltPhase2L3Muons_cfi import * from ..modules.hltPhase2L3MuonsNoID_cfi import * from ..modules.hltPhase2L3MuonTracks_cfi import * @@ -119,8 +119,8 @@ hltPhase2L3GlbMuon, hltPhase2L3MuonCandidates, hltPhase2L3MuonMerged, - hltPhase2L3MuonPixelTracksFilter, - hltPhase2L3MuonPixelTracksFitter, + hltPhase2PixelTrackFilterByKinematics, + hltPhase2PixelFitterByHelixProjections, hltPhase2L3MuonTracks, hltPhase2L3Muons, hltPhase2L3MuonsNoID, 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 a00cba3bdb2d1..b1e0e2e182f30 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 @@ -43,8 +43,8 @@ from ..modules.hltPhase2L3GlbMuon_cfi import * from ..modules.hltPhase2L3MuonCandidates_cfi import * from ..modules.hltPhase2L3MuonMerged_cfi import * -from ..modules.hltPhase2L3MuonPixelTracksFilter_cfi import * -from ..modules.hltPhase2L3MuonPixelTracksFitter_cfi import * +from ..modules.hltPhase2PixelTrackFilterByKinematics_cfi import * +from ..modules.hltPhase2PixelFitterByHelixProjections_cfi import * from ..modules.hltPhase2L3Muons_cfi import * from ..modules.hltPhase2L3MuonsNoID_cfi import * from ..modules.hltPhase2L3MuonTracks_cfi import * @@ -113,8 +113,8 @@ hltPhase2L3GlbMuon, hltPhase2L3MuonCandidates, hltPhase2L3MuonMerged, - hltPhase2L3MuonPixelTracksFilter, - hltPhase2L3MuonPixelTracksFitter, + hltPhase2PixelTrackFilterByKinematics, + hltPhase2PixelFitterByHelixProjections, hltPhase2L3MuonTracks, hltPhase2L3Muons, hltPhase2L3MuonsNoID, 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 837671ab8ab64..9cb6cf27bb6d2 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 @@ -48,8 +48,8 @@ from ..modules.hltPhase2L3GlbMuon_cfi import * from ..modules.hltPhase2L3MuonCandidates_cfi import * from ..modules.hltPhase2L3MuonMerged_cfi import * -from ..modules.hltPhase2L3MuonPixelTracksFilter_cfi import * -from ..modules.hltPhase2L3MuonPixelTracksFitter_cfi import * +from ..modules.hltPhase2PixelTrackFilterByKinematics_cfi import * +from ..modules.hltPhase2PixelFitterByHelixProjections_cfi import * from ..modules.hltPhase2L3Muons_cfi import * from ..modules.hltPhase2L3MuonsNoID_cfi import * from ..modules.hltPhase2L3MuonTracks_cfi import * @@ -123,8 +123,8 @@ hltPhase2L3GlbMuon, hltPhase2L3MuonCandidates, hltPhase2L3MuonMerged, - hltPhase2L3MuonPixelTracksFilter, - hltPhase2L3MuonPixelTracksFitter, + hltPhase2PixelTrackFilterByKinematics, + hltPhase2PixelFitterByHelixProjections, hltPhase2L3MuonTracks, hltPhase2L3Muons, hltPhase2L3MuonsNoID, diff --git a/HLTrigger/Configuration/python/HLT_75e33/tasks/HLTParticleFlowTask_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/tasks/HLTParticleFlowTask_cfi.py index bf3988fc3f54d..22d3e23dc4537 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/tasks/HLTParticleFlowTask_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/tasks/HLTParticleFlowTask_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms from ..modules.generalTracks_cfi import * -from ..modules.pixelVertices_cfi import * +from ..modules.hltPhase2PixelVertices_cfi import * from ..modules.trackerClusterCheck_cfi import * from ..tasks.HLTBeamSpotTask_cfi import * from ..tasks.RawToDigiTask_cfi import * @@ -17,7 +17,7 @@ from ..tasks.localrecoTask_cfi import * from ..tasks.otLocalRecoTask_cfi import * from ..tasks.particleFlowClusterTask_cfi import * -from ..tasks.pixelTracksTask_cfi import * +from ..tasks.hltPhase2PixelTracksTask_cfi import * from ..tasks.vertexRecoTask_cfi import * HLTParticleFlowTask = cms.Task( @@ -37,8 +37,8 @@ localrecoTask, otLocalRecoTask, particleFlowClusterTask, - pixelTracksTask, - pixelVertices, + hltPhase2PixelTracksTask, + hltPhase2PixelVertices, trackerClusterCheck, vertexRecoTask ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/tasks/HLTTrackingV61Task_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/tasks/HLTTrackingV61Task_cfi.py index 8bd1b99ab0e23..887a54795cc90 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/tasks/HLTTrackingV61Task_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/tasks/HLTTrackingV61Task_cfi.py @@ -10,21 +10,20 @@ from ..modules.highPtTripletStepTrackCandidates_cfi import * from ..modules.highPtTripletStepTrackCutClassifier_cfi import * from ..modules.highPtTripletStepTrackSelectionHighPurity_cfi import * -from ..modules.highPtTripletStepTrackingRegions_cfi import * +from ..modules.hltPhase2PixelTracksAndHighPtStepTrackingRegions_cfi import * from ..modules.highPtTripletStepTracks_cfi import * from ..modules.initialStepSeeds_cfi import * from ..modules.initialStepTrackCandidates_cfi import * from ..modules.initialStepTrackCutClassifier_cfi import * from ..modules.initialStepTrackSelectionHighPurity_cfi import * from ..modules.initialStepTracks_cfi import * -from ..modules.pixelFitterByHelixProjections_cfi import * -from ..modules.pixelTrackFilterByKinematics_cfi import * -from ..modules.pixelTracksHitDoublets_cfi import * -from ..modules.pixelTracksHitSeeds_cfi import * -from ..modules.pixelTracksSeedLayers_cfi import * -from ..modules.pixelTracksTrackingRegions_cfi import * -from ..modules.pixelTracks_cfi import * -from ..modules.pixelVertices_cfi import * +from ..modules.hltPhase2PixelFitterByHelixProjections_cfi import * +from ..modules.hltPhase2PixelTrackFilterByKinematics_cfi import * +from ..modules.hltPhase2PixelTracksHitDoublets_cfi import * +from ..modules.hltPhase2PixelTracksHitSeeds_cfi import * +from ..modules.hltPhase2PixelTracksSeedLayers_cfi import * +from ..modules.hltPhase2PixelTracks_cfi import * +from ..modules.hltPhase2PixelVertices_cfi import * from ..modules.siPhase2Clusters_cfi import * from ..modules.siPixelClusterShapeCache_cfi import * from ..modules.siPixelClusters_cfi import * @@ -44,21 +43,20 @@ highPtTripletStepTrackCandidates, highPtTripletStepTrackCutClassifier, highPtTripletStepTrackSelectionHighPurity, - highPtTripletStepTrackingRegions, + hltPhase2PixelTracksAndHighPtStepTrackingRegions, highPtTripletStepTracks, initialStepSeeds, initialStepTrackCandidates, initialStepTrackCutClassifier, initialStepTrackSelectionHighPurity, initialStepTracks, - pixelFitterByHelixProjections, - pixelTrackFilterByKinematics, - pixelTracks, - pixelTracksHitDoublets, - pixelTracksHitSeeds, - pixelTracksSeedLayers, - pixelTracksTrackingRegions, - pixelVertices, + hltPhase2PixelFitterByHelixProjections, + hltPhase2PixelTrackFilterByKinematics, + hltPhase2PixelTracks, + hltPhase2PixelTracksHitDoublets, + hltPhase2PixelTracksHitSeeds, + hltPhase2PixelTracksSeedLayers, + hltPhase2PixelVertices, siPhase2Clusters, siPixelClusterShapeCache, siPixelClusters, diff --git a/HLTrigger/Configuration/python/HLT_75e33/tasks/highPtTripletStepSeedingTask_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/tasks/highPtTripletStepSeedingTask_cfi.py index b0b7e82203a60..3d6a2d42acc41 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/tasks/highPtTripletStepSeedingTask_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/tasks/highPtTripletStepSeedingTask_cfi.py @@ -5,7 +5,7 @@ from ..modules.highPtTripletStepHitTriplets_cfi import * from ..modules.highPtTripletStepSeedLayers_cfi import * from ..modules.highPtTripletStepSeeds_cfi import * -from ..modules.highPtTripletStepTrackingRegions_cfi import * +from ..modules.hltPhase2PixelTracksAndHighPtStepTrackingRegions_cfi import * highPtTripletStepSeedingTask = cms.Task( highPtTripletStepClusters, @@ -13,5 +13,5 @@ highPtTripletStepHitTriplets, highPtTripletStepSeedLayers, highPtTripletStepSeeds, - highPtTripletStepTrackingRegions + hltPhase2PixelTracksAndHighPtStepTrackingRegions ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/tasks/hltPhase2PixelTracksTask_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/tasks/hltPhase2PixelTracksTask_cfi.py new file mode 100644 index 0000000000000..4d4974b33eb88 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/tasks/hltPhase2PixelTracksTask_cfi.py @@ -0,0 +1,19 @@ +import FWCore.ParameterSet.Config as cms + +from ..modules.hltPhase2PixelFitterByHelixProjections_cfi import * +from ..modules.hltPhase2PixelTrackFilterByKinematics_cfi import * +from ..modules.hltPhase2PixelTracks_cfi import * +from ..modules.hltPhase2PixelTracksHitDoublets_cfi import * +from ..modules.hltPhase2PixelTracksHitSeeds_cfi import * +from ..modules.hltPhase2PixelTracksSeedLayers_cfi import * +from ..modules.hltPhase2PixelTracksAndHighPtStepTrackingRegions_cfi import * + +hltPhase2PixelTracksTask = cms.Task( + hltPhase2PixelFitterByHelixProjections, + hltPhase2PixelTrackFilterByKinematics, + hltPhase2PixelTracks, + hltPhase2PixelTracksHitDoublets, + hltPhase2PixelTracksHitSeeds, + hltPhase2PixelTracksSeedLayers, + hltPhase2PixelTracksAndHighPtStepTrackingRegions +) diff --git a/HLTrigger/Configuration/python/HLT_75e33/tasks/initialStepPVTask_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/tasks/initialStepPVTask_cfi.py index 2cc8c05e06df5..f241490bc3846 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/tasks/initialStepPVTask_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/tasks/initialStepPVTask_cfi.py @@ -1,11 +1,11 @@ import FWCore.ParameterSet.Config as cms from ..modules.ak4CaloJetsForTrk_cfi import * -from ..modules.caloTowerForTrk_cfi import * +from ..modules.hltPhase2TowerMakerForAll_cfi import * from ..modules.firstStepPrimaryVerticesUnsorted_cfi import * initialStepPVTask = cms.Task( ak4CaloJetsForTrk, - caloTowerForTrk, + hltPhase2TowerMakerForAll, firstStepPrimaryVerticesUnsorted, ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/tasks/pixelTracksTask_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/tasks/pixelTracksTask_cfi.py deleted file mode 100644 index e26a00b481392..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/tasks/pixelTracksTask_cfi.py +++ /dev/null @@ -1,19 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from ..modules.pixelFitterByHelixProjections_cfi import * -from ..modules.pixelTrackFilterByKinematics_cfi import * -from ..modules.pixelTracks_cfi import * -from ..modules.pixelTracksHitDoublets_cfi import * -from ..modules.pixelTracksHitSeeds_cfi import * -from ..modules.pixelTracksSeedLayers_cfi import * -from ..modules.pixelTracksTrackingRegions_cfi import * - -pixelTracksTask = cms.Task( - pixelFitterByHelixProjections, - pixelTrackFilterByKinematics, - pixelTracks, - pixelTracksHitDoublets, - pixelTracksHitSeeds, - pixelTracksSeedLayers, - pixelTracksTrackingRegions -)