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

Displaced regional tracking iteration #40643

Merged
merged 23 commits into from
May 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
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
@@ -0,0 +1,5 @@
import FWCore.ParameterSet.Config as cms

# This modifier is for activating displacedRegionalStep step for phase1 tracking

displacedRegionalTracking = cms.Modifier()
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
from Configuration.ProcessModifiers.trackingMkFitMixedTripletStep_cff import *
from Configuration.ProcessModifiers.trackingMkFitPixelLessStep_cff import *
from Configuration.ProcessModifiers.trackingMkFitTobTecStep_cff import *
from Configuration.ProcessModifiers.trackingMkFitDisplacedRegionalStep_cff import *

# Use mkFit in selected iterations
trackingMkFitDevel = cms.ModifierChain(
Expand All @@ -26,5 +27,6 @@
trackingMkFitPixelPairStep,
trackingMkFitMixedTripletStep,
trackingMkFitPixelLessStep,
trackingMkFitTobTecStep
trackingMkFitTobTecStep,
trackingMkFitDisplacedRegionalStep
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import FWCore.ParameterSet.Config as cms

# This modifier sets replaces the default pattern recognition with mkFit for displacedRegionalStep
trackingMkFitDisplacedRegionalStep = cms.Modifier()
Copy link
Contributor

Choose a reason for hiding this comment

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

please add this in Configuration/ProcessModifiers/python/trackingMkFitDevel_cff.py for regular testing

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

1 change: 1 addition & 0 deletions Configuration/PyReleaseValidation/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ The offsets currently in use are:
* 0.6: HE Collapse (old depth segmentation for 2018)
* 0.601: HLT as separate step
* 0.7: trackingMkFit modifier
* 0.701: DisplacedRegionalStep tracking iteration for Run-3
* 0.8: BPH Parking (Run-2)
* 0.81: Running also HeavyFlavor DQM
* 0.9: Vector hits
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,27 @@ def condition(self, fragment, stepList, key, hasHarvest):
offset = 0.17,
)

#Workflow to enable displacedRegionalStep tracking iteration
class UpgradeWorkflow_displacedRegional(UpgradeWorkflowTracking):
def setup__(self, step, stepName, stepDict, k, properties):
if 'Reco' in step: stepDict[stepName][k] = merge([self.step3, stepDict[step][k]])
def condition_(self, fragment, stepList, key, hasHarvest):
return '2021' in key
upgradeWFs['displacedRegional'] = UpgradeWorkflow_displacedRegional(
steps = [
'Reco',
'RecoFakeHLT',
'RecoGlobal',
'RecoNano',
],
PU = [],
suffix = '_displacedRegional',
offset = 0.701,
)
upgradeWFs['displacedRegional'].step3 = {
'--procModifiers': 'displacedRegionalTracking'
}

# Vector Hits workflows
class UpgradeWorkflow_vectorHits(UpgradeWorkflow):
def setup_(self, step, stepName, stepDict, k, properties):
Expand Down
16 changes: 11 additions & 5 deletions DQM/TrackingMonitorSource/python/EDModules2monitor_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,23 @@

# apparentely there are not LogError in RecoLocalTracker/SubCollectionProducers/src/TrackClusterRemover.cc
pluginsMonName['Clusterizer'] = cms.string ( 'TrackClusterRemover' )
modulesLabel ['Clusterizer'] = cms.vstring( 'lowPtTripletStepClusters', 'pixelPairStepClusters', 'detachedTripletStepClusters', 'mixedTripletStepClusters', 'pixelLessStepClusters', 'tobTecStepClusters', 'displacedGeneralStepClusters' ) # TrackClusterRemover
modulesLabel ['Clusterizer'] = cms.vstring( 'lowPtTripletStepClusters', 'pixelPairStepClusters', 'detachedTripletStepClusters', 'mixedTripletStepClusters', 'pixelLessStepClusters', 'tobTecStepClusters', 'displacedGeneralStepClusters', 'displacedRegionalStepClusters' ) # TrackClusterRemover
categories ['Clusterizer'] = cms.vstring( )

# initialStepSeeds,lowPtTripletStepSeeds, pixelPairStepSeeds, detachedTripletStepSeeds, : TooManyClusters (SeedGeneratorFromRegionHitsEDProducer),
# photonConvTrajSeedFromSingleLeg : (PhotonConversionTrajectorySeedProducerFromSingleLeg)
pluginsMonName['Seeding'] = cms.string ( 'Seeding' )
modulesLabel ['Seeding'] = cms.vstring( 'initialStepSeeds', 'lowPtTripletStepSeeds', 'pixelPairStepSeeds', 'detachedTripletStepSeeds', 'mixedTripletStepSeedsA', 'mixedTripletStepSeedsB', 'mixedTripletStepSeeds', 'pixelLessStepSeeds', 'tobTecStepSeeds', 'displacedGeneralStepSeeds','photonConvTrajSeedFromSingleLeg')
modulesLabel ['Seeding'] = cms.vstring( 'initialStepSeeds', 'lowPtTripletStepSeeds', 'pixelPairStepSeeds', 'detachedTripletStepSeeds', 'mixedTripletStepSeedsA', 'mixedTripletStepSeedsB', 'mixedTripletStepSeeds', 'pixelLessStepSeeds', 'tobTecStepSeeds', 'displacedGeneralStepSeeds', 'displacedRegionalStepSeeds' ,'photonConvTrajSeedFromSingleLeg')
categories ['Seeding'] = cms.vstring( 'TooManyClusters', 'TooManyPairs', 'TooManyTriplets', 'TooManySeeds' )

