Skip to content

Commit

Permalink
phase 2 tracking tuning
Browse files Browse the repository at this point in the history
  • Loading branch information
stensokm committed Mar 27, 2014
1 parent 17c8c2c commit 1256ce0
Show file tree
Hide file tree
Showing 11 changed files with 68 additions and 63 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -94,34 +94,34 @@
minNumber3DLayers = 3,
d0_par1 = ( 0.8, 4.0 ),
dz_par1 = ( 0.9, 4.0 ),
d0_par2 = ( 0.5, 4.0 ),
dz_par2 = ( 0.7, 4.0 )
d0_par2 = ( 0.6, 4.0 ),
dz_par2 = ( 0.8, 4.0 )
), #end of pset
RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.tightMTS.clone(
name = 'initialStepTight',
preFilterName = 'initialStepLoose',
chi2n_par = 1.2,
chi2n_par = 1.4,
res_par = ( 0.003, 0.002 ),
minNumberLayers = 3,
maxNumberLostLayers = 2,
minNumber3DLayers = 3,
d0_par1 = ( 0.7, 4.0 ),
dz_par1 = ( 0.8, 4.0 ),
d0_par2 = ( 0.4, 4.0 ),
dz_par2 = ( 0.6, 4.0 )
d0_par2 = ( 0.5, 4.0 ),
dz_par2 = ( 0.7, 4.0 )
),
RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.highpurityMTS.clone(
name = 'initialStep',
preFilterName = 'initialStepTight',
chi2n_par = 0.9,
chi2n_par = 1.0,
res_par = ( 0.003, 0.001 ),
minNumberLayers = 3,
maxNumberLostLayers = 2,
minNumber3DLayers = 3,
d0_par1 = ( 0.6, 4.0 ),
dz_par1 = ( 0.7, 4.0 ),
d0_par2 = ( 0.35, 4.0 ),
dz_par2 = ( 0.45, 4.0 )
d0_par2 = ( 0.45, 4.0 ),
dz_par2 = ( 0.55, 4.0 )
),
) #end of vpset
) #end of clone
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# NEW CLUSTERS (remove previously used clusters)
lowPtQuadStepClusters = cms.EDProducer("TrackClusterRemover",
clusterLessSolution= cms.bool(True),
oldClusterRemovalInfo = cms.InputTag("highPtTripletStepClusters"),
trajectories = cms.InputTag("highPtTripletStepTracks"),
overrideTrkQuals = cms.InputTag('highPtTripletStepSelector','highPtTripletStep'),
TrackQuality = cms.string('highPurity'),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# NEW CLUSTERS (remove previously used clusters)
lowPtTripletStepClusters = cms.EDProducer("TrackClusterRemover",
clusterLessSolution= cms.bool(True),
oldClusterRemovalInfo = cms.InputTag("lowPtQuadStepClusters"),
trajectories = cms.InputTag("lowPtQuadStepTracks"),
overrideTrkQuals = cms.InputTag('lowPtQuadStepSelector','lowPtQuadStep'),
TrackQuality = cms.string('highPurity'),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# NEW CLUSTERS (remove previously used clusters)
lowPtQuadStepClusters = cms.EDProducer("TrackClusterRemover",
clusterLessSolution= cms.bool(True),
oldClusterRemovalInfo = cms.InputTag("highPtTripletStepClusters"),
trajectories = cms.InputTag("highPtTripletStepTracks"),
overrideTrkQuals = cms.InputTag('highPtTripletStepSelector','highPtTripletStep'),
TrackQuality = cms.string('highPurity'),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# NEW CLUSTERS (remove previously used clusters)
lowPtTripletStepClusters = cms.EDProducer("TrackClusterRemover",
clusterLessSolution= cms.bool(True),
oldClusterRemovalInfo = cms.InputTag("lowPtQuadStepClusters"),
trajectories = cms.InputTag("lowPtQuadStepTracks"),
overrideTrkQuals = cms.InputTag('lowPtQuadStepSelector','lowPtQuadStep'),
TrackQuality = cms.string('highPurity'),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
RegionFactoryPSet = RegionPsetFomBeamSpotBlock.clone(
ComponentName = cms.string('GlobalRegionProducerFromBeamSpot'),
RegionPSet = RegionPsetFomBeamSpotBlock.RegionPSet.clone(
ptMin = 0.5,
originRadius = 0.5,
ptMin = 0.45,
originRadius = 0.7,
nSigmaZ = 4.0
)
),
Expand Down Expand Up @@ -154,7 +154,7 @@
trackSelectors= cms.VPSet(
RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone(
name = 'detachedQuadStepVtxLoose',
chi2n_par = 0.9,
chi2n_par = 1.0,
res_par = ( 0.003, 0.001 ),
minNumberLayers = 3,
d0_par1 = ( 0.9, 3.0 ),
Expand All @@ -164,7 +164,7 @@
),
RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone(
name = 'detachedQuadStepTrkLoose',
chi2n_par = 0.5,
chi2n_par = 0.6,
res_par = ( 0.003, 0.001 ),
minNumberLayers = 3,
d0_par1 = ( 1.3, 4.0 ),
Expand All @@ -188,7 +188,7 @@
RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.tightMTS.clone(
name = 'detachedQuadStepTrkTight',
preFilterName = 'detachedQuadStepTrkLoose',
chi2n_par = 0.35,
chi2n_par = 0.5,
res_par = ( 0.003, 0.001 ),
minNumberLayers = 4,
maxNumberLostLayers = 1,
Expand All @@ -201,7 +201,7 @@
RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.highpurityMTS.clone(
name = 'detachedQuadStepVtx',
preFilterName = 'detachedQuadStepVtxTight',
chi2n_par = 0.8,
chi2n_par = 0.9,
res_par = ( 0.003, 0.001 ),
minNumberLayers = 3,
maxNumberLostLayers = 1,
Expand All @@ -214,7 +214,7 @@
RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.highpurityMTS.clone(
name = 'detachedQuadStepTrk',
preFilterName = 'detachedQuadStepTrkTight',
chi2n_par = 0.35,
chi2n_par = 0.45,
res_par = ( 0.003, 0.001 ),
minNumberLayers = 4,
maxNumberLostLayers = 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
minNumber3DLayers = 3,
d0_par1 = ( 0.7, 4.0 ),
dz_par1 = ( 0.8, 4.0 ),
d0_par2 = ( 0.4, 4.0 ),
d0_par2 = ( 0.6, 4.0 ),
dz_par2 = ( 0.6, 4.0 )
), #end of pset
RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.tightMTS.clone(
Expand All @@ -148,7 +148,7 @@
minNumber3DLayers = 3,
d0_par1 = ( 0.6, 4.0 ),
dz_par1 = ( 0.7, 4.0 ),
d0_par2 = ( 0.35, 4.0 ),
d0_par2 = ( 0.5, 4.0 ),
dz_par2 = ( 0.5, 4.0 )
),
RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.highpurityMTS.clone(
Expand All @@ -159,9 +159,9 @@
minNumberLayers = 3,
maxNumberLostLayers = 2,
minNumber3DLayers = 3,
d0_par1 = ( 0.4, 4.0 ),
d0_par1 = ( 0.5, 4.0 ),
dz_par1 = ( 0.6, 4.0 ),
d0_par2 = ( 0.3, 4.0 ),
d0_par2 = ( 0.45, 4.0 ),
dz_par2 = ( 0.45, 4.0 )
),
) #end of vpset
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,34 +148,34 @@
minNumber3DLayers = 3,
d0_par1 = ( 0.8, 4.0 ),
dz_par1 = ( 0.7, 4.0 ),
d0_par2 = ( 0.5, 4.0 ),
dz_par2 = ( 0.5, 4.0 )
d0_par2 = ( 0.6, 4.0 ),
dz_par2 = ( 0.6, 4.0 )
), #end of pset
RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.tightMTS.clone(
name = 'lowPtQuadStepTight',
preFilterName = 'lowPtQuadStepLoose',
chi2n_par = 1.3,
chi2n_par = 1.4,
res_par = ( 0.003, 0.002 ),
minNumberLayers = 3,
maxNumberLostLayers = 2,
minNumber3DLayers = 3,
d0_par1 = ( 0.7, 4.0 ),
dz_par1 = ( 0.6, 4.0 ),
d0_par2 = ( 0.4, 4.0 ),
dz_par2 = ( 0.4, 4.0 )
d0_par2 = ( 0.5, 4.0 ),
dz_par2 = ( 0.5, 4.0 )
),
RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.highpurityMTS.clone(
name = 'lowPtQuadStep',
preFilterName = 'lowPtQuadStepTight',
chi2n_par = 0.9,
chi2n_par = 1.2,
res_par = ( 0.003, 0.001 ),
minNumberLayers = 3,
maxNumberLostLayers = 2,
minNumber3DLayers = 3,
d0_par1 = ( 0.5, 4.0 ),
dz_par1 = ( 0.5, 4.0 ),
d0_par2 = ( 0.3, 4.0 ),
dz_par2 = ( 0.4, 4.0 )
d0_par2 = ( 0.45, 4.0 ),
dz_par2 = ( 0.45, 4.0 )
),
) #end of vpset
) #end of clone
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,16 @@
ComponentName = cms.string('lowPtTripletStepSeedLayers'),
layerList = cms.vstring('BPix1+BPix2+BPix3', 'BPix2+BPix3+BPix4',
'BPix1+BPix3+BPix4', 'BPix1+BPix2+BPix4',
'BPix2+BPix3+FPix1_pos', 'BPix2+BPix3+FPix1_neg',
'BPix1+BPix2+FPix1_pos', 'BPix1+BPix2+FPix1_neg',
'BPix2+FPix1_pos+FPix2_pos', 'BPix2+FPix1_neg+FPix2_neg',
'BPix1+FPix1_pos+FPix2_pos', 'BPix1+FPix1_neg+FPix2_neg',
'BPix1+BPix2+FPix2_pos', 'BPix1+BPix2+FPix2_neg',
'FPix1_pos+FPix2_pos+FPix3_pos', 'FPix1_neg+FPix2_neg+FPix3_neg',
'BPix1+FPix2_pos+FPix3_pos', 'BPix1+FPix2_neg+FPix3_neg',
'BPix1+FPix1_pos+FPix3_pos', 'BPix1+FPix1_neg+FPix3_neg',
'FPix2_pos+FPix3_pos+FPix4_pos', 'FPix2_neg+FPix3_neg+FPix4_neg',
'FPix3_pos+FPix4_pos+FPix5_pos', 'FPix3_neg+FPix4_neg+FPix5_neg',
'FPix4_pos+FPix5_pos+FPix6_pos', 'FPix4_neg+FPix5_neg+FPix6_neg',
'FPix5_pos+FPix6_pos+FPix7_pos', 'FPix5_neg+FPix6_neg+FPix7_neg',
'FPix6_pos+FPix7_pos+FPix8_pos', 'FPix6_neg+FPix7_neg+FPix8_neg',
'FPix6_pos+FPix7_pos+FPix9_pos', 'FPix6_neg+FPix7_neg+FPix9_neg')
'FPix6_pos+FPix7_pos+FPix8_pos', 'FPix6_neg+FPix7_neg+FPix8_neg')
)
lowPtTripletStepSeedLayers.BPix.skipClusters = cms.InputTag('lowPtTripletStepClusters')
lowPtTripletStepSeedLayers.FPix.skipClusters = cms.InputTag('lowPtTripletStepClusters')
Expand Down Expand Up @@ -92,8 +88,8 @@
MeasurementTrackerName = '',
trajectoryFilterName = 'lowPtTripletStepTrajectoryFilter',
clustersToSkip = cms.InputTag('lowPtTripletStepClusters'),
minNrOfHitsForRebuild = 1,
maxCand = 5,
minNrOfHitsForRebuild = 2,
maxCand = 3,
estimator = cms.string('lowPtTripletStepChi2Est'),
maxDPhiForLooperReconstruction = cms.double(2.0),
# 0.63 GeV is the maximum pT for a charged particle to loop within the 1.1m radius
Expand Down Expand Up @@ -144,8 +140,8 @@
minNumber3DLayers = 3,
d0_par1 = ( 0.7, 4.0 ),
dz_par1 = ( 0.6, 4.0 ),
d0_par2 = ( 0.5, 4.0 ),
dz_par2 = ( 0.5, 4.0 )
d0_par2 = ( 0.6, 4.0 ),
dz_par2 = ( 0.6, 4.0 )
), #end of pset
RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.tightMTS.clone(
name = 'lowPtTripletStepTight',
Expand All @@ -157,8 +153,8 @@
minNumber3DLayers = 3,
d0_par1 = ( 0.6, 4.0 ),
dz_par1 = ( 0.5, 4.0 ),
d0_par2 = ( 0.4, 4.0 ),
dz_par2 = ( 0.4, 4.0 )
d0_par2 = ( 0.5, 4.0 ),
dz_par2 = ( 0.5, 4.0 )
),
RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.highpurityMTS.clone(
name = 'lowPtTripletStep',
Expand All @@ -170,8 +166,8 @@
minNumber3DLayers = 3,
d0_par1 = ( 0.5, 4.0 ),
dz_par1 = ( 0.4, 4.0 ),
d0_par2 = ( 0.3, 4.0 ),
dz_par2 = ( 0.35, 4.0 )
d0_par2 = ( 0.45, 4.0 ),
dz_par2 = ( 0.45, 4.0 )
),
) #end of vpset
) #end of clone
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,7 @@
'FPix2_pos+FPix3_pos', 'FPix2_neg+FPix3_neg'
'FPix3_pos+FPix4_pos', 'FPix3_neg+FPix4_neg',
'FPix4_pos+FPix5_pos', 'FPix4_neg+FPix5_neg',
'FPix5_pos+FPix6_pos', 'FPix5_neg+FPix6_neg',
'FPix6_pos+FPix7_pos', 'FPix6_neg+FPix7_neg',
'FPix7_pos+FPix8_pos', 'FPix7_neg+FPix8_neg',
'FPix7_pos+FPix9_pos', 'FPix7_neg+FPix9_neg'),
'FPix5_pos+FPix6_pos', 'FPix5_neg+FPix6_neg'),
BPix = cms.PSet(
useErrorsFromParam = cms.bool(True),
hitErrorRPhi = cms.double(0.0027),
Expand All @@ -51,11 +48,18 @@
)

