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.

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

thorough clean-up of TrackCandidate producer #9595

Merged
merged 11 commits into from
Jun 17, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
import FastSimulation.Tracking.TrackCandidateProducer_cfi
# GsfTrackCandidateMaker
electronGSGsfTrackCandidates = FastSimulation.Tracking.TrackCandidateProducer_cfi.trackCandidateProducer.clone()
electronGSGsfTrackCandidates.SeedProducer = cms.InputTag("electronMergedSeeds")
electronGSGsfTrackCandidates.SeedCleaning = True
electronGSGsfTrackCandidates.src = cms.InputTag("electronMergedSeeds")
electronGSGsfTrackCandidates.MinNumberOfCrossedLayers = 5
#electronGSGsfTrackCandidates.SplitHits = False
electronGSGsfTrackCandidates.OverlapCleaning = True
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
# from FastSimulation.Configuration.StandardSequences_cff import famosGsfTrackSequence

hltEgammaCkfTrackCandidatesForGSF = electronGSGsfTrackCandidates.clone()
hltEgammaCkfTrackCandidatesForGSF.SeedProducer = "hltEgammaElectronPixelSeeds"
hltEgammaCkfTrackCandidatesForGSF.src = "hltEgammaElectronPixelSeeds"
hltEgammaGsfTracks = TrackingTools.GsfTracking.GsfElectronFit_cfi.GsfGlobalElectronTest.clone()
hltEgammaGsfTracks.src = 'hltEgammaCkfTrackCandidatesForGSF'
hltEgammaGsfTracks.TTRHBuilder = 'WithoutRefit'
hltEgammaGsfTracks.TrajectoryInEvent = True

hltEgammaCkfTrackCandidatesForGSFUnseeded = electronGSGsfTrackCandidates.clone()
hltEgammaCkfTrackCandidatesForGSFUnseeded.SeedProducer = "hltEgammaElectronPixelSeedsUnseeded"
hltEgammaCkfTrackCandidatesForGSFUnseeded.src = "hltEgammaElectronPixelSeedsUnseeded"
hltEgammaGsfTracksUnseeded = hltEgammaGsfTracks.clone()
hltEgammaGsfTracksUnseeded.src = 'hltEgammaCkfTrackCandidatesForGSFUnseeded'
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@
import FastSimulation.Tracking.TrackCandidateProducer_cfi

hltCkf3HitL1SeededTrackCandidates = FastSimulation.Tracking.TrackCandidateProducer_cfi.trackCandidateProducer.clone()
hltCkf3HitL1SeededTrackCandidates.SeedProducer = cms.InputTag("hltL1SeededStartUpElectronPixelSeeds")
hltCkf3HitL1SeededTrackCandidates.MaxNumberOfCrossedLayers = 999
hltCkf3HitL1SeededTrackCandidates.SeedCleaning = True
hltCkf3HitL1SeededTrackCandidates.src = cms.InputTag("hltL1SeededStartUpElectronPixelSeeds")
hltCkf3HitL1SeededTrackCandidates.SplitHits = False

# CTF track fit with material
Expand All @@ -45,9 +43,7 @@
import FastSimulation.Tracking.TrackCandidateProducer_cfi

hltCkf3HitL1IsoTrackCandidates = FastSimulation.Tracking.TrackCandidateProducer_cfi.trackCandidateProducer.clone()
hltCkf3HitL1IsoTrackCandidates.SeedProducer = cms.InputTag("hltL1IsoStartUpElectronPixelSeeds")
hltCkf3HitL1IsoTrackCandidates.MaxNumberOfCrossedLayers = 999
hltCkf3HitL1IsoTrackCandidates.SeedCleaning = True
hltCkf3HitL1IsoTrackCandidates.src = cms.InputTag("hltL1IsoStartUpElectronPixelSeeds")
hltCkf3HitL1IsoTrackCandidates.SplitHits = False

# CTF track fit with material
Expand All @@ -74,9 +70,7 @@
import FastSimulation.Tracking.TrackCandidateProducer_cfi

hltCkf3HitL1NonIsoTrackCandidates = FastSimulation.Tracking.TrackCandidateProducer_cfi.trackCandidateProducer.clone()
hltCkf3HitL1NonIsoTrackCandidates.SeedProducer = cms.InputTag("hltL1NonIsoStartUpElectronPixelSeeds")
hltCkf3HitL1NonIsoTrackCandidates.MaxNumberOfCrossedLayers = 999
hltCkf3HitL1NonIsoTrackCandidates.SeedCleaning = True
hltCkf3HitL1NonIsoTrackCandidates.src = cms.InputTag("hltL1NonIsoStartUpElectronPixelSeeds")
hltCkf3HitL1NonIsoTrackCandidates.SplitHits = False

