diff --git a/Configuration/Eras/python/Modifier_trackingPhase1PU70_cff.py b/Configuration/Eras/python/Modifier_trackingPhase1PU70_cff.py deleted file mode 100644 index d84fecf397be9..0000000000000 --- a/Configuration/Eras/python/Modifier_trackingPhase1PU70_cff.py +++ /dev/null @@ -1,4 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -trackingPhase1PU70 = cms.Modifier() - diff --git a/Configuration/StandardSequences/python/Reconstruction_cff.py b/Configuration/StandardSequences/python/Reconstruction_cff.py index bde20a9806022..471be706b006c 100644 --- a/Configuration/StandardSequences/python/Reconstruction_cff.py +++ b/Configuration/StandardSequences/python/Reconstruction_cff.py @@ -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* diff --git a/RecoJets/JetProducers/python/caloJetsForTrk_cff.py b/RecoJets/JetProducers/python/caloJetsForTrk_cff.py index 6680cb0f28cfb..f7ad47dfc80a1 100644 --- a/RecoJets/JetProducers/python/caloJetsForTrk_cff.py +++ b/RecoJets/JetProducers/python/caloJetsForTrk_cff.py @@ -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" diff --git a/RecoMuon/Configuration/python/preDuplicateMergingDisplacedTracks_cfi.py b/RecoMuon/Configuration/python/preDuplicateMergingDisplacedTracks_cfi.py index d0d7d813fb9c5..d10baf749bcf3 100644 --- a/RecoMuon/Configuration/python/preDuplicateMergingDisplacedTracks_cfi.py +++ b/RecoMuon/Configuration/python/preDuplicateMergingDisplacedTracks_cfi.py @@ -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"], diff --git a/RecoPixelVertexing/Configuration/python/RecoPixelVertexing_cff.py b/RecoPixelVertexing/Configuration/python/RecoPixelVertexing_cff.py index bdafaf7563258..d50d5bcf89061 100644 --- a/RecoPixelVertexing/Configuration/python/RecoPixelVertexing_cff.py +++ b/RecoPixelVertexing/Configuration/python/RecoPixelVertexing_cff.py @@ -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) diff --git a/RecoPixelVertexing/PixelTrackFitting/python/PixelTracks_cff.py b/RecoPixelVertexing/PixelTrackFitting/python/PixelTracks_cff.py index 625b8992bdfa6..6e0bc4dbc1d91 100644 --- a/RecoPixelVertexing/PixelTrackFitting/python/PixelTracks_cff.py +++ b/RecoPixelVertexing/PixelTrackFitting/python/PixelTracks_cff.py @@ -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 @@ -51,7 +49,6 @@ ) _seedingLayers = dict(seedingLayers = "PixelLayerTripletsPreSplitting") trackingLowPU.toModify(pixelTracksHitDoublets, **_seedingLayers) -trackingPhase1PU70.toModify(pixelTracksHitDoublets, **_seedingLayers) trackingPhase2PU140.toModify(pixelTracksHitDoublets, **_seedingLayers) pixelTracksHitTriplets = _pixelTripletHLTEDProducer.clone( @@ -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( @@ -79,5 +75,4 @@ ) _pixelTracksSequence_quad = pixelTracksSequence.copy() _pixelTracksSequence_quad.replace(pixelTracksHitTriplets, pixelTracksHitTriplets+pixelTracksHitQuadruplets) -trackingPhase1PU70.toReplaceWith(pixelTracksSequence, _pixelTracksSequence_quad) trackingPhase2PU140.toReplaceWith(pixelTracksSequence, _pixelTracksSequence_quad) diff --git a/RecoPixelVertexing/PixelTrackFitting/python/pixelTrackFilterByKinematics_cfi.py b/RecoPixelVertexing/PixelTrackFitting/python/pixelTrackFilterByKinematics_cfi.py index 19fd2f47a763c..7ac42bae3cd0d 100644 --- a/RecoPixelVertexing/PixelTrackFitting/python/pixelTrackFilterByKinematics_cfi.py +++ b/RecoPixelVertexing/PixelTrackFitting/python/pixelTrackFilterByKinematics_cfi.py @@ -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) diff --git a/RecoPixelVertexing/PixelTrackFitting/python/pixelTracks_cfi.py b/RecoPixelVertexing/PixelTrackFitting/python/pixelTracks_cfi.py index 83e54b1405645..14828443d8ef6 100644 --- a/RecoPixelVertexing/PixelTrackFitting/python/pixelTracks_cfi.py +++ b/RecoPixelVertexing/PixelTrackFitting/python/pixelTracks_cfi.py @@ -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) diff --git a/RecoPixelVertexing/PixelTriplets/python/PixelTripletLargeTipGenerator_cfi.py b/RecoPixelVertexing/PixelTriplets/python/PixelTripletLargeTipGenerator_cfi.py index 8a2d7280e0c1f..b10a749c38a5f 100644 --- a/RecoPixelVertexing/PixelTriplets/python/PixelTripletLargeTipGenerator_cfi.py +++ b/RecoPixelVertexing/PixelTriplets/python/PixelTripletLargeTipGenerator_cfi.py @@ -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) diff --git a/RecoPixelVertexing/PixelTriplets/python/pixelTripletHLTEDProducer_cfi.py b/RecoPixelVertexing/PixelTriplets/python/pixelTripletHLTEDProducer_cfi.py index 91eebb01b9ab5..f38753349beb4 100644 --- a/RecoPixelVertexing/PixelTriplets/python/pixelTripletHLTEDProducer_cfi.py +++ b/RecoPixelVertexing/PixelTriplets/python/pixelTripletHLTEDProducer_cfi.py @@ -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) diff --git a/RecoPixelVertexing/PixelTriplets/python/pixelTripletLargeTipEDProducer_cfi.py b/RecoPixelVertexing/PixelTriplets/python/pixelTripletLargeTipEDProducer_cfi.py index 5b9aa1819d9ff..19143513b3103 100644 --- a/RecoPixelVertexing/PixelTriplets/python/pixelTripletLargeTipEDProducer_cfi.py +++ b/RecoPixelVertexing/PixelTriplets/python/pixelTripletLargeTipEDProducer_cfi.py @@ -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 diff --git a/RecoPixelVertexing/PixelTriplets/python/quadrupletseedmerging_cff.py b/RecoPixelVertexing/PixelTriplets/python/quadrupletseedmerging_cff.py index 4757eefaa6419..dcf474b07d2e9 100644 --- a/RecoPixelVertexing/PixelTriplets/python/quadrupletseedmerging_cff.py +++ b/RecoPixelVertexing/PixelTriplets/python/quadrupletseedmerging_cff.py @@ -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) diff --git a/RecoTracker/ConversionSeedGenerators/python/ConversionStep_cff.py b/RecoTracker/ConversionSeedGenerators/python/ConversionStep_cff.py index a238acc200ec1..803c45de43400 100644 --- a/RecoTracker/ConversionSeedGenerators/python/ConversionStep_cff.py +++ b/RecoTracker/ConversionSeedGenerators/python/ConversionStep_cff.py @@ -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 @@ -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', @@ -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 @@ -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, )) diff --git a/RecoTracker/ConversionSeedGenerators/python/PhotonConversionTrajectorySeedProducerFromSingleLeg_cfi.py b/RecoTracker/ConversionSeedGenerators/python/PhotonConversionTrajectorySeedProducerFromSingleLeg_cfi.py index 77bc0857888e2..365c48bdc34e3 100644 --- a/RecoTracker/ConversionSeedGenerators/python/PhotonConversionTrajectorySeedProducerFromSingleLeg_cfi.py +++ b/RecoTracker/ConversionSeedGenerators/python/PhotonConversionTrajectorySeedProducerFromSingleLeg_cfi.py @@ -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( diff --git a/RecoTracker/FinalTrackSelectors/python/TrackCutClassifier_cff.py b/RecoTracker/FinalTrackSelectors/python/TrackCutClassifier_cff.py index f28d238e6c36d..afb2039daaf84 100644 --- a/RecoTracker/FinalTrackSelectors/python/TrackCutClassifier_cff.py +++ b/RecoTracker/FinalTrackSelectors/python/TrackCutClassifier_cff.py @@ -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" diff --git a/RecoTracker/FinalTrackSelectors/python/earlyGeneralTracks_cfi.py b/RecoTracker/FinalTrackSelectors/python/earlyGeneralTracks_cfi.py index 27bb63a363984..57c2ebe995de7 100644 --- a/RecoTracker/FinalTrackSelectors/python/earlyGeneralTracks_cfi.py +++ b/RecoTracker/FinalTrackSelectors/python/earlyGeneralTracks_cfi.py @@ -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', diff --git a/RecoTracker/FinalTrackSelectors/python/multiTrackSelector_cfi.py b/RecoTracker/FinalTrackSelectors/python/multiTrackSelector_cfi.py index 3251602bf25f1..08c5a8d649da6 100644 --- a/RecoTracker/FinalTrackSelectors/python/multiTrackSelector_cfi.py +++ b/RecoTracker/FinalTrackSelectors/python/multiTrackSelector_cfi.py @@ -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" diff --git a/RecoTracker/FinalTrackSelectors/python/preDuplicateMergingGeneralTracks_cfi.py b/RecoTracker/FinalTrackSelectors/python/preDuplicateMergingGeneralTracks_cfi.py index 5a5c1332d3056..3276a464f3f97 100644 --- a/RecoTracker/FinalTrackSelectors/python/preDuplicateMergingGeneralTracks_cfi.py +++ b/RecoTracker/FinalTrackSelectors/python/preDuplicateMergingGeneralTracks_cfi.py @@ -18,35 +18,9 @@ preDuplicateMergingGeneralTracks.lostHitPenalty = 1.0 -# For Phase1PU70 -from RecoTracker.FinalTrackSelectors.trackListMerger_cfi import trackListMerger as _trackListMerger -from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 -trackingPhase1PU70.toReplaceWith(preDuplicateMergingGeneralTracks, _trackListMerger.clone( - TrackProducers = [ - "earlyGeneralTracks", - "muonSeededTracksInOut", - "muonSeededTracksOutIn", - ], - hasSelector = [0,1,1], - selectedTrackQuals = [ - cms.InputTag("muonSeededTracksInOutSelector","muonSeededTracksInOutHighPurity"), # not used but needed - cms.InputTag("muonSeededTracksInOutSelector","muonSeededTracksInOutHighPurity"), - cms.InputTag("muonSeededTracksOutInSelector","muonSeededTracksOutInHighPurity"), - ], - mvaValueTags = cms.VInputTag( - cms.InputTag("earlyGeneralTracks","MVAVals"), - cms.InputTag("muonSeededTracksInOutSelector","MVAVals"), - cms.InputTag("muonSeededTracksOutInSelector","MVAVals"), - ), - setsToMerge = [cms.PSet(pQual = cms.bool(True), tLists = cms.vint32(0, 1,2))], - FoundHitBonus = 100.0, - LostHitPenalty = 1.0, - 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(preDuplicateMergingGeneralTracks, _trackListMerger.clone( TrackProducers = cms.VInputTag( cms.InputTag("earlyGeneralTracks"), diff --git a/RecoTracker/IterativeTracking/python/DetachedQuadStep_cff.py b/RecoTracker/IterativeTracking/python/DetachedQuadStep_cff.py index ad553f5d70463..0996fba82d7bc 100644 --- a/RecoTracker/IterativeTracking/python/DetachedQuadStep_cff.py +++ b/RecoTracker/IterativeTracking/python/DetachedQuadStep_cff.py @@ -14,21 +14,10 @@ import RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi import RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff detachedQuadStepSeedLayers = RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi.PixelLayerTriplets.clone( + layerList = RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff.PixelSeedMergerQuadruplets.layerList.value(), BPix = dict(skipClusters = cms.InputTag('detachedQuadStepClusters')), FPix = dict(skipClusters = cms.InputTag('detachedQuadStepClusters')) ) -from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1 -trackingPhase1.toModify(detachedQuadStepSeedLayers, - layerList = RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff.PixelSeedMergerQuadruplets.layerList.value() -) -from Configuration.Eras.Modifier_trackingPhase1QuadProp_cff import trackingPhase1QuadProp -trackingPhase1QuadProp.toModify(detachedQuadStepSeedLayers, - layerList = RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff.PixelSeedMergerQuadruplets.layerList.value() -) -from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 -trackingPhase2PU140.toModify(detachedQuadStepSeedLayers, - layerList = RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff.PixelSeedMergerQuadruplets.layerList.value() -) # TrackingRegion from RecoTracker.TkTrackingRegions.globalTrackingRegionFromBeamSpotFixedZ_cfi import globalTrackingRegionFromBeamSpotFixedZ as _globalTrackingRegionFromBeamSpotFixedZ @@ -38,12 +27,7 @@ originRadius = 1.5 )) from RecoTracker.TkTrackingRegions.globalTrackingRegionFromBeamSpot_cfi import globalTrackingRegionFromBeamSpot as _globalTrackingRegionFromBeamSpot -from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 -trackingPhase1PU70.toReplaceWith(detachedQuadStepTrackingRegions, _globalTrackingRegionFromBeamSpot.clone(RegionPSet = dict( - ptMin = 0.3, - originRadius = 0.5, - nSigmaZ = 4.0 -))) +from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 trackingPhase2PU140.toReplaceWith(detachedQuadStepTrackingRegions, _globalTrackingRegionFromBeamSpot.clone(RegionPSet = dict( ptMin = 0.45, originRadius = 0.7, @@ -55,39 +39,16 @@ detachedQuadStepHitDoublets = _hitPairEDProducer.clone( seedingLayers = "detachedQuadStepSeedLayers", trackingRegions = "detachedQuadStepTrackingRegions", + layerPairs = [0,1,2], # layer pairs (0,1), (1,2), (2,3), maxElement = 0, produceIntermediateHitDoublets = True, ) +from RecoPixelVertexing.PixelTriplets.caHitQuadrupletEDProducer_cfi import caHitQuadrupletEDProducer as _caHitQuadrupletEDProducer from RecoPixelVertexing.PixelTriplets.pixelTripletLargeTipEDProducer_cfi import pixelTripletLargeTipEDProducer as _pixelTripletLargeTipEDProducer from RecoPixelVertexing.PixelLowPtUtilities.ClusterShapeHitFilterESProducer_cfi import * -detachedQuadStepHitTriplets = _pixelTripletLargeTipEDProducer.clone( - doublets = "detachedQuadStepHitDoublets", - produceIntermediateHitTriplets = True, -) -from RecoPixelVertexing.PixelTriplets.pixelQuadrupletEDProducer_cfi import pixelQuadrupletEDProducer as _pixelQuadrupletEDProducer -detachedQuadStepHitQuadruplets = _pixelQuadrupletEDProducer.clone( - triplets = "detachedQuadStepHitTriplets", - extraHitRZtolerance = detachedQuadStepHitTriplets.extraHitRZtolerance, - extraHitRPhitolerance = detachedQuadStepHitTriplets.extraHitRPhitolerance, - maxChi2 = dict( - pt1 = 0.8, pt2 = 2, - value1 = 500, value2 = 100, - enabled = True, - ), - extraPhiTolerance = dict( - pt1 = 0.4, pt2 = 1, - value1 = 0.2, value2 = 0.05, - enabled = True, - ), - useBendingCorrection = True, - fitFastCircle = True, - fitFastCircleChi2Cut = True, -) -from RecoPixelVertexing.PixelTriplets.caHitQuadrupletEDProducer_cfi import caHitQuadrupletEDProducer as _caHitQuadrupletEDProducer -trackingPhase1.toModify(detachedQuadStepHitDoublets, layerPairs = [0,1,2]) # layer pairs (0,1), (1,2), (2,3) -trackingPhase1.toReplaceWith(detachedQuadStepHitQuadruplets, _caHitQuadrupletEDProducer.clone( +detachedQuadStepHitQuadruplets = _caHitQuadrupletEDProducer.clone( doublets = "detachedQuadStepHitDoublets", - extraHitRPhitolerance = detachedQuadStepHitTriplets.extraHitRPhitolerance, + extraHitRPhitolerance = _pixelTripletLargeTipEDProducer.extraHitRPhitolerance, maxChi2 = dict( pt1 = 0.8, pt2 = 2, value1 = 500, value2 = 100, @@ -97,13 +58,6 @@ fitFastCircleChi2Cut = True, CAThetaCut = 0.0011, CAPhiCut = 0, -)) - -from RecoPixelVertexing.PixelTriplets.pixelQuadrupletMergerEDProducer_cfi import pixelQuadrupletMergerEDProducer as _pixelQuadrupletMergerEDProducer -from RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff import * -_detachedQuadStepHitQuadrupletsMerging = _pixelQuadrupletMergerEDProducer.clone( - triplets = "detachedQuadStepHitTriplets", - layerList = dict(refToPSet_ = cms.string("PixelSeedMergerQuadruplets")), ) from RecoTracker.TkSeedGenerator.seedCreatorFromRegionConsecutiveHitsTripletOnlyEDProducer_cff import seedCreatorFromRegionConsecutiveHitsTripletOnlyEDProducer as _seedCreatorFromRegionConsecutiveHitsTripletOnlyEDProducer detachedQuadStepSeeds = _seedCreatorFromRegionConsecutiveHitsTripletOnlyEDProducer.clone( @@ -117,22 +71,36 @@ ClusterShapeCacheSrc = cms.InputTag('siPixelClusterShapeCache') ), ) -# temporary... -_detachedQuadStepHitQuadrupletsMerging.SeedCreatorPSet = cms.PSet( - ComponentName = cms.string("SeedFromConsecutiveHitsTripletOnlyCreator"), - MinOneOverPtError = detachedQuadStepSeeds.MinOneOverPtError, - OriginTransverseErrorMultiplier = detachedQuadStepSeeds.OriginTransverseErrorMultiplier, - SeedMomentumForBOFF = detachedQuadStepSeeds.SeedMomentumForBOFF, - TTRHBuilder = detachedQuadStepSeeds.TTRHBuilder, - forceKinematicWithRegionDirection = detachedQuadStepSeeds.forceKinematicWithRegionDirection, - magneticField = detachedQuadStepSeeds.magneticField, - propagator = detachedQuadStepSeeds.propagator, -) -_detachedQuadStepHitQuadrupletsMerging.SeedComparitorPSet = detachedQuadStepSeeds.SeedComparitorPSet -trackingPhase1PU70.toModify(detachedQuadStepHitTriplets, produceIntermediateHitTriplets=False, produceSeedingHitSets=True) -trackingPhase1PU70.toReplaceWith(detachedQuadStepHitQuadruplets, _detachedQuadStepHitQuadrupletsMerging) -trackingPhase1PU70.toModify(detachedQuadStepSeeds, SeedComparitorPSet=cms.PSet(ComponentName=cms.string("none"))) + +from Configuration.Eras.Modifier_trackingPhase1QuadProp_cff import trackingPhase1QuadProp +trackingPhase1QuadProp.toModify(detachedQuadStepHitDoublets, layerPairs = [0]) +trackingPhase2PU140.toModify(detachedQuadStepHitDoublets, layerPairs = [0]) +detachedQuadStepHitTriplets = _pixelTripletLargeTipEDProducer.clone( + doublets = "detachedQuadStepHitDoublets", + produceIntermediateHitTriplets = True, +) +from RecoPixelVertexing.PixelTriplets.pixelQuadrupletEDProducer_cfi import pixelQuadrupletEDProducer as _pixelQuadrupletEDProducer +_detachedQuadStepHitQuadruplets_propagation = _pixelQuadrupletEDProducer.clone( + triplets = "detachedQuadStepHitTriplets", + extraHitRZtolerance = detachedQuadStepHitTriplets.extraHitRZtolerance, + extraHitRPhitolerance = detachedQuadStepHitTriplets.extraHitRPhitolerance, + maxChi2 = dict( + pt1 = 0.8, pt2 = 2, + value1 = 500, value2 = 100, + enabled = True, + ), + extraPhiTolerance = dict( + pt1 = 0.4, pt2 = 1, + value1 = 0.2, value2 = 0.05, + enabled = True, + ), + useBendingCorrection = True, + fitFastCircle = True, + fitFastCircleChi2Cut = True, +) +trackingPhase1QuadProp.toReplaceWith(detachedQuadStepHitQuadruplets, _detachedQuadStepHitQuadruplets_propagation) +trackingPhase2PU140.toReplaceWith(detachedQuadStepHitQuadruplets, _detachedQuadStepHitQuadruplets_propagation) # QUALITY CUTS DURING TRACK BUILDING @@ -145,12 +113,6 @@ maxCCCLostHits = 0, minGoodStripCharge = dict(refToPSet_ = 'SiStripClusterChargeCutLoose') ) -trackingPhase1PU70.toReplaceWith(detachedQuadStepTrajectoryFilterBase, - _detachedQuadStepTrajectoryFilterBase.clone( - maxLostHitsFraction = 1./10., - constantValueForLostHitsFractionFilter = 0.501, - ) -) trackingPhase2PU140.toReplaceWith(detachedQuadStepTrajectoryFilterBase, _detachedQuadStepTrajectoryFilterBase.clone( maxLostHitsFraction = 1./10., @@ -160,9 +122,6 @@ detachedQuadStepTrajectoryFilter = _TrajectoryFilter_cff.CompositeTrajectoryFilter_block.clone( filters = [cms.PSet(refToPSet_ = cms.string('detachedQuadStepTrajectoryFilterBase'))] ) -trackingPhase1PU70.toModify(detachedQuadStepTrajectoryFilter, - filters = detachedQuadStepTrajectoryFilter.filters.value()+[cms.PSet(refToPSet_ = cms.string('ClusterShapeTrajectoryFilter'))] -) trackingPhase2PU140.toModify(detachedQuadStepTrajectoryFilter, filters = detachedQuadStepTrajectoryFilter.filters.value()+[cms.PSet(refToPSet_ = cms.string('ClusterShapeTrajectoryFilter'))] ) @@ -175,9 +134,6 @@ MaxChi2 = 9.0, clusterChargeCut = dict(refToPSet_ = 'SiStripClusterChargeCutTight'), ) -trackingPhase1PU70.toModify(detachedQuadStepChi2Est, - clusterChargeCut = dict(refToPSet_ = "SiStripClusterChargeCutNone") -) trackingPhase2PU140.toModify(detachedQuadStepChi2Est, MaxChi2 = 16.0, clusterChargeCut = dict(refToPSet_ = "SiStripClusterChargeCutNone") @@ -195,10 +151,6 @@ maxDPhiForLooperReconstruction = cms.double(2.0), maxPtForLooperReconstruction = cms.double(0.7) ) -trackingPhase1PU70.toModify(detachedQuadStepTrajectoryBuilder, - maxCand = 2, - alwaysUseInvalidHits = False, -) trackingPhase2PU140.toModify(detachedQuadStepTrajectoryBuilder, maxCand = 2, alwaysUseInvalidHits = False, @@ -211,9 +163,6 @@ fractionShared = cms.double(0.13), allowSharedFirstHit = cms.bool(True) ) -trackingPhase1PU70.toModify(detachedQuadStepTrajectoryCleanerBySharedHits, - fractionShared = 0.095 -) trackingPhase2PU140.toModify(detachedQuadStepTrajectoryCleanerBySharedHits, fractionShared = 0.09 ) @@ -245,101 +194,19 @@ ) # TRACK SELECTION AND QUALITY FLAG SETTING. -from RecoTracker.FinalTrackSelectors.TrackMVAClassifierPrompt_cfi import * from RecoTracker.FinalTrackSelectors.TrackMVAClassifierDetached_cfi import * -detachedQuadStepClassifier1 = TrackMVAClassifierDetached.clone( +detachedQuadStep = TrackMVAClassifierDetached.clone( src = 'detachedQuadStepTracks', - GBRForestLabel = 'MVASelectorIter3_13TeV', - qualityCuts = [-0.5,0.0,0.5] -) -detachedQuadStepClassifier2 = TrackMVAClassifierPrompt.clone( - src = 'detachedQuadStepTracks', - GBRForestLabel = 'MVASelectorIter0_13TeV', - qualityCuts = [-0.2,0.0,0.4] + GBRForestLabel = 'MVASelectorDetachedQuadStep_Phase1', + qualityCuts = [-0.5,0.0,0.5], ) -# For Phase1PU70 + +# For Phase2PU140 import RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi detachedQuadStepSelector = RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.multiTrackSelector.clone( src = 'detachedQuadStepTracks', trackSelectors = [ - RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone( - name = 'detachedQuadStepVtxLoose', - chi2n_par = 0.9, - res_par = ( 0.003, 0.001 ), - minNumberLayers = 3, - d0_par1 = ( 0.9, 3.0 ), - dz_par1 = ( 0.9, 3.0 ), - d0_par2 = ( 1.0, 3.0 ), - dz_par2 = ( 1.0, 3.0 ) - ), - RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone( - name = 'detachedQuadStepTrkLoose', - chi2n_par = 0.5, - res_par = ( 0.003, 0.001 ), - minNumberLayers = 3, - d0_par1 = ( 1.3, 4.0 ), - dz_par1 = ( 1.3, 4.0 ), - d0_par2 = ( 1.3, 4.0 ), - dz_par2 = ( 1.3, 4.0 ) - ), - RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.tightMTS.clone( - name = 'detachedQuadStepVtxTight', - preFilterName = 'detachedQuadStepVtxLoose', - chi2n_par = 0.9, - res_par = ( 0.003, 0.001 ), - minNumberLayers = 3, - maxNumberLostLayers = 1, - minNumber3DLayers = 3, - d0_par1 = ( 0.9, 3.0 ), - dz_par1 = ( 0.9, 3.0 ), - d0_par2 = ( 0.9, 3.0 ), - dz_par2 = ( 0.9, 3.0 ) - ), - RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.tightMTS.clone( - name = 'detachedQuadStepTrkTight', - preFilterName = 'detachedQuadStepTrkLoose', - chi2n_par = 0.35, - res_par = ( 0.003, 0.001 ), - minNumberLayers = 5, - maxNumberLostLayers = 1, - minNumber3DLayers = 4, - d0_par1 = ( 1.1, 4.0 ), - dz_par1 = ( 1.1, 4.0 ), - d0_par2 = ( 1.1, 4.0 ), - dz_par2 = ( 1.1, 4.0 ) - ), - RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.highpurityMTS.clone( - name = 'detachedQuadStepVtx', - preFilterName = 'detachedQuadStepVtxTight', - chi2n_par = 0.9, - res_par = ( 0.003, 0.001 ), - minNumberLayers = 3, - maxNumberLostLayers = 1, - minNumber3DLayers = 3, - d0_par1 = ( 0.8, 3.0 ), - dz_par1 = ( 0.8, 3.0 ), - d0_par2 = ( 0.8, 3.0 ), - dz_par2 = ( 0.8, 3.0 ) - ), - RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.highpurityMTS.clone( - name = 'detachedQuadStepTrk', - preFilterName = 'detachedQuadStepTrkTight', - chi2n_par = 0.2, - res_par = ( 0.003, 0.001 ), - minNumberLayers = 5, - maxNumberLostLayers = 0, - minNumber3DLayers = 4, - d0_par1 = ( 0.9, 4.0 ), - dz_par1 = ( 0.9, 4.0 ), - d0_par2 = ( 0.8, 4.0 ), - dz_par2 = ( 0.8, 4.0 ) - ) - ] -) #end of clone - -trackingPhase2PU140.toModify(detachedQuadStepSelector, - trackSelectors= cms.VPSet( RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone( name = 'detachedQuadStepVtxLoose', chi2n_par = 1.0, @@ -412,41 +279,12 @@ d0_par2 = ( 0.8, 4.0 ), dz_par2 = ( 0.8, 4.0 ) ) - ), #end of vpset - vertices = "pixelVertices" - ) #end of clone - -from RecoTracker.FinalTrackSelectors.ClassifierMerger_cfi import * -detachedQuadStep = ClassifierMerger.clone() -detachedQuadStep.inputClassifiers=['detachedQuadStepClassifier1','detachedQuadStepClassifier2'] + ] #end of vpset +) #end of clone -trackingPhase1.toReplaceWith(detachedQuadStep, detachedQuadStepClassifier1.clone( - GBRForestLabel = 'MVASelectorDetachedQuadStep_Phase1', - qualityCuts = [-0.5,0.0,0.5], -)) -trackingPhase1QuadProp.toReplaceWith(detachedQuadStep, detachedQuadStepClassifier1.clone( - GBRForestLabel = 'MVASelectorDetachedQuadStep_Phase1', - qualityCuts = [-0.5,0.0,0.5], -)) from RecoTracker.FinalTrackSelectors.trackAlgoPriorityOrder_cfi import trackAlgoPriorityOrder import RecoTracker.FinalTrackSelectors.trackListMerger_cfi -trackingPhase1PU70.toReplaceWith(detachedQuadStep, RecoTracker.FinalTrackSelectors.trackListMerger_cfi.trackListMerger.clone( - TrackProducers = [ - 'detachedQuadStepTracks', - 'detachedQuadStepTracks', - ], - hasSelector = [1,1], - shareFrac = cms.double(0.095), - indivShareFrac = [0.095, 0.095], - selectedTrackQuals = [ - cms.InputTag("detachedQuadStepSelector","detachedQuadStepVtx"), - cms.InputTag("detachedQuadStepSelector","detachedQuadStepTrk") - ], - setsToMerge = [cms.PSet( tLists=cms.vint32(0,1), pQual=cms.bool(True) )], - writeOnlyTrkQuals = True -)) - trackingPhase2PU140.toReplaceWith(detachedQuadStep, RecoTracker.FinalTrackSelectors.trackListMerger_cfi.trackListMerger.clone( TrackProducers = cms.VInputTag(cms.InputTag('detachedQuadStepTracks'), cms.InputTag('detachedQuadStepTracks')), @@ -464,15 +302,14 @@ detachedQuadStepSeedLayers* detachedQuadStepTrackingRegions* detachedQuadStepHitDoublets* - detachedQuadStepHitTriplets* detachedQuadStepHitQuadruplets* detachedQuadStepSeeds* detachedQuadStepTrackCandidates* detachedQuadStepTracks* - detachedQuadStepClassifier1*detachedQuadStepClassifier2* detachedQuadStep) -trackingPhase1.toReplaceWith(DetachedQuadStep, DetachedQuadStep.copyAndExclude([detachedQuadStepHitTriplets])) -_DetachedQuadStep_Phase1PU70 = DetachedQuadStep.copyAndExclude([detachedQuadStepClassifier1]) -_DetachedQuadStep_Phase1PU70.replace(detachedQuadStepClassifier2, detachedQuadStepSelector) -trackingPhase1PU70.toReplaceWith(DetachedQuadStep, _DetachedQuadStep_Phase1PU70) -trackingPhase2PU140.toReplaceWith(DetachedQuadStep, _DetachedQuadStep_Phase1PU70) +_DetachedQuadStep_Phase1Prop = DetachedQuadStep.copy() +_DetachedQuadStep_Phase1Prop.replace(detachedQuadStepHitDoublets, detachedQuadStepHitDoublets+detachedQuadStepHitTriplets) +trackingPhase1QuadProp.toReplaceWith(DetachedQuadStep, _DetachedQuadStep_Phase1Prop) +_DetachedQuadStep_Phase2PU140 = _DetachedQuadStep_Phase1Prop.copy() +_DetachedQuadStep_Phase2PU140.replace(detachedQuadStep, detachedQuadStepSelector+detachedQuadStep) +trackingPhase2PU140.toReplaceWith(DetachedQuadStep, _DetachedQuadStep_Phase2PU140) diff --git a/RecoTracker/IterativeTracking/python/ElectronSeeds_cff.py b/RecoTracker/IterativeTracking/python/ElectronSeeds_cff.py index b70cf3a7aa467..324b480ec47b5 100644 --- a/RecoTracker/IterativeTracking/python/ElectronSeeds_cff.py +++ b/RecoTracker/IterativeTracking/python/ElectronSeeds_cff.py @@ -5,8 +5,6 @@ trajectories = cms.InputTag("initialStepSeeds"), oldClusterRemovalInfo = cms.InputTag("pixelLessStepClusters") ) -from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 -trackingPhase1PU70.toModify(initialStepSeedClusterMask, oldClusterRemovalInfo = "highPtTripletStepClusters") from RecoLocalTracker.SubCollectionProducers.seedClusterRemoverPhase2_cfi import seedClusterRemoverPhase2 from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 @@ -16,7 +14,7 @@ ) ) -highPtTripletStepSeedClusterMask = seedClusterRemover.clone( # for Phase1PU70 +highPtTripletStepSeedClusterMask = seedClusterRemover.clone( # for Phase2PU140 trajectories = "highPtTripletStepSeeds", oldClusterRemovalInfo = cms.InputTag("initialStepSeedClusterMask") ) @@ -24,7 +22,6 @@ trajectories = cms.InputTag("pixelPairStepSeeds"), oldClusterRemovalInfo = cms.InputTag("initialStepSeedClusterMask") ) -trackingPhase1PU70.toModify(pixelPairStepSeedClusterMask, oldClusterRemovalInfo = "highPtTripletStepSeedClusterMask") trackingPhase2PU140.toReplaceWith(highPtTripletStepSeedClusterMask, seedClusterRemoverPhase2.clone( trajectories = cms.InputTag("highPtTripletStepSeeds"), @@ -89,11 +86,6 @@ ] trackingPhase1.toModify(tripletElectronSeedLayers, layerList = _layerListForPhase1) trackingPhase1QuadProp.toModify(tripletElectronSeedLayers, layerList = _layerListForPhase1) -trackingPhase1PU70.toModify(tripletElectronSeedLayers, - layerList = _layerListForPhase1, - BPix = dict(skipClusters = 'pixelPairStepSeedClusterMask'), - FPix = dict(skipClusters = 'pixelPairStepSeedClusterMask') -) trackingPhase2PU140.toModify(tripletElectronSeedLayers, layerList = _layerListForPhase1, BPix = dict(skipClusters = 'pixelPairStepSeedClusterMask'), @@ -124,9 +116,6 @@ tripletElectronSeeds = _seedCreatorFromRegionConsecutiveHitsEDProducer.clone( seedingHitSets = "tripletElectronHitTriplets", ) -trackingPhase1PU70.toModify(tripletElectronHitTriplets, - maxElement = 0, # not sure if this has any effect -) trackingPhase2PU140.toModify(tripletElectronHitTriplets, maxElement = 0, ) @@ -261,12 +250,6 @@ ] trackingPhase1.toModify(newCombinedSeeds, seedCollections = _seedCollections_Phase1) trackingPhase1QuadProp.toModify(newCombinedSeeds, seedCollections = _seedCollections_Phase1) -trackingPhase1PU70.toModify(newCombinedSeeds, seedCollections = [ - 'initialStepSeeds', - 'highPtTripletStepSeeds', - 'pixelPairStepSeeds', - 'tripletElectronSeeds' -]) trackingPhase2PU140.toModify(newCombinedSeeds, seedCollections = [ 'initialStepSeeds', 'highPtTripletStepSeeds', @@ -296,17 +279,6 @@ _electronSeedsSeq_Phase1.replace(pixelPairStepSeedClusterMask, detachedTripletStepSeedClusterMask) trackingPhase1.toReplaceWith(electronSeedsSeq, _electronSeedsSeq_Phase1) trackingPhase1QuadProp.toReplaceWith(electronSeedsSeq, _electronSeedsSeq_Phase1) -trackingPhase1PU70.toReplaceWith(electronSeedsSeq, cms.Sequence( - initialStepSeedClusterMask* - highPtTripletStepSeedClusterMask* - pixelPairStepSeedClusterMask* - tripletElectronSeedLayers* - tripletElectronTrackingRegions* - tripletElectronHitDoublets* - tripletElectronHitTriplets* - tripletElectronSeeds* - newCombinedSeeds -)) trackingPhase2PU140.toReplaceWith(electronSeedsSeq, cms.Sequence( initialStepSeedClusterMask* highPtTripletStepSeedClusterMask* diff --git a/RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py b/RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py index 67791478af018..4fd46ebd67753 100644 --- a/RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py @@ -56,14 +56,12 @@ # TrackingRegion from RecoTracker.TkTrackingRegions.globalTrackingRegionFromBeamSpot_cfi import globalTrackingRegionFromBeamSpot as _globalTrackingRegionFromBeamSpot highPtTripletStepTrackingRegions = _globalTrackingRegionFromBeamSpot.clone(RegionPSet = dict( - ptMin = 0.6, + ptMin = 0.55, originRadius = 0.02, nSigmaZ = 4.0 )) -from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1 -trackingPhase1.toModify(highPtTripletStepTrackingRegions, RegionPSet = dict(ptMin = 0.55)) -from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 -trackingPhase1PU70.toModify(highPtTripletStepTrackingRegions, RegionPSet = dict(ptMin = 0.7)) +from Configuration.Eras.Modifier_trackingPhase1QuadProp_cff import trackingPhase1QuadProp +trackingPhase1QuadProp.toModify(highPtTripletStepTrackingRegions, RegionPSet = dict(ptMin = 0.6)) trackingPhase2PU140.toModify(highPtTripletStepTrackingRegions, RegionPSet = dict(ptMin = 0.9, originRadius = 0.03)) # seeding @@ -71,28 +69,18 @@ highPtTripletStepHitDoublets = _hitPairEDProducer.clone( seedingLayers = "highPtTripletStepSeedLayers", trackingRegions = "highPtTripletStepTrackingRegions", + layerPairs = [0,1], # layer pairs (0,1), (1,2) maxElement = 0, produceIntermediateHitDoublets = True, ) +from RecoPixelVertexing.PixelTriplets.caHitTripletEDProducer_cfi import caHitTripletEDProducer as _caHitTripletEDProducer from RecoPixelVertexing.PixelTriplets.pixelTripletHLTEDProducer_cfi import pixelTripletHLTEDProducer as _pixelTripletHLTEDProducer from RecoPixelVertexing.PixelLowPtUtilities.ClusterShapeHitFilterESProducer_cfi import * import RecoPixelVertexing.PixelLowPtUtilities.LowPtClusterShapeSeedComparitor_cfi -highPtTripletStepHitTriplets = _pixelTripletHLTEDProducer.clone( +highPtTripletStepHitTriplets = _caHitTripletEDProducer.clone( doublets = "highPtTripletStepHitDoublets", - produceSeedingHitSets = True, - SeedComparitorPSet = RecoPixelVertexing.PixelLowPtUtilities.LowPtClusterShapeSeedComparitor_cfi.LowPtClusterShapeSeedComparitor.clone() -) -from RecoTracker.TkSeedGenerator.seedCreatorFromRegionConsecutiveHitsEDProducer_cff import seedCreatorFromRegionConsecutiveHitsEDProducer as _seedCreatorFromRegionConsecutiveHitsEDProducer -highPtTripletStepSeeds = _seedCreatorFromRegionConsecutiveHitsEDProducer.clone( - seedingHitSets = "highPtTripletStepHitTriplets", -) - -from RecoPixelVertexing.PixelTriplets.caHitTripletEDProducer_cfi import caHitTripletEDProducer as _caHitTripletEDProducer -trackingPhase1.toModify(highPtTripletStepHitDoublets, layerPairs = [0,1]) # layer pairs (0,1), (1,2) -trackingPhase1.toReplaceWith(highPtTripletStepHitTriplets, _caHitTripletEDProducer.clone( - doublets = "highPtTripletStepHitDoublets", - extraHitRPhitolerance = highPtTripletStepHitTriplets.extraHitRPhitolerance, - SeedComparitorPSet = highPtTripletStepHitTriplets.SeedComparitorPSet, + extraHitRPhitolerance = _pixelTripletHLTEDProducer.extraHitRPhitolerance, + SeedComparitorPSet = RecoPixelVertexing.PixelLowPtUtilities.LowPtClusterShapeSeedComparitor_cfi.LowPtClusterShapeSeedComparitor.clone(), maxChi2 = dict( pt1 = 0.8, pt2 = 8, value1 = 100, value2 = 6, @@ -101,7 +89,21 @@ CAThetaCut = 0.004, CAPhiCut = 0.07, CAHardPtCut = 0.3, -)) +) +from RecoTracker.TkSeedGenerator.seedCreatorFromRegionConsecutiveHitsEDProducer_cff import seedCreatorFromRegionConsecutiveHitsEDProducer as _seedCreatorFromRegionConsecutiveHitsEDProducer +highPtTripletStepSeeds = _seedCreatorFromRegionConsecutiveHitsEDProducer.clone( + seedingHitSets = "highPtTripletStepHitTriplets", +) + +trackingPhase1QuadProp.toModify(highPtTripletStepHitDoublets, layerPairs = [0]) # layer pair (0,1) +trackingPhase2PU140.toModify(highPtTripletStepHitDoublets, layerPairs = [0]) # layer pair (0,1) +_highPtTripletStepHitTriplets_propagation = _pixelTripletHLTEDProducer.clone( + doublets = "highPtTripletStepHitDoublets", + produceSeedingHitSets = True, + SeedComparitorPSet = highPtTripletStepHitTriplets.SeedComparitorPSet, +) +trackingPhase1QuadProp.toReplaceWith(highPtTripletStepHitTriplets, _highPtTripletStepHitTriplets_propagation) +trackingPhase2PU140.toReplaceWith(highPtTripletStepHitTriplets, _highPtTripletStepHitTriplets_propagation) # QUALITY CUTS DURING TRACK BUILDING import TrackingTools.TrajectoryFiltering.TrajectoryFilter_cff as _TrajectoryFilter_cff @@ -113,7 +115,6 @@ maxCCCLostHits = 0, minGoodStripCharge = dict(refToPSet_ = 'SiStripClusterChargeCutLoose') ) -trackingPhase1PU70.toReplaceWith(highPtTripletStepTrajectoryFilterBase, _highPtTripletStepTrajectoryFilterBase) trackingPhase2PU140.toReplaceWith(highPtTripletStepTrajectoryFilterBase, _highPtTripletStepTrajectoryFilterBase) highPtTripletStepTrajectoryFilter = _TrajectoryFilter_cff.CompositeTrajectoryFilter_block.clone( filters = [cms.PSet(refToPSet_ = cms.string('highPtTripletStepTrajectoryFilterBase'))] @@ -135,9 +136,6 @@ clusterChargeCut = dict(refToPSet_ = 'SiStripClusterChargeCutLoose'), pTChargeCutThreshold = 15. ) -trackingPhase1PU70.toModify(highPtTripletStepChi2Est, - clusterChargeCut = dict(refToPSet_ = "SiStripClusterChargeCutNone") -) trackingPhase2PU140.toModify(highPtTripletStepChi2Est, clusterChargeCut = dict(refToPSet_ = "SiStripClusterChargeCutNone"), MaxChi2 = cms.double(25.0) @@ -156,10 +154,6 @@ # of the outermost Tracker barrel layer (with B=3.8T) maxPtForLooperReconstruction = cms.double(0.7) ) -trackingPhase1PU70.toModify(highPtTripletStepTrajectoryBuilder, - MeasurementTrackerName = '', - maxCand = 3, -) trackingPhase2PU140.toModify(highPtTripletStepTrajectoryBuilder, inOutTrajectoryFilter = dict(refToPSet_ = "highPtTripletStepTrajectoryFilterInOut"), useSameTrajFilter = False, @@ -179,14 +173,13 @@ useHitsSplitting = True ) -# For Phase1PU70 & Phase2PU140 +# For Phase2PU140 from TrackingTools.TrajectoryCleaning.TrajectoryCleanerBySharedHits_cfi import trajectoryCleanerBySharedHits as _trajectoryCleanerBySharedHits highPtTripletStepTrajectoryCleanerBySharedHits = _trajectoryCleanerBySharedHits.clone( ComponentName = 'highPtTripletStepTrajectoryCleanerBySharedHits', fractionShared = 0.16, allowSharedFirstHit = True ) -trackingPhase1PU70.toModify(highPtTripletStepTrackCandidates, TrajectoryCleaner = 'highPtTripletStepTrajectoryCleanerBySharedHits') trackingPhase2PU140.toModify(highPtTripletStepTrackCandidates, TrajectoryCleaner = 'highPtTripletStepTrajectoryCleanerBySharedHits', clustersToSkip = None, @@ -204,92 +197,18 @@ # Final selection from RecoTracker.FinalTrackSelectors.TrackMVAClassifierPrompt_cfi import * -from RecoTracker.FinalTrackSelectors.TrackCutClassifier_cfi import TrackCutClassifier -highPtTripletStep = TrackCutClassifier.clone( - src = "highPtTripletStepTracks", - vertices = "firstStepPrimaryVertices", - mva = dict( - minPixelHits = [1,1,1], - maxChi2 = [9999.,9999.,9999.], - maxChi2n = [2.0,1.0,0.7], - minLayers = [3,3,3], - min3DLayers = [3,3,3], - maxLostLayers = [3,2,2], - dz_par = dict( - dz_par1 = [0.8,0.7,0.7], - dz_par2 = [0.6,0.5,0.4], - dz_exp = [4,4,4] - ), - dr_par = dict( - dr_par1 = [0.7,0.6,0.5], - dr_par2 = [0.4,0.35,0.25], - dr_exp = [4,4,4], - d0err_par = [0.002,0.002,0.001] - ) - ) -) - -trackingPhase1.toReplaceWith(highPtTripletStep, TrackMVAClassifierPrompt.clone( - src = 'highPtTripletStepTracks', - GBRForestLabel = 'MVASelectorHighPtTripletStep_Phase1', - qualityCuts = [0.2,0.3,0.4], -)) -from Configuration.Eras.Modifier_trackingPhase1QuadProp_cff import trackingPhase1QuadProp -trackingPhase1QuadProp.toReplaceWith(highPtTripletStep, TrackMVAClassifierPrompt.clone( +highPtTripletStep = TrackMVAClassifierPrompt.clone( src = 'highPtTripletStepTracks', GBRForestLabel = 'MVASelectorHighPtTripletStep_Phase1', qualityCuts = [0.2,0.3,0.4], -)) +) -# For Phase1PU70 +# For Phase2PU140 import RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi highPtTripletStepSelector = RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.multiTrackSelector.clone( src = 'highPtTripletStepTracks', trackSelectors = [ - RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone( - name = 'highPtTripletStepLoose', - chi2n_par = 2.0, - res_par = ( 0.003, 0.002 ), - minNumberLayers = 3, - maxNumberLostLayers = 3, - minNumber3DLayers = 3, - d0_par1 = ( 0.7, 4.0 ), - dz_par1 = ( 0.8, 4.0 ), - d0_par2 = ( 0.4, 4.0 ), - dz_par2 = ( 0.6, 4.0 ) - ), #end of pset - RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.tightMTS.clone( - name = 'highPtTripletStepTight', - preFilterName = 'highPtTripletStepLoose', - chi2n_par = 1.0, - res_par = ( 0.003, 0.002 ), - minNumberLayers = 3, - maxNumberLostLayers = 2, - minNumber3DLayers = 3, - d0_par1 = ( 0.6, 4.0 ), - dz_par1 = ( 0.7, 4.0 ), - d0_par2 = ( 0.35, 4.0 ), - dz_par2 = ( 0.5, 4.0 ) - ), - RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.highpurityMTS.clone( - name = 'highPtTripletStep', - preFilterName = 'highPtTripletStepTight', - chi2n_par = 0.7, - res_par = ( 0.003, 0.001 ), - minNumberLayers = 3, - maxNumberLostLayers = 2, - minNumber3DLayers = 3, - d0_par1 = ( 0.5, 4.0 ), - dz_par1 = ( 0.7, 4.0 ), - d0_par2 = ( 0.25, 4.0 ), - dz_par2 = ( 0.4, 4.0 ) - ), - ] -) #end of clone - -trackingPhase2PU140.toModify(highPtTripletStepSelector, - trackSelectors= cms.VPSet( RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone( name = 'highPtTripletStepLoose', chi2n_par = 2.0, @@ -331,8 +250,7 @@ d0_par2 = ( 0.45, 4.0 ), dz_par2 = ( 0.45, 4.0 ) ), - ), #end of vpset - vertices = "pixelVertices" + ] #end of vpset ) #end of clone # Final sequence @@ -346,7 +264,6 @@ highPtTripletStepTracks* # highPtTripletStepClassifier1*highPtTripletStepClassifier2*highPtTripletStepClassifier3* highPtTripletStep) -_HighPtTripletStep_Phase1PU70 = HighPtTripletStep.copy() -_HighPtTripletStep_Phase1PU70.replace(highPtTripletStep, highPtTripletStepSelector) -trackingPhase1PU70.toReplaceWith(HighPtTripletStep, _HighPtTripletStep_Phase1PU70) -trackingPhase2PU140.toReplaceWith(HighPtTripletStep, _HighPtTripletStep_Phase1PU70) +_HighPtTripletStep_Phase2PU140 = HighPtTripletStep.copy() +_HighPtTripletStep_Phase2PU140.replace(highPtTripletStep, highPtTripletStepSelector) +trackingPhase2PU140.toReplaceWith(HighPtTripletStep, _HighPtTripletStep_Phase2PU140) diff --git a/RecoTracker/IterativeTracking/python/InitialStepPreSplitting_cff.py b/RecoTracker/IterativeTracking/python/InitialStepPreSplitting_cff.py index 71617eeb67966..1c3abeeff2463 100644 --- a/RecoTracker/IterativeTracking/python/InitialStepPreSplitting_cff.py +++ b/RecoTracker/IterativeTracking/python/InitialStepPreSplitting_cff.py @@ -218,7 +218,7 @@ trackingPhase1.toReplaceWith(InitialStepPreSplitting, _InitialStepPreSplitting_trackingPhase1.copyAndExclude([initialStepHitTripletsPreSplitting])) trackingPhase1QuadProp.toReplaceWith(InitialStepPreSplitting, _InitialStepPreSplitting_trackingPhase1) -# Although InitialStepPreSplitting is not really part of LowPU/Run1/Phase1PU70 +# Although InitialStepPreSplitting is not really part of LowPU/Run1/Phase2PU140 # tracking, we use it to get siPixelClusters and siPixelRecHits # collections for non-splitted pixel clusters. All modules before # iterTracking sequence use siPixelClustersPreSplitting and @@ -227,7 +227,7 @@ # If siPixelClusters would be defined in # RecoLocalTracker.Configuration.RecoLocalTracker_cff, we would have a # situation where -# - LowPU/Phase1PU70 has siPixelClusters defined in RecoLocalTracker_cff +# - LowPU/Phase2PU140 has siPixelClusters defined in RecoLocalTracker_cff # - everything else has siPixelClusters defined here # and this leads to a mess. The way it is done here we have only # one place (within Reconstruction_cff) where siPixelClusters @@ -235,16 +235,13 @@ from RecoLocalTracker.SiPixelClusterizer.SiPixelClusterizer_cfi import siPixelClusters as _siPixelClusters from Configuration.Eras.Modifier_trackingLowPU_cff import trackingLowPU trackingLowPU.toReplaceWith(siPixelClusters, _siPixelClusters) -from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 -trackingPhase1PU70.toReplaceWith(siPixelClusters, _siPixelClusters) from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 trackingPhase2PU140.toReplaceWith(siPixelClusters, _siPixelClusters) -_InitialStepPreSplitting_LowPU_Phase1PU70 = cms.Sequence( +_InitialStepPreSplitting_LowPU_Phase2PU140 = cms.Sequence( siPixelClusters + siPixelRecHits + MeasurementTrackerEvent + siPixelClusterShapeCache ) -trackingLowPU.toReplaceWith(InitialStepPreSplitting, _InitialStepPreSplitting_LowPU_Phase1PU70) -trackingPhase1PU70.toReplaceWith(InitialStepPreSplitting, _InitialStepPreSplitting_LowPU_Phase1PU70) -trackingPhase2PU140.toReplaceWith(InitialStepPreSplitting, _InitialStepPreSplitting_LowPU_Phase1PU70) +trackingLowPU.toReplaceWith(InitialStepPreSplitting, _InitialStepPreSplitting_LowPU_Phase2PU140) +trackingPhase2PU140.toReplaceWith(InitialStepPreSplitting, _InitialStepPreSplitting_LowPU_Phase2PU140) diff --git a/RecoTracker/IterativeTracking/python/InitialStep_cff.py b/RecoTracker/IterativeTracking/python/InitialStep_cff.py index b3938b00e2f93..a5316b8abb1d1 100644 --- a/RecoTracker/IterativeTracking/python/InitialStep_cff.py +++ b/RecoTracker/IterativeTracking/python/InitialStep_cff.py @@ -36,10 +36,8 @@ originRadius = 0.02, nSigmaZ = 4.0 )) -from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 trackingPhase1.toModify(initialStepTrackingRegions, RegionPSet = dict(ptMin = 0.5)) -trackingPhase1PU70.toModify(initialStepTrackingRegions, RegionPSet = dict(ptMin = 0.7)) trackingPhase2PU140.toModify(initialStepTrackingRegions, RegionPSet = dict(ptMin = 0.8)) # seeding @@ -58,12 +56,6 @@ produceSeedingHitSets = True, SeedComparitorPSet = RecoPixelVertexing.PixelLowPtUtilities.LowPtClusterShapeSeedComparitor_cfi.LowPtClusterShapeSeedComparitor.clone() ) -from RecoPixelVertexing.PixelTriplets.pixelQuadrupletMergerEDProducer_cfi import pixelQuadrupletMergerEDProducer as _pixelQuadrupletMergerEDProducer -from RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff import * -_initialStepHitQuadrupletsMerging = _pixelQuadrupletMergerEDProducer.clone( - triplets = "initialStepHitTriplets", - layerList = dict(refToPSet_ = cms.string("PixelSeedMergerQuadruplets")), -) from RecoTracker.TkSeedGenerator.seedCreatorFromRegionConsecutiveHitsEDProducer_cff import seedCreatorFromRegionConsecutiveHitsEDProducer as _seedCreatorFromRegionConsecutiveHitsEDProducer initialStepSeeds = _seedCreatorFromRegionConsecutiveHitsEDProducer.clone( seedingHitSets = "initialStepHitTriplets", @@ -126,23 +118,6 @@ )) trackingPhase2PU140.toModify(initialStepSeeds, seedingHitSets = "initialStepHitQuadruplets") -# temporary... -_initialStepHitQuadrupletsMerging.SeedCreatorPSet = cms.PSet( - ComponentName = cms.string("SeedFromConsecutiveHitsCreator"), - MinOneOverPtError = initialStepSeeds.MinOneOverPtError, - OriginTransverseErrorMultiplier = initialStepSeeds.OriginTransverseErrorMultiplier, - SeedMomentumForBOFF = initialStepSeeds.SeedMomentumForBOFF, - TTRHBuilder = initialStepSeeds.TTRHBuilder, - forceKinematicWithRegionDirection = initialStepSeeds.forceKinematicWithRegionDirection, - magneticField = initialStepSeeds.magneticField, - propagator = initialStepSeeds.propagator, - -) -_initialStepHitQuadrupletsMerging.SeedComparitorPSet = initialStepSeeds.SeedComparitorPSet - -trackingPhase1PU70.toReplaceWith(initialStepHitQuadruplets, _initialStepHitQuadrupletsMerging) -trackingPhase1PU70.toModify(initialStepSeeds, seedingHitSets="initialStepHitQuadruplets") - # building import TrackingTools.TrajectoryFiltering.TrajectoryFilter_cff @@ -164,7 +139,6 @@ ) from Configuration.Eras.Modifier_trackingLowPU_cff import trackingLowPU trackingLowPU.toReplaceWith(initialStepTrajectoryFilterBase, _initialStepTrajectoryFilterBase) -trackingPhase1PU70.toReplaceWith(initialStepTrajectoryFilterBase, _initialStepTrajectoryFilterBase) trackingPhase2PU140.toReplaceWith(initialStepTrajectoryFilterBase, _initialStepTrajectoryFilterBase) import RecoPixelVertexing.PixelLowPtUtilities.StripSubClusterShapeTrajectoryFilter_cfi @@ -193,9 +167,6 @@ _tracker_apv_vfp30_2016.toModify(initialStepChi2Est, clusterChargeCut = dict(refToPSet_ = "SiStripClusterChargeCutTiny") ) -trackingPhase1PU70.toModify(initialStepChi2Est, - clusterChargeCut = dict(refToPSet_ = 'SiStripClusterChargeCutNone'), -) trackingPhase2PU140.toModify(initialStepChi2Est, clusterChargeCut = dict(refToPSet_ = 'SiStripClusterChargeCutNone'), ) @@ -221,7 +192,6 @@ inOutTrajectoryFilter = dict(refToPSet_ = "initialStepTrajectoryFilterInOut"), useSameTrajFilter = False ) -trackingPhase1PU70.toModify(initialStepTrajectoryBuilder, maxCand = 6) trackingPhase2PU140.toModify(initialStepTrajectoryBuilder, maxCand = 7, minNrOfHitsForRebuild = 1) import RecoTracker.CkfPattern.CkfTrackCandidates_cfi @@ -281,7 +251,7 @@ qualityCuts = [-0.95,-0.85,-0.75], )) -# For LowPU and Phase1PU70 +# For LowPU and Phase2PU140 import RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi initialStepSelector = RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.multiTrackSelector.clone( src = 'initialStepTracks', @@ -301,51 +271,6 @@ ), ] #end of vpset ) #end of clone -trackingPhase1PU70.toModify(initialStepSelector, - useAnyMVA = None, - GBRForestLabel = None, - trackSelectors = [ - RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone( - name = 'initialStepLoose', - chi2n_par = 2.0, - res_par = ( 0.003, 0.002 ), - minNumberLayers = 3, - maxNumberLostLayers = 3, - minNumber3DLayers = 3, - d0_par1 = ( 0.7, 4.0 ), - dz_par1 = ( 0.8, 4.0 ), - d0_par2 = ( 0.4, 4.0 ), - dz_par2 = ( 0.6, 4.0 ) - ), #end of pset - RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.tightMTS.clone( - name = 'initialStepTight', - preFilterName = 'initialStepLoose', - chi2n_par = 1.0, - res_par = ( 0.003, 0.002 ), - minNumberLayers = 3, - maxNumberLostLayers = 2, - minNumber3DLayers = 3, - d0_par1 = ( 0.6, 4.0 ), - dz_par1 = ( 0.7, 4.0 ), - d0_par2 = ( 0.35, 4.0 ), - dz_par2 = ( 0.5, 4.0 ) - ), - RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.highpurityMTS.clone( - name = 'initialStep', - preFilterName = 'initialStepTight', - chi2n_par = 0.7, - res_par = ( 0.003, 0.001 ), - minNumberLayers = 3, - maxNumberLostLayers = 2, - minNumber3DLayers = 3, - d0_par1 = ( 0.5, 4.0 ), - dz_par1 = ( 0.7, 4.0 ), - d0_par2 = ( 0.25, 4.0 ), - dz_par2 = ( 0.4, 4.0 ) - ), - ] #end of vpset -) - trackingPhase2PU140.toModify(initialStepSelector, useAnyMVA = None, GBRForestLabel = None, @@ -408,16 +333,11 @@ _InitialStep_LowPU = InitialStep.copyAndExclude([firstStepPrimaryVertices, initialStepClassifier1, initialStepClassifier2, initialStepClassifier3]) _InitialStep_LowPU.replace(initialStep, initialStepSelector) trackingLowPU.toReplaceWith(InitialStep, _InitialStep_LowPU) -_InitialStep_Phase1QuadProp = InitialStep.copy() -_InitialStep_Phase1QuadProp.remove(initialStepClassifier2) -_InitialStep_Phase1QuadProp.remove(initialStepClassifier3) +_InitialStep_Phase1QuadProp = InitialStep.copyAndExclude([initialStepClassifier2, initialStepClassifier3]) +_InitialStep_Phase1QuadProp.replace(initialStepHitTriplets, initialStepHitTriplets+initialStepHitQuadruplets) trackingPhase1QuadProp.toReplaceWith(InitialStep, _InitialStep_Phase1QuadProp) -_InitialStep_Phase1 = _InitialStep_Phase1QuadProp.copy() -_InitialStep_Phase1.replace(initialStepHitTriplets, initialStepHitQuadruplets) +_InitialStep_Phase1 = _InitialStep_Phase1QuadProp.copyAndExclude([initialStepHitTriplets]) trackingPhase1.toReplaceWith(InitialStep, _InitialStep_Phase1) -_InitialStep_Phase1PU70 = _InitialStep_LowPU.copy() -_InitialStep_Phase1PU70.replace(initialStepHitTriplets, initialStepHitTriplets+initialStepHitQuadruplets) -trackingPhase1PU70.toReplaceWith(InitialStep, _InitialStep_Phase1PU70) _InitialStep_trackingPhase2 = _InitialStep_LowPU.copy() _InitialStep_trackingPhase2.replace(initialStepHitTriplets, initialStepHitTriplets*initialStepHitQuadruplets) trackingPhase2PU140.toReplaceWith(InitialStep, _InitialStep_trackingPhase2) diff --git a/RecoTracker/IterativeTracking/python/LowPtQuadStep_cff.py b/RecoTracker/IterativeTracking/python/LowPtQuadStep_cff.py index cf52f821667fd..d6588ac0475cf 100644 --- a/RecoTracker/IterativeTracking/python/LowPtQuadStep_cff.py +++ b/RecoTracker/IterativeTracking/python/LowPtQuadStep_cff.py @@ -11,30 +11,21 @@ import RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi import RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff lowPtQuadStepSeedLayers = RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi.PixelLayerTriplets.clone( + layerList = RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff.PixelSeedMergerQuadruplets.layerList.value(), BPix = dict(skipClusters = cms.InputTag('lowPtQuadStepClusters')), FPix = dict(skipClusters = cms.InputTag('lowPtQuadStepClusters')) ) -from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1 -trackingPhase1.toModify(lowPtQuadStepSeedLayers, - layerList = RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff.PixelSeedMergerQuadruplets.layerList.value() -) -from Configuration.Eras.Modifier_trackingPhase1QuadProp_cff import trackingPhase1QuadProp -trackingPhase1QuadProp.toModify(lowPtQuadStepSeedLayers, - layerList = RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff.PixelSeedMergerQuadruplets.layerList.value() -) -from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 -trackingPhase2PU140.toModify(lowPtQuadStepSeedLayers, - layerList = RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff.PixelSeedMergerQuadruplets.layerList.value() -) # TrackingRegion from RecoTracker.TkTrackingRegions.globalTrackingRegionFromBeamSpot_cfi import globalTrackingRegionFromBeamSpot as _globalTrackingRegionFromBeamSpot lowPtQuadStepTrackingRegions = _globalTrackingRegionFromBeamSpot.clone(RegionPSet = dict( - ptMin = 0.2, + ptMin = 0.15, originRadius = 0.02, nSigmaZ = 4.0 )) -trackingPhase1.toModify(lowPtQuadStepTrackingRegions, RegionPSet = dict(ptMin = 0.15)) +from Configuration.Eras.Modifier_trackingPhase1QuadProp_cff import trackingPhase1QuadProp +from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 +trackingPhase1QuadProp.toModify(lowPtQuadStepTrackingRegions, RegionPSet = dict(ptMin = 0.2)) trackingPhase2PU140.toModify(lowPtQuadStepTrackingRegions, RegionPSet = dict(ptMin = 0.35)) @@ -43,19 +34,42 @@ lowPtQuadStepHitDoublets = _hitPairEDProducer.clone( seedingLayers = "lowPtQuadStepSeedLayers", trackingRegions = "lowPtQuadStepTrackingRegions", + layerPairs = [0,1,2], # layer pairs (0,1), (1,2), (2,3) maxElement = 0, produceIntermediateHitDoublets = True, ) +from RecoPixelVertexing.PixelTriplets.caHitQuadrupletEDProducer_cfi import caHitQuadrupletEDProducer as _caHitQuadrupletEDProducer from RecoPixelVertexing.PixelTriplets.pixelTripletHLTEDProducer_cfi import pixelTripletHLTEDProducer as _pixelTripletHLTEDProducer from RecoPixelVertexing.PixelLowPtUtilities.ClusterShapeHitFilterESProducer_cfi import * import RecoPixelVertexing.PixelLowPtUtilities.LowPtClusterShapeSeedComparitor_cfi +lowPtQuadStepHitQuadruplets = _caHitQuadrupletEDProducer.clone( + doublets = "lowPtQuadStepHitDoublets", + extraHitRPhitolerance = _pixelTripletHLTEDProducer.extraHitRPhitolerance, + SeedComparitorPSet = RecoPixelVertexing.PixelLowPtUtilities.LowPtClusterShapeSeedComparitor_cfi.LowPtClusterShapeSeedComparitor.clone(), + maxChi2 = dict( + pt1 = 0.7, pt2 = 2, + value1 = 1000, value2 = 150, + ), + useBendingCorrection = True, + fitFastCircle = True, + fitFastCircleChi2Cut = True, + CAThetaCut = 0.0017, + CAPhiCut = 0.3, +) +from RecoTracker.TkSeedGenerator.seedCreatorFromRegionConsecutiveHitsEDProducer_cff import seedCreatorFromRegionConsecutiveHitsEDProducer as _seedCreatorFromRegionConsecutiveHitsEDProducer +lowPtQuadStepSeeds = _seedCreatorFromRegionConsecutiveHitsEDProducer.clone( + seedingHitSets = "lowPtQuadStepHitQuadruplets", +) + +trackingPhase1QuadProp.toModify(lowPtQuadStepHitDoublets, layerPairs = [0]) +trackingPhase2PU140.toModify(lowPtQuadStepHitDoublets, layerPairs = [0]) lowPtQuadStepHitTriplets = _pixelTripletHLTEDProducer.clone( doublets = "lowPtQuadStepHitDoublets", produceIntermediateHitTriplets = True, - SeedComparitorPSet = RecoPixelVertexing.PixelLowPtUtilities.LowPtClusterShapeSeedComparitor_cfi.LowPtClusterShapeSeedComparitor.clone() + SeedComparitorPSet = lowPtQuadStepHitQuadruplets.SeedComparitorPSet, ) from RecoPixelVertexing.PixelTriplets.pixelQuadrupletEDProducer_cfi import pixelQuadrupletEDProducer as _pixelQuadrupletEDProducer -lowPtQuadStepHitQuadruplets = _pixelQuadrupletEDProducer.clone( +_lowPtQuadStepHitQuadruplets_propagation = _pixelQuadrupletEDProducer.clone( triplets = "lowPtQuadStepHitTriplets", extraHitRZtolerance = lowPtQuadStepHitTriplets.extraHitRZtolerance, extraHitRPhitolerance = lowPtQuadStepHitTriplets.extraHitRPhitolerance, @@ -74,49 +88,9 @@ fitFastCircleChi2Cut = True, SeedComparitorPSet = lowPtQuadStepHitTriplets.SeedComparitorPSet, ) -from RecoPixelVertexing.PixelTriplets.caHitQuadrupletEDProducer_cfi import caHitQuadrupletEDProducer as _caHitQuadrupletEDProducer -trackingPhase1.toModify(lowPtQuadStepHitDoublets, layerPairs = [0,1,2]) # layer pairs (0,1), (1,2), (2,3) -trackingPhase1.toReplaceWith(lowPtQuadStepHitQuadruplets, _caHitQuadrupletEDProducer.clone( - doublets = "lowPtQuadStepHitDoublets", - extraHitRPhitolerance = lowPtQuadStepHitTriplets.extraHitRPhitolerance, - SeedComparitorPSet = lowPtQuadStepHitTriplets.SeedComparitorPSet, - maxChi2 = dict( - pt1 = 0.7, pt2 = 2, - value1 = 1000, value2 = 150, - ), - useBendingCorrection = True, - fitFastCircle = True, - fitFastCircleChi2Cut = True, - CAThetaCut = 0.0017, - CAPhiCut = 0.3, -)) - -from RecoPixelVertexing.PixelTriplets.pixelQuadrupletMergerEDProducer_cfi import pixelQuadrupletMergerEDProducer as _pixelQuadrupletMergerEDProducer -from RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff import * -_lowPtQuadStepHitQuadrupletsMerging = _pixelQuadrupletMergerEDProducer.clone( - triplets = "lowPtQuadStepHitTriplets", - layerList = dict(refToPSet_ = cms.string("PixelSeedMergerQuadruplets")), -) -from RecoTracker.TkSeedGenerator.seedCreatorFromRegionConsecutiveHitsEDProducer_cff import seedCreatorFromRegionConsecutiveHitsEDProducer as _seedCreatorFromRegionConsecutiveHitsEDProducer -lowPtQuadStepSeeds = _seedCreatorFromRegionConsecutiveHitsEDProducer.clone( - seedingHitSets = "lowPtQuadStepHitQuadruplets", -) -# temporary... -_lowPtQuadStepHitQuadrupletsMerging.SeedCreatorPSet = cms.PSet( - ComponentName = cms.string("SeedFromConsecutiveHitsCreator"), - MinOneOverPtError = lowPtQuadStepSeeds.MinOneOverPtError, - OriginTransverseErrorMultiplier = lowPtQuadStepSeeds.OriginTransverseErrorMultiplier, - SeedMomentumForBOFF = lowPtQuadStepSeeds.SeedMomentumForBOFF, - TTRHBuilder = lowPtQuadStepSeeds.TTRHBuilder, - forceKinematicWithRegionDirection = lowPtQuadStepSeeds.forceKinematicWithRegionDirection, - magneticField = lowPtQuadStepSeeds.magneticField, - propagator = lowPtQuadStepSeeds.propagator, +trackingPhase1QuadProp.toReplaceWith(lowPtQuadStepHitQuadruplets, _lowPtQuadStepHitQuadruplets_propagation) +trackingPhase2PU140.toReplaceWith(lowPtQuadStepHitQuadruplets, _lowPtQuadStepHitQuadruplets_propagation) -) -_lowPtQuadStepHitQuadrupletsMerging.SeedComparitorPSet = lowPtQuadStepSeeds.SeedComparitorPSet - -trackingPhase1PU70.toModify(lowPtQuadStepHitTriplets, produceIntermediateHitTriplets=False, produceSeedingHitSets=True) -trackingPhase1PU70.toReplaceWith(lowPtQuadStepHitQuadruplets, _lowPtQuadStepHitQuadrupletsMerging) # QUALITY CUTS DURING TRACK BUILDING @@ -129,7 +103,6 @@ maxCCCLostHits = 0, minGoodStripCharge = dict(refToPSet_ = 'SiStripClusterChargeCutLoose') ) -trackingPhase1PU70.toReplaceWith(lowPtQuadStepTrajectoryFilterBase, _lowPtQuadStepTrajectoryFilterBase) trackingPhase2PU140.toReplaceWith(lowPtQuadStepTrajectoryFilterBase, _lowPtQuadStepTrajectoryFilterBase) from RecoPixelVertexing.PixelLowPtUtilities.ClusterShapeTrajectoryFilter_cfi import * @@ -137,9 +110,6 @@ lowPtQuadStepTrajectoryFilter = _TrajectoryFilter_cff.CompositeTrajectoryFilter_block.clone( filters = [cms.PSet(refToPSet_ = cms.string('lowPtQuadStepTrajectoryFilterBase'))] ) -trackingPhase1PU70.toModify(lowPtQuadStepTrajectoryFilter, - filters = lowPtQuadStepTrajectoryFilter.filters.value() + [cms.PSet(refToPSet_ = cms.string('ClusterShapeTrajectoryFilter'))] -) trackingPhase2PU140.toModify(lowPtQuadStepTrajectoryFilter, filters = lowPtQuadStepTrajectoryFilter.filters.value() + [cms.PSet(refToPSet_ = cms.string('ClusterShapeTrajectoryFilter'))] ) @@ -151,10 +121,6 @@ MaxChi2 = 9.0, clusterChargeCut = dict(refToPSet_ = ('SiStripClusterChargeCutTight')), ) -trackingPhase1PU70.toModify(lowPtQuadStepChi2Est, - MaxChi2 = 25.0, - clusterChargeCut = dict(refToPSet_ = 'SiStripClusterChargeCutNone') -) trackingPhase2PU140.toModify(lowPtQuadStepChi2Est, MaxChi2 = 25.0, clusterChargeCut = dict(refToPSet_ = 'SiStripClusterChargeCutNone') @@ -181,7 +147,6 @@ fractionShared = 0.16, allowSharedFirstHit = True ) -trackingPhase1PU70.toModify(lowPtQuadStepTrajectoryCleanerBySharedHits, fractionShared = 0.095) trackingPhase2PU140.toModify(lowPtQuadStepTrajectoryCleanerBySharedHits, fractionShared = 0.09) import RecoTracker.CkfPattern.CkfTrackCandidates_cfi @@ -214,67 +179,15 @@ from RecoTracker.FinalTrackSelectors.TrackMVAClassifierPrompt_cfi import * lowPtQuadStep = TrackMVAClassifierPrompt.clone( src = 'lowPtQuadStepTracks', - GBRForestLabel = 'MVASelectorIter1_13TeV', - qualityCuts = [-0.6,-0.3,-0.1] -) - -trackingPhase1.toReplaceWith(lowPtQuadStep, lowPtQuadStep.clone( - GBRForestLabel = 'MVASelectorLowPtQuadStep_Phase1', - qualityCuts = [-0.65,-0.35,-0.15], -)) -trackingPhase1QuadProp.toReplaceWith(lowPtQuadStep, lowPtQuadStep.clone( GBRForestLabel = 'MVASelectorLowPtQuadStep_Phase1', qualityCuts = [-0.65,-0.35,-0.15], -)) +) -# For Phase1PU70 +# For Phase2PU140 import RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi lowPtQuadStepSelector = RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.multiTrackSelector.clone( src = 'lowPtQuadStepTracks', trackSelectors = [ - RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone( - name = 'lowPtQuadStepLoose', - chi2n_par = 2.0, - res_par = ( 0.003, 0.002 ), - minNumberLayers = 3, - maxNumberLostLayers = 2, - minNumber3DLayers = 3, - d0_par1 = ( 0.8, 4.0 ), - dz_par1 = ( 0.7, 4.0 ), - d0_par2 = ( 0.5, 4.0 ), - dz_par2 = ( 0.5, 4.0 ) - ), #end of pset - RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.tightMTS.clone( - name = 'lowPtQuadStepTight', - preFilterName = 'lowPtQuadStepLoose', - chi2n_par = 1.3, - res_par = ( 0.003, 0.002 ), - minNumberLayers = 3, - maxNumberLostLayers = 2, - minNumber3DLayers = 3, - d0_par1 = ( 0.7, 4.0 ), - dz_par1 = ( 0.6, 4.0 ), - d0_par2 = ( 0.4, 4.0 ), - dz_par2 = ( 0.4, 4.0 ) - ), - RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.highpurityMTS.clone( - name = 'lowPtQuadStep', - preFilterName = 'lowPtQuadStepTight', - chi2n_par = 1.0, - res_par = ( 0.003, 0.001 ), - minNumberLayers = 3, - maxNumberLostLayers = 2, - minNumber3DLayers = 3, - d0_par1 = ( 0.6, 4.0 ), - dz_par1 = ( 0.5, 4.0 ), - d0_par2 = ( 0.3, 4.0 ), - dz_par2 = ( 0.4, 4.0 ) - ), - ] -) #end of clone - -trackingPhase2PU140.toModify(lowPtQuadStepSelector, - trackSelectors= cms.VPSet( RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone( name = 'lowPtQuadStepLoose', chi2n_par = 2.0, @@ -313,23 +226,23 @@ d0_par2 = ( 0.45, 4.0 ), dz_par2 = ( 0.45, 4.0 ) ), - ), #end of vpset - vertices = "pixelVertices" + ] #end of vpset ) #end of clone + # Final sequence LowPtQuadStep = cms.Sequence(lowPtQuadStepClusters* lowPtQuadStepSeedLayers* lowPtQuadStepTrackingRegions* lowPtQuadStepHitDoublets* - lowPtQuadStepHitTriplets* lowPtQuadStepHitQuadruplets* lowPtQuadStepSeeds* lowPtQuadStepTrackCandidates* lowPtQuadStepTracks* lowPtQuadStep) -trackingPhase1.toReplaceWith(LowPtQuadStep, LowPtQuadStep.copyAndExclude([lowPtQuadStepHitTriplets])) -_LowPtQuadStep_Phase1PU70 = LowPtQuadStep.copy() -_LowPtQuadStep_Phase1PU70.replace(lowPtQuadStep, lowPtQuadStepSelector) -trackingPhase1PU70.toReplaceWith(LowPtQuadStep, _LowPtQuadStep_Phase1PU70) -trackingPhase2PU140.toReplaceWith(LowPtQuadStep, _LowPtQuadStep_Phase1PU70) +_LowPtQuadStep_Phase1Prop = LowPtQuadStep.copy() +_LowPtQuadStep_Phase1Prop.replace(lowPtQuadStepHitDoublets, lowPtQuadStepHitDoublets+lowPtQuadStepHitTriplets) +trackingPhase1QuadProp.toReplaceWith(LowPtQuadStep, _LowPtQuadStep_Phase1Prop) +_LowPtQuadStep_Phase2PU140 = _LowPtQuadStep_Phase1Prop.copy() +_LowPtQuadStep_Phase2PU140.replace(lowPtQuadStep, lowPtQuadStepSelector) +trackingPhase2PU140.toReplaceWith(LowPtQuadStep, _LowPtQuadStep_Phase2PU140) diff --git a/RecoTracker/IterativeTracking/python/LowPtTripletStep_cff.py b/RecoTracker/IterativeTracking/python/LowPtTripletStep_cff.py index 533d0b968b7ec..7e26a52ea4991 100644 --- a/RecoTracker/IterativeTracking/python/LowPtTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/LowPtTripletStep_cff.py @@ -27,10 +27,8 @@ ] from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1 from Configuration.Eras.Modifier_trackingPhase1QuadProp_cff import trackingPhase1QuadProp -from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 trackingPhase1.toModify(lowPtTripletStepSeedLayers, layerList = _layerListForPhase1) trackingPhase1QuadProp.toModify(lowPtTripletStepSeedLayers, layerList = _layerListForPhase1) -trackingPhase1PU70.toModify(lowPtTripletStepSeedLayers, layerList = _layerListForPhase1) # combination with gap removed as only source of fakes in current geometry (kept for doc,=) _layerListForPhase2 = ['BPix1+BPix2+BPix3', 'BPix2+BPix3+BPix4', @@ -59,7 +57,6 @@ )) trackingPhase1.toModify(lowPtTripletStepTrackingRegions, RegionPSet = dict(ptMin = 0.2)) trackingPhase1QuadProp.toModify(lowPtTripletStepTrackingRegions, RegionPSet = dict(ptMin = 0.35)) # FIXME: Phase1PU70 value, let's see if we can lower it to Run2 value (0.2) -trackingPhase1PU70.toModify(lowPtTripletStepTrackingRegions, RegionPSet = dict(ptMin = 0.35, originRadius = 0.015)) trackingPhase2PU140.toModify(lowPtTripletStepTrackingRegions, RegionPSet = dict(ptMin = 0.45)) # seeding @@ -113,7 +110,6 @@ _tracker_apv_vfp30_2016.toModify(lowPtTripletStepStandardTrajectoryFilter, maxCCCLostHits = 1) from Configuration.Eras.Modifier_trackingLowPU_cff import trackingLowPU trackingLowPU.toReplaceWith(lowPtTripletStepStandardTrajectoryFilter, _lowPtTripletStepStandardTrajectoryFilterBase) -trackingPhase1PU70.toReplaceWith(lowPtTripletStepStandardTrajectoryFilter, _lowPtTripletStepStandardTrajectoryFilterBase) trackingPhase2PU140.toReplaceWith(lowPtTripletStepStandardTrajectoryFilter, _lowPtTripletStepStandardTrajectoryFilterBase) from RecoPixelVertexing.PixelLowPtUtilities.ClusterShapeTrajectoryFilter_cfi import * @@ -123,9 +119,6 @@ # cms.PSet(refToPSet_ = cms.string('ClusterShapeTrajectoryFilter')) ] ) -trackingPhase1PU70.toModify(lowPtTripletStepTrajectoryFilter, - filters = lowPtTripletStepTrajectoryFilter.filters + [cms.PSet(refToPSet_ = cms.string('ClusterShapeTrajectoryFilter'))] -) trackingPhase2PU140.toModify(lowPtTripletStepTrajectoryFilter, filters = lowPtTripletStepTrajectoryFilter.filters + [cms.PSet(refToPSet_ = cms.string('ClusterShapeTrajectoryFilter'))] ) @@ -140,9 +133,6 @@ _tracker_apv_vfp30_2016.toModify(lowPtTripletStepChi2Est, clusterChargeCut = dict(refToPSet_ = "SiStripClusterChargeCutTiny") ) -trackingPhase1PU70.toModify(lowPtTripletStepChi2Est, - clusterChargeCut = dict(refToPSet_ = 'SiStripClusterChargeCutNone'), -) # TRACK BUILDING import RecoTracker.CkfPattern.GroupedCkfTrajectoryBuilder_cfi @@ -193,7 +183,6 @@ ) lowPtTripletStepTrackCandidates.TrajectoryCleaner = 'lowPtTripletStepTrajectoryCleanerBySharedHits' trackingLowPU.toModify(lowPtTripletStepTrajectoryCleanerBySharedHits, fractionShared = 0.19) -trackingPhase1PU70.toModify(lowPtTripletStepTrajectoryCleanerBySharedHits, fractionShared = 0.09) trackingPhase2PU140.toModify(lowPtTripletStepTrajectoryCleanerBySharedHits, fractionShared = 0.09) # Final selection @@ -213,7 +202,7 @@ )) -# For LowPU and Phase1PU70 +# For LowPU and Phase2PU140 import RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi lowPtTripletStepSelector = RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.multiTrackSelector.clone( src = 'lowPtTripletStepTracks', @@ -233,51 +222,6 @@ ), ] #end of vpset ) #end of clone -trackingPhase1PU70.toModify(lowPtTripletStepSelector, - useAnyMVA = None, - GBRForestLabel = None, - trackSelectors = [ - RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone( - name = 'lowPtTripletStepLoose', - chi2n_par = 2.0, - res_par = ( 0.003, 0.002 ), - minNumberLayers = 3, - maxNumberLostLayers = 2, - minNumber3DLayers = 3, - d0_par1 = ( 0.8, 4.0 ), - dz_par1 = ( 0.7, 4.0 ), - d0_par2 = ( 0.5, 4.0 ), - dz_par2 = ( 0.5, 4.0 ) - ), #end of pset - RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.tightMTS.clone( - name = 'lowPtTripletStepTight', - preFilterName = 'lowPtTripletStepLoose', - chi2n_par = 0.9, - res_par = ( 0.003, 0.002 ), - minNumberLayers = 3, - maxNumberLostLayers = 2, - minNumber3DLayers = 3, - d0_par1 = ( 0.7, 4.0 ), - dz_par1 = ( 0.6, 4.0 ), - d0_par2 = ( 0.4, 4.0 ), - dz_par2 = ( 0.4, 4.0 ) - ), - RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.highpurityMTS.clone( - name = 'lowPtTripletStep', - preFilterName = 'lowPtTripletStepTight', - chi2n_par = 0.5, - res_par = ( 0.003, 0.001 ), - minNumberLayers = 3, - maxNumberLostLayers = 2, - minNumber3DLayers = 3, - d0_par1 = ( 0.6, 4.0 ), - dz_par1 = ( 0.45, 4.0 ), - d0_par2 = ( 0.3, 4.0 ), - dz_par2 = ( 0.4, 4.0 ) - ), - ] #end of vpset -) #end of clone - trackingPhase2PU140.toModify(lowPtTripletStepSelector, useAnyMVA = None, GBRForestLabel = None, @@ -339,10 +283,7 @@ lowPtTripletStepTrackCandidates* lowPtTripletStepTracks* lowPtTripletStep) -_LowPtTripletStep_LowPU = LowPtTripletStep.copy() -_LowPtTripletStep_LowPU.replace(lowPtTripletStep, lowPtTripletStepSelector) -trackingLowPU.toReplaceWith(LowPtTripletStep, _LowPtTripletStep_LowPU) -_LowPtTripletStep_Phase1PU70 = LowPtTripletStep.copy() -_LowPtTripletStep_Phase1PU70.replace(lowPtTripletStep, lowPtTripletStepSelector) -trackingPhase1PU70.toReplaceWith(LowPtTripletStep, _LowPtTripletStep_Phase1PU70) -trackingPhase2PU140.toReplaceWith(LowPtTripletStep, _LowPtTripletStep_Phase1PU70) +_LowPtTripletStep_LowPU_Phase2PU140 = LowPtTripletStep.copy() +_LowPtTripletStep_LowPU_Phase2PU140.replace(lowPtTripletStep, lowPtTripletStepSelector) +trackingLowPU.toReplaceWith(LowPtTripletStep, _LowPtTripletStep_LowPU_Phase2PU140) +trackingPhase2PU140.toReplaceWith(LowPtTripletStep, _LowPtTripletStep_LowPU_Phase2PU140) diff --git a/RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py b/RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py index 827880305ed14..90dbd36516af7 100644 --- a/RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py @@ -65,21 +65,6 @@ ], TEC = dict(clusterChargeCut = dict(refToPSet_ = 'SiStripClusterChargeCutTiny')), ) -from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 -trackingPhase1PU70.toModify(mixedTripletStepSeedLayersA, - layerList = [ - 'BPix1+BPix2+FPix1_pos', 'BPix1+BPix2+FPix1_neg', - 'BPix1+FPix1_pos+FPix2_pos', 'BPix1+FPix1_neg+FPix2_neg', - 'FPix1_pos+FPix2_pos+FPix3_pos', 'FPix1_neg+FPix2_neg+FPix3_neg', - 'BPix2+FPix1_pos+FPix2_pos', 'BPix2+FPix1_neg+FPix2_neg', - 'BPix1+FPix1_pos+FPix3_pos', 'BPix1+FPix1_neg+FPix3_neg', - 'FPix2_pos+FPix3_pos+TEC1_pos', 'FPix2_neg+FPix3_neg+TEC1_neg' - ], - TEC = dict( - clusterChargeCut = dict(refToPSet_ = 'SiStripClusterChargeCutNone'), - maxRing = 2 - ) -) # TrackingRegion from RecoTracker.TkTrackingRegions.globalTrackingRegionFromBeamSpotFixedZ_cfi import globalTrackingRegionFromBeamSpotFixedZ as _globalTrackingRegionFromBeamSpotFixedZ @@ -89,7 +74,6 @@ originRadius = 1.5 )) trackingLowPU.toModify(mixedTripletStepTrackingRegionsA, RegionPSet = dict(originHalfLength = 10.0)) -trackingPhase1PU70.toModify(mixedTripletStepTrackingRegionsA, RegionPSet = dict(ptMin = 0.7)) # seeding from RecoPixelVertexing.PixelLowPtUtilities.ClusterShapeHitFilterESProducer_cfi import ClusterShapeHitFilterESProducer as _ClusterShapeHitFilterESProducer @@ -125,9 +109,6 @@ trackingLowPU.toModify(mixedTripletStepSeedsA, SeedComparitorPSet = dict(ClusterShapeHitFilterName = 'ClusterShapeHitFilter') ) -trackingPhase1PU70.toModify(mixedTripletStepSeedsA, - SeedComparitorPSet = dict(ClusterShapeHitFilterName = 'ClusterShapeHitFilter'), -) # SEEDING LAYERS mixedTripletStepSeedLayersB = cms.EDProducer("SeedingLayersEDProducer", @@ -149,20 +130,9 @@ ) trackingPhase1.toModify(mixedTripletStepSeedLayersB, layerList = ['BPix3+BPix4+TIB1']) trackingPhase1QuadProp.toModify(mixedTripletStepSeedLayersB, layerList = ['BPix3+BPix4+TIB1']) -trackingPhase1PU70.toModify(mixedTripletStepSeedLayersB, - layerList = [ - 'BPix1+BPix2+BPix3', 'BPix2+BPix3+BPix4','BPix1+BPix2+BPix4', 'BPix1+BPix3+BPix4' - ], - TIB = None -) # TrackingRegion mixedTripletStepTrackingRegionsB = mixedTripletStepTrackingRegionsA.clone(RegionPSet = dict(ptMin=0.6, originHalfLength=10.0)) -trackingPhase1PU70.toModify(mixedTripletStepTrackingRegionsB, RegionPSet = dict( - ptMin = 0.5, - originHalfLength = 15.0, - originRadius = 1.0 -)) # seeding mixedTripletStepHitDoubletsB = mixedTripletStepHitDoubletsA.clone( @@ -192,9 +162,6 @@ trackingLowPU.toReplaceWith(mixedTripletStepTrajectoryFilter, _mixedTripletStepTrajectoryFilterBase.clone( maxLostHits = 0, )) -trackingPhase1PU70.toReplaceWith(mixedTripletStepTrajectoryFilter, _mixedTripletStepTrajectoryFilterBase.clone( - maxLostHits = 0, -)) # Propagator taking into account momentum uncertainty in multiple scattering calculation. import TrackingTools.MaterialEffects.MaterialPropagatorParabolicMf_cff @@ -222,9 +189,6 @@ trackingLowPU.toModify(mixedTripletStepChi2Est, clusterChargeCut = dict(refToPSet_ = 'SiStripClusterChargeCutTiny') ) -trackingPhase1PU70.toModify(mixedTripletStepChi2Est, - clusterChargeCut = dict(refToPSet_ = 'SiStripClusterChargeCutNone'), -) # TRACK BUILDING import RecoTracker.CkfPattern.GroupedCkfTrajectoryBuilder_cfi @@ -262,7 +226,6 @@ ) mixedTripletStepTrackCandidates.TrajectoryCleaner = 'mixedTripletStepTrajectoryCleanerBySharedHits' trackingLowPU.toModify(mixedTripletStepTrajectoryCleanerBySharedHits, fractionShared = 0.19) -trackingPhase1PU70.toModify(mixedTripletStepTrajectoryCleanerBySharedHits, fractionShared = 0.095) # TRACK FITTING @@ -298,9 +261,8 @@ qualityCuts = [-0.5,0.0,0.5], )) -# For LowPU and Phase1PU70 +# For LowPU import RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi -# First LowPU mixedTripletStepSelector = RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.multiTrackSelector.clone( src = 'mixedTripletStepTracks', useAnyMVA = cms.bool(False), @@ -384,90 +346,6 @@ ) ] #end of vpset ) #end of clone -trackingPhase1PU70.toModify(mixedTripletStepSelector, - useAnyMVA = None, - GBRForestLabel = None, - trackSelectors = [ - RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone( - name = 'mixedTripletStepVtxLoose', - chi2n_par = 0.9, - res_par = ( 0.003, 0.001 ), - minNumberLayers = 3, - maxNumberLostLayers = 1, - minNumber3DLayers = 2, - d0_par1 = ( 1.2, 3.0 ), - dz_par1 = ( 1.2, 3.0 ), - d0_par2 = ( 1.3, 3.0 ), - dz_par2 = ( 1.3, 3.0 ) - ), - RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone( - name = 'mixedTripletStepTrkLoose', - chi2n_par = 0.5, - res_par = ( 0.003, 0.001 ), - minNumberLayers = 4, - maxNumberLostLayers = 1, - minNumber3DLayers = 3, - d0_par1 = ( 1.1, 4.0 ), - dz_par1 = ( 1.1, 4.0 ), - d0_par2 = ( 1.1, 4.0 ), - dz_par2 = ( 1.1, 4.0 ) - ), - RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.tightMTS.clone( - name = 'mixedTripletStepVtxTight', - preFilterName = 'mixedTripletStepVtxLoose', - chi2n_par = 0.6, - res_par = ( 0.003, 0.001 ), - minNumberLayers = 3, - maxNumberLostLayers = 1, - minNumber3DLayers = 3, - d0_par1 = ( 1.1, 3.0 ), - dz_par1 = ( 1.1, 3.0 ), - d0_par2 = ( 1.2, 3.0 ), - dz_par2 = ( 1.2, 3.0 ) - ), - RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.tightMTS.clone( - name = 'mixedTripletStepTrkTight', - preFilterName = 'mixedTripletStepTrkLoose', - chi2n_par = 0.35, - res_par = ( 0.003, 0.001 ), - minNumberLayers = 5, - maxNumberLostLayers = 1, - minNumber3DLayers = 4, - d0_par1 = ( 0.9, 4.0 ), - dz_par1 = ( 0.9, 4.0 ), - d0_par2 = ( 0.9, 4.0 ), - dz_par2 = ( 0.9, 4.0 ) - ), - RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.highpurityMTS.clone( - name = 'mixedTripletStepVtx', - preFilterName = 'mixedTripletStepVtxTight', - chi2n_par = 0.4, - res_par = ( 0.003, 0.001 ), - minNumberLayers = 3, - maxNumberLostLayers = 1, - minNumber3DLayers = 3, - max_minMissHitOutOrIn = 1, - d0_par1 = ( 0.9, 3.0 ), - dz_par1 = ( 0.9, 3.0 ), - d0_par2 = ( 1.0, 3.0 ), - dz_par2 = ( 1.0, 3.0 ) - ), - RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.highpurityMTS.clone( - name = 'mixedTripletStepTrk', - preFilterName = 'mixedTripletStepTrkTight', - chi2n_par = 0.2, - res_par = ( 0.003, 0.001 ), - minNumberLayers = 5, - maxNumberLostLayers = 0, - minNumber3DLayers = 4, - max_minMissHitOutOrIn = 1, - d0_par1 = ( 0.7, 4.0 ), - dz_par1 = ( 0.7, 4.0 ), - d0_par2 = ( 0.7, 4.0 ), - dz_par2 = ( 0.7, 4.0 ) - ) - ] #end of vpset -) #end of clone from RecoTracker.FinalTrackSelectors.trackAlgoPriorityOrder_cfi import trackAlgoPriorityOrder @@ -482,10 +360,6 @@ writeOnlyTrkQuals = True ) trackingLowPU.toReplaceWith(mixedTripletStep, _trackListMergerBase) -trackingPhase1PU70.toReplaceWith(mixedTripletStep, _trackListMergerBase.clone( - shareFrac = cms.double(0.095), - indivShareFrac = [0.095,0.095], -)) @@ -505,7 +379,6 @@ mixedTripletStepTracks* mixedTripletStepClassifier1*mixedTripletStepClassifier2* mixedTripletStep) -_MixedTripletStep_LowPU_Phase1PU70 = MixedTripletStep.copyAndExclude([chargeCut2069Clusters, mixedTripletStepClassifier1]) -_MixedTripletStep_LowPU_Phase1PU70.replace(mixedTripletStepClassifier2, mixedTripletStepSelector) -trackingLowPU.toReplaceWith(MixedTripletStep, _MixedTripletStep_LowPU_Phase1PU70) -trackingPhase1PU70.toReplaceWith(MixedTripletStep, _MixedTripletStep_LowPU_Phase1PU70) +_MixedTripletStep_LowPU = MixedTripletStep.copyAndExclude([chargeCut2069Clusters, mixedTripletStepClassifier1]) +_MixedTripletStep_LowPU.replace(mixedTripletStepClassifier2, mixedTripletStepSelector) +trackingLowPU.toReplaceWith(MixedTripletStep, _MixedTripletStep_LowPU) diff --git a/RecoTracker/IterativeTracking/python/MuonSeededStep_cff.py b/RecoTracker/IterativeTracking/python/MuonSeededStep_cff.py index a5d73c406f395..7f66be5b7ee5a 100644 --- a/RecoTracker/IterativeTracking/python/MuonSeededStep_cff.py +++ b/RecoTracker/IterativeTracking/python/MuonSeededStep_cff.py @@ -40,10 +40,6 @@ muonSeededMeasurementEstimatorForInOut = _muonSeededMeasurementEstimatorForInOutBase.clone( MaxSagitta = cms.double(-1.) ) -from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 -trackingPhase1PU70.toReplaceWith(muonSeededMeasurementEstimatorForInOut, _muonSeededMeasurementEstimatorForInOutBase.clone( - MaxChi2 = 400 -)) from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 trackingPhase2PU140.toModify(muonSeededMeasurementEstimatorForInOut, MaxChi2 = 400.0, MaxSagitta = 2) @@ -57,7 +53,6 @@ muonSeededMeasurementEstimatorForOutIn = _muonSeededMeasurementEstimatorForOutInBase.clone( MaxSagitta = cms.double(-1.) ) -trackingPhase1PU70.toReplaceWith(muonSeededMeasurementEstimatorForOutIn, _muonSeededMeasurementEstimatorForOutInBase) ###------------- TrajectoryFilter, defining selections on the trajectories while building them ---------------- import TrackingTools.TrajectoryFiltering.TrajectoryFilter_cff @@ -154,7 +149,7 @@ muonSeededTracksOutInClassifier.mva.maxLostLayers = [4,3,2] -# For Phase1PU70 +# For Phase2PU140 import RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi muonSeededTracksInOutSelector = RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.multiTrackSelector.clone( src='muonSeededTracksInOut', @@ -248,9 +243,6 @@ muonSeededStepExtraInOut = cms.Sequence( muonSeededTracksInOutClassifier ) -trackingPhase1PU70.toReplaceWith(muonSeededStepExtraInOut, cms.Sequence( - muonSeededTracksInOutSelector -)) trackingPhase2PU140.toReplaceWith(muonSeededStepExtraInOut, cms.Sequence( muonSeededTracksInOutSelector )) @@ -258,10 +250,6 @@ muonSeededStepExtraInOut + muonSeededTracksOutInClassifier ) -trackingPhase1PU70.toReplaceWith(muonSeededStepExtra, cms.Sequence( - muonSeededStepExtraInOut + - muonSeededTracksOutInSelector -)) trackingPhase2PU140.toReplaceWith(muonSeededStepExtra, cms.Sequence( muonSeededStepExtraInOut + muonSeededTracksOutInSelector diff --git a/RecoTracker/IterativeTracking/python/PixelPairStep_cff.py b/RecoTracker/IterativeTracking/python/PixelPairStep_cff.py index d15572d498f87..d6f97116305b8 100644 --- a/RecoTracker/IterativeTracking/python/PixelPairStep_cff.py +++ b/RecoTracker/IterativeTracking/python/PixelPairStep_cff.py @@ -25,17 +25,6 @@ skipClusters = cms.InputTag('pixelPairStepClusters') ) ) -from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 -trackingPhase1PU70.toModify(pixelPairStepSeedLayers, - layerList = [ - 'BPix1+BPix2', 'BPix1+BPix3', 'BPix2+BPix3', - 'BPix2+BPix4', 'BPix3+BPix4', - 'BPix1+FPix1_pos', 'BPix1+FPix1_neg', - 'BPix2+FPix1_pos', 'BPix2+FPix1_neg', - 'FPix1_pos+FPix2_pos', 'FPix1_neg+FPix2_neg', - 'FPix2_pos+FPix3_pos', 'FPix2_neg+FPix3_neg' - ] -) # only layers covering the region not covered by quadruplets # (so it is just acting as backup of triplets) @@ -71,7 +60,6 @@ )) from Configuration.Eras.Modifier_trackingLowPU_cff import trackingLowPU trackingLowPU.toModify(pixelPairStepTrackingRegions, RegionPSet=dict(useMultipleScattering=False)) -trackingPhase1PU70.toModify(pixelPairStepTrackingRegions, RegionPSet=dict(ptMin = 1.2, useMultipleScattering=False)) trackingPhase2PU140.toModify(pixelPairStepTrackingRegions, RegionPSet=dict(ptMin = 0.6, useMultipleScattering=False)) # SEEDS @@ -108,10 +96,6 @@ from Configuration.Eras.Modifier_tracker_apv_vfp30_2016_cff import tracker_apv_vfp30_2016 _tracker_apv_vfp30_2016.toModify(pixelPairStepTrajectoryFilterBase, maxCCCLostHits = 2) trackingLowPU.toReplaceWith(pixelPairStepTrajectoryFilterBase, _pixelPairStepTrajectoryFilterBase) -trackingPhase1PU70.toReplaceWith(pixelPairStepTrajectoryFilterBase, _pixelPairStepTrajectoryFilterBase.clone( - maxLostHitsFraction = 1./10., - constantValueForLostHitsFractionFilter = 0.801, -)) trackingPhase2PU140.toReplaceWith(pixelPairStepTrajectoryFilterBase, _pixelPairStepTrajectoryFilterBase.clone( minimumNumberOfHits = 4, maxLostHitsFraction = 1./10., @@ -151,10 +135,6 @@ trackingLowPU.toModify(pixelPairStepChi2Est, clusterChargeCut = dict(refToPSet_ = 'SiStripClusterChargeCutTiny'), ) -trackingPhase1PU70.toModify(pixelPairStepChi2Est, - MaxChi2 = 16.0, - clusterChargeCut = dict(refToPSet_ = 'SiStripClusterChargeCutNone'), -) # TRACK BUILDING import RecoTracker.CkfPattern.GroupedCkfTrajectoryBuilder_cfi @@ -200,7 +180,6 @@ fractionShared = 0.095, allowSharedFirstHit = True ) -trackingPhase1PU70.toModify(pixelPairStepTrackCandidates, TrajectoryCleaner = 'pixelPairStepTrajectoryCleanerBySharedHits') trackingPhase2PU140.toModify(pixelPairStepTrajectoryCleanerBySharedHits, fractionShared = 0.09) # TRACK FITTING @@ -218,7 +197,7 @@ pixelPairStep.GBRForestLabel = 'MVASelectorIter2_13TeV' pixelPairStep.qualityCuts = [-0.2,0.0,0.3] -# For LowPU and Phase1PU70 +# For LowPU and Phase2PU140 import RecoTracker.IterativeTracking.LowPtTripletStep_cff import RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi pixelPairStepSelector = RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.multiTrackSelector.clone( @@ -240,51 +219,6 @@ ), vertices = cms.InputTag("pixelVertices")#end of vpset ) #end of clone -trackingPhase1PU70.toModify(pixelPairStepSelector, - useAnyMVA = None, - GBRForestLabel = None, - trackSelectors = [ - RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone( - name = 'pixelPairStepLoose', - chi2n_par = 0.9, - res_par = ( 0.003, 0.002 ), - minNumberLayers = 3, - maxNumberLostLayers = 3, - minNumber3DLayers = 3, - d0_par1 = ( 0.4, 4.0 ), - dz_par1 = ( 0.4, 4.0 ), - d0_par2 = ( 0.4, 4.0 ), - dz_par2 = ( 0.4, 4.0 ) - ), #end of pset - RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.tightMTS.clone( - name = 'pixelPairStepTight', - preFilterName = 'pixelPairStepLoose', - chi2n_par = 0.6, - res_par = ( 0.003, 0.002 ), - minNumberLayers = 4, - maxNumberLostLayers = 2, - minNumber3DLayers = 3, - d0_par1 = ( 0.3, 4.0 ), - dz_par1 = ( 0.3, 4.0 ), - d0_par2 = ( 0.3, 4.0 ), - dz_par2 = ( 0.3, 4.0 ) - ), - RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.highpurityMTS.clone( - name = 'pixelPairStep', - preFilterName = 'pixelPairStepTight', - chi2n_par = 0.4, - res_par = ( 0.003, 0.001 ), - minNumberLayers = 4, - maxNumberLostLayers = 1, - minNumber3DLayers = 3, - d0_par1 = ( 0.2, 4.0 ), - dz_par1 = ( 0.25, 4.0 ), - d0_par2 = ( 0.25, 4.0 ), - dz_par2 = ( 0.25, 4.0 ) - ), - ] #end of vpset -) #end of clone - trackingPhase2PU140.toModify(pixelPairStepSelector, useAnyMVA = None, GBRForestLabel = None, @@ -341,8 +275,7 @@ pixelPairStepTrackCandidates* pixelPairStepTracks* pixelPairStep) -_PixelPairStep_LowPU_Phase1PU70 = PixelPairStep.copy() -_PixelPairStep_LowPU_Phase1PU70.replace(pixelPairStep, pixelPairStepSelector) -trackingLowPU.toReplaceWith(PixelPairStep, _PixelPairStep_LowPU_Phase1PU70) -trackingPhase1PU70.toReplaceWith(PixelPairStep, _PixelPairStep_LowPU_Phase1PU70) -trackingPhase2PU140.toReplaceWith(PixelPairStep, _PixelPairStep_LowPU_Phase1PU70) +_PixelPairStep_LowPU_Phase2PU140 = PixelPairStep.copy() +_PixelPairStep_LowPU_Phase2PU140.replace(pixelPairStep, pixelPairStepSelector) +trackingLowPU.toReplaceWith(PixelPairStep, _PixelPairStep_LowPU_Phase2PU140) +trackingPhase2PU140.toReplaceWith(PixelPairStep, _PixelPairStep_LowPU_Phase2PU140) diff --git a/RecoTracker/IterativeTracking/python/TobTecStep_cff.py b/RecoTracker/IterativeTracking/python/TobTecStep_cff.py index cacdd66df4c77..f47737bbfd033 100644 --- a/RecoTracker/IterativeTracking/python/TobTecStep_cff.py +++ b/RecoTracker/IterativeTracking/python/TobTecStep_cff.py @@ -142,25 +142,6 @@ trackingLowPU.toReplaceWith(tobTecStepSeeds, _seedCreatorFromRegionConsecutiveHitsEDProducer.clone( seedingHitSets = "tobTecStepHitDoubletsPair", )) -# Phase1PU70 -from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 -trackingPhase1PU70.toModify(tobTecStepTrackingRegionsPair, RegionPSet = dict( - ptMin = 1.0, - originHalfLength = 15.0, - originRadius = 2.0 -)) -trackingPhase1PU70.toModify(tobTecStepHitDoubletsPair, seedingLayers = 'tobTecStepSeedLayers') -trackingPhase1PU70.toReplaceWith(tobTecStepSeeds, tobTecStepSeedsPair.clone( - OriginTransverseErrorMultiplier = 3.0, - SeedComparitorPSet = cms.PSet(# FIXME: is this defined in any cfi that could be imported instead of copy-paste? - ComponentName = cms.string('PixelClusterShapeSeedComparitor'), - FilterAtHelixStage = cms.bool(True), - FilterPixelHits = cms.bool(False), - FilterStripHits = cms.bool(True), - ClusterShapeHitFilterName = cms.string('ClusterShapeHitFilter'), - ClusterShapeCacheSrc = cms.InputTag("siPixelClusterShapeCache") # not really needed here since FilterPixelHits=False - ), -)) # QUALITY CUTS DURING TRACK BUILDING (for inwardss and outwards track building steps) @@ -177,9 +158,6 @@ trackingLowPU.toReplaceWith(tobTecStepTrajectoryFilter, _tobTecStepTrajectoryFilterBase.clone( minimumNumberOfHits = 6, )) -trackingPhase1PU70.toReplaceWith(tobTecStepTrajectoryFilter, _tobTecStepTrajectoryFilterBase.clone( - minimumNumberOfHits = 6, -)) tobTecStepInOutTrajectoryFilter = tobTecStepTrajectoryFilter.clone( minimumNumberOfHits = 4, @@ -196,10 +174,6 @@ trackingLowPU.toModify(tobTecStepChi2Est, clusterChargeCut = dict(refToPSet_ = 'SiStripClusterChargeCutTiny') ) -trackingPhase1PU70.toModify(tobTecStepChi2Est, - MaxChi2 = 9.0, - clusterChargeCut = dict(refToPSet_ = 'SiStripClusterChargeCutNone'), -) # TRACK BUILDING import RecoTracker.CkfPattern.GroupedCkfTrajectoryBuilder_cfi @@ -250,7 +224,6 @@ ) tobTecStepTrackCandidates.TrajectoryCleaner = 'tobTecStepTrajectoryCleanerBySharedHits' trackingLowPU.toModify(tobTecStepTrajectoryCleanerBySharedHits, fractionShared = 0.19) -trackingPhase1PU70.toModify(tobTecStepTrajectoryCleanerBySharedHits, fractionShared = 0.08) # TRACK FITTING AND SMOOTHING OPTIONS import TrackingTools.TrackFitters.RungeKuttaFitters_cff @@ -262,7 +235,6 @@ Smoother = cms.string('tobTecStepRKSmoother') ) trackingLowPU.toModify(tobTecStepFitterSmoother, MinNumberOfHits = 8) -trackingPhase1PU70.toModify(tobTecStepFitterSmoother, MinNumberOfHits = 8) tobTecStepFitterSmootherForLoopers = tobTecStepFitterSmoother.clone( ComponentName = 'tobTecStepFitterSmootherForLoopers', @@ -276,7 +248,6 @@ minHits = 7 ) trackingLowPU.toModify(tobTecStepRKTrajectoryFitter, minHits = 8) -trackingPhase1PU70.toModify(tobTecStepRKTrajectoryFitter, minHits = 8) tobTecStepRKTrajectoryFitterForLoopers = tobTecStepRKTrajectoryFitter.clone( ComponentName = cms.string('tobTecStepRKFitterForLoopers'), @@ -289,7 +260,6 @@ minHits = 7 ) trackingLowPU.toModify(tobTecStepRKTrajectorySmoother, minHits = 8) -trackingPhase1PU70.toModify(tobTecStepRKTrajectorySmoother, minHits = 8) tobTecStepRKTrajectorySmootherForLoopers = tobTecStepRKTrajectorySmoother.clone( ComponentName = cms.string('tobTecStepRKSmootherForLoopers'), @@ -409,21 +379,8 @@ -### Following are specific for LowPU and/or Phase1PU70, they're collected here to +### Following are specific for LowPU, they're collected here to ### not to interfere too much with the default configuration -# For Phase1PU70 -from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import trackClusterRemover as _trackClusterRemover -tobTecStepSeedClusters = _trackClusterRemover.clone( - maxChi2 = 9.0, - trajectories = "mixedTripletStepTracks", - pixelClusters = "siPixelClusters", - stripClusters = "siStripClusters", - oldClusterRemovalInfo = "mixedTripletStepClusters", - overrideTrkQuals = 'mixedTripletStep', - TrackQuality = 'highPurity', - minNumberOfLayersWithMeasBeforeFiltering = 0, -) - # SEEDING LAYERS tobTecStepSeedLayers = cms.EDProducer("SeedingLayersEDProducer", layerList = cms.vstring('TOB1+TOB2', @@ -449,63 +406,6 @@ maxRing = cms.int32(5) ) ) -trackingPhase1PU70.toModify(tobTecStepSeedLayers, - TOB = dict( - skipClusters = 'tobTecStepSeedClusters', - clusterChargeCut = dict(refToPSet_ = 'SiStripClusterChargeCutNone') - ), - TEC = dict( - skipClusters = 'tobTecStepSeedClusters', - clusterChargeCut = dict(refToPSet_ = 'SiStripClusterChargeCutNone') - ), -) - -import RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi -tobTecStepSelector = RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.multiTrackSelector.clone( - src = 'tobTecStepTracks', - trackSelectors = [ - RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone( - name = 'tobTecStepLoose', - chi2n_par = 0.25, - res_par = ( 0.003, 0.001 ), - minNumberLayers = 5, - maxNumberLostLayers = 0, - minNumber3DLayers = 2, - d0_par1 = ( 1.3, 4.0 ), - dz_par1 = ( 1.2, 4.0 ), - d0_par2 = ( 1.3, 4.0 ), - dz_par2 = ( 1.2, 4.0 ) - ), - RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.tightMTS.clone( - name = 'tobTecStepTight', - preFilterName = 'tobTecStepLoose', - chi2n_par = 0.2, - res_par = ( 0.003, 0.001 ), - minNumberLayers = 5, - maxNumberLostLayers = 0, - minNumber3DLayers = 2, - max_minMissHitOutOrIn = 1, - d0_par1 = ( 1.1, 4.0 ), - dz_par1 = ( 1.0, 4.0 ), - d0_par2 = ( 1.1, 4.0 ), - dz_par2 = ( 1.0, 4.0 ) - ), - RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.highpurityMTS.clone( - name = 'tobTecStep', - preFilterName = 'tobTecStepTight', - chi2n_par = 0.15, - res_par = ( 0.003, 0.001 ), - minNumberLayers = 6, - maxNumberLostLayers = 0, - minNumber3DLayers = 2, - max_minMissHitOutOrIn = 0, - d0_par1 = ( 0.9, 4.0 ), - dz_par1 = ( 0.8, 4.0 ), - d0_par2 = ( 0.9, 4.0 ), - dz_par2 = ( 0.8, 4.0 ) - ), - ] #end of vpset -) #end of clone trackingLowPU.toReplaceWith(TobTecStep, cms.Sequence( tobTecStepClusters* @@ -517,14 +417,3 @@ tobTecStepTracks* tobTecStep )) -trackingPhase1PU70.toReplaceWith(TobTecStep, cms.Sequence( - tobTecStepClusters* - tobTecStepSeedClusters* - tobTecStepSeedLayers* - tobTecStepTrackingRegionsPair* - tobTecStepHitDoubletsPair* - tobTecStepSeeds* - tobTecStepTrackCandidates* - tobTecStepTracks* - tobTecStepSelector -)) diff --git a/RecoTracker/IterativeTracking/python/iterativeTkConfig.py b/RecoTracker/IterativeTracking/python/iterativeTkConfig.py index 1972cb9286d01..cf30130d26ef4 100644 --- a/RecoTracker/IterativeTracking/python/iterativeTkConfig.py +++ b/RecoTracker/IterativeTracking/python/iterativeTkConfig.py @@ -4,7 +4,7 @@ import FWCore.ParameterSet.Config as cms _defaultEraName = "" -_nonDefaultEraNames = ["trackingLowPU", "trackingPhase1", "trackingPhase1QuadProp", "trackingPhase1PU70", "trackingPhase2PU140"] +_nonDefaultEraNames = ["trackingLowPU", "trackingPhase1", "trackingPhase1QuadProp", "trackingPhase2PU140"] # name, postfix, era _defaultEra = (_defaultEraName, "", None) @@ -48,16 +48,6 @@ "JetCoreRegionalStep", ] _iterations_trackingPhase1QuadProp = _iterations_trackingPhase1 -_iterations_trackingPhase1PU70 = [ - "InitialStep", - "HighPtTripletStep", - "LowPtQuadStep", - "LowPtTripletStep", - "DetachedQuadStep", - "MixedTripletStep", - "PixelPairStep", - "TobTecStep", -] _iterations_trackingPhase2PU140 = [ "InitialStep", "HighPtTripletStep", @@ -84,7 +74,6 @@ } _multipleSeedProducers_trackingPhase1 = _multipleSeedProducers _multipleSeedProducers_trackingPhase1QuadProp = _multipleSeedProducers_trackingPhase1 -_multipleSeedProducers_trackingPhase1PU70 = _multipleSeedProducers_trackingLowPU _multipleSeedProducers_trackingPhase2PU140 = {} _oldStyleHasSelector = set([ "InitialStep", @@ -201,7 +190,7 @@ def clusterRemoverForIter(iteration, eraName="", postfix="", module=None): trajectories = _tracks(prevIter), oldClusterRemovalInfo = _clusterRemover(prevIter) if ind >= 2 else "", # 1st iteration does not have cluster remover ) - if eraName in ["trackingPhase1PU70", "trackingPhase2PU140"]: + if eraName in ["trackingPhase2PU140"]: customize["overrideTrkQuals"] = _classifier(prevIter, oldStyle=True) # old-style selector elif eraName == "trackingLowPU": customize["overrideTrkQuals"] = _classifier(prevIter, oldStyle=True, oldStyleQualityMasks=True) # old-style selector with 'QualityMasks' instance label diff --git a/RecoTracker/TkHitPairs/python/hitPairEDProducer_cfi.py b/RecoTracker/TkHitPairs/python/hitPairEDProducer_cfi.py index 181d7e19b4b7a..5203db118d93e 100644 --- a/RecoTracker/TkHitPairs/python/hitPairEDProducer_cfi.py +++ b/RecoTracker/TkHitPairs/python/hitPairEDProducer_cfi.py @@ -1,7 +1,5 @@ from RecoTracker.TkHitPairs.hitPairEDProducerDefault_cfi import hitPairEDProducerDefault as _hitPairEDProducerDefault hitPairEDProducer = _hitPairEDProducerDefault.clone() -from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 -trackingPhase1PU70.toModify(hitPairEDProducer, maxElement=0) trackingPhase2PU140.toModify(hitPairEDProducer, maxElement=0) diff --git a/RecoTracker/TkSeedGenerator/python/GlobalMixedSeeds_cff.py b/RecoTracker/TkSeedGenerator/python/GlobalMixedSeeds_cff.py index 3872c1ccba0d7..648c4e12acb4e 100644 --- a/RecoTracker/TkSeedGenerator/python/GlobalMixedSeeds_cff.py +++ b/RecoTracker/TkSeedGenerator/python/GlobalMixedSeeds_cff.py @@ -25,7 +25,3 @@ maxElement = cms.uint32(1000000) ) ) -from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 -trackingPhase1PU70.toModify(globalMixedSeeds, - OrderedHitsFactoryPSet = dict(maxElement = 0), -) diff --git a/RecoTracker/TkSeedGenerator/python/GlobalSeedsFromPairsWithVertices_cff.py b/RecoTracker/TkSeedGenerator/python/GlobalSeedsFromPairsWithVertices_cff.py index d1cae32e9c236..b4f19e223a378 100644 --- a/RecoTracker/TkSeedGenerator/python/GlobalSeedsFromPairsWithVertices_cff.py +++ b/RecoTracker/TkSeedGenerator/python/GlobalSeedsFromPairsWithVertices_cff.py @@ -25,8 +25,3 @@ ComponentName = cms.string('GlobalTrackingRegionWithVerticesProducer') ) ) -from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 -trackingPhase1PU70.toModify(globalSeedsFromPairsWithVertices, - OrderedHitsFactoryPSet = dict(maxElement = 0), -) - diff --git a/RecoTracker/TkSeedGenerator/python/GlobalSeedsFromTriplets_cff.py b/RecoTracker/TkSeedGenerator/python/GlobalSeedsFromTriplets_cff.py index ee09ba5c7988e..a296560a68238 100644 --- a/RecoTracker/TkSeedGenerator/python/GlobalSeedsFromTriplets_cff.py +++ b/RecoTracker/TkSeedGenerator/python/GlobalSeedsFromTriplets_cff.py @@ -24,7 +24,3 @@ # GeneratorPSet = cms.PSet(PixelTripletLargeTipGenerator) ) ) -from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 -trackingPhase1PU70.toModify(globalSeedsFromTriplets, - OrderedHitsFactoryPSet = dict(GeneratorPSet = dict(maxElement = 0)), -) diff --git a/RecoTracker/TkSeedGenerator/python/SeedFromConsecutiveHitsCreator_cfi.py b/RecoTracker/TkSeedGenerator/python/SeedFromConsecutiveHitsCreator_cfi.py index 570ee4cbd2444..cb7929425aa6e 100644 --- a/RecoTracker/TkSeedGenerator/python/SeedFromConsecutiveHitsCreator_cfi.py +++ b/RecoTracker/TkSeedGenerator/python/SeedFromConsecutiveHitsCreator_cfi.py @@ -12,8 +12,3 @@ TTRHBuilder = cms.string('WithTrackAngle'), forceKinematicWithRegionDirection = cms.bool(False) ) -from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 -trackingPhase1PU70.toModify(SeedFromConsecutiveHitsCreator, - magneticField = '', - propagator = 'PropagatorWithMaterial' -) diff --git a/RecoTracker/TkSeedGenerator/python/seedCreatorFromRegionConsecutiveHitsEDProducer_cff.py b/RecoTracker/TkSeedGenerator/python/seedCreatorFromRegionConsecutiveHitsEDProducer_cff.py index d99e306682358..fc3040802c338 100644 --- a/RecoTracker/TkSeedGenerator/python/seedCreatorFromRegionConsecutiveHitsEDProducer_cff.py +++ b/RecoTracker/TkSeedGenerator/python/seedCreatorFromRegionConsecutiveHitsEDProducer_cff.py @@ -1,10 +1,5 @@ from RecoTracker.TkSeedGenerator.seedCreatorFromRegionConsecutiveHitsEDProducer_cfi import * -from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 -trackingPhase1PU70.toModify(seedCreatorFromRegionConsecutiveHitsEDProducer, - magneticField = '', - propagator = 'PropagatorWithMaterial', -) trackingPhase2PU140.toModify(seedCreatorFromRegionConsecutiveHitsEDProducer, magneticField = '', propagator = 'PropagatorWithMaterial', diff --git a/RecoTracker/TkSeedGenerator/python/seedCreatorFromRegionConsecutiveHitsTripletOnlyEDProducer_cff.py b/RecoTracker/TkSeedGenerator/python/seedCreatorFromRegionConsecutiveHitsTripletOnlyEDProducer_cff.py index 71fd7b0c9000b..da73f968f7087 100644 --- a/RecoTracker/TkSeedGenerator/python/seedCreatorFromRegionConsecutiveHitsTripletOnlyEDProducer_cff.py +++ b/RecoTracker/TkSeedGenerator/python/seedCreatorFromRegionConsecutiveHitsTripletOnlyEDProducer_cff.py @@ -1,10 +1,5 @@ from RecoTracker.TkSeedGenerator.seedCreatorFromRegionConsecutiveHitsTripletOnlyEDProducer_cfi import * -from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 -trackingPhase1PU70.toModify(seedCreatorFromRegionConsecutiveHitsTripletOnlyEDProducer, - magneticField = '', - propagator = 'PropagatorWithMaterial', -) trackingPhase2PU140.toModify(seedCreatorFromRegionConsecutiveHitsTripletOnlyEDProducer, magneticField = '', propagator = 'PropagatorWithMaterial', diff --git a/RecoTracker/TkSeedingLayers/python/PixelLayerTriplets_cfi.py b/RecoTracker/TkSeedingLayers/python/PixelLayerTriplets_cfi.py index d9ee13caf4cc8..a804feea7e9c9 100644 --- a/RecoTracker/TkSeedingLayers/python/PixelLayerTriplets_cfi.py +++ b/RecoTracker/TkSeedingLayers/python/PixelLayerTriplets_cfi.py @@ -38,8 +38,6 @@ trackingPhase1.toModify(PixelLayerTriplets, layerList=_layersForPhase1) from Configuration.Eras.Modifier_trackingPhase1QuadProp_cff import trackingPhase1QuadProp trackingPhase1QuadProp.toModify(PixelLayerTriplets, layerList=_layersForPhase1) -from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 -trackingPhase1PU70.toModify(PixelLayerTriplets, layerList=_layersForPhase1) _layersForPhase2 = [ 'BPix1+BPix2+BPix3', 'BPix2+BPix3+BPix4', 'BPix2+BPix3+FPix1_pos', 'BPix2+BPix3+FPix1_neg', diff --git a/RecoTracker/TkTrackingRegions/python/globalTrackingRegionWithVertices_cff.py b/RecoTracker/TkTrackingRegions/python/globalTrackingRegionWithVertices_cff.py index e75611cb93d2c..d47970b740ed5 100644 --- a/RecoTracker/TkTrackingRegions/python/globalTrackingRegionWithVertices_cff.py +++ b/RecoTracker/TkTrackingRegions/python/globalTrackingRegionWithVertices_cff.py @@ -1,7 +1,5 @@ from RecoTracker.TkTrackingRegions.globalTrackingRegionWithVertices_cfi 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 trackingLowPU.toModify(globalTrackingRegionWithVertices, RegionPSet = dict(VertexCollection = "pixelVertices")) -trackingPhase1PU70.toModify(globalTrackingRegionWithVertices, RegionPSet = dict(VertexCollection = "pixelVertices")) trackingPhase2PU140.toModify(globalTrackingRegionWithVertices, RegionPSet = dict(VertexCollection = "pixelVertices")) diff --git a/Validation/RecoTrack/python/TrackValidation_cff.py b/Validation/RecoTrack/python/TrackValidation_cff.py index e7027274f0729..7b852302bfe47 100644 --- a/Validation/RecoTrack/python/TrackValidation_cff.py +++ b/Validation/RecoTrack/python/TrackValidation_cff.py @@ -26,7 +26,7 @@ for _eraName, _postfix, _era in _cfg.allEras(): _seedProd = ["initialStepSeedsPreSplitting"] _trackProd = ["initialStepTracksPreSplitting"] - if _eraName in ["trackingLowPU", "trackingPhase1PU70", "trackingPhase2PU140"]: # these don't have preSplitting + if _eraName in ["trackingLowPU", "trackingPhase2PU140"]: # these don't have preSplitting _seedProd = [] _trackProd = [] diff --git a/Validation/RecoTrack/python/plotting/trackingPlots.py b/Validation/RecoTrack/python/plotting/trackingPlots.py index a90abf78bd4ba..3167c32a9503e 100644 --- a/Validation/RecoTrack/python/plotting/trackingPlots.py +++ b/Validation/RecoTrack/python/plotting/trackingPlots.py @@ -457,29 +457,6 @@ def _makeMVAPlots(num, hp=False): "Tenth" : "iter10", } -def _trackingSubFoldersFallbackSLHC_Phase1PU70_OldMapping(subfolder): - ret = subfolder.replace("trackingParticleRecoAsssociation", "AssociatorByHitsRecoDenom") - for (old, new) in [("InitialStep", "Zero"), - ("LowPtTripletStep", "First"), - ("PixelPairStep", "Second"), - ("MixedTripletStep", "Fourth"), - ("MuonSeededStepInOut", "Ninth"), - ("MuonSeededStepOutIn", "Tenth")]: - - ret = ret.replace(old, new) - if ret == subfolder: - return None - return ret -def _trackingRefFileFallbackSLHC_Phase1PU70_OldMapping(path): - for (old, new) in [("initialStep", "iter0"), - ("lowPtTripletStep", "iter1"), - ("pixelPairStep", "iter2"), - ("mixedTripletStep", "iter4"), - ("muonSeededStepInOut", "iter9"), - ("muonSeededStepOutIn", "iter10")]: - path = path.replace(old, new) - return path - def _trackingSubFoldersFallbackSLHC_Phase1PU140(subfolder): ret = subfolder.replace("trackingParticleRecoAsssociation", "AssociatorByHitsRecoDenom") for (old, new) in [("InitialStep", "Zero"), @@ -1030,11 +1007,9 @@ def _appendTrackingPlots(lastDirName, name, algoPlots, onlyForPileup=False, only # to keep backward compatibility, this set of plots has empty name limiters = dict(onlyForPileup=onlyForPileup, onlyForElectron=onlyForElectron, onlyForConversion=onlyForConversion) commonForTPF = dict(purpose=PlotPurpose.TrackingIteration, fallbackRefFiles=[ - #_trackingRefFileFallbackSLHC_Phase1PU70_OldMapping _trackingRefFileFallbackSLHC_Phase1PU140 ], **limiters) common = dict(fallbackDqmSubFolders=[ - #_trackingSubFoldersFallbackSLHC_Phase1PU70_OldMapping, _trackingSubFoldersFallbackSLHC_Phase1PU140, _trackingSubFoldersFallbackFromPV, _trackingSubFoldersFallbackConversion]) plotter.append(name, folders, TrackingPlotFolder(*algoPlots, **commonForTPF), **common) diff --git a/Validation/RecoVertex/python/PrimaryVertexAnalyzer4PUSlimmed_cfi.py b/Validation/RecoVertex/python/PrimaryVertexAnalyzer4PUSlimmed_cfi.py index 6b16f74cd7c93..a8990cd6d154e 100644 --- a/Validation/RecoVertex/python/PrimaryVertexAnalyzer4PUSlimmed_cfi.py +++ b/Validation/RecoVertex/python/PrimaryVertexAnalyzer4PUSlimmed_cfi.py @@ -36,8 +36,6 @@ ) from Configuration.Eras.Modifier_trackingLowPU_cff import trackingLowPU trackingLowPU.toModify(vertexAnalysisTrackingOnly, vertexRecoCollections = vertexAnalysis.vertexRecoCollections.value()) -from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 -trackingPhase1PU70.toModify(vertexAnalysisTrackingOnly, vertexRecoCollections = vertexAnalysis.vertexRecoCollections.value()) from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 trackingPhase2PU140.toModify(vertexAnalysisTrackingOnly, vertexRecoCollections = vertexAnalysis.vertexRecoCollections.value()) @@ -81,5 +79,4 @@ + pixelVertexAnalysisTrackingOnly ) trackingLowPU.toReplaceWith(vertexAnalysisSequenceTrackingOnly, _vertexAnalysisSequenceTrackingOnly_trackingLowPU) -trackingPhase1PU70.toReplaceWith(vertexAnalysisSequenceTrackingOnly, _vertexAnalysisSequenceTrackingOnly_trackingLowPU) trackingPhase2PU140.toReplaceWith(vertexAnalysisSequenceTrackingOnly, _vertexAnalysisSequenceTrackingOnly_trackingLowPU)