Skip to content

Commit

Permalink
Further fixes to configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
makortel authored and Martin-Grunewald committed Feb 10, 2014
1 parent 13273b8 commit 6b9363b
Show file tree
Hide file tree
Showing 15 changed files with 52 additions and 60 deletions.
10 changes: 4 additions & 6 deletions RecoHI/HiMuonAlgos/python/HiRegitMuonMixedTripletStep_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@


# SEEDING LAYERS A
hiRegitMuMixedTripletStepSeedLayersA = RecoTracker.IterativeTracking.MixedTripletStep_cff.mixedTripletStepSeedLayersA.clone(
ComponentName = 'hiRegitMuMixedTripletStepSeedLayersA'
)
hiRegitMuMixedTripletStepSeedLayersA = RecoTracker.IterativeTracking.MixedTripletStep_cff.mixedTripletStepSeedLayersA.clone()
hiRegitMuMixedTripletStepSeedLayersA.BPix.skipClusters = cms.InputTag('hiRegitMuMixedTripletStepClusters')
hiRegitMuMixedTripletStepSeedLayersA.FPix.skipClusters = cms.InputTag('hiRegitMuMixedTripletStepClusters')
hiRegitMuMixedTripletStepSeedLayersA.TEC.skipClusters = cms.InputTag('hiRegitMuMixedTripletStepClusters')
Expand All @@ -44,9 +42,7 @@
hiRegitMuMixedTripletStepSeedsA.OrderedHitsFactoryPSet.SeedingLayers = 'hiRegitMuMixedTripletStepSeedLayersA'

# SEEDING LAYERS B
hiRegitMuMixedTripletStepSeedLayersB = RecoTracker.IterativeTracking.MixedTripletStep_cff.mixedTripletStepSeedLayersB.clone(
ComponentName = 'hiRegitMuMixedTripletStepSeedLayersB',
)
hiRegitMuMixedTripletStepSeedLayersB = RecoTracker.IterativeTracking.MixedTripletStep_cff.mixedTripletStepSeedLayersB.clone()
hiRegitMuMixedTripletStepSeedLayersB.BPix.skipClusters = cms.InputTag('hiRegitMuMixedTripletStepClusters')
hiRegitMuMixedTripletStepSeedLayersB.TIB.skipClusters = cms.InputTag('hiRegitMuMixedTripletStepClusters')

Expand Down Expand Up @@ -120,7 +116,9 @@
) #end of clone

hiRegitMuonMixedTripletStep = cms.Sequence(hiRegitMuMixedTripletStepClusters*
hiRegitMuMixedTripletStepSeedLayersA*
hiRegitMuMixedTripletStepSeedsA*
hiRegitMuMixedTripletStepSeedLayersB*
hiRegitMuMixedTripletStepSeedsB*
hiRegitMuMixedTripletStepSeeds*
hiRegitMuMixedTripletStepTrackCandidates*
Expand Down
5 changes: 2 additions & 3 deletions RecoHI/HiMuonAlgos/python/HiRegitMuonPixelLessStep_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@
)

# SEEDING LAYERS
hiRegitMuPixelLessStepSeedLayers = RecoTracker.IterativeTracking.PixelLessStep_cff.pixelLessStepSeedLayers.clone(
ComponentName = 'hiRegitMuPixelLessStepSeedLayers',
)
hiRegitMuPixelLessStepSeedLayers = RecoTracker.IterativeTracking.PixelLessStep_cff.pixelLessStepSeedLayers.clone()
hiRegitMuPixelLessStepSeedLayers.TIB.skipClusters = cms.InputTag('hiRegitMuPixelLessStepClusters')
hiRegitMuPixelLessStepSeedLayers.TID.skipClusters = cms.InputTag('hiRegitMuPixelLessStepClusters')
hiRegitMuPixelLessStepSeedLayers.TEC.skipClusters = cms.InputTag('hiRegitMuPixelLessStepClusters')
Expand Down Expand Up @@ -89,6 +87,7 @@
)