# CTF track fit with material
Expand All @@ -103,9 +97,7 @@
import FastSimulation.Tracking.TrackCandidateProducer_cfi

hltCkf3HitActivityTrackCandidates = FastSimulation.Tracking.TrackCandidateProducer_cfi.trackCandidateProducer.clone()
hltCkf3HitActivityTrackCandidates.SeedProducer = cms.InputTag("hltActivityStartUpElectronPixelSeeds")
hltCkf3HitActivityTrackCandidates.MaxNumberOfCrossedLayers = 999
hltCkf3HitActivityTrackCandidates.SeedCleaning = True
hltCkf3HitActivityTrackCandidates.src = cms.InputTag("hltActivityStartUpElectronPixelSeeds")
hltCkf3HitActivityTrackCandidates.SplitHits = False

# CTF track fit with material
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,14 @@
import FastSimulation.Tracking.TrackCandidateProducer_cfi

hltCkfActivityTrackCandidates = FastSimulation.Tracking.TrackCandidateProducer_cfi.trackCandidateProducer.clone()
hltCkfActivityTrackCandidates.SeedProducer = cms.InputTag("hltActivityStartUpElectronPixelSeeds")
hltCkfActivityTrackCandidates.MaxNumberOfCrossedLayers = 999
hltCkfActivityTrackCandidates.SeedCleaning = True
hltCkfActivityTrackCandidates.src = cms.InputTag("hltActivityStartUpElectronPixelSeeds")
hltCkfActivityTrackCandidates.SplitHits = False

hltActivityCkfTrackCandidatesForGSF = FastSimulation.Tracking.TrackCandidateProducer_cfi.trackCandidateProducer.clone()
hltActivityCkfTrackCandidatesForGSF.SeedProducer = cms.InputTag("hltActivityStartUpElectronPixelSeeds")
hltActivityCkfTrackCandidatesForGSF.MaxNumberOfCrossedLayers = 999
hltActivityCkfTrackCandidatesForGSF.SeedCleaning = True
hltActivityCkfTrackCandidatesForGSF.src = cms.InputTag("hltActivityStartUpElectronPixelSeeds")
hltActivityCkfTrackCandidatesForGSF.SplitHits = True



# CTF track fit with material
import RecoTracker.TrackProducer.CTFFinalFitWithMaterial_cfi

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,8 @@
# Track candidates
import FastSimulation.Tracking.TrackCandidateProducer_cfi
hltCkfL1IsoLargeWindowTrackCandidates = FastSimulation.Tracking.TrackCandidateProducer_cfi.trackCandidateProducer.clone()
hltCkfL1IsoLargeWindowTrackCandidates.SeedProducer = cms.InputTag("hltL1IsoLargeWindowElectronPixelSeeds")
hltCkfL1IsoLargeWindowTrackCandidates.src = cms.InputTag("hltL1IsoLargeWindowElectronPixelSeeds")
hltCkfL1IsoLargeWindowTrackCandidates.TrackProducers = cms.VInputTag(cms.InputTag("hltCtfL1IsoWithMaterialTracks"))
hltCkfL1IsoLargeWindowTrackCandidates.MaxNumberOfCrossedLayers = 999
hltCkfL1IsoLargeWindowTrackCandidates.SeedCleaning = True
hltCkfL1IsoLargeWindowTrackCandidates.SplitHits = False


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,14 @@
import FastSimulation.Tracking.TrackCandidateProducer_cfi

hltCkfL1IsoTrackCandidates = FastSimulation.Tracking.TrackCandidateProducer_cfi.trackCandidateProducer.clone()
#hltCkfL1IsoTrackCandidates.SeedProducer = cms.InputTag("hltL1IsoElectronPixelSeeds")
hltCkfL1IsoTrackCandidates.SeedProducer = cms.InputTag("hltL1IsoStartUpElectronPixelSeeds")
hltCkfL1IsoTrackCandidates.MaxNumberOfCrossedLayers = 999
hltCkfL1IsoTrackCandidates.SeedCleaning = True
#hltCkfL1IsoTrackCandidates.src = cms.InputTag("hltL1IsoElectronPixelSeeds")
hltCkfL1IsoTrackCandidates.src = cms.InputTag("hltL1IsoStartUpElectronPixelSeeds")
hltCkfL1IsoTrackCandidates.SplitHits = False

