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.

Sign up for GitHub

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

Migrate PixelTrackProducer and HLT to new seeding framework #17170

Merged
merged 14 commits into from
Jan 26, 2017
Merged

Migrate PixelTrackProducer and HLT to new seeding framework #17170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b087dac
Migrate seeding to new seeding framework in customizeHLTforCMSSW
makortel Aug 5, 2016
e883189
Always clone LowPtClusterShapeSeedComparitor
makortel Dec 1, 2016
a73b1b5
Replace assert with an exception
makortel Dec 1, 2016
52501d2
Add GlobalTrackingRegionEDProducer
makortel Nov 28, 2016
a15a3c0
Make cluster multiplicity check optional in HitPairEDProducer
makortel Nov 28, 2016
6f54989
Add HITrackingRegionForPrimaryVtxEDProducer
makortel Nov 29, 2016
43aeb02
Add CandidateSeededTrackingRegionsEDProducer
makortel Nov 30, 2016
a5ae39b
Make PixelQuadrupletMergerEDProducer to work with PixelTrackProducer
makortel Dec 1, 2016
b2242d4
Migrate PixelTrackProducer to the new seeding framework
makortel Nov 28, 2016
f8fe5eb
Migrate customiseFor*HLTPixelTracksByCellularAutomaton
makortel Nov 30, 2016
9bce3aa
Add PixelTrackProducer migration to customizeHLTforCMSSW
makortel Nov 30, 2016
2e95095
Remove added region/doublet/triplet producers for pixel tracks from F…
makortel Dec 1, 2016
9944fe1
Migrate customizeHLTTrackingForPhaseI2017
makortel Jan 12, 2017
8f717e9
Missed some pieces in HLT migration
makortel Jan 15, 2017
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
122 changes: 70 additions & 52 deletions Calibration/IsolatedParticles/python/isoTrack_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,39 @@
L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ),
offset = cms.uint32( 0 )
)
hltHITPixelTracksHBTrackingRegions = cms.EDProducer("GlobalTrackingRegionFromBeamSpotEDProducer",
RegionPSet = cms.PSet(
precise = cms.bool( True ),
originRadius = cms.double( 0.0015 ),
nSigmaZ = cms.double( 3.0 ),
ptMin = cms.double( 0.7 ),
beamSpot = cms.InputTag( "hltOnlineBeamSpot" )
)
)
hltHITPixelTracksHBHitDoublets = cms.EDProducer("HitPairEDProducer",
clusterCheck = cms.InputTag(""),
layerPairs = cms.vuint32(0),
maxElement = cms.uint32(0),
produceIntermediateHitDoublets = cms.bool(True),
produceSeedingHitSets = cms.bool(False),
seedingLayers = cms.InputTag("hltESPPixelLayerTripletsHITHB"),
trackingRegions = cms.InputTag("hltHITPixelTracksHBTrackingRegions")
)
hltHITPixelTracksHBHitTriplets = cms.EDProducer("PixelTripletHLTEDProducer",
SeedComparitorPSet = cms.PSet(
ComponentName = cms.string("none"),
),
doublets = cms.InputTag("hltHITPixelTracksHBHitDoublets"),
extraHitRPhitolerance = cms.double(0.06),
extraHitRZtolerance = cms.double(0.06),
maxElement = cms.uint32(100000),
phiPreFiltering = cms.double(0.3),
produceIntermediateHitTriplets = cms.bool(False),
produceSeedingHitSets = cms.bool(True),
useBending = cms.bool(True),
useFixedPreFiltering = cms.bool(False),
useMultScattering = cms.bool(True)
)
hltHITPixelTracksHBFitter = cms.EDProducer("PixelFitterByConformalMappingAndLineProducer",
TTRHBuilder = cms.string( "hltESPTTRHBuilderPixelOnly" ),
useFixImpactParameter = cms.bool(True),
Expand All @@ -24,34 +57,43 @@
Filter = cms.InputTag("hltHITPixelTracksHBFilter"),
passLabel = cms.string( "Pixel triplet primary tracks with vertex constraint" ),
Fitter = cms.InputTag("hltHITPixelTracksHBFitter"),
RegionFactoryPSet = cms.PSet(
ComponentName = cms.string( "GlobalRegionProducerFromBeamSpot" ),
RegionPSet = cms.PSet(
precise = cms.bool( True ),
originRadius = cms.double( 0.0015 ),
nSigmaZ = cms.double( 3.0 ),
ptMin = cms.double( 0.7 ),
beamSpot = cms.InputTag( "hltOnlineBeamSpot" )
)
),
Cleaner = cms.string("hltHITPixelTracksCleaner"),
OrderedHitsFactoryPSet = cms.PSet(
ComponentName = cms.string( "StandardHitTripletGenerator" ),
SeedingLayers = cms.string( "hltESPPixelLayerTripletsHITHB" ),
GeneratorPSet = cms.PSet(
useBending = cms.bool( True ),
useFixedPreFiltering = cms.bool( False ),
maxElement = cms.uint32( 100000 ),
phiPreFiltering = cms.double( 0.3 ),
extraHitRPhitolerance = cms.double( 0.06 ),
useMultScattering = cms.bool( True ),
ComponentName = cms.string( "PixelTripletHLTGenerator" ),
extraHitRZtolerance = cms.double( 0.06 ),
SeedComparitorPSet = cms.PSet( ComponentName = cms.string( "none" ) )
)
)
SeedingHitSets = cms.InputTag("hltHITPixelTracksHBHitTriplets"),
)

