diff --git a/RecoTracker/IterativeTracking/python/ElectronSeeds_cff.py b/RecoTracker/IterativeTracking/python/ElectronSeeds_cff.py index db92a7df14fb4..417e6d27ba945 100644 --- a/RecoTracker/IterativeTracking/python/ElectronSeeds_cff.py +++ b/RecoTracker/IterativeTracking/python/ElectronSeeds_cff.py @@ -29,7 +29,7 @@ ) ) trackingPhase2PU140.toReplaceWith(pixelPairStepSeedClusterMask, seedClusterRemoverPhase2.clone( - trajectories = cms.InputTag('detachedQuadStepSeeds'), + trajectories = 'detachedQuadStepSeeds', oldClusterRemovalInfo = cms.InputTag('highPtTripletStepSeedClusterMask') ) ) @@ -52,10 +52,12 @@ oldClusterRemovalInfo = cms.InputTag('mixedTripletStepSeedClusterMask') ) -tripletElectronSeedLayers = cms.EDProducer('SeedingLayersEDProducer', - layerList = cms.vstring('BPix1+BPix2+BPix3', - 'BPix1+BPix2+FPix1_pos', 'BPix1+BPix2+FPix1_neg', - 'BPix1+FPix1_pos+FPix2_pos', 'BPix1+FPix1_neg+FPix2_neg'), +import RecoTracker.TkSeedingLayers.seedingLayersEDProducer_cfi as _mod + +tripletElectronSeedLayers = _mod.seedingLayersEDProducer.clone( + layerList = ['BPix1+BPix2+BPix3', + 'BPix1+BPix2+FPix1_pos', 'BPix1+BPix2+FPix1_neg', + 'BPix1+FPix1_pos+FPix2_pos', 'BPix1+FPix1_neg+FPix2_neg'], BPix = cms.PSet( TTRHBuilder = cms.string('TTRHBuilderWithoutAngle4PixelTriplets'), HitProducer = cms.string('siPixelRecHits'), @@ -138,12 +140,12 @@ ) ) -pixelPairElectronSeedLayers = cms.EDProducer('SeedingLayersEDProducer', - layerList = cms.vstring('BPix1+BPix2', 'BPix1+BPix3', 'BPix2+BPix3', - 'BPix1+FPix1_pos', 'BPix1+FPix1_neg', - 'BPix1+FPix2_pos', 'BPix1+FPix2_neg', - 'BPix2+FPix1_pos', 'BPix2+FPix1_neg', - 'FPix1_pos+FPix2_pos', 'FPix1_neg+FPix2_neg'), +pixelPairElectronSeedLayers = _mod.seedingLayersEDProducer.clone( + layerList = ['BPix1+BPix2', 'BPix1+BPix3', 'BPix2+BPix3', + 'BPix1+FPix1_pos', 'BPix1+FPix1_neg', + 'BPix1+FPix2_pos', 'BPix1+FPix2_neg', + 'BPix2+FPix1_pos', 'BPix2+FPix1_neg', + 'FPix1_pos+FPix2_pos', 'FPix1_neg+FPix2_neg'], BPix = cms.PSet( TTRHBuilder = cms.string('WithTrackAngle'), HitProducer = cms.string('siPixelRecHits'), @@ -188,10 +190,10 @@ seedingHitSets = 'pixelPairElectronHitDoublets', ) -stripPairElectronSeedLayers = cms.EDProducer('SeedingLayersEDProducer', - layerList = cms.vstring('TIB1+TIB2', 'TIB1+TID1_pos', 'TIB1+TID1_neg', 'TID2_pos+TID3_pos', 'TID2_neg+TID3_neg', - 'TEC1_pos+TEC2_pos','TEC2_pos+TEC3_pos','TEC3_pos+TEC4_pos','TEC3_pos+TEC5_pos', - 'TEC1_neg+TEC2_neg','TEC2_neg+TEC3_neg','TEC3_neg+TEC4_neg','TEC3_neg+TEC5_neg'), +stripPairElectronSeedLayers = _mod.seedingLayersEDProducer.clone( + layerList = ['TIB1+TIB2', 'TIB1+TID1_pos', 'TIB1+TID1_neg', 'TID2_pos+TID3_pos', 'TID2_neg+TID3_neg', + 'TEC1_pos+TEC2_pos','TEC2_pos+TEC3_pos','TEC3_pos+TEC4_pos','TEC3_pos+TEC5_pos', + 'TEC1_neg+TEC2_neg','TEC2_neg+TEC3_neg','TEC3_neg+TEC4_neg','TEC3_neg+TEC5_neg'], TIB = cms.PSet( TTRHBuilder = cms.string('WithTrackAngle'), clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone')), matchedRecHits = cms.InputTag('siStripMatchedRecHits','matchedRecHit'), diff --git a/RecoTracker/IterativeTracking/python/JetCoreRegionalStep_cff.py b/RecoTracker/IterativeTracking/python/JetCoreRegionalStep_cff.py index 3a49666ef82fb..9466b60c8bbd5 100644 --- a/RecoTracker/IterativeTracking/python/JetCoreRegionalStep_cff.py +++ b/RecoTracker/IterativeTracking/python/JetCoreRegionalStep_cff.py @@ -22,14 +22,16 @@ src=cms.InputTag('firstStepPrimaryVertices') ) +import RecoTracker.TkSeedingLayers.seedingLayersEDProducer_cfi as _mod + # SEEDING LAYERS -jetCoreRegionalStepSeedLayers = cms.EDProducer('SeedingLayersEDProducer', - layerList = cms.vstring('BPix1+BPix2', 'BPix1+BPix3', 'BPix2+BPix3', - 'BPix1+FPix1_pos', 'BPix1+FPix1_neg', - 'BPix2+FPix1_pos', 'BPix2+FPix1_neg', - 'FPix1_pos+FPix2_pos', 'FPix1_neg+FPix2_neg', - #'BPix2+TIB1','BPix2+TIB2', - 'BPix3+TIB1','BPix3+TIB2'), +jetCoreRegionalStepSeedLayers = _mod.seedingLayersEDProducer.clone( + layerList = ['BPix1+BPix2', 'BPix1+BPix3', 'BPix2+BPix3', + 'BPix1+FPix1_pos', 'BPix1+FPix1_neg', + 'BPix2+FPix1_pos', 'BPix2+FPix1_neg', + 'FPix1_pos+FPix2_pos', 'FPix1_neg+FPix2_neg', + #'BPix2+TIB1','BPix2+TIB2', + 'BPix3+TIB1','BPix3+TIB2'], TIB = cms.PSet( matchedRecHits = cms.InputTag('siStripMatchedRecHits','matchedRecHit'), TTRHBuilder = cms.string('WithTrackAngle'), clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone')) diff --git a/RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py b/RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py index c3051b3053241..65068f7589728 100644 --- a/RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py @@ -160,10 +160,11 @@ ) fastSim.toReplaceWith(mixedTripletStepSeedsA,_fastSim_mixedTripletStepSeedsA) +import RecoTracker.TkSeedingLayers.seedingLayersEDProducer_cfi as _mod # SEEDING LAYERS -mixedTripletStepSeedLayersB = cms.EDProducer('SeedingLayersEDProducer', - layerList = cms.vstring('BPix2+BPix3+TIB1'), +mixedTripletStepSeedLayersB = _mod.seedingLayersEDProducer.clone( + layerList = ['BPix2+BPix3+TIB1'], BPix = cms.PSet( TTRHBuilder = cms.string('WithTrackAngle'), HitProducer = cms.string('siPixelRecHits'), diff --git a/RecoTracker/IterativeTracking/python/PixelLessStep_cff.py b/RecoTracker/IterativeTracking/python/PixelLessStep_cff.py index de8694abee81b..09a06e56ac647 100644 --- a/RecoTracker/IterativeTracking/python/PixelLessStep_cff.py +++ b/RecoTracker/IterativeTracking/python/PixelLessStep_cff.py @@ -19,8 +19,10 @@ # SEEDING LAYERS from RecoLocalTracker.SiStripClusterizer.SiStripClusterChargeCut_cfi import * -pixelLessStepSeedLayers = cms.EDProducer('SeedingLayersEDProducer', - layerList = cms.vstring( +import RecoTracker.TkSeedingLayers.seedingLayersEDProducer_cfi as _mod + +pixelLessStepSeedLayers = _mod.seedingLayersEDProducer.clone( + layerList = [ #TIB 'TIB1+TIB2+MTIB3','TIB1+TIB2+MTIB4', #TIB+TID @@ -45,7 +47,7 @@ 'TEC3_pos+TEC4_pos+MTEC5_pos','TEC3_neg+TEC4_neg+MTEC5_neg', 'TEC3_pos+TEC5_pos+TEC6_pos', 'TEC3_neg+TEC5_neg+TEC6_neg', 'TEC4_pos+TEC5_pos+TEC6_pos', 'TEC4_neg+TEC5_neg+TEC6_neg' - ), + ], TIB = cms.PSet( TTRHBuilder = cms.string('WithTrackAngle'), clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')), matchedRecHits = cms.InputTag('siStripMatchedRecHits','matchedRecHit'), diff --git a/RecoTracker/IterativeTracking/python/PixelPairStep_cff.py b/RecoTracker/IterativeTracking/python/PixelPairStep_cff.py index 0b9d5c6dc5a77..24a2ede8a4f6e 100644 --- a/RecoTracker/IterativeTracking/python/PixelPairStep_cff.py +++ b/RecoTracker/IterativeTracking/python/PixelPairStep_cff.py @@ -12,13 +12,14 @@ for _eraName, _postfix, _era in _cfg.nonDefaultEras(): _era.toReplaceWith(pixelPairStepClusters, _cfg.clusterRemoverForIter('PixelPairStep', _eraName, _postfix)) +import RecoTracker.TkSeedingLayers.seedingLayersEDProducer_cfi as _mod # SEEDING LAYERS -pixelPairStepSeedLayers = cms.EDProducer('SeedingLayersEDProducer', - layerList = cms.vstring('BPix1+BPix2', 'BPix1+BPix3', 'BPix2+BPix3', +pixelPairStepSeedLayers = _mod.seedingLayersEDProducer.clone( + layerList = ['BPix1+BPix2', 'BPix1+BPix3', 'BPix2+BPix3', 'BPix1+FPix1_pos', 'BPix1+FPix1_neg', 'BPix2+FPix1_pos', 'BPix2+FPix1_neg', - 'FPix1_pos+FPix2_pos', 'FPix1_neg+FPix2_neg'), + 'FPix1_pos+FPix2_pos', 'FPix1_neg+FPix2_neg'], BPix = cms.PSet( TTRHBuilder = cms.string('WithTrackAngle'), HitProducer = cms.string('siPixelRecHits'), diff --git a/RecoTracker/IterativeTracking/python/TobTecStep_cff.py b/RecoTracker/IterativeTracking/python/TobTecStep_cff.py index af527c2b64769..956b44c83fa81 100644 --- a/RecoTracker/IterativeTracking/python/TobTecStep_cff.py +++ b/RecoTracker/IterativeTracking/python/TobTecStep_cff.py @@ -16,13 +16,15 @@ # TRIPLET SEEDING LAYERS from RecoLocalTracker.SiStripClusterizer.SiStripClusterChargeCut_cfi import * -tobTecStepSeedLayersTripl = cms.EDProducer('SeedingLayersEDProducer', - layerList = cms.vstring( +import RecoTracker.TkSeedingLayers.seedingLayersEDProducer_cfi as _mod + +tobTecStepSeedLayersTripl = _mod.seedingLayersEDProducer.clone( + layerList = [ #TOB 'TOB1+TOB2+MTOB3','TOB1+TOB2+MTOB4', #TOB+MTEC 'TOB1+TOB2+MTEC1_pos','TOB1+TOB2+MTEC1_neg', - ), + ], TOB = cms.PSet( TTRHBuilder = cms.string('WithTrackAngle'), clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')), matchedRecHits = cms.InputTag('siStripMatchedRecHits','matchedRecHit'), @@ -119,14 +121,14 @@ fastSim.toReplaceWith(tobTecStepSeedsTripl,_fastSim_tobTecStepSeedsTripl) # PAIR SEEDING LAYERS -tobTecStepSeedLayersPair = cms.EDProducer('SeedingLayersEDProducer', - layerList = cms.vstring('TOB1+TEC1_pos','TOB1+TEC1_neg', - 'TEC1_pos+TEC2_pos','TEC1_neg+TEC2_neg', - 'TEC2_pos+TEC3_pos','TEC2_neg+TEC3_neg', - 'TEC3_pos+TEC4_pos','TEC3_neg+TEC4_neg', - 'TEC4_pos+TEC5_pos','TEC4_neg+TEC5_neg', - 'TEC5_pos+TEC6_pos','TEC5_neg+TEC6_neg', - 'TEC6_pos+TEC7_pos','TEC6_neg+TEC7_neg'), +tobTecStepSeedLayersPair = _mod.seedingLayersEDProducer.clone( + layerList = ['TOB1+TEC1_pos','TOB1+TEC1_neg', + 'TEC1_pos+TEC2_pos','TEC1_neg+TEC2_neg', + 'TEC2_pos+TEC3_pos','TEC2_neg+TEC3_neg', + 'TEC3_pos+TEC4_pos','TEC3_neg+TEC4_neg', + 'TEC4_pos+TEC5_pos','TEC4_neg+TEC5_neg', + 'TEC5_pos+TEC6_pos','TEC5_neg+TEC6_neg', + 'TEC6_pos+TEC7_pos','TEC6_neg+TEC7_neg'], TOB = cms.PSet( TTRHBuilder = cms.string('WithTrackAngle'), clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')), matchedRecHits = cms.InputTag('siStripMatchedRecHits','matchedRecHit'), @@ -453,15 +455,15 @@ ### Following are specific for LowPU, they're collected here to ### not to interfere too much with the default configuration # SEEDING LAYERS -tobTecStepSeedLayers = cms.EDProducer('SeedingLayersEDProducer', - layerList = cms.vstring('TOB1+TOB2', +tobTecStepSeedLayers = _mod.seedingLayersEDProducer.clone( + layerList = ['TOB1+TOB2', 'TOB1+TEC1_pos', 'TOB1+TEC1_neg', 'TEC1_pos+TEC2_pos', 'TEC2_pos+TEC3_pos', 'TEC3_pos+TEC4_pos', 'TEC4_pos+TEC5_pos', 'TEC5_pos+TEC6_pos', 'TEC6_pos+TEC7_pos', 'TEC1_neg+TEC2_neg', 'TEC2_neg+TEC3_neg', 'TEC3_neg+TEC4_neg', 'TEC4_neg+TEC5_neg', - 'TEC5_neg+TEC6_neg', 'TEC6_neg+TEC7_neg'), + 'TEC5_neg+TEC6_neg', 'TEC6_neg+TEC7_neg'], TOB = cms.PSet( matchedRecHits = cms.InputTag('siStripMatchedRecHits','matchedRecHit'), skipClusters = cms.InputTag('tobTecStepClusters'),