# Not needed any longer
#hltCkfL1IsoStartUpTrackCandidates = FastSimulation.Tracking.TrackCandidateProducer_cfi.trackCandidateProducer.clone()
#hltCkfL1IsoStartUpTrackCandidates.SeedProducer = cms.InputTag("hltL1IsoStartUpElectronPixelSeeds")
#hltCkfL1IsoStartUpTrackCandidates.src = cms.InputTag("hltL1IsoStartUpElectronPixelSeeds")
#hltCkfL1IsoStartUpTrackCandidates.TrackProducers = []
#hltCkfL1IsoStartUpTrackCandidates.MaxNumberOfCrossedLayers = 999
#hltCkfL1IsoStartUpTrackCandidates.SeedCleaning = True
#hltCkfL1IsoStartUpTrackCandidates.SplitHits = False

# CTF track fit with material
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,8 @@
import FastSimulation.Tracking.TrackCandidateProducer_cfi

hltCkfL1NonIsoLargeWindowTrackCandidates = FastSimulation.Tracking.TrackCandidateProducer_cfi.trackCandidateProducer.clone()
hltCkfL1NonIsoLargeWindowTrackCandidates.SeedProducer = cms.InputTag("hltL1NonIsoLargeWindowElectronPixelSeeds")
hltCkfL1NonIsoLargeWindowTrackCandidates.src = cms.InputTag("hltL1NonIsoLargeWindowElectronPixelSeeds")
hltCkfL1NonIsoLargeWindowTrackCandidates.TrackProducers = cms.VInputTag(cms.InputTag("hltCtfL1NonIsoWithMaterialTracks"))
hltCkfL1NonIsoLargeWindowTrackCandidates.MaxNumberOfCrossedLayers = 999
hltCkfL1NonIsoLargeWindowTrackCandidates.SeedCleaning = True
hltCkfL1NonIsoLargeWindowTrackCandidates.SplitHits = False


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,15 @@


hltCkfL1NonIsoTrackCandidates = FastSimulation.Tracking.TrackCandidateProducer_cfi.trackCandidateProducer.clone()
#hltCkfL1NonIsoTrackCandidates.SeedProducer = cms.InputTag("hltL1NonIsoElectronPixelSeeds")
hltCkfL1NonIsoTrackCandidates.SeedProducer = cms.InputTag("hltL1NonIsoStartUpElectronPixelSeeds")
#hltCkfL1NonIsoTrackCandidates.src = cms.InputTag("hltL1NonIsoElectronPixelSeeds")
hltCkfL1NonIsoTrackCandidates.src = cms.InputTag("hltL1NonIsoStartUpElectronPixelSeeds")
#hltCkfL1NonIsoTrackCandidates.TrackProducers = []
hltCkfL1NonIsoTrackCandidates.MaxNumberOfCrossedLayers = 999
hltCkfL1NonIsoTrackCandidates.SeedCleaning = True
hltCkfL1NonIsoTrackCandidates.SplitHits = False

#not needed
#hltCkfL1NonIsoStartUpTrackCandidates = FastSimulation.Tracking.TrackCandidateProducer_cfi.trackCandidateProducer.clone()
#hltCkfL1NonIsoStartUpTrackCandidates.SeedProducer = cms.InputTag("hltL1NonIsoStartUpElectronPixelSeeds")
#hltCkfL1NonIsoStartUpTrackCandidates.src = cms.InputTag("hltL1NonIsoStartUpElectronPixelSeeds")
#hltCkfL1NonIsoStartUpTrackCandidates.TrackProducers = []
#hltCkfL1NonIsoStartUpTrackCandidates.MaxNumberOfCrossedLayers = 999
#hltCkfL1NonIsoStartUpTrackCandidates.SeedCleaning = True
#hltCkfL1NonIsoStartUpTrackCandidates.SplitHits = False

# CTF track fit with material
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,8 @@
import FastSimulation.Tracking.TrackCandidateProducer_cfi