# SEEDS
import RecoTracker.TkSeedGenerator.GlobalSeedsFromPairsWithVertices_cff
pixelPairStepSeeds = RecoTracker.TkSeedGenerator.GlobalSeedsFromPairsWithVertices_cff.globalSeedsFromPairsWithVertices.clone()
pixelPairStepSeeds.RegionFactoryPSet.RegionPSet.ptMin = 1.3
pixelPairStepSeeds.RegionFactoryPSet.RegionPSet.originRadius = 0.015
pixelPairStepSeeds.RegionFactoryPSet.RegionPSet.fixedError = 0.03
import RecoTracker.TkSeedGenerator.GlobalPixelSeeds_cff
from RecoTracker.TkTrackingRegions.GlobalTrackingRegionFromBeamSpot_cfi import RegionPsetFomBeamSpotBlock
pixelPairStepSeeds = RecoTracker.TkSeedGenerator.GlobalPixelSeeds_cff.globalPixelSeeds.clone(
RegionFactoryPSet = RegionPsetFomBeamSpotBlock.clone(
ComponentName = cms.string('GlobalRegionProducerFromBeamSpot'),
RegionPSet = RegionPsetFomBeamSpotBlock.RegionPSet.clone(
ptMin = 1.3,
originRadius = 0.015,
nSigmaZ = 4.0
)
)
)
pixelPairStepSeeds.OrderedHitsFactoryPSet.SeedingLayers = cms.string('pixelPairStepSeedLayers')