hltHITPixelTracksHETrackingRegions = cms.EDProducer("GlobalTrackingRegionFromBeamSpotEDProducer",
RegionPSet = cms.PSet(
precise = cms.bool( True ),
originRadius = cms.double( 0.0015 ),
nSigmaZ = cms.double( 3.0 ),
beamSpot = cms.InputTag( "hltOnlineBeamSpot" ),
ptMin = cms.double( 0.35 )
)
)
hltHITPixelTracksHEHitDoublets = cms.EDProducer("HitPairEDProducer",
clusterCheck = cms.InputTag(""),
layerPairs = cms.vuint32(0),
maxElement = cms.uint32(0),
produceIntermediateHitDoublets = cms.bool(True),
produceSeedingHitSets = cms.bool(False),
seedingLayers = cms.InputTag("hltESPPixelLayerTripletsHITHE"),
trackingRegions = cms.InputTag("hltHITPixelTracksHBTrackingRegions")
)
hltHITPixelTracksHEHitTriplets = cms.EDProducer("PixelTripletHLTEDProducer",
SeedComparitorPSet = cms.PSet(
ComponentName = cms.string("none"),
),
doublets = cms.InputTag("hltHITPixelTracksHEHitDoublets"),
extraHitRPhitolerance = cms.double(0.06),
extraHitRZtolerance = cms.double(0.06),
maxElement = cms.uint32(100000),
phiPreFiltering = cms.double(0.3),
produceIntermediateHitTriplets = cms.bool(False),
produceSeedingHitSets = cms.bool(True),
useBending = cms.bool(True),
useFixedPreFiltering = cms.bool(False),
useMultScattering = cms.bool(True)
)
hltHITPixelTracksHEFitter = cms.EDProducer("PixelFitterByConformalMappingAndLineProducer",
TTRHBuilder = cms.string( "hltESPTTRHBuilderPixelOnly" ),
useFixImpactParameter = cms.bool(True),
Expand All @@ -68,35 +110,11 @@
Filter = cms.InputTag("hltHITPixelTracksHEFilter"),
passLabel = cms.string( "Pixel triplet primary tracks with vertex constraint" ),
Fitter = cms.InputTag("hltHITPixelTracksHEFitter"),
RegionFactoryPSet = cms.PSet(
ComponentName = cms.string( "GlobalRegionProducerFromBeamSpot" ),
RegionPSet = cms.PSet(
precise = cms.bool( True ),
originRadius = cms.double( 0.0015 ),
nSigmaZ = cms.double( 3.0 ),
beamSpot = cms.InputTag( "hltOnlineBeamSpot" ),
ptMin = cms.double( 0.35 )
)
),
CleanerPSet = cms.PSet(
ComponentName = cms.string( "PixelTrackCleanerBySharedHits" ),
useQuadrupletAlgo = cms.bool(False)
),
OrderedHitsFactoryPSet = cms.PSet(
ComponentName = cms.string( "StandardHitTripletGenerator" ),
GeneratorPSet = cms.PSet(
useBending = cms.bool( True ),
useFixedPreFiltering = cms.bool( False ),
maxElement = cms.uint32( 100000 ),
phiPreFiltering = cms.double( 0.3 ),
extraHitRPhitolerance = cms.double( 0.06 ),
useMultScattering = cms.bool( True ),
ComponentName = cms.string( "PixelTripletHLTGenerator" ),
extraHitRZtolerance = cms.double( 0.06 ),
SeedComparitorPSet = cms.PSet( ComponentName = cms.string( "none" ) )
),
SeedingLayers = cms.string( "hltESPPixelLayerTripletsHITHE" )
)
SeedingHitSets = cms.InputTag("hltHITPixelTracksHEHitTriplets"),
)

