Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,9 @@ def _copyIfExists(mod, pset, name):
trackingLST.toModify(locals()["TrackSeedMonhighPtTripletStep"],
SeedProducer = "lstInputProducer"
)
seedingLST.toModify(locals()["TrackSeedMonhighPtTripletStep"],
SeedProducer = "highPtTripletStepTrajectorySeedsLST"
)
_LST_TrackSeedMonSequence = TrackSeedMonSequence.copyAndExclude([locals()["TrackSeedMoninitialStep"]])
(seedingLST | trackingLST).toReplaceWith(TrackSeedMonSequence, _LST_TrackSeedMonSequence)

Expand Down
40 changes: 37 additions & 3 deletions RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -247,14 +247,25 @@
config = ('', 'highPtTripletStepTrackCandidatesMkFitConfig'),
clustersToSkip = 'highPtTripletStepClusters',
)
trackingMkFitHighPtTripletStep.toReplaceWith(highPtTripletStepTrackCandidates, mkFitOutputConverter_cfi.mkFitOutputConverter.clone(
(~trackingPhase2PU140 & trackingMkFitHighPtTripletStep).toReplaceWith(highPtTripletStepTrackCandidates, mkFitOutputConverter_cfi.mkFitOutputConverter.clone(
seeds = 'highPtTripletStepSeeds',
mkFitSeeds = 'highPtTripletStepTrackCandidatesMkFitSeeds',
tracks = 'highPtTripletStepTrackCandidatesMkFit',
candMVASel = True,
candWP = -0.3,
))
(pp_on_XeXe_2017 | pp_on_AA).toModify(highPtTripletStepTrackCandidatesMkFitConfig, minPt=0.7)
(trackingPhase2PU140 & trackingMkFitHighPtTripletStep & seedingLST & trackingLST).toModify(highPtTripletStepTrackCandidatesMkFitSeeds,
seeds = 'highPtTripletStepTrajectorySeedsLST'
)
(trackingPhase2PU140 & trackingMkFitHighPtTripletStep & seedingLST & trackingLST).toModify(highPtTripletStepTrackCandidatesMkFit,
stripHits = cms.InputTag("mkFitSiPhase2Hits"),
clustersToSkip = cms.InputTag("")
)
(trackingPhase2PU140 & trackingMkFitHighPtTripletStep & seedingLST & trackingLST).toModify(highPtTripletStepTrackCandidatesMkFitConfig,
config = cms.FileInPath('RecoTracker/MkFit/data/mkfit-phase2-lstStep-offline.json'),
minPt = cms.double(0)
)

# For Phase2PU140
from TrackingTools.TrajectoryCleaning.TrajectoryCleanerBySharedHits_cfi import trajectoryCleanerBySharedHits as _trajectoryCleanerBySharedHits
Expand All @@ -263,14 +274,26 @@
fractionShared = 0.16,
allowSharedFirstHit = True
)
trackingPhase2PU140.toModify(highPtTripletStepTrackCandidates,
trackingPhase2PU140.toModify(highPtTripletStepTrackCandidates,
TrajectoryCleaner = 'highPtTripletStepTrajectoryCleanerBySharedHits',
clustersToSkip = '',
phase2clustersToSkip = 'highPtTripletStepClusters'
)

from RecoTracker.LST.lstOutputConverter_cfi import lstOutputConverter as _lstOutputConverter
(trackingPhase2PU140 & trackingLST).toReplaceWith(highPtTripletStepTrackCandidates, _lstOutputConverter.clone())
highPtTripletStepTrajectorySeedsLST = _lstOutputConverter.clone(
includeNonpLSTSs = cms.bool(True)
)

(trackingPhase2PU140 & trackingMkFitHighPtTripletStep & seedingLST & trackingLST).toReplaceWith(highPtTripletStepTrackCandidates, mkFitOutputConverter_cfi.mkFitOutputConverter.clone(
seeds = 'highPtTripletStepTrajectorySeedsLST',
mkFitSeeds = 'highPtTripletStepTrackCandidatesMkFitSeeds',
tracks = 'highPtTripletStepTrackCandidatesMkFit',
candMVASel = False,
candCutSel = False,
mkFitStripHits = 'mkFitSiPhase2Hits'
))

#For FastSim phase1 tracking
import FastSimulation.Tracking.TrackCandidateProducer_cfi
Expand Down Expand Up @@ -376,6 +399,8 @@

(trackingPhase2PU140 & seedingLST).toModify(highPtTripletStepSelector, passThroughForAll = True)

(trackingPhase2PU140 & seedingLST & trackingMkFitHighPtTripletStep).toModify(highPtTripletStepSelector, passThroughForAll = False)

# Final sequence
HighPtTripletStepTask = cms.Task(highPtTripletStepClusters,
highPtTripletStepSeedLayers,
Expand Down Expand Up @@ -405,6 +430,13 @@
_HighPtTripletStepTask_LST.add(siPhase2RecHits, lstInputProducer, lstProducerTask)
(trackingPhase2PU140 & trackingLST).toReplaceWith(HighPtTripletStepTask, _HighPtTripletStepTask_LST)

_HighPtTripletStepTask_LST_mkFit = _HighPtTripletStepTask_LST.copy()
(trackingPhase2PU140 & seedingLST & trackingLST & trackingMkFitHighPtTripletStep).toModify(lstInputProducer,
ptCut = cms.double(0.1)
)
_HighPtTripletStepTask_LST_mkFit.add(highPtTripletStepTrajectorySeedsLST,highPtTripletStepTrackCandidatesMkFitSeeds, highPtTripletStepTrackCandidatesMkFit, highPtTripletStepTrackCandidatesMkFitConfig)
(trackingPhase2PU140 & trackingMkFitHighPtTripletStep & seedingLST & trackingLST).toReplaceWith(HighPtTripletStepTask,_HighPtTripletStepTask_LST_mkFit)

from Configuration.ProcessModifiers.alpakaValidationLST_cff import alpakaValidationLST
from HeterogeneousCore.AlpakaCore.functions import makeSerialClone
lstInputProducerSerialSync = makeSerialClone(lstInputProducer)
Expand All @@ -425,9 +457,11 @@
lstProducerSerialSync, highPtTripletStepTrackCandidatesSerialSync,
highPtTripletStepTracksSerialSync, highPtTripletStepSelectorSerialSync
)
_HighPtTripletStepTask_LST_mkFitSerialSync = _HighPtTripletStepTask_LSTSerialSync.copy()
_HighPtTripletStepTask_LST_mkFitSerialSync.add(highPtTripletStepTrajectorySeedsLST,highPtTripletStepTrackCandidatesMkFitSeeds, highPtTripletStepTrackCandidatesMkFit, highPtTripletStepTrackCandidatesMkFitConfig)
HighPtTripletStepTaskSerialSync = cms.Task()
(trackingPhase2PU140 & alpakaValidationLST & trackingLST).toReplaceWith(HighPtTripletStepTaskSerialSync, _HighPtTripletStepTask_LSTSerialSync)

(trackingPhase2PU140 & alpakaValidationLST & trackingLST & seedingLST & trackingMkFitHighPtTripletStep).toReplaceWith(HighPtTripletStepTaskSerialSync,_HighPtTripletStepTask_LST_mkFitSerialSync)
# fast tracking mask producer
_HighPtTripletStepTask_fastSim = cms.Task(highPtTripletStepMasks
,highPtTripletStepTrackingRegions
Expand Down
15 changes: 15 additions & 0 deletions RecoTracker/LST/python/lstProducerTask_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,19 @@

from RecoTracker.LST.lstModulesDevESProducer_cfi import lstModulesDevESProducer

from Configuration.ProcessModifiers.seedingLST_cff import seedingLST
from Configuration.ProcessModifiers.trackingLST_cff import trackingLST
from Configuration.ProcessModifiers.trackingMkFitHighPtTripletStep_cff import trackingMkFitHighPtTripletStep
from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140

(trackingPhase2PU140 & trackingMkFitHighPtTripletStep & seedingLST & trackingLST).toModify(lstProducer,
ptCut = cms.double(0.6),
ptCutLabel = cms.string('0.6'),
nopLSDupClean = cms.bool(True),
tcpLSTriplets = cms.bool(True)
)
(trackingPhase2PU140 & trackingMkFitHighPtTripletStep & seedingLST & trackingLST).toModify(lstModulesDevESProducer,
ptCutLabel = cms.string('0.6')
)

lstProducerTask = cms.Task(lstModulesDevESProducer, lstProducer)