diff --git a/RecoTracker/Configuration/python/RecoTrackerTopBottom_cff.py b/RecoTracker/Configuration/python/RecoTrackerTopBottom_cff.py index d937f2c0f09f2..f0ffa9f85d812 100644 --- a/RecoTracker/Configuration/python/RecoTrackerTopBottom_cff.py +++ b/RecoTracker/Configuration/python/RecoTrackerTopBottom_cff.py @@ -81,13 +81,16 @@ SeedsFromNegativeY = False, ClusterCollectionLabel = 'siStripClustersTop', MaxNumberOfCosmicClusters = 150, + + OrderedHitsFactoryPSets = {0: dict(LayerSrc = "combinatorialcosmicseedingtripletsP5Top"), + 1: dict(LayerSrc = "combinatorialcosmicseedingpairsTOBP5Top"), + 2: dict(LayerSrc = "combinatorialcosmicseedingpairsTECposP5Top"), + 3: dict(LayerSrc = "combinatorialcosmicseedingpairsTECposP5Top"), + 4: dict(LayerSrc = "combinatorialcosmicseedingpairsTECnegP5Top"), + 5: dict(LayerSrc = "combinatorialcosmicseedingpairsTECnegP5Top") + } + ) -combinatorialcosmicseedfinderP5Top.OrderedHitsFactoryPSets[0].LayerSrc = "combinatorialcosmicseedingtripletsP5Top" -combinatorialcosmicseedfinderP5Top.OrderedHitsFactoryPSets[1].LayerSrc = "combinatorialcosmicseedingpairsTOBP5Top" -combinatorialcosmicseedfinderP5Top.OrderedHitsFactoryPSets[2].LayerSrc = "combinatorialcosmicseedingpairsTECposP5Top" -combinatorialcosmicseedfinderP5Top.OrderedHitsFactoryPSets[3].LayerSrc = "combinatorialcosmicseedingpairsTECposP5Top" -combinatorialcosmicseedfinderP5Top.OrderedHitsFactoryPSets[4].LayerSrc = "combinatorialcosmicseedingpairsTECnegP5Top" -combinatorialcosmicseedfinderP5Top.OrderedHitsFactoryPSets[5].LayerSrc = "combinatorialcosmicseedingpairsTECnegP5Top" simpleCosmicBONSeedingLayersTop = simpleCosmicBONSeedingLayers.clone( TIB = dict(matchedRecHits = 'siStripMatchedRecHitsTop:matchedRecHit'), @@ -179,20 +182,15 @@ SeedsFromPositiveY = False, SeedsFromNegativeY = True, ClusterCollectionLabel = 'siStripClustersBottom', - MaxNumberOfCosmicClusters = 150 + MaxNumberOfCosmicClusters = 150, + OrderedHitsFactoryPSets = {0: dict(PropagationDirection = 'oppositeToMomentum', LayerSrc = "combinatorialcosmicseedingtripletsP5Bottom"), + 1: dict(PropagationDirection = 'oppositeToMomentum', LayerSrc = "combinatorialcosmicseedingpairsTOBP5Bottom"), + 2: dict(PropagationDirection = 'oppositeToMomentum', LayerSrc = "combinatorialcosmicseedingpairsTECposP5Bottom"), + 3: dict(PropagationDirection = 'oppositeToMomentum', LayerSrc = "combinatorialcosmicseedingpairsTECposP5Bottom"), + 4: dict(PropagationDirection = 'oppositeToMomentum', LayerSrc = "combinatorialcosmicseedingpairsTECnegP5Bottom"), + 5: dict(PropagationDirection = 'oppositeToMomentum', LayerSrc = "combinatorialcosmicseedingpairsTECnegP5Bottom"), + } ) -combinatorialcosmicseedfinderP5Bottom.OrderedHitsFactoryPSets[0].PropagationDirection = 'oppositeToMomentum' -combinatorialcosmicseedfinderP5Bottom.OrderedHitsFactoryPSets[1].PropagationDirection = 'oppositeToMomentum' -combinatorialcosmicseedfinderP5Bottom.OrderedHitsFactoryPSets[2].PropagationDirection = 'oppositeToMomentum' -combinatorialcosmicseedfinderP5Bottom.OrderedHitsFactoryPSets[3].PropagationDirection = 'oppositeToMomentum' -combinatorialcosmicseedfinderP5Bottom.OrderedHitsFactoryPSets[4].PropagationDirection = 'oppositeToMomentum' -combinatorialcosmicseedfinderP5Bottom.OrderedHitsFactoryPSets[5].PropagationDirection = 'oppositeToMomentum' -combinatorialcosmicseedfinderP5Bottom.OrderedHitsFactoryPSets[0].LayerSrc = "combinatorialcosmicseedingtripletsP5Bottom" -combinatorialcosmicseedfinderP5Bottom.OrderedHitsFactoryPSets[1].LayerSrc = "combinatorialcosmicseedingpairsTOBP5Bottom" -combinatorialcosmicseedfinderP5Bottom.OrderedHitsFactoryPSets[2].LayerSrc = "combinatorialcosmicseedingpairsTECposP5Bottom" -combinatorialcosmicseedfinderP5Bottom.OrderedHitsFactoryPSets[3].LayerSrc = "combinatorialcosmicseedingpairsTECposP5Bottom" -combinatorialcosmicseedfinderP5Bottom.OrderedHitsFactoryPSets[4].LayerSrc = "combinatorialcosmicseedingpairsTECnegP5Bottom" -combinatorialcosmicseedfinderP5Bottom.OrderedHitsFactoryPSets[5].LayerSrc = "combinatorialcosmicseedingpairsTECnegP5Bottom" simpleCosmicBONSeedingLayersBottom = simpleCosmicBONSeedingLayers.clone( TIB = dict(matchedRecHits = 'siStripMatchedRecHitsBottom:matchedRecHit'), diff --git a/RecoTracker/ConversionSeedGenerators/python/ConversionStep2_cff.py b/RecoTracker/ConversionSeedGenerators/python/ConversionStep2_cff.py index b8a3fa27dc5fd..5028c95d83d39 100644 --- a/RecoTracker/ConversionSeedGenerators/python/ConversionStep2_cff.py +++ b/RecoTracker/ConversionSeedGenerators/python/ConversionStep2_cff.py @@ -188,8 +188,8 @@ ) -photonConvTrajSeedFromQuadruplets.TrackRefitter = cms.InputTag('generalTracks') -photonConvTrajSeedFromQuadruplets.primaryVerticesTag = cms.InputTag('pixelVertices') +photonConvTrajSeedFromQuadruplets.TrackRefitter = 'generalTracks' +photonConvTrajSeedFromQuadruplets.primaryVerticesTag = 'pixelVertices' # TRACKER DATA CONTROL diff --git a/RecoTracker/ConversionSeedGenerators/python/ConversionStep_cff.py b/RecoTracker/ConversionSeedGenerators/python/ConversionStep_cff.py index d07c6d1233926..33784db679d14 100644 --- a/RecoTracker/ConversionSeedGenerators/python/ConversionStep_cff.py +++ b/RecoTracker/ConversionSeedGenerators/python/ConversionStep_cff.py @@ -204,7 +204,7 @@ _convLayerPairsLayerListPhaseI.extend(_convLayerPairsStripOnlyLayers) from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1 -trackingPhase1.toModify(convLayerPairs, layerList = cms.vstring(_convLayerPairsLayerListPhaseI)) +trackingPhase1.toModify(convLayerPairs, layerList = _convLayerPairsLayerListPhaseI) trackingPhase2PU140.toReplaceWith(convLayerPairs, cms.EDProducer('SeedingLayersEDProducer', @@ -244,10 +244,10 @@ ) ) -photonConvTrajSeedFromSingleLeg.TrackRefitter = cms.InputTag('generalTracks') -photonConvTrajSeedFromSingleLeg.primaryVerticesTag = cms.InputTag('firstStepPrimaryVertices') -#photonConvTrajSeedFromQuadruplets.TrackRefitter = cms.InputTag('generalTracks') -#photonConvTrajSeedFromQuadruplets.primaryVerticesTag = cms.InputTag('pixelVertices') +photonConvTrajSeedFromSingleLeg.TrackRefitter = 'generalTracks' +photonConvTrajSeedFromSingleLeg.primaryVerticesTag = 'firstStepPrimaryVertices' +#photonConvTrajSeedFromQuadruplets.TrackRefitter = 'generalTracks' +#photonConvTrajSeedFromQuadruplets.primaryVerticesTag = 'pixelVertices' from Configuration.Eras.Modifier_trackingLowPU_cff import trackingLowPU trackingLowPU.toModify(photonConvTrajSeedFromSingleLeg, primaryVerticesTag = 'pixelVertices') from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA diff --git a/RecoTracker/DeDx/python/dedxEstimatorsFromRefitter_cff.py b/RecoTracker/DeDx/python/dedxEstimatorsFromRefitter_cff.py index e64a36f8a20d8..6f1e3b503cf99 100644 --- a/RecoTracker/DeDx/python/dedxEstimatorsFromRefitter_cff.py +++ b/RecoTracker/DeDx/python/dedxEstimatorsFromRefitter_cff.py @@ -8,32 +8,32 @@ from RecoTracker.DeDx.dedxEstimators_cff import * -dedxHitInfo.tracks=cms.InputTag("RefitterForDeDx") -dedxHitInfo.trajectoryTrackAssociation = cms.InputTag("RefitterForDeDx") +dedxHitInfo.tracks="RefitterForDeDx" +dedxHitInfo.trajectoryTrackAssociation = "RefitterForDeDx" -dedxHarmonic2.tracks=cms.InputTag("RefitterForDeDx") -dedxHarmonic2.trajectoryTrackAssociation = cms.InputTag("RefitterForDeDx") +dedxHarmonic2.tracks="RefitterForDeDx" +dedxHarmonic2.trajectoryTrackAssociation = "RefitterForDeDx" -dedxTruncated40.tracks=cms.InputTag("RefitterForDeDx") -dedxTruncated40.trajectoryTrackAssociation = cms.InputTag("RefitterForDeDx") +dedxTruncated40.tracks="RefitterForDeDx" +dedxTruncated40.trajectoryTrackAssociation = "RefitterForDeDx" -dedxMedian.tracks=cms.InputTag("RefitterForDeDx") -dedxMedian.trajectoryTrackAssociation = cms.InputTag("RefitterForDeDx") +dedxMedian.tracks="RefitterForDeDx" +dedxMedian.trajectoryTrackAssociation = "RefitterForDeDx" -dedxUnbinned.tracks=cms.InputTag("RefitterForDeDx") -dedxUnbinned.trajectoryTrackAssociation = cms.InputTag("RefitterForDeDx") +dedxUnbinned.tracks="RefitterForDeDx" +dedxUnbinned.trajectoryTrackAssociation = "RefitterForDeDx" -dedxDiscrimProd.tracks=cms.InputTag("RefitterForDeDx") -dedxDiscrimProd.trajectoryTrackAssociation = cms.InputTag("RefitterForDeDx") +dedxDiscrimProd.tracks="RefitterForDeDx" +dedxDiscrimProd.trajectoryTrackAssociation = "RefitterForDeDx" -dedxDiscrimBTag.tracks=cms.InputTag("RefitterForDeDx") -dedxDiscrimBTag.trajectoryTrackAssociation = cms.InputTag("RefitterForDeDx") +dedxDiscrimBTag.tracks="RefitterForDeDx" +dedxDiscrimBTag.trajectoryTrackAssociation = "RefitterForDeDx" -dedxDiscrimSmi.tracks=cms.InputTag("RefitterForDeDx") -dedxDiscrimSmi.trajectoryTrackAssociation = cms.InputTag("RefitterForDeDx") +dedxDiscrimSmi.tracks="RefitterForDeDx" +dedxDiscrimSmi.trajectoryTrackAssociation = "RefitterForDeDx" -dedxDiscrimASmi.tracks=cms.InputTag("RefitterForDeDx") -dedxDiscrimASmi.trajectoryTrackAssociation = cms.InputTag("RefitterForDeDx") +dedxDiscrimASmi.tracks="RefitterForDeDx" +dedxDiscrimASmi.trajectoryTrackAssociation = "RefitterForDeDx" doAlldEdXEstimatorsTask = cms.Task(RefitterForDeDx, dedxTruncated40, dedxHarmonic2, dedxHitInfo ) doAlldEdXEstimators = cms.Sequence(doAlldEdXEstimatorsTask) diff --git a/RecoTracker/FinalTrackSelectors/python/preDuplicateMergingGeneralTracks_cfi.py b/RecoTracker/FinalTrackSelectors/python/preDuplicateMergingGeneralTracks_cfi.py index cf441f13f99e6..78bf165ec907a 100644 --- a/RecoTracker/FinalTrackSelectors/python/preDuplicateMergingGeneralTracks_cfi.py +++ b/RecoTracker/FinalTrackSelectors/python/preDuplicateMergingGeneralTracks_cfi.py @@ -24,15 +24,11 @@ selectedTrackQuals = ["muonSeededTracksInOutSelector:muonSeededTracksInOutHighPurity", # not used but needed "muonSeededTracksInOutSelector:muonSeededTracksInOutHighPurity", "muonSeededTracksOutInSelector:muonSeededTracksOutInHighPurity"], -# mvaValueTags = ["earlyGeneralTracks:MVAVals", -# "muonSeededTracksInOutSelector:MVAVals", -# "muonSeededTracksOutInSelector:MVAVals"], mvaValueTags = cms.VInputTag( cms.InputTag("earlyGeneralTracks","MVAVals"), cms.InputTag("muonSeededTracksInOutSelector","MVAVals"), cms.InputTag("muonSeededTracksOutInSelector","MVAVals"), ), - #setsToMerge = dict(pQual = False, tLists = [0, 1, 2]), setsToMerge = cms.VPSet(cms.PSet(pQual = cms.bool(False), tLists = cms.vint32(0, 1, 2))), FoundHitBonus = 100.0, LostHitPenalty = 1.0, diff --git a/RecoTracker/IterativeTracking/python/InitialStep_cff.py b/RecoTracker/IterativeTracking/python/InitialStep_cff.py index c3296859b1a0e..e36252298f4e9 100644 --- a/RecoTracker/IterativeTracking/python/InitialStep_cff.py +++ b/RecoTracker/IterativeTracking/python/InitialStep_cff.py @@ -110,10 +110,10 @@ from FastSimulation.Tracking.SeedingMigration import _hitSetProducerToFactoryPSet _fastSim_initialStepSeeds = FastSimulation.Tracking.TrajectorySeedProducer_cfi.trajectorySeedProducer.clone( trackingRegions = 'initialStepTrackingRegions', - seedFinderSelector = dict( pixelTripletGeneratorFactory = _hitSetProducerToFactoryPSet(initialStepHitTriplets), - layerList = initialStepSeedLayers.layerList.value()) + seedFinderSelector = dict( pixelTripletGeneratorFactory = _hitSetProducerToFactoryPSet(initialStepHitTriplets).clone(SeedComparitorPSet = dict(ComponentName = 'none')), + layerList = initialStepSeedLayers.layerList.value() + ) ) -_fastSim_initialStepSeeds.seedFinderSelector.pixelTripletGeneratorFactory.SeedComparitorPSet.ComponentName = 'none' #new for phase1 trackingPhase1.toModify(_fastSim_initialStepSeeds, seedFinderSelector = dict( pixelTripletGeneratorFactory = None, diff --git a/RecoTracker/IterativeTracking/python/LowPtForwardTripletStep_cff.py b/RecoTracker/IterativeTracking/python/LowPtForwardTripletStep_cff.py index 20e13eb2a5390..067cb54f754b5 100644 --- a/RecoTracker/IterativeTracking/python/LowPtForwardTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/LowPtForwardTripletStep_cff.py @@ -27,20 +27,21 @@ from RecoTracker.TkTrackingRegions.GlobalTrackingRegionFromBeamSpot_cfi import RegionPsetFomBeamSpotBlock lowPtForwardTripletStepSeeds = RecoTracker.TkSeedGenerator.GlobalSeedsFromTriplets_cff.globalSeedsFromTriplets.clone( RegionFactoryPSet = RegionPsetFomBeamSpotBlock.clone( - ComponentName = 'GlobalRegionProducerFromBeamSpot', - RegionPSet = RegionPsetFomBeamSpotBlock.RegionPSet.clone( - ptMin = 0.2, - originRadius = 0.03, - nSigmaZ = 4.0) + ComponentName = 'GlobalRegionProducerFromBeamSpot', + RegionPSet = RegionPsetFomBeamSpotBlock.RegionPSet.clone( + ptMin = 0.2, + originRadius = 0.03, + nSigmaZ = 4.0) + ), + OrderedHitsFactoryPSet = dict( + SeedingLayers = 'lowPtForwardTripletStepSeedLayers' ) ) -lowPtForwardTripletStepSeeds.OrderedHitsFactoryPSet.SeedingLayers = 'lowPtForwardTripletStepSeedLayers' from RecoPixelVertexing.PixelLowPtUtilities.ClusterShapeHitFilterESProducer_cfi import * import RecoPixelVertexing.PixelLowPtUtilities.LowPtClusterShapeSeedComparitor_cfi lowPtForwardTripletStepSeeds.OrderedHitsFactoryPSet.GeneratorPSet.SeedComparitorPSet = RecoPixelVertexing.PixelLowPtUtilities.LowPtClusterShapeSeedComparitor_cfi.LowPtClusterShapeSeedComparitor - # QUALITY CUTS DURING TRACK BUILDING import TrackingTools.TrajectoryFiltering.TrajectoryFilter_cff lowPtForwardTripletStepTrajectoryFilter = TrackingTools.TrajectoryFiltering.TrajectoryFilter_cff.CkfBaseTrajectoryFilter_block.clone( diff --git a/RecoTracker/IterativeTracking/python/LowPtQuadStep_cff.py b/RecoTracker/IterativeTracking/python/LowPtQuadStep_cff.py index 6d1e137901549..806e68b098bcf 100644 --- a/RecoTracker/IterativeTracking/python/LowPtQuadStep_cff.py +++ b/RecoTracker/IterativeTracking/python/LowPtQuadStep_cff.py @@ -94,8 +94,6 @@ layerPairs = lowPtQuadStepHitDoublets.layerPairs.value() ) ) - -_fastSim_lowPtQuadStepSeeds.seedFinderSelector.CAHitQuadrupletGeneratorFactory.SeedComparitorPSet.ComponentName = 'none' fastSim.toReplaceWith(lowPtQuadStepSeeds,_fastSim_lowPtQuadStepSeeds) # QUALITY CUTS DURING TRACK BUILDING diff --git a/RecoTracker/IterativeTracking/python/PixelLessStep_cff.py b/RecoTracker/IterativeTracking/python/PixelLessStep_cff.py index 1d76dc3b1fe80..433abb1c77412 100644 --- a/RecoTracker/IterativeTracking/python/PixelLessStep_cff.py +++ b/RecoTracker/IterativeTracking/python/PixelLessStep_cff.py @@ -112,18 +112,18 @@ 'TID1_pos+TID2_pos', 'TID1_neg+TID2_neg' ], TOB = cms.PSet( - TTRHBuilder = cms.string('WithTrackAngle'), + TTRHBuilder = cms.string('WithTrackAngle'), clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone')), - vectorRecHits = cms.InputTag("siPhase2VectorHits", 'vectorHitsAccepted'), - skipClusters = cms.InputTag('pixelLessStepClusters') + vectorRecHits = cms.InputTag("siPhase2VectorHits", 'vectorHitsAccepted'), + skipClusters = cms.InputTag('pixelLessStepClusters') ), TIB = None, TID = dict( - clusterChargeCut = dict(refToPSet_ = cms.string('SiStripClusterChargeCutNone')), - vectorRecHits = cms.InputTag("siPhase2VectorHits", 'accepted'), - maxRing = cms.int32(8) + clusterChargeCut = dict(refToPSet_ = 'SiStripClusterChargeCutNone'), + vectorRecHits = cms.InputTag("siPhase2VectorHits", 'accepted'), + maxRing = 8 ), - TEC = None, + TEC = None, MTIB = None, MTID = None, MTEC = None, diff --git a/RecoTracker/IterativeTracking/python/PixelPairStep_cff.py b/RecoTracker/IterativeTracking/python/PixelPairStep_cff.py index e945486cbb2cc..a6e5dcc276d9a 100644 --- a/RecoTracker/IterativeTracking/python/PixelPairStep_cff.py +++ b/RecoTracker/IterativeTracking/python/PixelPairStep_cff.py @@ -53,14 +53,14 @@ BPix = dict( useErrorsFromParam = cms.bool(True), hitErrorRPhi = cms.double(0.0016), - hitErrorRZ = cms.double(0.0035), - TTRHBuilder = cms.string('TTRHBuilderWithoutAngle4PixelPairs'), + hitErrorRZ = cms.double(0.0035), + TTRHBuilder = 'TTRHBuilderWithoutAngle4PixelPairs', ), FPix = dict( useErrorsFromParam = cms.bool(True), hitErrorRPhi = cms.double(0.0030), - hitErrorRZ = cms.double(0.0020), - TTRHBuilder = cms.string('TTRHBuilderWithoutAngle4PixelPairs'), + hitErrorRZ = cms.double(0.0020), + TTRHBuilder = 'TTRHBuilderWithoutAngle4PixelPairs', ) ) diff --git a/RecoTracker/MeasurementDet/python/MeasurementTrackerEventProducer_cfi.py b/RecoTracker/MeasurementDet/python/MeasurementTrackerEventProducer_cfi.py index 2d4e807b21872..83a33b2313769 100644 --- a/RecoTracker/MeasurementDet/python/MeasurementTrackerEventProducer_cfi.py +++ b/RecoTracker/MeasurementDet/python/MeasurementTrackerEventProducer_cfi.py @@ -19,14 +19,14 @@ fastSim.toModify(MeasurementTrackerEvent, pixelClusterProducer = '', stripClusterProducer = '', - inactivePixelDetectorLabels = cms.VInputTag(), - inactiveStripDetectorLabels = cms.VInputTag(), + inactivePixelDetectorLabels = [], + inactiveStripDetectorLabels = [], switchOffPixelsIfEmpty = False ) from Configuration.ProcessModifiers.vectorHits_cff import vectorHits vectorHits.toModify(MeasurementTrackerEvent, - vectorHits = ("siPhase2VectorHits", "accepted"), - vectorHitsRej = ("siPhase2VectorHits", "rejected"), + vectorHits = "siPhase2VectorHits:accepted", + vectorHitsRej = "siPhase2VectorHits:rejected", ) MeasurementTrackerEventPreSplitting = MeasurementTrackerEvent.clone(