hltHITPixelVerticesHE = cms.EDProducer("PixelVertexProducer",
Expand Down Expand Up @@ -430,7 +448,7 @@
saveTags = cms.bool( False )
)

HLT_IsoTrackHE_v15 = cms.Path( HLTBeginSequence + hltL1sV0SingleJet60 + hltPreIsoTrackHE + HLTDoLocalPixelSequence + hltHITPixelTracksHBFitter + hltHITPixelTracksHBFilter + hltHITPixelTracksHEFitter + hltHITPixelTracksHEFilter + hltHITPixelTracksHB + hltHITPixelTracksHE + hltHITPixelVerticesHE + hltIsolPixelTrackProdHE + hltIsolPixelTrackL2FilterHE + HLTDoLocalStripSequence + hltHITPixelTripletSeedGeneratorHE + hltHITCkfTrackCandidatesHE + hltHITCtfWithMaterialTracksHE + hltHITIPTCorrectorHE + hltIsolPixelTrackL3FilterHE + HLTEndSequence )
HLT_IsoTrackHE_v15 = cms.Path( HLTBeginSequence + hltL1sV0SingleJet60 + hltPreIsoTrackHE + HLTDoLocalPixelSequence + hltHITPixelTracksHBTrackingRegions + hltHITPixelTracksHBHitDoublets + hltHITPixelTracksHBHitTriplets + hltHITPixelTracksHBFitter + hltHITPixelTracksHBFilter + hltHITPixelTracksHEFitter + hltHITPixelTracksHEFilter + hltHITPixelTracksHB + hltHITPixelTracksHBTrackingRegions + hltHITPixelTracksHBHitDoublets + hltHITPixelTracksHBHitTriplets + hltHITPixelTracksHE + hltHITPixelVerticesHE + hltIsolPixelTrackProdHE + hltIsolPixelTrackL2FilterHE + HLTDoLocalStripSequence + hltHITPixelTripletSeedGeneratorHE + hltHITCkfTrackCandidatesHE + hltHITCtfWithMaterialTracksHE + hltHITIPTCorrectorHE + hltIsolPixelTrackL3FilterHE + HLTEndSequence )

HLT_IsoTrackHB_v14 = cms.Path( HLTBeginSequence + hltL1sV0SingleJet60 + hltPreIsoTrackHB + HLTDoLocalPixelSequence + hltHITPixelTracksHBFitter + hltHITPixelTracksHBFilter + hltHITPixelTracksHB + hltHITPixelVerticesHB + hltIsolPixelTrackProdHB + hltIsolPixelTrackL2FilterHB + HLTDoLocalStripSequence + hltHITPixelTripletSeedGeneratorHB + hltHITCkfTrackCandidatesHB + hltHITCtfWithMaterialTracksHB + hltHITIPTCorrectorHB + hltIsolPixelTrackL3FilterHB + HLTEndSequence )
HLT_IsoTrackHB_v14 = cms.Path( HLTBeginSequence + hltL1sV0SingleJet60 + hltPreIsoTrackHB + HLTDoLocalPixelSequence + hltHITPixelTracksHBTrackingRegions + hltHITPixelTracksHBHitDoublets + hltHITPixelTracksHBHitTriplets + hltHITPixelTracksHBFitter + hltHITPixelTracksHBFilter + hltHITPixelTracksHB + hltHITPixelVerticesHB + hltIsolPixelTrackProdHB + hltIsolPixelTrackL2FilterHB + HLTDoLocalStripSequence + hltHITPixelTripletSeedGeneratorHB + hltHITCkfTrackCandidatesHB + hltHITCtfWithMaterialTracksHB + hltHITIPTCorrectorHB + hltIsolPixelTrackL3FilterHB + HLTEndSequence )