# RecoTracker/CkfPattern/src/CkfTrackCandidateMakerBase.cc
pluginsMonName['TrackCandidate'] = cms.string ( 'TrackCandidate' )
modulesLabel ['TrackCandidate'] = cms.vstring( 'initialStepTrackCandidates', 'lowPtTripletStepTrackCandidates', 'pixelPairStepTrackCandidates', 'detachedTripletStepTrackCandidates', 'mixedTripletStepTrackCandidates', 'pixelLessStepTrackCandidates', 'tobTecStepTrackCandidates', 'displacedGeneralStepTrackCandidates', 'convTrackCandidates' )
modulesLabel ['TrackCandidate'] = cms.vstring( 'initialStepTrackCandidates', 'lowPtTripletStepTrackCandidates', 'pixelPairStepTrackCandidates', 'detachedTripletStepTrackCandidates', 'mixedTripletStepTrackCandidates', 'pixelLessStepTrackCandidates', 'tobTecStepTrackCandidates', 'displacedGeneralStepTrackCandidates', 'displacedRegionalStepTrackCandidates', 'convTrackCandidates' )
categories ['TrackCandidate'] = cms.vstring( 'TooManySeeds', 'CkfPattern', 'BaseCkfTrajectoryBuilder_InfiniteLoop' )

# TrackProducer:FailedPropagation
pluginsMonName['TrackFinder'] = cms.string ( 'TrackFinder' )
modulesLabel ['TrackFinder'] = cms.vstring( 'pixelTracks', 'initialStepTracks', 'lowPtTripletStepTracks', 'pixelPairStepTracks', 'detachedTripletStepTracks', 'mixedTripletStepTracks', 'pixelLessStepTracks', 'tobTecStepTracks', 'displacedGeneralStepTracks', 'generalTracks' )
modulesLabel ['TrackFinder'] = cms.vstring( 'pixelTracks', 'initialStepTracks', 'lowPtTripletStepTracks', 'pixelPairStepTracks', 'detachedTripletStepTracks', 'mixedTripletStepTracks', 'pixelLessStepTracks', 'tobTecStepTracks', 'displacedGeneralStepTracks', 'displacedRegionalStepTracks', 'generalTracks' )
categories ['TrackFinder'] = cms.vstring( 'FailedPropagation' )


Expand Down Expand Up @@ -63,6 +63,9 @@
'displacedGeneralStepSeeds_iter7',
'displacedGeneralStepTrackCandidates_iter7',
'displacedGeneralStepTracks_iter7',
'displacedRegionalStepSeeds_iter8',
'displacedRegionalStepTrackCandidates_iter8',
'displacedRegionalStepTracks_iter8',
'photonConvTrajSeedFromSingleLeg',
'convTrackCandidates',
'convStepTracks',
Expand Down Expand Up @@ -101,7 +104,10 @@
'tobTecStepTracks_iter6',
'displacedGeneralStepSeeds_iter7',
'displacedGeneralStepTrackCandidates_iter7',
'displacedGeneralStepTracks_iter7'
'displacedGeneralStepTracks_iter7',
'displacedRegionalStepSeeds_iter8',
'displacedRegionalStepTrackCandidates_iter8',
'displacedRegionalStepTracks_iter8'
)
categories['IterTracking'] = cms.vstring(
'TooManyClusters',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,18 @@
clusterMax = cms.double(100000),
)

seedMonitoring['displacedRegionalStep'] = cms.PSet(
seedInputTag = cms.InputTag("displacedRegionalStepSeeds"),
trackCandInputTag= cms.InputTag("displacedRegionalStepTrackCandidates"),
trackSeedSizeBin = cms.int32(400),
trackSeedSizeMin = cms.double(0),
trackSeedSizeMax = cms.double(100000),
TCSizeMax = cms.double(199.5),
clusterLabel = cms.vstring('Strip'),
clusterBin = cms.int32(100),
clusterMax = cms.double(100000),
)

seedMonitoring['muonSeededStepOutInDisplaced'] = cms.PSet(
seedInputTag = cms.InputTag("muonSeededSeedsOutInDisplaced"),
trackCandInputTag = cms.InputTag("muonSeededTrackCandidatesOutInDisplacedg"),
Expand Down
2 changes: 1 addition & 1 deletion DataFormats/TrackReco/interface/TrackBase.h
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ namespace reco {
lowPtQuadStep = 23,
detachedQuadStep = 24,
displacedGeneralStep = 25,
reservedForUpgrades2 = 26,
displacedRegionalStep = 26,
bTagGhostTracks = 27,
beamhalo = 28,
gsf = 29,
Expand Down
2 changes: 1 addition & 1 deletion DataFormats/TrackReco/src/TrackBase.cc
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ std::string const TrackBase::algoNames[] = {"undefAlgorithm",
"lowPtQuadStep",
"detachedQuadStep",
"displacedGeneralStep",
"reservedForUpgrades2",
"displacedRegionalStep",
"bTagGhostTracks",
"beamhalo",
"gsf",
Expand Down
10 changes: 10 additions & 0 deletions RecoTracker/DisplacedRegionalTracking/plugins/BuildFile.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<use name="DataFormats/BeamSpot"/>
<use name="DataFormats/Candidate"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/Math"/>
<use name="DataFormats/VertexReco"/>
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/Utilities"/>
<use name="PhysicsTools/TensorFlow"/>
<flags EDM_PLUGIN="1"/>