hltCkfL1SeededLargeWindowTrackCandidates = FastSimulation.Tracking.TrackCandidateProducer_cfi.trackCandidateProducer.clone()
hltCkfL1SeededLargeWindowTrackCandidates.SeedProducer = cms.InputTag("hltL1SeededLargeWindowElectronPixelSeeds")
hltCkfL1SeededLargeWindowTrackCandidates.src = cms.InputTag("hltL1SeededLargeWindowElectronPixelSeeds")
hltCkfL1SeededLargeWindowTrackCandidates.TrackProducers = cms.VInputTag(cms.InputTag("hltCtfL1SeededWithMaterialTracks"))
hltCkfL1SeededLargeWindowTrackCandidates.MaxNumberOfCrossedLayers = 999
hltCkfL1SeededLargeWindowTrackCandidates.SeedCleaning = True
hltCkfL1SeededLargeWindowTrackCandidates.SplitHits = False


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,26 +38,20 @@


hltCkfL1SeededTrackCandidates = FastSimulation.Tracking.TrackCandidateProducer_cfi.trackCandidateProducer.clone()
#hltCkfL1SeededTrackCandidates.SeedProducer = cms.InputTag("hltL1SeededElectronPixelSeeds")
hltCkfL1SeededTrackCandidates.SeedProducer = cms.InputTag("hltL1SeededStartUpElectronPixelSeeds")
#hltCkfL1SeededTrackCandidates.src = cms.InputTag("hltL1SeededElectronPixelSeeds")
hltCkfL1SeededTrackCandidates.src = cms.InputTag("hltL1SeededStartUpElectronPixelSeeds")
#hltCkfL1SeededTrackCandidates.TrackProducers = []
hltCkfL1SeededTrackCandidates.MaxNumberOfCrossedLayers = 999
hltCkfL1SeededTrackCandidates.SeedCleaning = True
hltCkfL1SeededTrackCandidates.SplitHits = False

hltL1SeededCkfTrackCandidatesForGSF = FastSimulation.Tracking.TrackCandidateProducer_cfi.trackCandidateProducer.clone()
hltL1SeededCkfTrackCandidatesForGSF.SeedProducer = cms.InputTag("hltL1SeededStartUpElectronPixelSeeds")
hltL1SeededCkfTrackCandidatesForGSF.src = cms.InputTag("hltL1SeededStartUpElectronPixelSeeds")
#hltL1SeededCkfTrackCandidatesForGSF.TrackProducers = []
hltL1SeededCkfTrackCandidatesForGSF.MaxNumberOfCrossedLayers = 999
hltL1SeededCkfTrackCandidatesForGSF.SeedCleaning = True
hltL1SeededCkfTrackCandidatesForGSF.SplitHits = True

#not needed
#hltCkfL1NonIsoStartUpTrackCandidates = FastSimulation.Tracking.TrackCandidateProducer_cfi.trackCandidateProducer.clone()
#hltCkfL1NonIsoStartUpTrackCandidates.SeedProducer = cms.InputTag("hltL1NonIsoStartUpElectronPixelSeeds")
#hltCkfL1NonIsoStartUpTrackCandidates.src = cms.InputTag("hltL1NonIsoStartUpElectronPixelSeeds")
#hltCkfL1NonIsoStartUpTrackCandidates.TrackProducers = []
#hltCkfL1NonIsoStartUpTrackCandidates.MaxNumberOfCrossedLayers = 999
#hltCkfL1NonIsoStartUpTrackCandidates.SeedCleaning = True
#hltCkfL1NonIsoStartUpTrackCandidates.SplitHits = False

# CTF track fit with material
Expand Down
20 changes: 8 additions & 12 deletions FastSimulation/HighLevelTrigger/python/HLTFastRecoForMuon_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@
## Make one TrackCand for each seeder
from FastSimulation.Muons.TrackCandidateFromL2_cfi import *
hltL3TrackCandidateFromL2OIState = FastSimulation.Muons.TrackCandidateFromL2_cfi.hltL3TrackCandidateFromL2.clone()
hltL3TrackCandidateFromL2OIState.SeedProducer = "hltL3TrajSeedOIState"
hltL3TrackCandidateFromL2OIState.src = "hltL3TrajSeedOIState"
hltL3TrackCandidateFromL2OIHit = FastSimulation.Muons.TrackCandidateFromL2_cfi.hltL3TrackCandidateFromL2.clone()
hltL3TrackCandidateFromL2OIHit.SeedProducer = "hltL3TrajSeedOIHit"
hltL3TrackCandidateFromL2OIHit.src = "hltL3TrajSeedOIHit"
hltL3TrackCandidateFromL2IOHit = FastSimulation.Muons.TrackCandidateFromL2_cfi.hltL3TrackCandidateFromL2.clone()
hltL3TrackCandidateFromL2IOHit.SeedProducer = "hltL3TrajSeedIOHit"
hltL3TrackCandidateFromL2IOHit.src = "hltL3TrajSeedIOHit"
hltL3TrackCandidateFromL2NoVtx = FastSimulation.Muons.TrackCandidateFromL2_cfi.hltL3TrackCandidateFromL2.clone()
hltL3TrackCandidateFromL2NoVtx.SeedProducer = "hltL3TrajectorySeedNoVtx"
hltL3TrackCandidateFromL2NoVtx.src = "hltL3TrajectorySeedNoVtx"