30 changes: 23 additions & 7 deletions DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,8 @@
process.InitialStepPreSplitting.remove(process.siPixelRecHits)
process.InitialStepPreSplitting.remove(process.MeasurementTrackerEvent)
process.InitialStepPreSplitting.remove(process.siPixelClusterShapeCache)
# 2016-11-28 MK FIXME: I suppose I should migrate the lines below following the "new seeding framework"
#
# if z is very far due to bad fit
process.initialStepSeedsPreSplitting.RegionFactoryPSet.RegionPSet.originRadius = 1.5
process.initialStepSeedsPreSplitting.RegionFactoryPSet.RegionPSet.originHalfLength = cms.double(30.0)
Expand All @@ -213,21 +215,35 @@
else: # pixel tracking
print "[beam_dqm_sourceclient-live_cfg]:: pixelTracking"
#pixel track/vertices reco
from RecoTracker.TkTrackingRegions.GlobalTrackingRegion_cfi import *
process.RegionPSetBlock.RegionPSet.originRadius = cms.double(0.4)

process.load("RecoPixelVertexing.Configuration.RecoPixelVertexing_cff")
process.PixelTrackReconstructionBlock.RegionFactoryPSet = cms.PSet(RegionPSetBlock, ComponentName = cms.string("GlobalTrackingRegion"))
process.pixelVertices.TkFilterParameters.minPt = process.pixelTracks.RegionFactoryPSet.RegionPSet.ptMin
from RecoPixelVertexing.PixelTrackFitting.PixelTracks_cff import *
from RecoTracker.TkTrackingRegions.globalTrackingRegion_cfi import *
new = globalTrackingRegion.clone()
def _copy(old, new, skip=[]):
skipSet = set(skip)
for key in old.parameterNames_():
if key not in skipSet:
setattr(new, key, getattr(old, key))
_copy(process.pixelTracksTrackingRegions, new, skip=["nSigmaZ", "beamSpot"])
new.RegionPSet.originRadius = 0.4
# Bit of a hack to replace a module with another, but works
#
# With the naive
# process.pixelTracksTrackingRegions = glovalTrackingRegion.clone()
# the configuration system complains that pixelTracksTrackingRegions is already being used in recopixelvertexing sequence
modifier = cms.Modifier()
modifier._setChosen()
modifier.toReplaceWith(process.pixelTracksTrackingRegions, new)

process.pixelVertices.TkFilterParameters.minPt = process.pixelTracksTrackingRegions.RegionPSet.ptMin

process.dqmBeamMonitor.PVFitter.errorScale = 1.22 #keep checking this with new release expected close to 1.2


from RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi import *
process.PixelLayerTriplets.BPix.HitProducer = cms.string('siPixelRecHitsPreSplitting')
process.PixelLayerTriplets.FPix.HitProducer = cms.string('siPixelRecHitsPreSplitting')
from RecoPixelVertexing.PixelTrackFitting.PixelTracks_cff import *
process.pixelTracks.OrderedHitsFactoryPSet.GeneratorPSet.SeedComparitorPSet.clusterShapeCacheSrc = cms.InputTag('siPixelClusterShapeCachePreSplitting')
process.pixelTracksHitTriplets.SeedComparitorPSet.clusterShapeCacheSrc = 'siPixelClusterShapeCachePreSplitting'

