Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

drop type specifications in RecoTracker #32694

Merged
merged 4 commits into from
Jan 25, 2021
Merged

drop type specifications in RecoTracker #32694

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
082088f
recheck_drop type specs in RecoTracker
jeongeun Jan 20, 2021
5b779a7
drop type spec
jeongeun Jan 20, 2021
91d872b
minor fix
jeongeun Jan 20, 2021
7e02386
Update ConversionStep_cff.py
jeongeun Jan 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 17 additions & 19 deletions RecoTracker/Configuration/python/RecoTrackerTopBottom_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down Expand Up @@ -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'),
Expand Down
4 changes: 2 additions & 2 deletions RecoTracker/ConversionSeedGenerators/python/ConversionStep2_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,8 @@
)


photonConvTrajSeedFromQuadruplets.TrackRefitter = cms.InputTag('generalTracks')
photonConvTrajSeedFromQuadruplets.primaryVerticesTag = cms.InputTag('pixelVertices')
photonConvTrajSeedFromQuadruplets.TrackRefitter = 'generalTracks'
photonConvTrajSeedFromQuadruplets.primaryVerticesTag = 'pixelVertices'


# TRACKER DATA CONTROL
Expand Down
6 changes: 3 additions & 3 deletions RecoTracker/ConversionSeedGenerators/python/ConversionStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -244,8 +244,8 @@
)
)

photonConvTrajSeedFromSingleLeg.TrackRefitter = cms.InputTag('generalTracks')
photonConvTrajSeedFromSingleLeg.primaryVerticesTag = cms.InputTag('firstStepPrimaryVertices')
photonConvTrajSeedFromSingleLeg.TrackRefitter = 'generalTracks'
photonConvTrajSeedFromSingleLeg.primaryVerticesTag = 'firstStepPrimaryVertices'
#photonConvTrajSeedFromQuadruplets.TrackRefitter = cms.InputTag('generalTracks')
Copy link
Contributor

Choose a reason for hiding this comment

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

Since you are there, you can complete the job by updating also these two lines, even if commented out
Beside that, the PR is ready to go

#photonConvTrajSeedFromQuadruplets.primaryVerticesTag = cms.InputTag('pixelVertices')
from Configuration.Eras.Modifier_trackingLowPU_cff import trackingLowPU
Expand Down
36 changes: 18 additions & 18 deletions RecoTracker/DeDx/python/dedxEstimatorsFromRefitter_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
4 changes: 0 additions & 4 deletions RecoTracker/FinalTrackSelectors/python/preDuplicateMergingGeneralTracks_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions RecoTracker/IterativeTracking/python/InitialStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
15 changes: 8 additions & 7 deletions RecoTracker/IterativeTracking/python/LowPtForwardTripletStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 0 additions & 2 deletions RecoTracker/IterativeTracking/python/LowPtQuadStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions RecoTracker/IterativeTracking/python/PixelLessStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions RecoTracker/IterativeTracking/python/PixelPairStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
)
)

Expand Down
8 changes: 4 additions & 4 deletions RecoTracker/MeasurementDet/python/MeasurementTrackerEventProducer_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down