# (Not-so) Regional Tracking - needed because the TrackCandidateProducer needs the seeds
Expand All @@ -64,23 +64,19 @@
import FastSimulation.Tracking.TrackCandidateProducer_cfi

hltMuCkfTrackCandidates = FastSimulation.Tracking.TrackCandidateProducer_cfi.trackCandidateProducer.clone()
hltMuCkfTrackCandidates.SeedProducer = cms.InputTag("hltMuTrackSeeds")
hltMuCkfTrackCandidates.SeedCleaning = True
hltMuCkfTrackCandidates.src = cms.InputTag("hltMuTrackSeeds")
hltMuCkfTrackCandidates.SplitHits = False

hltMuTrackJpsiCkfTrackCandidates = FastSimulation.Tracking.TrackCandidateProducer_cfi.trackCandidateProducer.clone()
hltMuTrackJpsiCkfTrackCandidates.SeedProducer = cms.InputTag("hltMuTrackJpsiTrackSeeds")
hltMuTrackJpsiCkfTrackCandidates.SeedCleaning = True
hltMuTrackJpsiCkfTrackCandidates.src = cms.InputTag("hltMuTrackJpsiTrackSeeds")
hltMuTrackJpsiCkfTrackCandidates.SplitHits = False

hltMuTrackJpsiEffCkfTrackCandidates = FastSimulation.Tracking.TrackCandidateProducer_cfi.trackCandidateProducer.clone()
hltMuTrackJpsiEffCkfTrackCandidates.SeedProducer = cms.InputTag("hltMuTrackJpsiTrackSeeds")
hltMuTrackJpsiEffCkfTrackCandidates.SeedCleaning = True
hltMuTrackJpsiEffCkfTrackCandidates.src = cms.InputTag("hltMuTrackJpsiTrackSeeds")
hltMuTrackJpsiEffCkfTrackCandidates.SplitHits = False

hltMuTrackCkfTrackCandidatesOnia = FastSimulation.Tracking.TrackCandidateProducer_cfi.trackCandidateProducer.clone()
hltMuTrackCkfTrackCandidatesOnia.SeedProducer = cms.InputTag("hltMuTrackTrackSeedsOnia")
hltMuTrackCkfTrackCandidatesOnia.SeedCleaning = True
hltMuTrackCkfTrackCandidatesOnia.src = cms.InputTag("hltMuTrackTrackSeedsOnia")
hltMuTrackCkfTrackCandidatesOnia.SplitHits = False

# CTF track fit with material
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@
import FastSimulation.Tracking.TrackCandidateProducer_cfi

hltTau3MuCkfTrackCandidates = FastSimulation.Tracking.TrackCandidateProducer_cfi.trackCandidateProducer.clone()
hltTau3MuCkfTrackCandidates.SeedProducer = cms.InputTag("hltTau3MuPixelSeedsFromPixelTracks")
hltTau3MuCkfTrackCandidates.SeedCleaning = True
hltTau3MuCkfTrackCandidates.src = cms.InputTag("hltTau3MuPixelSeedsFromPixelTracks")
hltTau3MuCkfTrackCandidates.SplitHits = False


Expand Down
3 changes: 2 additions & 1 deletion FastSimulation/Muons/plugins/FastTSGFromIOHit.cc
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ void FastTSGFromIOHit::trackerSeeds(const TrackCand& staMuon, const TrackingRegi
// Cut on muons with low momenta
if ( muRef->pt() < thePtCut
|| muRef->innerMomentum().Rho() < thePtCut
|| muRef->innerMomentum().R() < 2.5 ) return;
|| muRef->innerMomentum().R() < 2.5 ){
}return;

// Copy the collection of seeds (ahem, this is time consuming!)
std::vector<TrajectorySeed> tkSeeds;
Expand Down