process.tracking_FirstStep = cms.Sequence(process.siPixelDigis*
process.offlineBeamSpot*
Expand Down
28 changes: 21 additions & 7 deletions DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,19 +115,33 @@
#----------------------------
# Pixel-Tracks&Vertices Config
#----------------------------
from RecoTracker.TkTrackingRegions.GlobalTrackingRegion_cfi import *
process.RegionPSetBlock.RegionPSet.originRadius = cms.double(0.4)

process.load("RecoPixelVertexing.Configuration.RecoPixelVertexing_cff")
process.PixelTrackReconstructionBlock.RegionFactoryPSet = cms.PSet(RegionPSetBlock, ComponentName = cms.string("GlobalTrackingRegion"))
process.pixelVertices.TkFilterParameters.minPt = process.pixelTracks.RegionFactoryPSet.RegionPSet.ptMin
from RecoPixelVertexing.PixelTrackFitting.PixelTracks_cff import *
from RecoTracker.TkTrackingRegions.globalTrackingRegion_cfi import *
new = globalTrackingRegion.clone()
def _copy(old, new, skip=[]):
skipSet = set(skip)
for key in old.parameterNames_():
if key not in skipSet:
setattr(new, key, getattr(old, key))
_copy(process.pixelTracksTrackingRegions, new, skip=["nSigmaZ", "beamSpot"])
new.RegionPSet.originRadius = 0.4
# Bit of a hack to replace a module with another, but works
#
# With the naive
# process.pixelTracksTrackingRegions = glovalTrackingRegion.clone()
# the configuration system complains that pixelTracksTrackingRegions is already being used in recopixelvertexing sequence
modifier = cms.Modifier()
modifier._setChosen()
modifier.toReplaceWith(process.pixelTracksTrackingRegions, new)

process.pixelVertices.TkFilterParameters.minPt = process.pixelTracksTrackingRegions.RegionPSet.ptMin

from RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi import *
process.PixelLayerTriplets.BPix.HitProducer = cms.string("siPixelRecHitsPreSplitting")
process.PixelLayerTriplets.FPix.HitProducer = cms.string("siPixelRecHitsPreSplitting")

from RecoPixelVertexing.PixelTrackFitting.PixelTracks_cff import *
process.pixelTracks.OrderedHitsFactoryPSet.GeneratorPSet.SeedComparitorPSet.clusterShapeCacheSrc = cms.InputTag("siPixelClusterShapeCachePreSplitting")
process.pixelTracksHitTriplets.SeedComparitorPSet.clusterShapeCacheSrc = "siPixelClusterShapeCachePreSplitting"


#----------------------------
Expand Down
2 changes: 1 addition & 1 deletion DQM/Integration/python/clients/sistrip_dqm_sourceclient-live_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@
process.PixelLayerTriplets.BPix.HitProducer = cms.string('siPixelRecHitsPreSplitting')
process.PixelLayerTriplets.FPix.HitProducer = cms.string('siPixelRecHitsPreSplitting')
from RecoPixelVertexing.PixelTrackFitting.PixelTracks_cff import *
process.pixelTracks.OrderedHitsFactoryPSet.GeneratorPSet.SeedComparitorPSet.clusterShapeCacheSrc = cms.InputTag('siPixelClusterShapeCachePreSplitting')
process.pixelTracksHitTriplets.SeedComparitorPSet.clusterShapeCacheSrc = 'siPixelClusterShapeCachePreSplitting'

process.RecoForDQM_TrkReco = cms.Sequence(process.offlineBeamSpot*process.MeasurementTrackerEventPreSplitting*process.siPixelClusterShapeCachePreSplitting*process.recopixelvertexing*process.InitialStepPreSplitting)

Expand Down
2 changes: 1 addition & 1 deletion FastSimulation/Tracking/python/LowPtTripletStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
hitMasks = cms.InputTag("lowPtTripletStepMasks"),
)
lowPtTripletStepSeeds.seedFinderSelector.pixelTripletGeneratorFactory = _hitSetProducerToFactoryPSet(_standard.lowPtTripletStepHitTriplets)
#lowPtTripletStepSeeds.pixelTripletGeneratorFactory.SeedComparitorPSet=cms.PSet( ComponentName = cms.string( "none" ) )
lowPtTripletStepSeeds.seedFinderSelector.pixelTripletGeneratorFactory.SeedComparitorPSet.ComponentName = "none"

# track candidates
import FastSimulation.Tracking.TrackCandidateProducer_cfi
Expand Down
Loading