hiRegitMuonPixelLessStep = cms.Sequence(hiRegitMuPixelLessStepClusters*
hiRegitMuPixelLessStepSeedLayers*
hiRegitMuPixelLessStepSeeds*
hiRegitMuPixelLessStepTrackCandidates*
hiRegitMuPixelLessStepTracks*
Expand Down
5 changes: 2 additions & 3 deletions RecoHI/HiMuonAlgos/python/HiRegitMuonPixelPairStep_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@


# SEEDING LAYERS
hiRegitMuPixelPairStepSeedLayers = RecoHI.HiTracking.hiRegitPixelPairStep_cff.hiRegitPixelPairStepSeedLayers.clone(
ComponentName = 'hiRegitMuPixelPairStepSeedLayers'
)
hiRegitMuPixelPairStepSeedLayers = RecoHI.HiTracking.hiRegitPixelPairStep_cff.hiRegitPixelPairStepSeedLayers.clone()
hiRegitMuPixelPairStepSeedLayers.BPix.skipClusters = cms.InputTag('hiRegitMuPixelPairStepClusters')
hiRegitMuPixelPairStepSeedLayers.FPix.skipClusters = cms.InputTag('hiRegitMuPixelPairStepClusters')

Expand Down Expand Up @@ -95,6 +93,7 @@
)

hiRegitMuonPixelPairStep = cms.Sequence(hiRegitMuPixelPairStepClusters*
hiRegitMuPixelPairStepSeedLayers*
hiRegitMuPixelPairStepSeeds*
hiRegitMuPixelPairStepTrackCandidates*
hiRegitMuPixelPairStepTracks*
Expand Down
5 changes: 2 additions & 3 deletions RecoHI/HiMuonAlgos/python/HiRegitMuonTobTecStep_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@
)

# SEEDING LAYERS
hiRegitMuTobTecStepSeedLayers = RecoTracker.IterativeTracking.TobTecStep_cff.tobTecStepSeedLayers.clone(
ComponentName = cms.string('hiRegitMuTobTecStepSeedLayers'),
)
hiRegitMuTobTecStepSeedLayers = RecoTracker.IterativeTracking.TobTecStep_cff.tobTecStepSeedLayers.clone()
hiRegitMuTobTecStepSeedLayers.TOB.skipClusters = cms.InputTag('hiRegitMuTobTecStepClusters')
hiRegitMuTobTecStepSeedLayers.TEC.skipClusters = cms.InputTag('hiRegitMuTobTecStepClusters')

Expand Down Expand Up @@ -97,6 +95,7 @@
)

hiRegitMuonTobTecStep = cms.Sequence(hiRegitMuTobTecStepClusters*
hiRegitMuTobTecStepSeedLayers*
hiRegitMuTobTecStepSeeds*
hiRegitMuTobTecStepTrackCandidates*
hiRegitMuTobTecStepTracks*
Expand Down
10 changes: 4 additions & 6 deletions RecoHI/HiTracking/python/hiRegitMixedTripletStep_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@


# SEEDING LAYERS A
hiRegitMixedTripletStepSeedLayersA = RecoTracker.IterativeTracking.MixedTripletStep_cff.mixedTripletStepSeedLayersA.clone(
ComponentName = 'hiRegitMixedTripletStepSeedLayersA'
)
hiRegitMixedTripletStepSeedLayersA = RecoTracker.IterativeTracking.MixedTripletStep_cff.mixedTripletStepSeedLayersA.clone()
hiRegitMixedTripletStepSeedLayersA.BPix.skipClusters = cms.InputTag('hiRegitMixedTripletStepClusters')
hiRegitMixedTripletStepSeedLayersA.FPix.skipClusters = cms.InputTag('hiRegitMixedTripletStepClusters')
hiRegitMixedTripletStepSeedLayersA.TEC.skipClusters = cms.InputTag('hiRegitMixedTripletStepClusters')
Expand All @@ -51,9 +49,7 @@
hiRegitMixedTripletStepSeedsA.RegionFactoryPSet.RegionPSet.ptMin = 1.0

# SEEDING LAYERS B
hiRegitMixedTripletStepSeedLayersB = RecoTracker.IterativeTracking.MixedTripletStep_cff.mixedTripletStepSeedLayersB.clone(
ComponentName = 'hiRegitMixedTripletStepSeedLayersB',
)
hiRegitMixedTripletStepSeedLayersB = RecoTracker.IterativeTracking.MixedTripletStep_cff.mixedTripletStepSeedLayersB.clone()
hiRegitMixedTripletStepSeedLayersB.BPix.skipClusters = cms.InputTag('hiRegitMixedTripletStepClusters')
hiRegitMixedTripletStepSeedLayersB.TIB.skipClusters = cms.InputTag('hiRegitMixedTripletStepClusters')
hiRegitMixedTripletStepSeedLayersB.layerList = cms.vstring('BPix2+BPix3+TIB1','BPix2+BPix3+TIB2')
Expand Down Expand Up @@ -125,7 +121,9 @@
) #end of clone

