Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Muon regional iterative tracking in default HI reco #6279

Merged
merged 22 commits into from Nov 14, 2014
Merged

Muon regional iterative tracking in default HI reco #6279

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
6bd5e44
initial commit to the pr_73X_v02_echapon branch
echapon Oct 10, 2014
702ccc4
Add "step2nmatch" configuration files
echapon Oct 14, 2014
5b6d537
Adding an example crab.cfg too
echapon Oct 14, 2014
266cdf5
Initial commit of the new RegIt in 7.2 (based on 5.3, plus modificati…
echapon Oct 15, 2014
8eb5359
First working version of myregit
echapon Nov 3, 2014
581b41d
Merge pull request #1 from echapon/pr_73X_v02_echapon_local
echapon Nov 4, 2014
0392365
Merge branch 'from-CMSSW_7_3_X_2014-11-04-0200' into pr_73X_v03_echapon
echapon Nov 4, 2014
3968043
Modifications for CMSSW 7.3
echapon Nov 6, 2014
ef27a3c
Remove unwanted files
echapon Nov 7, 2014
29943d1
Remove commented lines
echapon Nov 8, 2014
e42cdfe
Remove commented lines
echapon Nov 8, 2014
3dc1c0f
Remove commented lines
echapon Nov 8, 2014
1b4f8cb
Remove commented lines
echapon Nov 8, 2014
418ed95
Remove commented lines
echapon Nov 8, 2014
16189f0
Remove commented lines
echapon Nov 8, 2014
f038376
Remove commented lines
echapon Nov 8, 2014
775d7f8
Remove commented lines
echapon Nov 8, 2014
0d14708
Remove commented lines
echapon Nov 8, 2014
2e3d3a3
Remove commented lines
echapon Nov 8, 2014
58b5415
Remove commented lines
echapon Nov 8, 2014
ac6ea1b
Remove commented lines
echapon Nov 8, 2014
3a8c59e
Add back the missing standalone muon reconstruction steps
echapon Nov 13, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 7 additions & 2 deletions RecoHI/HiMuonAlgos/python/HiRecoMuon_cff.py
View file
Open in desktop
Expand Up @@ -23,8 +23,13 @@
muonShowerInformation.muonCollection = "muons"

#don't modify somebody else's sequence, create a new one if needed
muonreco_plus_isolation_PbPb = muonreco_plus_isolation.expandAndClone()
muonreco_plus_isolation_PbPb.replace(muons1stStep, muons)
muonIdProducerSequence_PbPb = cms.Sequence(glbTrackQual*muons*calomuons*muonEcalDetIds*muonShowerInformation)
muontracking_PbPb = cms.Sequence(globalMuons) # tracking is already done before
muontracking_with_TeVRefinement_PbPb = cms.Sequence(muontracking_PbPb * tevMuons)

muonreco_PbPb = cms.Sequence(muontracking_PbPb * muonIdProducerSequence_PbPb)
muonrecowith_TeVRefinemen_PbPb = cms.Sequence(muontracking_with_TeVRefinement_PbPb * muonIdProducerSequence_PbPb)
muonreco_plus_isolation_PbPb = cms.Sequence(muonrecowith_TeVRefinemen_PbPb * muIsolation)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the problem with missing standalone muon variants are here.
I don't see anything truly PbPb or muRegit in this part of changes, was there a reason to make this change or was it just a result of somewhat blind port from the past?


globalMuons.TrackerCollectionLabel = hiTracks

Expand Down
58 changes: 36 additions & 22 deletions RecoHI/HiMuonAlgos/python/HiRegitMuonDetachedTripletStep_cff.py
View file
Open in desktop
Expand Up @@ -16,22 +16,25 @@


###################################
from RecoHI.HiTracking.hiRegitDetachedTripletStep_cff import *
from RecoTracker.IterativeTracking.DetachedTripletStep_cff import *

# NEW CLUSTERS (remove previously used clusters)
hiRegitMuDetachedTripletStepClusters = RecoHI.HiTracking.hiRegitDetachedTripletStep_cff.hiRegitDetachedTripletStepClusters.clone(
oldClusterRemovalInfo = cms.InputTag("hiRegitMuPixelPairStepClusters"),
trajectories = cms.InputTag("hiRegitMuPixelPairStepTracks"),
overrideTrkQuals = cms.InputTag('hiRegitMuPixelPairStepSelector','hiRegitMuPixelPairStep'),
hiRegitMuDetachedTripletStepClusters = RecoTracker.IterativeTracking.DetachedTripletStep_cff.detachedTripletStepClusters.clone(
# oldClusterRemovalInfo = cms.InputTag("hiRegitMuInitialStepClusters"),
trajectories = cms.InputTag("hiRegitMuInitialStepTracks"),
overrideTrkQuals = cms.InputTag('hiRegitMuInitialStepSelector','hiRegitMuInitialStep'),
TrackQuality = cms.string('tight')
)

# SEEDING LAYERS
hiRegitMuDetachedTripletStepSeedLayers = RecoHI.HiTracking.hiRegitDetachedTripletStep_cff.hiRegitDetachedTripletStepSeedLayers.clone()
hiRegitMuDetachedTripletStepSeedLayers = RecoTracker.IterativeTracking.DetachedTripletStep_cff.detachedTripletStepSeedLayers.clone(
# ComponentName = 'hiRegitMuDetachedTripletStepSeedLayers'
)
hiRegitMuDetachedTripletStepSeedLayers.BPix.skipClusters = cms.InputTag('hiRegitMuDetachedTripletStepClusters')
hiRegitMuDetachedTripletStepSeedLayers.FPix.skipClusters = cms.InputTag('hiRegitMuDetachedTripletStepClusters')

# seeding
hiRegitMuDetachedTripletStepSeeds = RecoHI.HiTracking.hiRegitDetachedTripletStep_cff.hiRegitDetachedTripletStepSeeds.clone()
hiRegitMuDetachedTripletStepSeeds = RecoTracker.IterativeTracking.DetachedTripletStep_cff.detachedTripletStepSeeds.clone()
hiRegitMuDetachedTripletStepSeeds.RegionFactoryPSet = HiTrackingRegionFactoryFromSTAMuonsBlock.clone()
hiRegitMuDetachedTripletStepSeeds.ClusterCheckPSet.doClusterCheck = False # do not check for max number of clusters pixel or strips
hiRegitMuDetachedTripletStepSeeds.RegionFactoryPSet.MuonTrackingRegionBuilder.EscapePt = 0.9
Expand All @@ -40,43 +43,54 @@
hiRegitMuDetachedTripletStepSeeds.RegionFactoryPSet.MuonTrackingRegionBuilder.Rescale_Dz = 4. # max(DeltaZ_Region,Rescale_Dz*vtx->zError())
hiRegitMuDetachedTripletStepSeeds.OrderedHitsFactoryPSet.SeedingLayers = 'hiRegitMuDetachedTripletStepSeedLayers'
from RecoPixelVertexing.PixelLowPtUtilities.ClusterShapeHitFilterESProducer_cfi import *
#import RecoPixelVertexing.PixelLowPtUtilities.LowPtClusterShapeSeedComparitor_cfi
#hiRegitMuDetachedTripletStepSeeds.OrderedHitsFactoryPSet.GeneratorPSet.SeedComparitorPSet = RecoPixelVertexing.PixelLowPtUtilities.LowPtClusterShapeSeedComparitor_cfi.LowPtClusterShapeSeedComparitor
#hiRegitMuDetachedTripletStepSeeds.OrderedHitsFactoryPSet.GeneratorPSet.SeedComparitorPSet.ComponentName = 'LowPtClusterShapeSeedComparitor'

# building: feed the new-named seeds
hiRegitMuDetachedTripletStepTrajectoryFilter = RecoHI.HiTracking.hiRegitDetachedTripletStep_cff.hiRegitDetachedTripletStepTrajectoryFilter.clone()
hiRegitMuDetachedTripletStepTrajectoryFilter.minPt = 0.8 # after each new hit, apply pT cut for traj w/ at least minHitsMinPt = cms.int32(3),
hiRegitMuDetachedTripletStepTrajectoryFilterBase = RecoTracker.IterativeTracking.DetachedTripletStep_cff.detachedTripletStepTrajectoryFilterBase.clone()
hiRegitMuDetachedTripletStepTrajectoryFilterBase.minPt = 0.8 # after each new hit, apply pT cut for traj w/ at least minHitsMinPt = cms.int32(3),

hiRegitMuDetachedTripletStepTrajectoryFilter = RecoTracker.IterativeTracking.DetachedTripletStep_cff.detachedTripletStepTrajectoryFilter.clone()
hiRegitMuDetachedTripletStepTrajectoryFilter.filters = cms.VPSet(
cms.PSet( refToPSet_ = cms.string('hiRegitMuDetachedTripletStepTrajectoryFilterBase')),
cms.PSet( refToPSet_ = cms.string('detachedTripletStepTrajectoryFilterShape')))

hiRegitMuDetachedTripletStepTrajectoryBuilder = RecoHI.HiTracking.hiRegitDetachedTripletStep_cff.hiRegitDetachedTripletStepTrajectoryBuilder.clone(
trajectoryFilter = cms.PSet(refToPSet_ = cms.string('hiRegitMuDetachedTripletStepTrajectoryFilter')),
hiRegitMuDetachedTripletStepTrajectoryBuilder = RecoTracker.IterativeTracking.DetachedTripletStep_cff.detachedTripletStepTrajectoryBuilder.clone(
# ComponentName = 'hiRegitMuDetachedTripletStepTrajectoryBuilder',
# trajectoryFilterName = 'hiRegitMuDetachedTripletStepTrajectoryFilter',
clustersToSkip = cms.InputTag('hiRegitMuDetachedTripletStepClusters')
)

hiRegitMuDetachedTripletStepTrackCandidates = RecoHI.HiTracking.hiRegitDetachedTripletStep_cff.hiRegitDetachedTripletStepTrackCandidates.clone(
hiRegitMuDetachedTripletStepTrackCandidates = RecoTracker.IterativeTracking.DetachedTripletStep_cff.detachedTripletStepTrackCandidates.clone(
src = cms.InputTag('hiRegitMuDetachedTripletStepSeeds'),
TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('hiRegitDetachedTripletStepTrajectoryBuilder')),
maxNSeeds=100000
TrajectoryBuilder = 'hiRegitMuDetachedTripletStepTrajectoryBuilder',
clustersToSkip = cms.InputTag("hiRegitMuDetachedTripletStepClusters")
)

# fitting: feed new-names
hiRegitMuDetachedTripletStepTracks = RecoHI.HiTracking.hiRegitDetachedTripletStep_cff.hiRegitDetachedTripletStepTracks.clone(
hiRegitMuDetachedTripletStepTracks = RecoTracker.IterativeTracking.DetachedTripletStep_cff.detachedTripletStepTracks.clone(
AlgorithmName = cms.string('iter6'),
src = 'hiRegitMuDetachedTripletStepTrackCandidates'
)


hiRegitMuDetachedTripletStepSelector = RecoHI.HiTracking.hiRegitDetachedTripletStep_cff.hiRegitDetachedTripletStepSelector.clone(
import RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi
hiRegitMuDetachedTripletStepSelector = RecoTracker.IterativeTracking.DetachedTripletStep_cff.detachedTripletStepSelector.clone(
src ='hiRegitMuDetachedTripletStepTracks',
vertices = cms.InputTag("hiSelectedVertex"),
trackSelectors= cms.VPSet(
RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiLooseMTS.clone(
name = 'hiRegitMuDetachedTripletStepLoose',
RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone(
name = 'hiRegitMuDetachedTripletStepLoose',
qualityBit = cms.string('loose'),
),
RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiTightMTS.clone(
RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.tightMTS.clone(
name = 'hiRegitMuDetachedTripletStepTight',
preFilterName = 'hiRegitMuDetachedTripletStepLoose',
qualityBit = cms.string('loose'),
),
RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiHighpurityMTS.clone(
RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.highpurityMTS.clone(
name = 'hiRegitMuDetachedTripletStep',
preFilterName = 'hiRegitMuDetachedTripletStepTight',
qualityBit = cms.string('tight'),
)
) #end of vpset
)
Expand Down
77 changes: 35 additions & 42 deletions RecoHI/HiMuonAlgos/python/HiRegitMuonInitialStep_cff.py
View file
Open in desktop
Expand Up @@ -13,85 +13,78 @@


###################################
hiRegitMuFirstStepFilter = cms.EDProducer("QualityFilter",
TrackQuality = cms.string('highPurity'),
recTracks = cms.InputTag("hiSelectedTracks")
)

# NEW CLUSTERS (remove previously used clusters)
hiRegitMuInitialStepClusters = cms.EDProducer("TrackClusterRemover",
clusterLessSolution= cms.bool(True),
trajectories = cms.InputTag("hiRegitMuFirstStepFilter"),
TrackQuality = cms.string('highPurity'),
pixelClusters = cms.InputTag("siPixelClusters"),
stripClusters = cms.InputTag("siStripClusters"),
Common = cms.PSet(
maxChi2 = cms.double(9.0)
),
Strip = cms.PSet(
#Yen-Jie's mod to preserve merged clusters
maxSize = cms.uint32(2),
maxChi2 = cms.double(9.0)
)
)
from RecoTracker.IterativeTracking.InitialStep_cff import *

#-------------------------
from RecoHI.HiTracking.hiRegitInitialStep_cff import *
# SEEDING LAYERS
hiRegitMuInitialStepSeedLayers = RecoTracker.IterativeTracking.InitialStep_cff.initialStepSeedLayers.clone()

# seeding
hiRegitMuInitialStepSeeds = RecoHI.HiTracking.hiRegitInitialStep_cff.hiRegitInitialStepSeeds.clone()
hiRegitMuInitialStepSeeds = RecoTracker.IterativeTracking.InitialStep_cff.initialStepSeeds.clone()
hiRegitMuInitialStepSeeds.RegionFactoryPSet = HiTrackingRegionFactoryFromSTAMuonsBlock.clone()
hiRegitMuInitialStepSeeds.OrderedHitsFactoryPSet.SeedingLayers = cms.InputTag("hiRegitMuInitialStepSeedLayers")
hiRegitMuInitialStepSeeds.ClusterCheckPSet.doClusterCheck = False # do not check for max number of clusters pixel or strips
hiRegitMuInitialStepSeeds.RegionFactoryPSet.MuonTrackingRegionBuilder.EscapePt = 3.0
hiRegitMuInitialStepSeeds.RegionFactoryPSet.MuonTrackingRegionBuilder.DeltaR = 1 # default = 0.2
hiRegitMuInitialStepSeeds.RegionFactoryPSet.MuonTrackingRegionBuilder.DeltaZ_Region = 1 # this give you the length
hiRegitMuInitialStepSeeds.RegionFactoryPSet.MuonTrackingRegionBuilder.Rescale_Dz = 4. # max(DeltaZ_Region,Rescale_Dz*vtx->zError())
hiRegitMuInitialStepSeeds.skipClusters = cms.InputTag('hiRegitMuInitialStepClusters')



# building: feed the new-named seeds
hiRegitMuInitialStepTrajectoryFilter = RecoHI.HiTracking.hiRegitInitialStep_cff.hiRegitInitialStepTrajectoryFilter.clone()
hiRegitMuInitialStepTrajectoryFilter.minPt = 2.5 # after each new hit, apply pT cut for traj w/ at least minHitsMinPt = cms.int32(3),
hiRegitMuInitialStepTrajectoryFilterBase = RecoTracker.IterativeTracking.InitialStep_cff.initialStepTrajectoryFilterBase.clone()
hiRegitMuInitialStepTrajectoryFilterBase.minPt = 2.5 # after each new hit, apply pT cut for traj w/ at least minHitsMinPt = cms.int32(3),

hiRegitMuInitialStepTrajectoryFilter = RecoTracker.IterativeTracking.InitialStep_cff.initialStepTrajectoryFilter.clone()
hiRegitMuInitialStepTrajectoryFilter.filters = cms.VPSet(
cms.PSet( refToPSet_ = cms.string('hiRegitMuInitialStepTrajectoryFilterBase')),
cms.PSet( refToPSet_ = cms.string('initialStepTrajectoryFilterShape')))


hiRegitMuInitialStepTrajectoryBuilder = RecoHI.HiTracking.hiRegitInitialStep_cff.hiRegitInitialStepTrajectoryBuilder.clone(
trajectoryFilter = cms.PSet(refToPSet_ = cms.string('hiRegitMuInitialStepTrajectoryFilter')),
clustersToSkip = cms.InputTag('hiRegitMuInitialStepClusters')
hiRegitMuInitialStepTrajectoryBuilder = RecoTracker.IterativeTracking.InitialStep_cff.initialStepTrajectoryBuilder.clone(
# ComponentName = 'hiRegitMuInitialStepTrajectoryBuilder',
trajectoryFilter = cms.PSet(
refToPSet_ = cms.string('hiRegitMuInitialStepTrajectoryFilter')
),
)

# track candidates
hiRegitMuInitialStepTrackCandidates = RecoHI.HiTracking.hiRegitInitialStep_cff.hiRegitInitialStepTrackCandidates.clone(
hiRegitMuInitialStepTrackCandidates = RecoTracker.IterativeTracking.InitialStep_cff.initialStepTrackCandidates.clone(
src = cms.InputTag('hiRegitMuInitialStepSeeds'),
TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('hiRegitMuInitialStepTrajectoryBuilder')),
TrajectoryBuilderPSet = cms.PSet(
refToPSet_ = cms.string('hiRegitMuInitialStepTrajectoryBuilder')
),
maxNSeeds = cms.uint32(1000000)
)

# fitting: feed new-names
hiRegitMuInitialStepTracks = RecoHI.HiTracking.hiRegitInitialStep_cff.hiRegitInitialStepTracks.clone(
hiRegitMuInitialStepTracks = RecoTracker.IterativeTracking.InitialStep_cff.initialStepTracks.clone(
AlgorithmName = cms.string('iter3'),
src = 'hiRegitMuInitialStepTrackCandidates'
)


hiRegitMuInitialStepSelector = RecoHI.HiTracking.hiRegitInitialStep_cff.hiRegitInitialStepSelector.clone(
import RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi
hiRegitMuInitialStepSelector = RecoTracker.IterativeTracking.InitialStep_cff.initialStepSelector.clone(
src ='hiRegitMuInitialStepTracks',
vertices = cms.InputTag("hiSelectedVertex"),
trackSelectors= cms.VPSet(
RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiLooseMTS.clone(
name = 'hiRegitMuInitialStepLoose',
RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone(
name = 'hiRegitMuInitialStepLoose',
qualityBit = cms.string('loose'),
), #end of pset
RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiTightMTS.clone(
RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.tightMTS.clone(
name = 'hiRegitMuInitialStepTight',
preFilterName = 'hiRegitMuInitialStepLoose',
qualityBit = cms.string('loose'),
),
RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiHighpurityMTS.clone(
RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.highpurityMTS.clone(
name = 'hiRegitMuInitialStep',
preFilterName = 'hiRegitMuInitialStepTight',
# minNumberLayers = 10
qualityBit = cms.string('tight'),
),
) #end of vpset
)

hiRegitMuonInitialStep = cms.Sequence(hiRegitMuFirstStepFilter*
hiRegitMuInitialStepClusters*
hiRegitMuonInitialStep = cms.Sequence(hiRegitMuInitialStepSeedLayers*
hiRegitMuInitialStepSeeds*
hiRegitMuInitialStepTrackCandidates*
hiRegitMuInitialStepTracks*
Expand Down