Skip to content

Commit

Permalink
drop type specs where original parameter exist
Browse files Browse the repository at this point in the history
  • Loading branch information
jeongeun committed Jul 28, 2020
1 parent 32195fe commit df0c7a8
Show file tree
Hide file tree
Showing 26 changed files with 357 additions and 293 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@
from TrackingTools.TrajectoryCleaning.TrajectoryCleanerBySharedHits_cfi import *
# navigation school
from RecoTracker.TkNavigation.NavigationSchoolESProducer_cff import *
import copy
from RecoTracker.CkfPattern.CkfTrackCandidates_cfi import *
# generate CTF track candidates ############
ckfTrackCandidatesCombinedSeeds = copy.deepcopy(ckfTrackCandidates)
ckfTrackCandidatesCombinedSeeds.src = cms.InputTag('globalCombinedSeeds')

ckfTrackCandidatesCombinedSeeds = ckfTrackCandidates.clone(
src = 'globalCombinedSeeds'
)
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@
from TrackingTools.TrajectoryCleaning.TrajectoryCleanerBySharedHits_cfi import *
# navigation school
from RecoTracker.TkNavigation.NavigationSchoolESProducer_cff import *
import copy
from RecoTracker.CkfPattern.CkfTrackCandidates_cfi import *
# generate CTF track candidates ############
ckfTrackCandidatesNoOverlaps = copy.deepcopy(ckfTrackCandidates)
ckfTrackCandidatesNoOverlaps.TrajectoryBuilderPSet.refToPSet_ = 'CkfTrajectoryBuilder'

ckfTrackCandidatesNoOverlaps = ckfTrackCandidates.clone(
TrajectoryBuilderPSet = dict(refToPSet_ = 'CkfTrajectoryBuilder')
)
12 changes: 6 additions & 6 deletions RecoTracker/CkfPattern/python/CkfTrackCandidatesP5_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
import copy
from RecoTracker.CkfPattern.CkfTrackCandidates_cfi import *
# generate CTF track candidates ############
ckfTrackCandidatesP5 = copy.deepcopy(ckfTrackCandidates)
ckfTrackCandidatesP5.NavigationSchool = 'CosmicNavigationSchool'
ckfTrackCandidatesP5.TrajectoryBuilderPSet.refToPSet_ = 'GroupedCkfTrajectoryBuilderP5'
#replace ckfTrackCandidatesP5.TrajectoryBuilder = "CkfTrajectoryBuilderP5"
ckfTrackCandidatesP5.src = cms.InputTag('combinatorialcosmicseedfinderP5')

ckfTrackCandidatesP5 = ckfTrackCandidates.clone(
NavigationSchool = 'CosmicNavigationSchool',
TrajectoryBuilderPSet = dict(refToPSet_ = 'GroupedCkfTrajectoryBuilderP5'),
#replace ckfTrackCandidatesP5.TrajectoryBuilder = "CkfTrajectoryBuilderP5"
src = 'combinatorialcosmicseedfinderP5'
)
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@
# Ckf pattern
import RecoTracker.CkfPattern.CkfTrackCandidatesP5_cff
regionalCosmicCkfTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidatesP5_cff.ckfTrackCandidatesP5.clone(
src = cms.InputTag( "regionalCosmicTrackerSeeds" ),
src = "regionalCosmicTrackerSeeds",
)