hiRegitMixedTripletStep = cms.Sequence(hiRegitMixedTripletStepClusters*
hiRegitMixedTripletStepSeedLayersA*
hiRegitMixedTripletStepSeedsA*
hiRegitMixedTripletStepSeedLayersB*
hiRegitMixedTripletStepSeedsB*
hiRegitMixedTripletStepSeeds*
hiRegitMixedTripletStepTrackCandidates*
Expand Down
5 changes: 2 additions & 3 deletions RecoHI/HiTracking/python/hiRegitPixelPairStep_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@


# SEEDING LAYERS
hiRegitPixelPairStepSeedLayers = RecoTracker.IterativeTracking.PixelPairStep_cff.pixelPairStepSeedLayers.clone(
ComponentName = 'hiRegitPixelPairStepSeedLayers'
)
hiRegitPixelPairStepSeedLayers = RecoTracker.IterativeTracking.PixelPairStep_cff.pixelPairStepSeedLayers.clone()
hiRegitPixelPairStepSeedLayers.BPix.skipClusters = cms.InputTag('hiRegitPixelPairStepClusters')
hiRegitPixelPairStepSeedLayers.FPix.skipClusters = cms.InputTag('hiRegitPixelPairStepClusters')

Expand Down Expand Up @@ -101,6 +99,7 @@
) #end of clone

hiRegitPixelPairStep = cms.Sequence(hiRegitPixelPairStepClusters*
hiRegitPixelPairStepSeedLayers*
hiRegitPixelPairStepSeeds*
hiRegitPixelPairStepTrackCandidates*
hiRegitPixelPairStepTracks*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
)

