Skip to content

Commit

Permalink
Merge pull request #18564 from makortel/removeTrackingPhase1PU70
Browse files Browse the repository at this point in the history
Remove trackingPhase1PU70 customizations as obsolete
  • Loading branch information
davidlange6 authored May 9, 2017
2 parents 4f15b52 + f752be9 commit 6ee7ba9
Show file tree
Hide file tree
Showing 42 changed files with 165 additions and 1,276 deletions.
4 changes: 0 additions & 4 deletions Configuration/Eras/python/Modifier_trackingPhase1PU70_cff.py

This file was deleted.

10 changes: 4 additions & 6 deletions Configuration/StandardSequences/python/Reconstruction_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,12 @@
trackingGlobalReco*
hcalGlobalRecoSequence*
vertexreco)
_globalreco_tracking_LowPU_Phase1PU70 = globalreco_tracking.copy()
_globalreco_tracking_LowPU_Phase1PU70.replace(trackingGlobalReco, recopixelvertexing+trackingGlobalReco)
_globalreco_tracking_LowPU_Phase2PU140 = globalreco_tracking.copy()
_globalreco_tracking_LowPU_Phase2PU140.replace(trackingGlobalReco, recopixelvertexing+trackingGlobalReco)
from Configuration.Eras.Modifier_trackingLowPU_cff import trackingLowPU
trackingLowPU.toReplaceWith(globalreco_tracking, _globalreco_tracking_LowPU_Phase1PU70)
from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70
trackingPhase1PU70.toReplaceWith(globalreco_tracking, _globalreco_tracking_LowPU_Phase1PU70)
trackingLowPU.toReplaceWith(globalreco_tracking, _globalreco_tracking_LowPU_Phase2PU140)
from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140
trackingPhase2PU140.toReplaceWith(globalreco_tracking, _globalreco_tracking_LowPU_Phase1PU70)
trackingPhase2PU140.toReplaceWith(globalreco_tracking, _globalreco_tracking_LowPU_Phase2PU140)

