From 4d99df788fe8eeb363e1516c7a1a687c41f88563 Mon Sep 17 00:00:00 2001 From: Matti Kortelainen Date: Sat, 19 Nov 2016 21:40:42 +0100 Subject: [PATCH] Switch phase1 back to generic CPE Done because with the final pixel geometry, template CPE has a (small) bias. Switching back to generic CPE until we have a fix. This commit essentially reverts ef463c1886234bd74b380adbc89ed75ea5b810ed. --- .../python/MergeDisplacedTrackCollections_cff.py | 4 ++++ .../GlobalTrackingTools/python/GlobalMuonRefitter_cff.py | 4 ++++ .../python/GlobalTrajectoryBuilderCommon_cff.py | 8 ++++++++ .../MuonIdentification/python/TrackerKinkFinder_cfi.py | 4 ++++ RecoMuon/TrackingTools/python/MuonTrackLoader_cff.py | 5 +++++ .../PFTracking/python/trackerDrivenElectronSeeds_cfi.py | 4 ++++ .../python/MergeTrackCollections_cff.py | 5 +++++ .../python/inOutSeedsFromTrackerMuons_cfi.py | 4 ++++ RecoTracker/TrackProducer/python/TrackProducer_cfi.py | 4 ++++ RecoTracker/TrackProducer/python/TrackRefitter_cfi.py | 4 +++- 10 files changed, 45 insertions(+), 1 deletion(-) diff --git a/RecoMuon/Configuration/python/MergeDisplacedTrackCollections_cff.py b/RecoMuon/Configuration/python/MergeDisplacedTrackCollections_cff.py index 44db9c8f03449..bfdbbbb56b420 100644 --- a/RecoMuon/Configuration/python/MergeDisplacedTrackCollections_cff.py +++ b/RecoMuon/Configuration/python/MergeDisplacedTrackCollections_cff.py @@ -47,6 +47,10 @@ displacedTracks ) +# Switch back to GenericCPE until bias in template CPE gets fixed +from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel +phase1Pixel.toModify(duplicateDisplacedTrackCandidates, ttrhBuilderName = "WithTrackAngle") # FIXME + # This customization will be removed once we get the templates for # phase2 pixel from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker diff --git a/RecoMuon/GlobalTrackingTools/python/GlobalMuonRefitter_cff.py b/RecoMuon/GlobalTrackingTools/python/GlobalMuonRefitter_cff.py index b71d73476df9f..58e69032638fa 100644 --- a/RecoMuon/GlobalTrackingTools/python/GlobalMuonRefitter_cff.py +++ b/RecoMuon/GlobalTrackingTools/python/GlobalMuonRefitter_cff.py @@ -45,6 +45,10 @@ RefitFlag = cms.bool( True ) ) +# Switch back to GenericCPE until bias in template CPE gets fixed +from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel +phase1Pixel.toModify(GlobalMuonRefitter, TrackerRecHitBuilder = 'WithTrackAngle') # FIXME + # This customization will be removed once we get the templates for # phase2 pixel from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker diff --git a/RecoMuon/GlobalTrackingTools/python/GlobalTrajectoryBuilderCommon_cff.py b/RecoMuon/GlobalTrackingTools/python/GlobalTrajectoryBuilderCommon_cff.py index be49cef0b514b..6621342e70ed2 100644 --- a/RecoMuon/GlobalTrackingTools/python/GlobalTrajectoryBuilderCommon_cff.py +++ b/RecoMuon/GlobalTrackingTools/python/GlobalTrajectoryBuilderCommon_cff.py @@ -69,6 +69,14 @@ ), ) +# Switch back to GenericCPE until bias in template CPE gets fixed +from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel +phase1Pixel.toModify(GlobalTrajectoryBuilderCommon, # FIXME + TrackerRecHitBuilder = 'WithTrackAngle', + TrackTransformer = dict(TrackerRecHitBuilder = 'WithTrackAngle'), + GlbRefitterParameters = dict(TrackerRecHitBuilder = 'WithTrackAngle'), +) + # This customization will be removed once we get the templates for # phase2 pixel from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker diff --git a/RecoMuon/MuonIdentification/python/TrackerKinkFinder_cfi.py b/RecoMuon/MuonIdentification/python/TrackerKinkFinder_cfi.py index 233ca21d4bd2a..a26dbb7fdd4a3 100644 --- a/RecoMuon/MuonIdentification/python/TrackerKinkFinder_cfi.py +++ b/RecoMuon/MuonIdentification/python/TrackerKinkFinder_cfi.py @@ -18,6 +18,10 @@ ) ) +# Switch back to GenericCPE until bias in template CPE gets fixed +from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel +phase1Pixel.toModify(TrackerKinkFinderParametersBlock, TrackerKinkFinderParameters = dict(TrackerRecHitBuilder = 'WithTrackAngle')) # FIXME + # This customization will be removed once we get the templates for # phase2 pixel from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker diff --git a/RecoMuon/TrackingTools/python/MuonTrackLoader_cff.py b/RecoMuon/TrackingTools/python/MuonTrackLoader_cff.py index 3820e20deeadc..f257b70cfa9e3 100644 --- a/RecoMuon/TrackingTools/python/MuonTrackLoader_cff.py +++ b/RecoMuon/TrackingTools/python/MuonTrackLoader_cff.py @@ -84,6 +84,11 @@ ) ) +# Switch back to GenericCPE until bias in template CPE gets fixed +from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel +for _loader in [MuonTrackLoaderForSTA, MuonTrackLoaderForGLB, MuonTrackLoaderForL2, MuonTrackLoaderForL3, MuonTrackLoaderForCosmic]: + phase1Pixel.toModify(_loader, TrackLoaderParameters = dict(TTRHBuilder = 'WithTrackAngle')) # FIXME + # This customization will be removed once we get the templates for # phase2 pixel from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker diff --git a/RecoParticleFlow/PFTracking/python/trackerDrivenElectronSeeds_cfi.py b/RecoParticleFlow/PFTracking/python/trackerDrivenElectronSeeds_cfi.py index 5b9a16eb63e66..9156b02fe94f1 100644 --- a/RecoParticleFlow/PFTracking/python/trackerDrivenElectronSeeds_cfi.py +++ b/RecoParticleFlow/PFTracking/python/trackerDrivenElectronSeeds_cfi.py @@ -49,6 +49,10 @@ Min_dr = cms.double(0.2) ) +# Switch back to GenericCPE until bias in template CPE gets fixed +from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel +phase1Pixel.toModify(trackerDrivenElectronSeeds, TTRHBuilder = 'WithTrackAngle') # FIXME + # This customization will be removed once we get the templates for # phase2 pixel from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker diff --git a/RecoTracker/FinalTrackSelectors/python/MergeTrackCollections_cff.py b/RecoTracker/FinalTrackSelectors/python/MergeTrackCollections_cff.py index 6f39d4172f062..c8ea5ae2b7f33 100644 --- a/RecoTracker/FinalTrackSelectors/python/MergeTrackCollections_cff.py +++ b/RecoTracker/FinalTrackSelectors/python/MergeTrackCollections_cff.py @@ -22,6 +22,11 @@ duplicateTrackClassifier.mva.minLayers = [0,0,0] duplicateTrackClassifier.mva.min3DLayers = [0,0,0] duplicateTrackClassifier.mva.maxLostLayers = [99,99,99] + +# Switch back to GenericCPE until bias in template CPE gets fixed +from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel +phase1Pixel.toModify(duplicateTrackCandidates, ttrhBuilderName = "WithTrackAngle") # FIXME + # This customization will be removed once we get the templates for # phase2 pixel from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker diff --git a/RecoTracker/SpecialSeedGenerators/python/inOutSeedsFromTrackerMuons_cfi.py b/RecoTracker/SpecialSeedGenerators/python/inOutSeedsFromTrackerMuons_cfi.py index 80fa55c211adf..7618f58ec5b61 100644 --- a/RecoTracker/SpecialSeedGenerators/python/inOutSeedsFromTrackerMuons_cfi.py +++ b/RecoTracker/SpecialSeedGenerators/python/inOutSeedsFromTrackerMuons_cfi.py @@ -21,6 +21,10 @@ Propagator = cms.string('SmartPropagatorAnyRKOpposite'), ) +# Switch back to GenericCPE until bias in template CPE gets fixed +from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel +phase1Pixel.toModify(inOutSeedsFromTrackerMuons, TrackerRecHitBuilder = 'WithTrackAngle') # FIXME + # This customization will be removed once we get the templates for # phase2 pixel from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker diff --git a/RecoTracker/TrackProducer/python/TrackProducer_cfi.py b/RecoTracker/TrackProducer/python/TrackProducer_cfi.py index 6cdb3fc0488cd..33d2fbc979c45 100644 --- a/RecoTracker/TrackProducer/python/TrackProducer_cfi.py +++ b/RecoTracker/TrackProducer/python/TrackProducer_cfi.py @@ -27,6 +27,10 @@ MeasurementTrackerEvent = cms.InputTag('MeasurementTrackerEvent'), ) +# Switch back to GenericCPE until bias in template CPE gets fixed +from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel +phase1Pixel.toModify(TrackProducer, TTRHBuilder = 'WithTrackAngle') # FIXME + # This customization will be removed once we get the templates for # phase2 pixel from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker diff --git a/RecoTracker/TrackProducer/python/TrackRefitter_cfi.py b/RecoTracker/TrackProducer/python/TrackRefitter_cfi.py index f958132ac289e..1ae093592ccdf 100644 --- a/RecoTracker/TrackProducer/python/TrackRefitter_cfi.py +++ b/RecoTracker/TrackProducer/python/TrackRefitter_cfi.py @@ -39,4 +39,6 @@ #NavigationSchool = cms.string('') ) - +# Switch back to GenericCPE until bias in template CPE gets fixed +from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel +phase1Pixel.toModify(TrackRefitter, TTRHBuilder = 'WithTrackAngle') # FIXME