convLayerPairs = cms.EDProducer("SeedingLayersEDProducer",
ComponentName = cms.string('convLayerPairs'),
layerList = cms.vstring('BPix1+BPix2',

'BPix2+BPix3',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

# TRIPLET SEEDING LAYERS
tobTecStepSeedLayersTripl = cms.EDProducer("SeedingLayersEDProducer",
ComponentName = cms.string('tobTecStepSeedLayersTripl'),
layerList = cms.vstring(
#TOB
'TOB1+TOB2+MTOB3',
Expand Down
12 changes: 6 additions & 6 deletions SLHCUpgradeSimulations/Configuration/python/phase1TkCustoms.py
Original file line number Diff line number Diff line change
Expand Up @@ -236,11 +236,12 @@ def customise_Reco(process,pileup):
process.reconstruction.remove(process.ak7CastorJetID)

#the quadruplet merger configuration
process.load("RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff")
process.pixelseedmergerlayers.BPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
process.pixelseedmergerlayers.BPix.HitProducer = cms.string("siPixelRecHits" )
process.pixelseedmergerlayers.FPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
process.pixelseedmergerlayers.FPix.HitProducer = cms.string("siPixelRecHits" )
# from this PSet the quadruplet merger uses only the layer list so these could probably be removed
from RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff import PixelSeedMergerQuadruplets
PixelSeedMergerQuadruplets.BPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
PixelSeedMergerQuadruplets.BPix.HitProducer = cms.string("siPixelRecHits" )
PixelSeedMergerQuadruplets.FPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
PixelSeedMergerQuadruplets.FPix.HitProducer = cms.string("siPixelRecHits" )

# Need these until pixel templates are used
process.load("SLHCUpgradeSimulations.Geometry.recoFromSimDigis_cff")
Expand All @@ -265,7 +266,6 @@ def customise_Reco(process,pileup):
# End of pixel template needed section

# Make pixelTracks use quadruplets
from RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff import PixelSeedMergerQuadruplets
process.pixelTracks.SeedMergerPSet = cms.PSet(
layerList = PixelSeedMergerQuadruplets,
addRemainingTriplets = cms.bool(False),
Expand Down
10 changes: 5 additions & 5 deletions SLHCUpgradeSimulations/Configuration/python/phase2TkCustomsBE.py
Original file line number Diff line number Diff line change
Expand Up @@ -200,11 +200,11 @@ def customise_Reco(process,pileup):
process.PixelCPEGenericESProducer.DoCosmics = False
process.siPixelRecHits.CPE = cms.string('PixelCPEGeneric')
#the quadruplet merger configuration
process.load("RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff")
process.pixelseedmergerlayers.BPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
process.pixelseedmergerlayers.BPix.HitProducer = cms.string("siPixelRecHits" )
process.pixelseedmergerlayers.FPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
process.pixelseedmergerlayers.FPix.HitProducer = cms.string("siPixelRecHits" )
# from this PSet the quadruplet merger uses only the layer list so these could probably be removed
PixelSeedMergerQuadruplets.BPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
PixelSeedMergerQuadruplets.BPix.HitProducer = cms.string("siPixelRecHits" )
PixelSeedMergerQuadruplets.FPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
PixelSeedMergerQuadruplets.FPix.HitProducer = cms.string("siPixelRecHits" )

process.highPtTripletStepTracks.TTRHBuilder=cms.string('WithTrackAngle')
process.detachedTripletStepTracks.TTRHBuilder=cms.string('WithTrackAngle')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,11 +167,11 @@ def customise_Reco(process):
process.PixelCPEGenericESProducer.DoCosmics = False
process.siPixelRecHits.CPE = cms.string('PixelCPEGeneric')
#the quadruplet merger configuration
process.load("RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff")
process.pixelseedmergerlayers.BPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
process.pixelseedmergerlayers.BPix.HitProducer = cms.string("siPixelRecHits" )
process.pixelseedmergerlayers.FPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
process.pixelseedmergerlayers.FPix.HitProducer = cms.string("siPixelRecHits" )
# from this PSet the quadruplet merger uses only the layer list so these could probably be removed
PixelSeedMergerQuadruplets.BPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
PixelSeedMergerQuadruplets.BPix.HitProducer = cms.string("siPixelRecHits" )
PixelSeedMergerQuadruplets.FPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
PixelSeedMergerQuadruplets.FPix.HitProducer = cms.string("siPixelRecHits" )

process.highPtTripletStepTracks.TTRHBuilder=cms.string('WithTrackAngle')
process.detachedTripletStepTracks.TTRHBuilder=cms.string('WithTrackAngle')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,11 +165,11 @@ def customise_Reco(process):
process.PixelCPEGenericESProducer.DoCosmics = False
process.siPixelRecHits.CPE = cms.string('PixelCPEGeneric')
#the quadruplet merger configuration
process.load("RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff")
process.pixelseedmergerlayers.BPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
process.pixelseedmergerlayers.BPix.HitProducer = cms.string("siPixelRecHits" )
process.pixelseedmergerlayers.FPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
process.pixelseedmergerlayers.FPix.HitProducer = cms.string("siPixelRecHits" )
# from this PSet the quadruplet merger uses only the layer list so these could probably be removed
PixelSeedMergerQuadruplets.BPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
PixelSeedMergerQuadruplets.BPix.HitProducer = cms.string("siPixelRecHits" )
PixelSeedMergerQuadruplets.FPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
PixelSeedMergerQuadruplets.FPix.HitProducer = cms.string("siPixelRecHits" )

process.highPtTripletStepTracks.TTRHBuilder=cms.string('WithTrackAngle')
process.detachedTripletStepTracks.TTRHBuilder=cms.string('WithTrackAngle')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,11 +165,11 @@ def customise_Reco(process):
process.PixelCPEGenericESProducer.DoCosmics = False
process.siPixelRecHits.CPE = cms.string('PixelCPEGeneric')
#the quadruplet merger configuration
process.load("RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff")
process.pixelseedmergerlayers.BPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
process.pixelseedmergerlayers.BPix.HitProducer = cms.string("siPixelRecHits" )
process.pixelseedmergerlayers.FPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
process.pixelseedmergerlayers.FPix.HitProducer = cms.string("siPixelRecHits" )
# from this PSet the quadruplet merger uses only the layer list so these could probably be removed
PixelSeedMergerQuadruplets.BPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
PixelSeedMergerQuadruplets.BPix.HitProducer = cms.string("siPixelRecHits" )
PixelSeedMergerQuadruplets.FPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
PixelSeedMergerQuadruplets.FPix.HitProducer = cms.string("siPixelRecHits" )

process.highPtTripletStepTracks.TTRHBuilder=cms.string('WithTrackAngle')
process.detachedTripletStepTracks.TTRHBuilder=cms.string('WithTrackAngle')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@
from RecoTracker.TkTrackingRegions.GlobalTrackingRegionFromBeamSpot_cfi import *

#the quadruplet merger configuration
# from this PSet the quadruplet merger uses only the layer list so these could probably be removed
from RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff import *
pixelseedmergerlayers.BPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
pixelseedmergerlayers.BPix.HitProducer = cms.string("siPixelRecHits" )
pixelseedmergerlayers.FPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
pixelseedmergerlayers.FPix.HitProducer = cms.string("siPixelRecHits" )
PixelSeedMergerQuadruplets.BPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
PixelSeedMergerQuadruplets.BPix.HitProducer = cms.string("siPixelRecHits" )
PixelSeedMergerQuadruplets.FPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
PixelSeedMergerQuadruplets.FPix.HitProducer = cms.string("siPixelRecHits" )

# new layer list (3/4 pixel seeding) in stepZero
PixelLayerTriplets.layerList = cms.vstring( 'BPix1+BPix2+BPix3',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@
from RecoTracker.TkTrackingRegions.GlobalTrackingRegionFromBeamSpot_cfi import *

#the quadruplet merger configuration
# from this PSet the quadruplet merger uses only the layer list so these could probably be removed
from RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff import *
pixelseedmergerlayers.BPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
pixelseedmergerlayers.BPix.HitProducer = cms.string("siPixelRecHits" )
pixelseedmergerlayers.FPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
pixelseedmergerlayers.FPix.HitProducer = cms.string("siPixelRecHits" )
PixelSeedMergerQuadruplets.BPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
PixelSeedMergerQuadruplets.BPix.HitProducer = cms.string("siPixelRecHits" )
PixelSeedMergerQuadruplets.FPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
PixelSeedMergerQuadruplets.FPix.HitProducer = cms.string("siPixelRecHits" )

# new layer list (3/4 pixel seeding) in stepZero
PixelLayerTriplets.layerList = cms.vstring( 'BPix1+BPix2+BPix3',
Expand Down

0 comments on commit 6b9363b

Please sign in to comment.