globalreco = cms.Sequence(globalreco_tracking*
particleFlowCluster*
Expand Down
4 changes: 0 additions & 4 deletions RecoJets/JetProducers/python/caloJetsForTrk_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@
trackingLowPU.toModify(ak4CaloJetsForTrk,
srcPVs = "pixelVertices"
)
from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70
trackingPhase1PU70.toModify(ak4CaloJetsForTrk,
srcPVs = "pixelVertices"
)
from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140
trackingPhase2PU140.toModify(ak4CaloJetsForTrk,
srcPVs = "pixelVertices"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,11 @@
preDuplicateMergingDisplacedTracks.foundHitBonus = 100.0
preDuplicateMergingDisplacedTracks.lostHitPenalty = 1.0

# For Phase1PU70 tracking, take out muonSeededTracksInOut because the
# For Phase2PU140 tracking, take out muonSeededTracksInOut because the
# cut-selector module is technically incompatible with this one. Since
# that configuration is indended only for tracking comparisons (not
# for production), it is not worth of the effort to try to fix the
# situation.
from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70
trackingPhase1PU70.toModify(preDuplicateMergingDisplacedTracks,
trackProducers = [x for x in preDuplicateMergingDisplacedTracks.trackProducers if x != "muonSeededTracksInOut"],
inputClassifiers = [x for x in preDuplicateMergingDisplacedTracks.inputClassifiers if x != "muonSeededTracksInOutClassifier"],
)

# Same for Phase2PU140
from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140
trackingPhase2PU140.toModify(preDuplicateMergingDisplacedTracks,
trackProducers = [x for x in preDuplicateMergingDisplacedTracks.trackProducers if x != "muonSeededTracksInOut"],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,14 @@
from RecoVertex.PrimaryVertexProducer.OfflinePixel3DPrimaryVertices_cfi import *
recopixelvertexing = cms.Sequence(PixelLayerTriplets*pixelTracksSequence*pixelVertices)

# For LowPU and Phase1PU70
# For LowPU and Phase2PU140
PixelLayerTripletsPreSplitting = PixelLayerTriplets.clone(
BPix = dict(HitProducer = "siPixelRecHitsPreSplitting"),
FPix = dict(HitProducer = "siPixelRecHitsPreSplitting"),
)
_recopixelvertexing_LowPU_Phase1PU70 = recopixelvertexing.copy()
_recopixelvertexing_LowPU_Phase1PU70.replace(PixelLayerTriplets, PixelLayerTripletsPreSplitting)
_recopixelvertexing_LowPU_Phase2PU140 = recopixelvertexing.copy()
_recopixelvertexing_LowPU_Phase2PU140.replace(PixelLayerTriplets, PixelLayerTripletsPreSplitting)
from Configuration.Eras.Modifier_trackingLowPU_cff import trackingLowPU
trackingLowPU.toReplaceWith(recopixelvertexing, _recopixelvertexing_LowPU_Phase1PU70)
from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70
trackingPhase1PU70.toReplaceWith(recopixelvertexing, _recopixelvertexing_LowPU_Phase1PU70)
trackingLowPU.toReplaceWith(recopixelvertexing, _recopixelvertexing_LowPU_Phase2PU140)
from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140
trackingPhase2PU140.toReplaceWith(recopixelvertexing, _recopixelvertexing_LowPU_Phase1PU70)
trackingPhase2PU140.toReplaceWith(recopixelvertexing, _recopixelvertexing_LowPU_Phase2PU140)
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,10 @@
from RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff import *

from Configuration.Eras.Modifier_trackingLowPU_cff import trackingLowPU
from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70
from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140

# TrackingRegion
pixelTracksTrackingRegions = _globalTrackingRegionFromBeamSpot.clone()
trackingPhase1PU70.toModify(pixelTracksTrackingRegions, RegionPSet = dict(originRadius = 0.02))
trackingPhase2PU140.toModify(pixelTracksTrackingRegions, RegionPSet = dict(originRadius = 0.02))

# Hit ntuplets
Expand All @@ -51,7 +49,6 @@
)
_seedingLayers = dict(seedingLayers = "PixelLayerTripletsPreSplitting")
trackingLowPU.toModify(pixelTracksHitDoublets, **_seedingLayers)
trackingPhase1PU70.toModify(pixelTracksHitDoublets, **_seedingLayers)
trackingPhase2PU140.toModify(pixelTracksHitDoublets, **_seedingLayers)

pixelTracksHitTriplets = _pixelTripletHLTEDProducer.clone(
Expand All @@ -61,7 +58,6 @@
)
_SeedComparitorPSet = dict(SeedComparitorPSet = dict(clusterShapeCacheSrc = "siPixelClusterShapeCachePreSplitting"))
trackingLowPU.toModify(pixelTracksHitTriplets, **_SeedComparitorPSet)
trackingPhase1PU70.toModify(pixelTracksHitTriplets, **_SeedComparitorPSet)
trackingPhase2PU140.toModify(pixelTracksHitTriplets, maxElement=0, **_SeedComparitorPSet)

pixelTracksHitQuadruplets = _pixelQuadrupletMergerEDProducer.clone(
Expand All @@ -79,5 +75,4 @@
)
_pixelTracksSequence_quad = pixelTracksSequence.copy()
_pixelTracksSequence_quad.replace(pixelTracksHitTriplets, pixelTracksHitTriplets+pixelTracksHitQuadruplets)
trackingPhase1PU70.toReplaceWith(pixelTracksSequence, _pixelTracksSequence_quad)
trackingPhase2PU140.toReplaceWith(pixelTracksSequence, _pixelTracksSequence_quad)
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,8 @@
from RecoPixelVertexing.PixelTrackFitting.pixelTrackFilterByKinematicsDefault_cfi import pixelTrackFilterByKinematicsDefault as _pixelTrackFilterByKinematicsDefault
pixelTrackFilterByKinematics = _pixelTrackFilterByKinematicsDefault.clone()

from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70
from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140
_cust = dict(
chi2 = 50.0,
tipMax = 0.05
trackingPhase2PU140.toModify(pixelTrackFilterByKinematics,
chi2 = 50.0,
tipMax = 0.05
)
trackingPhase1PU70.toModify(pixelTrackFilterByKinematics, **_cust)
trackingPhase2PU140.toModify(pixelTrackFilterByKinematics, **_cust)
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
from RecoPixelVertexing.PixelTrackFitting.pixelTracksDefault_cfi import pixelTracksDefault as _pixelTracksDefault
pixelTracks = _pixelTracksDefault.clone()

from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70
from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140
_SeedingHitSets = dict(SeedingHitSets = "pixelTracksHitQuadruplets")
trackingPhase1PU70.toModify(pixelTracks, **_SeedingHitSets)
trackingPhase2PU140.toModify(pixelTracks, **_SeedingHitSets)
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,5 @@
extraHitRPhitolerance = cms.double(0.032),
extraHitRZtolerance = cms.double(0.037)
)
from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70
trackingPhase1PU70.toModify(PixelTripletLargeTipGenerator, maxElement = 0)

from Configuration.Eras.Modifier_peripheralPbPb_cff import peripheralPbPb
peripheralPbPb.toModify(PixelTripletLargeTipGenerator, maxElement = 1000000)
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

pixelTripletHLTEDProducer = _pixelTripletHLTEDProducerDefault.clone()
from Configuration.Eras.Modifier_trackingLowPU_cff import trackingLowPU
from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70
from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140
trackingLowPU.toModify(pixelTripletHLTEDProducer, maxElement=100000)
trackingPhase1PU70.toModify(pixelTripletHLTEDProducer, maxElement=0)
trackingPhase2PU140.toModify(pixelTripletHLTEDProducer, maxElement=0)
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@

pixelTripletLargeTipEDProducer = _pixelTripletLargeTipEDProducerDefault.clone()
from Configuration.Eras.Modifier_trackingLowPU_cff import trackingLowPU
from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70
from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140
trackingLowPU.toModify(pixelTripletLargeTipEDProducer, maxElement=100000)
trackingPhase1PU70.toModify(pixelTripletLargeTipEDProducer, maxElement=0)
trackingPhase2PU140.toModify(pixelTripletLargeTipEDProducer, maxElement=0)

from Configuration.Eras.Modifier_peripheralPbPb_cff import peripheralPbPb
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,5 @@
trackingPhase1.toModify(PixelSeedMergerQuadruplets, **_forPhase1)
from Configuration.Eras.Modifier_trackingPhase1QuadProp_cff import trackingPhase1QuadProp
trackingPhase1QuadProp.toModify(PixelSeedMergerQuadruplets, **_forPhase1)
from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70
trackingPhase1PU70.toModify(PixelSeedMergerQuadruplets, **_forPhase1)
from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140
trackingPhase2PU140.toModify(PixelSeedMergerQuadruplets, layerList = _layerListForPhase2, **_forPhase1)
111 changes: 0 additions & 111 deletions RecoTracker/ConversionSeedGenerators/python/ConversionStep_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
convClusters = _convClustersBase.clone(
trackClassifier = cms.InputTag('tobTecStep',"QualityMasks"),
)
from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70
trackingPhase1PU70.toReplaceWith(convClusters, _convClustersBase.clone(
overrideTrkQuals = "tobTecStepSelector:tobTecStep",
))

#Phase2 : configuring the phase2 track Cluster Remover
from RecoLocalTracker.SubCollectionProducers.phase2trackClusterRemover_cfi import phase2trackClusterRemover as _phase2trackClusterRemover
Expand Down Expand Up @@ -222,109 +218,6 @@
skipClusters = cms.InputTag('convClusters'),
)
)
trackingPhase1PU70.toModify(convLayerPairs,
layerList = [
'BPix1+BPix2',

'BPix2+BPix3',
'BPix2+FPix1_pos',
'BPix2+FPix1_neg',
'BPix2+FPix2_pos',
'BPix2+FPix2_neg',

'FPix1_pos+FPix2_pos',
'FPix1_neg+FPix2_neg',

'BPix3+TIB1',
'BPix3+TIB2',

'TIB1+TID1_pos',
'TIB1+TID1_neg',
'TIB1+TID2_pos',
'TIB1+TID2_neg',
'TIB1+TIB2',
'TIB1+TIB3',

'TIB2+TID1_pos',
'TIB2+TID1_neg',
'TIB2+TID2_pos',
'TIB2+TID2_neg',
'TIB2+TIB3',
'TIB2+TIB4',

'TIB3+TIB4',
'TIB3+TOB1',
'TIB3+TID1_pos',
'TIB3+TID1_neg',

'TIB4+TOB1',
'TIB4+TOB2',

'TOB1+TOB2',
'TOB1+TOB3',
'TOB1+TEC1_pos',
'TOB1+TEC1_neg',

'TOB2+TOB3',
'TOB2+TOB4',
'TOB2+TEC1_pos',
'TOB2+TEC1_neg',

#NB: re-introduce these combinations when large displaced
# tracks, reconstructed only in TOB will be available
# For instance think at the OutIn Ecal Seeded tracks
#'TOB3+TOB4',
#'TOB3+TOB5',
#'TOB3+TEC1_pos',
#'TOB3+TEC1_neg',
#
#'TOB4+TOB5',
#'TOB4+TOB6',
#
#'TOB5+TOB6',

'TID1_pos+TID2_pos',
'TID2_pos+TID3_pos',
'TID3_pos+TEC1_pos',

'TID1_neg+TID2_neg',
'TID2_neg+TID3_neg',
'TID3_neg+TEC1_neg',

'TEC1_pos+TEC2_pos',
'TEC2_pos+TEC3_pos',
'TEC3_pos+TEC4_pos',
'TEC4_pos+TEC5_pos',
'TEC5_pos+TEC6_pos',
'TEC6_pos+TEC7_pos',
'TEC7_pos+TEC8_pos',

'TEC1_neg+TEC2_neg',
'TEC2_neg+TEC3_neg',
'TEC3_neg+TEC4_neg',
'TEC4_neg+TEC5_neg',
'TEC5_neg+TEC6_neg',
'TEC6_neg+TEC7_neg',
'TEC7_neg+TEC8_neg'
#other combinations could be added
],
BPix = dict(TTRHBuilder = "TTRHBuilderWithoutAngle4PixelPairs"),
FPix = dict(TTRHBuilder = "TTRHBuilderWithoutAngle4PixelPairs"),
TIB1 = dict(clusterChargeCut = dict(refToPSet_ = "SiStripClusterChargeCutNone")),
TIB2 = dict(clusterChargeCut = dict(refToPSet_ = "SiStripClusterChargeCutNone")),
TIB3 = dict(clusterChargeCut = dict(refToPSet_ = "SiStripClusterChargeCutNone")),
TIB4 = dict(clusterChargeCut = dict(refToPSet_ = "SiStripClusterChargeCutNone")),
TID1 = dict(clusterChargeCut = dict(refToPSet_ = "SiStripClusterChargeCutNone")),
TID2 = dict(clusterChargeCut = dict(refToPSet_ = "SiStripClusterChargeCutNone")),
TID3 = dict(clusterChargeCut = dict(refToPSet_ = "SiStripClusterChargeCutNone")),
TEC = dict(clusterChargeCut = dict(refToPSet_ = "SiStripClusterChargeCutNone")),
TOB1 = dict(clusterChargeCut = dict(refToPSet_ = "SiStripClusterChargeCutNone")),
TOB2 = dict(clusterChargeCut = dict(refToPSet_ = "SiStripClusterChargeCutNone")),
TOB3 = dict(clusterChargeCut = dict(refToPSet_ = "SiStripClusterChargeCutNone")),
TOB4 = dict(clusterChargeCut = dict(refToPSet_ = "SiStripClusterChargeCutNone")),
TOB5 = dict(clusterChargeCut = dict(refToPSet_ = "SiStripClusterChargeCutNone")),
TOB6 = dict(clusterChargeCut = dict(refToPSet_ = "SiStripClusterChargeCutNone")),
)
trackingPhase2PU140.toReplaceWith(convLayerPairs, cms.EDProducer("SeedingLayersEDProducer",
layerList = cms.vstring('BPix1+BPix2',
'BPix2+BPix3',
Expand Down Expand Up @@ -368,7 +261,6 @@
#photonConvTrajSeedFromQuadruplets.primaryVerticesTag = cms.InputTag('pixelVertices')
from Configuration.Eras.Modifier_trackingLowPU_cff import trackingLowPU
trackingLowPU.toModify(photonConvTrajSeedFromSingleLeg, primaryVerticesTag = "pixelVertices")
trackingPhase1PU70.toModify(photonConvTrajSeedFromSingleLeg, primaryVerticesTag = "pixelVertices")
trackingPhase2PU140.toModify(photonConvTrajSeedFromSingleLeg, primaryVerticesTag = "pixelVertices")

# TRACKER DATA CONTROL
Expand Down Expand Up @@ -403,9 +295,6 @@
convCkfTrajectoryBuilder = _convCkfTrajectoryBuilderBase.clone(
estimator = cms.string('convStepChi2Est')
)
trackingPhase1PU70.toReplaceWith(convCkfTrajectoryBuilder, _convCkfTrajectoryBuilderBase.clone(
maxCand = 2,
))
trackingPhase2PU140.toReplaceWith(convCkfTrajectoryBuilder, _convCkfTrajectoryBuilderBase.clone(
maxCand = 2,
))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,6 @@
)
)

from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70
trackingPhase1PU70.toModify(photonConvTrajSeedFromSingleLeg,
ClusterCheckPSet = dict(
MaxNumberOfCosmicClusters = 1000000,
MaxNumberOfPixelClusters = 100000,
cut = 'strip < 1000000 && pixel < 100000 && (strip < 100000 + 20*pixel) && (pixel < 20000 + 0.1*strip)'
),
OrderedHitsFactoryPSet = dict(maxElement = 100000),
RegionFactoryPSet = dict(RegionPSet = dict(ptMin = 0.3)),
)
from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140
trackingPhase2PU140.toModify(photonConvTrajSeedFromSingleLeg,
ClusterCheckPSet = dict(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@
trackingLowPU.toModify(TrackCutClassifier,
vertices = "pixelVertices"
)
from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70
trackingPhase1PU70.toModify(TrackCutClassifier,
vertices = "pixelVertices"
)
from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140
trackingPhase2PU140.toModify(TrackCutClassifier,
vertices = "pixelVertices"
Expand Down
27 changes: 1 addition & 26 deletions RecoTracker/FinalTrackSelectors/python/earlyGeneralTracks_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,34 +74,9 @@
trackingPhase1.toModify(earlyGeneralTracks, **_forPhase1)
trackingPhase1QuadProp.toModify(earlyGeneralTracks, **_forPhase1)

# For Phase1PU70
from RecoTracker.FinalTrackSelectors.trackListMerger_cfi import trackListMerger as _trackListMerger
from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70
trackingPhase1PU70.toReplaceWith(earlyGeneralTracks, _trackListMerger.clone(
TrackProducers = ['initialStepTracks',
'highPtTripletStepTracks',
'lowPtQuadStepTracks',
'lowPtTripletStepTracks',
'detachedQuadStepTracks',
'mixedTripletStepTracks',
'pixelPairStepTracks',
'tobTecStepTracks'],
hasSelector = [1,1,1,1,1,1,1,1],
indivShareFrac = [1.0,0.16,0.095,0.09,0.095,0.095,0.095,0.08],
selectedTrackQuals = [cms.InputTag("initialStepSelector","initialStep"),
cms.InputTag("highPtTripletStepSelector","highPtTripletStep"),
cms.InputTag("lowPtQuadStepSelector","lowPtQuadStep"),
cms.InputTag("lowPtTripletStepSelector","lowPtTripletStep"),
cms.InputTag("detachedQuadStep"),
cms.InputTag("mixedTripletStep"),
cms.InputTag("pixelPairStepSelector","pixelPairStep"),
cms.InputTag("tobTecStepSelector","tobTecStep")],
setsToMerge = [cms.PSet( tLists=cms.vint32(0,1,2,3,4,5,6,7), pQual=cms.bool(True) ) ],
copyExtras = True,
makeReKeyedSeeds = cms.untracked.bool(False)
))
# For Phase2PU140
from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140
from RecoTracker.FinalTrackSelectors.trackListMerger_cfi import trackListMerger as _trackListMerger
trackingPhase2PU140.toReplaceWith(earlyGeneralTracks, _trackListMerger.clone(
TrackProducers =['initialStepTracks',
'highPtTripletStepTracks',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,6 @@
trackingLowPU.toModify(multiTrackSelector,
vertices = "pixelVertices"
)
from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70
trackingPhase1PU70.toModify(multiTrackSelector,
vertices = "pixelVertices"
)
from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140
trackingPhase2PU140.toModify(multiTrackSelector,
vertices = "pixelVertices"
Expand Down
Loading

0 comments on commit 6ee7ba9

Please sign in to comment.