pixelPairStepSeeds.SeedComparitorPSet = cms.PSet(
Expand Down Expand Up @@ -94,8 +98,8 @@
MeasurementTrackerName = '',
trajectoryFilterName = 'pixelPairStepTrajectoryFilter',
clustersToSkip = cms.InputTag('pixelPairStepClusters'),
minNrOfHitsForRebuild = 1,
maxCand = 4,
minNrOfHitsForRebuild = 2,
maxCand = 3,
estimator = cms.string('pixelPairStepChi2Est'),
maxDPhiForLooperReconstruction = cms.double(2.0),
maxPtForLooperReconstruction = cms.double(0.7)
Expand Down Expand Up @@ -140,36 +144,36 @@
minNumberLayers = 3,
maxNumberLostLayers = 2,
minNumber3DLayers = 3,
d0_par1 = ( 0.35, 4.0 ),
d0_par1 = ( 0.4, 4.0 ),
dz_par1 = ( 0.4, 4.0 ),
d0_par2 = ( 0.4, 4.0 ),
dz_par2 = ( 0.4, 4.0 )
d0_par2 = ( 0.6, 4.0 ),
dz_par2 = ( 0.45, 4.0 )
), #end of pset
RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.tightMTS.clone(
name = 'pixelPairStepTight',
preFilterName = 'pixelPairStepLoose',
chi2n_par = 0.5,
chi2n_par = 0.6,
res_par = ( 0.003, 0.002 ),
minNumberLayers = 4,
maxNumberLostLayers = 2,
minNumber3DLayers = 3,
d0_par1 = ( 0.3, 4.0 ),
d0_par1 = ( 0.35, 4.0 ),
dz_par1 = ( 0.35, 4.0 ),
d0_par2 = ( 0.35, 4.0 ),
dz_par2 = ( 0.35, 4.0 )
d0_par2 = ( 0.5, 4.0 ),
dz_par2 = ( 0.4, 4.0 )
),
RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.highpurityMTS.clone(
name = 'pixelPairStep',
preFilterName = 'pixelPairStepTight',
chi2n_par = 0.4,
chi2n_par = 0.5,
res_par = ( 0.003, 0.001 ),
minNumberLayers = 5,
maxNumberLostLayers = 2,
minNumber3DLayers = 4,
d0_par1 = ( 0.25, 4.0 ),
d0_par1 = ( 0.3, 4.0 ),
dz_par1 = ( 0.3, 4.0 ),
d0_par2 = ( 0.3, 4.0 ),
dz_par2 = ( 0.3, 4.0 )
d0_par2 = ( 0.45, 4.0 ),
dz_par2 = ( 0.35, 4.0 )
),
) #end of vpset
) #end of clone
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ def customise_Reco(process,pileup):
process.cosmicsVetoTracksRaw.TTRHBuilder=cms.string('WithTrackAngle')
# End of pixel template needed section

process.regionalCosmicTrackerSeeds.OrderedHitsFactoryPSet.LayerPSet.layerList = cms.vstring('BPix10+BPix9') # Optimize later
process.regionalCosmicTrackerSeeds.OrderedHitsFactoryPSet.LayerPSet.layerList = cms.vstring('BPix9+BPix8') # Optimize later
process.regionalCosmicTrackerSeeds.OrderedHitsFactoryPSet.LayerPSet.BPix = cms.PSet(
HitProducer = cms.string('siPixelRecHits'),
hitErrorRZ = cms.double(0.006),
Expand All @@ -198,6 +198,7 @@ def customise_Reco(process,pileup):
mergeTriplets = cms.bool(True),
ttrhBuilderLabel = cms.string('PixelTTRHBuilderWithoutAngle')
)
process.pixelTracks.OrderedHitsFactoryPSet.GeneratorPSet.maxElement = cms.uint32(0)
process.pixelTracks.FilterPSet.chi2 = cms.double(50.0)
process.pixelTracks.FilterPSet.tipMax = cms.double(0.05)
process.pixelTracks.RegionFactoryPSet.RegionPSet.originRadius = cms.double(0.02)
Expand Down

0 comments on commit 1256ce0

Please sign in to comment.