Skip to content

Commit

Permalink
Merge pull request #10953 from echapon/75X_regitMuonSeededAndDetached…
Browse files Browse the repository at this point in the history
…Triplet

New steps for HI muon RegIt
  • Loading branch information
davidlange6 committed Aug 27, 2015
2 parents f75df6e + c616f47 commit 574ae69
Show file tree
Hide file tree
Showing 4 changed files with 167 additions and 11 deletions.
Expand Up @@ -20,8 +20,9 @@

# NEW CLUSTERS (remove previously used clusters)
hiRegitMuDetachedTripletStepClusters = RecoTracker.IterativeTracking.DetachedTripletStep_cff.detachedTripletStepClusters.clone(
trajectories = cms.InputTag("hiRegitMuInitialStepTracks"),
overrideTrkQuals = cms.InputTag('hiRegitMuInitialStepSelector','hiRegitMuInitialStep'),
trajectories = cms.InputTag("hiRegitMuPixelLessStepTracks"),
overrideTrkQuals = cms.InputTag('hiRegitMuPixelLessStepSelector','hiRegitMuPixelLessStep'),
trackClassifier = cms.InputTag(''),
TrackQuality = cms.string('tight')
)

Expand Down
139 changes: 139 additions & 0 deletions RecoHI/HiMuonAlgos/python/HiRegitMuonSeededStep_cff.py
@@ -0,0 +1,139 @@
import FWCore.ParameterSet.Config as cms
from RecoTracker.IterativeTracking.MuonSeededStep_cff import *

###### Muon reconstruction module #####
import RecoTracker.FinalTrackSelectors.trackListMerger_cfi
hiEarlyGeneralTracks = RecoTracker.FinalTrackSelectors.trackListMerger_cfi.trackListMerger.clone(
TrackProducers = (cms.InputTag('hiGlobalPrimTracks'),
cms.InputTag('hiDetachedTripletStepTracks'),
cms.InputTag('hiLowPtTripletStepTracks'),
cms.InputTag('hiPixelPairGlobalPrimTracks'),
cms.InputTag('hiJetCoreRegionalStepTracks'),
cms.InputTag('hiRegitMuInitialStepTracks'),
cms.InputTag('hiRegitMuPixelPairStepTracks'),
cms.InputTag('hiRegitMuMixedTripletStepTracks'),
cms.InputTag('hiRegitMuPixelLessStepTracks'),
cms.InputTag('hiRegitMuDetachedTripletStepTracks')
),
hasSelector=cms.vint32(1,1,1,1,1,1,1,1,1,1),
selectedTrackQuals = cms.VInputTag(
cms.InputTag("hiInitialStepSelector","hiInitialStep"),
cms.InputTag("hiDetachedTripletStepSelector","hiDetachedTripletStep"),
cms.InputTag("hiLowPtTripletStepSelector","hiLowPtTripletStep"),
cms.InputTag("hiPixelPairStepSelector","hiPixelPairStep"),
cms.InputTag("hiJetCoreRegionalStepSelector","hiJetCoreRegionalStep"),
cms.InputTag("hiRegitMuInitialStepSelector","hiRegitMuInitialStepLoose"),
cms.InputTag("hiRegitMuPixelPairStepSelector","hiRegitMuPixelPairStep"),
cms.InputTag("hiRegitMuMixedTripletStepSelector","hiRegitMuMixedTripletStep"),
cms.InputTag("hiRegitMuPixelLessStepSelector","hiRegitMuPixelLessStep"),
cms.InputTag("hiRegitMuDetachedTripletStepSelector","hiRegitMuDetachedTripletStep")
),
setsToMerge = cms.VPSet( cms.PSet( tLists=cms.vint32(0,1,2,3,4,5,6,7,8,9), pQual=cms.bool(True)), # should this be False?
),
copyExtras = True,
makeReKeyedSeeds = cms.untracked.bool(False)
)

hiEarlyMuons = earlyMuons.clone(
inputCollectionLabels = cms.VInputTag(cms.InputTag("hiEarlyGeneralTracks"),cms.InputTag("standAloneMuons","UpdatedAtVtx"))
)

###### SEEDER MODELS ######
import RecoTracker.SpecialSeedGenerators.outInSeedsFromStandaloneMuons_cfi
import RecoTracker.SpecialSeedGenerators.inOutSeedsFromTrackerMuons_cfi
hiRegitMuonSeededSeedsOutIn = RecoTracker.SpecialSeedGenerators.outInSeedsFromStandaloneMuons_cfi.outInSeedsFromStandaloneMuons.clone(
src = "hiEarlyMuons",
)
hiRegitMuonSeededSeedsInOut = RecoTracker.SpecialSeedGenerators.inOutSeedsFromTrackerMuons_cfi.inOutSeedsFromTrackerMuons.clone(
src = "hiEarlyMuons",
)