# Track producer
import RecoTracker.TrackProducer.CTFFinalFitWithMaterialP5_cff
regionalCosmicTracks = RecoTracker.TrackProducer.CTFFinalFitWithMaterialP5_cff.ctfWithMaterialTracksCosmics.clone(
src = cms.InputTag( "regionalCosmicCkfTrackCandidates" ),
src = "regionalCosmicCkfTrackCandidates",
)
# Final Sequence
regionalCosmicTracksTask = cms.Task(regionalCosmicTrackerSeedingLayers,
Expand Down
29 changes: 15 additions & 14 deletions RecoTracker/Configuration/python/RecoTrackerP5_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,16 @@
from RecoTracker.SpecialSeedGenerators.CombinatorialSeedGeneratorForCosmicsP5_cff import *
from RecoTracker.SpecialSeedGenerators.SimpleCosmicBONSeeder_cff import *
from RecoTracker.TkSeedGenerator.GlobalCombinedSeeds_cff import *
combinedP5SeedsForCTF = RecoTracker.TkSeedGenerator.GlobalCombinedSeeds_cfi.globalCombinedSeeds.clone()
combinedP5SeedsForCTF.seedCollections = cms.VInputTag(
cms.InputTag('combinatorialcosmicseedfinderP5'),
cms.InputTag('simpleCosmicBONSeeds'),
combinedP5SeedsForCTF = RecoTracker.TkSeedGenerator.GlobalCombinedSeeds_cfi.globalCombinedSeeds.clone(
seedCollections = ['combinatorialcosmicseedfinderP5',
'simpleCosmicBONSeeds'],
#backward compatibility 2.2/3.1
PairCollection = cms.InputTag('combinatorialcosmicseedfinderP5'),
TripletCollection = cms.InputTag('simpleCosmicBONSeeds')
)
#backward compatibility 2.2/3.1
combinedP5SeedsForCTF.PairCollection = cms.InputTag('combinatorialcosmicseedfinderP5')
combinedP5SeedsForCTF.TripletCollection = cms.InputTag('simpleCosmicBONSeeds')

from RecoTracker.CkfPattern.CkfTrackCandidatesP5_cff import *
ckfTrackCandidatesP5.src = cms.InputTag('combinedP5SeedsForCTF')
ckfTrackCandidatesP5.src = 'combinedP5SeedsForCTF'
#backward compatibility 2.2/3.1
#ckfTrackCandidatesP5.SeedProducer = 'combinedP5SeedsForCTF'

Expand All @@ -44,8 +43,8 @@
# TRACK INFO
#include "AnalysisAlgos/TrackInfoProducer/data/TrackInfoProducerP5.cff"

ckfTrackCandidatesP5LHCNavigation = ckfTrackCandidatesP5.clone(NavigationSchool = cms.string('SimpleNavigationSchool'))
ctfWithMaterialTracksP5LHCNavigation = ctfWithMaterialTracksCosmics.clone(src = cms.InputTag("ckfTrackCandidatesP5LHCNavigation"))
ckfTrackCandidatesP5LHCNavigation = ckfTrackCandidatesP5.clone(NavigationSchool = 'SimpleNavigationSchool')
ctfWithMaterialTracksP5LHCNavigation = ctfWithMaterialTracksCosmics.clone(src = "ckfTrackCandidatesP5LHCNavigation")

ctftracksP5Task = cms.Task(combinatorialcosmicseedinglayersP5Task,
combinatorialcosmicseedfinderP5,
Expand All @@ -60,10 +59,12 @@
ctftracksP5 = cms.Sequence(ctftracksP5Task)

from RecoTracker.FinalTrackSelectors.cosmicTrackSplitter_cfi import *
cosmicTrackSplitter.tjTkAssociationMapTag = 'cosmictrackfinderCosmics'
cosmicTrackSplitter.tracks = 'cosmictrackfinderCosmics'
splittedTracksP5 = cosmictrackfinderCosmics.clone(src = cms.InputTag("cosmicTrackSplitter"))

cosmicTrackSplitter = RecoTracker.FinalTrackSelectors.cosmicTrackSplitter_cfi.cosmicTrackSplitter.clone(
tjTkAssociationMapTag = 'cosmictrackfinderCosmics',
tracks = 'cosmictrackfinderCosmics'
)
splittedTracksP5 = cosmictrackfinderCosmics.clone(src = "cosmicTrackSplitter")

cosmictracksP5Task = cms.Task(cosmicseedfinderP5,
cosmicCandidateFinderP5,
cosmictrackfinderCosmics,
Expand Down
Loading

0 comments on commit df0c7a8

Please sign in to comment.