hiRegitMuonSeededTrackCandidatesInOut = muonSeededTrackCandidatesInOut.clone(
src = cms.InputTag("hiRegitMuonSeededSeedsInOut")
)
hiRegitMuonSeededTrackCandidatesOutIn = muonSeededTrackCandidatesOutIn.clone(
src = cms.InputTag("hiRegitMuonSeededSeedsOutIn")
)

hiRegitMuonSeededTracksOutIn = muonSeededTracksOutIn.clone(
src = cms.InputTag("hiRegitMuonSeededTrackCandidatesOutIn"),
AlgorithmName = cms.string('hiRegitMuMuonSeededStepOutIn')
)
hiRegitMuonSeededTracksInOut = muonSeededTracksInOut.clone(
src = cms.InputTag("hiRegitMuonSeededTrackCandidatesInOut"),
AlgorithmName = cms.string('hiRegitMuMuonSeededStepInOut')
)

import RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi
import RecoHI.HiTracking.hiMultiTrackSelector_cfi
hiRegitMuonSeededTracksInOutSelector = RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiMultiTrackSelector.clone(
src='hiRegitMuonSeededTracksInOut',
vertices = cms.InputTag("hiSelectedVertex"),
useAnyMVA = cms.bool(True),
GBRForestLabel = cms.string('HIMVASelectorIter7'),
GBRForestVars = cms.vstring(['chi2perdofperlayer', 'nhits', 'nlayers', 'eta']),
trackSelectors= cms.VPSet(
RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone(
name = 'hiRegitMuonSeededTracksInOutLoose',
min_nhits = cms.uint32(8)
),
RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiTightMTS.clone(
name = 'hiRegitMuonSeededTracksInOutTight',
preFilterName = 'hiRegitMuonSeededTracksInOutLoose',
min_nhits = cms.uint32(8),
useMVA = cms.bool(True),
minMVA = cms.double(-0.2)
),
RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiHighpurityMTS.clone(
name = 'hiRegitMuonSeededTracksInOutHighPurity',
preFilterName = 'hiRegitMuonSeededTracksInOutTight',
min_nhits = cms.uint32(8),
useMVA = cms.bool(True),
minMVA = cms.double(-0.09)
),
) #end of vpset
) #end of clone

hiRegitMuonSeededTracksOutInSelector = RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiMultiTrackSelector.clone(
src='hiRegitMuonSeededTracksOutIn',
vertices = cms.InputTag("hiSelectedVertex"),
useAnyMVA = cms.bool(True),
GBRForestLabel = cms.string('HIMVASelectorIter7'),
GBRForestVars = cms.vstring(['chi2perdofperlayer', 'nhits', 'nlayers', 'eta']),
trackSelectors= cms.VPSet(
RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone(
name = 'hiRegitMuonSeededTracksOutInLoose',
min_nhits = cms.uint32(8)
),
RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiTightMTS.clone(
name = 'hiRegitMuonSeededTracksOutInTight',
preFilterName = 'hiRegitMuonSeededTracksOutInLoose',
min_nhits = cms.uint32(8),
useMVA = cms.bool(True),
minMVA = cms.double(-0.2)
),
RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiHighpurityMTS.clone(
name = 'hiRegitMuonSeededTracksOutInHighPurity',
preFilterName = 'hiRegitMuonSeededTracksOutInTight',
min_nhits = cms.uint32(8),
useMVA = cms.bool(True),
minMVA = cms.double(-0.09)
),
) #end of vpset
) #end of clone

hiRegitMuonSeededStepCore = cms.Sequence(
hiRegitMuonSeededSeedsInOut + hiRegitMuonSeededTrackCandidatesInOut + hiRegitMuonSeededTracksInOut +
hiRegitMuonSeededSeedsOutIn + hiRegitMuonSeededTrackCandidatesOutIn + hiRegitMuonSeededTracksOutIn
)
hiRegitMuonSeededStepExtra = cms.Sequence(
hiRegitMuonSeededTracksInOutSelector +
hiRegitMuonSeededTracksOutInSelector
)

hiRegitMuonSeededStep = cms.Sequence(
hiEarlyGeneralTracks +
hiEarlyMuons +
hiRegitMuonSeededStepCore +
hiRegitMuonSeededStepExtra
)
18 changes: 14 additions & 4 deletions RecoHI/HiMuonAlgos/python/hiMuonIterativeTk_cff.py
Expand Up @@ -2,23 +2,31 @@

from RecoHI.HiMuonAlgos.HiRegitMuonInitialStep_cff import *
from RecoHI.HiMuonAlgos.HiRegitMuonPixelPairStep_cff import *
from RecoHI.HiMuonAlgos.HiRegitMuonDetachedTripletStep_cff import *
from RecoHI.HiMuonAlgos.HiRegitMuonMixedTripletStep_cff import *
from RecoHI.HiMuonAlgos.HiRegitMuonPixelLessStep_cff import *
from RecoHI.HiMuonAlgos.HiRegitMuonSeededStep_cff import *

import RecoTracker.FinalTrackSelectors.trackListMerger_cfi
hiGeneralAndRegitMuTracks = RecoTracker.FinalTrackSelectors.trackListMerger_cfi.trackListMerger.clone(
TrackProducers = (cms.InputTag('hiRegitMuInitialStepTracks'),
cms.InputTag('hiRegitMuPixelPairStepTracks'),
cms.InputTag('hiRegitMuMixedTripletStepTracks'),
cms.InputTag('hiRegitMuPixelLessStepTracks')
cms.InputTag('hiRegitMuPixelLessStepTracks'),
cms.InputTag('hiRegitMuDetachedTripletStepTracks'),
cms.InputTag('hiRegitMuonSeededTracksOutIn'),
cms.InputTag('hiRegitMuonSeededTracksInOut')
),
selectedTrackQuals = cms.VInputTag(cms.InputTag("hiRegitMuInitialStepSelector","hiRegitMuInitialStepLoose"),
cms.InputTag("hiRegitMuPixelPairStepSelector","hiRegitMuPixelPairStep"),
cms.InputTag("hiRegitMuMixedTripletStepSelector","hiRegitMuMixedTripletStep"),
cms.InputTag("hiRegitMuPixelLessStepSelector","hiRegitMuPixelLessStep")
cms.InputTag("hiRegitMuPixelLessStepSelector","hiRegitMuPixelLessStep"),
cms.InputTag("hiRegitMuDetachedTripletStepSelector","hiRegitMuDetachedTripletStep"),
cms.InputTag("hiRegitMuonSeededTracksOutInSelector","hiRegitMuonSeededTracksOutInHighPurity"),
cms.InputTag("hiRegitMuonSeededTracksInOutSelector","hiRegitMuonSeededTracksInOutHighPurity")
),
hasSelector=cms.vint32(1,1,1,1),
setsToMerge = cms.VPSet( cms.PSet( tLists=cms.vint32(0,1,2,3), pQual=cms.bool(True))),
hasSelector=cms.vint32(1,1,1,1,1,1,1),
setsToMerge = cms.VPSet( cms.PSet( tLists=cms.vint32(0,1,2,3,4,5,6), pQual=cms.bool(True))),
copyExtras = True,
makeReKeyedSeeds = cms.untracked.bool(False)
)
Expand All @@ -27,6 +35,8 @@
*hiRegitMuonPixelPairStep
*hiRegitMuonMixedTripletStep
*hiRegitMuonPixelLessStep
*hiRegitMuonDetachedTripletStep
*hiRegitMuonSeededStep
)

# Standalone muons
Expand Down
16 changes: 11 additions & 5 deletions RecoHI/HiTracking/python/MergeTrackCollectionsHI_cff.py
Expand Up @@ -30,9 +30,12 @@
cms.InputTag('hiRegitMuInitialStepTracks'),
cms.InputTag('hiRegitMuPixelPairStepTracks'),
cms.InputTag('hiRegitMuMixedTripletStepTracks'),
cms.InputTag('hiRegitMuPixelLessStepTracks')
),
hasSelector=cms.vint32(1,1,1,1,1,1,1,1,1),
cms.InputTag('hiRegitMuPixelLessStepTracks'),
cms.InputTag('hiRegitMuDetachedTripletStepTracks'),
cms.InputTag('hiRegitMuonSeededTracksOutIn'),
cms.InputTag('hiRegitMuonSeededTracksInOut')
),
hasSelector=cms.vint32(1,1,1,1,1,1,1,1,1,1,1,1),
selectedTrackQuals = cms.VInputTag(
cms.InputTag("hiInitialStepSelector","hiInitialStep"),
cms.InputTag("hiDetachedTripletStepSelector","hiDetachedTripletStep"),
Expand All @@ -42,9 +45,12 @@
cms.InputTag("hiRegitMuInitialStepSelector","hiRegitMuInitialStepLoose"),
cms.InputTag("hiRegitMuPixelPairStepSelector","hiRegitMuPixelPairStep"),
cms.InputTag("hiRegitMuMixedTripletStepSelector","hiRegitMuMixedTripletStep"),
cms.InputTag("hiRegitMuPixelLessStepSelector","hiRegitMuPixelLessStep")
cms.InputTag("hiRegitMuPixelLessStepSelector","hiRegitMuPixelLessStep"),
cms.InputTag("hiRegitMuDetachedTripletStepSelector","hiRegitMuDetachedTripletStep"),
cms.InputTag("hiRegitMuonSeededTracksOutInSelector","hiRegitMuonSeededTracksOutInHighPurity"),
cms.InputTag("hiRegitMuonSeededTracksInOutSelector","hiRegitMuonSeededTracksInOutHighPurity")
),
setsToMerge = cms.VPSet( cms.PSet( tLists=cms.vint32(0,1,2,3,4,5,6,7), pQual=cms.bool(True)), # should this be False?
setsToMerge = cms.VPSet( cms.PSet( tLists=cms.vint32(0,1,2,3,4,5,6,7,8,9,10,11), pQual=cms.bool(True)), # should this be False?
),
copyExtras = True,
makeReKeyedSeeds = cms.untracked.bool(False)
Expand Down

0 comments on commit 574ae69

Please sign in to comment.