From ba2f4536076f9633eefe0c37cd445854dda883a8 Mon Sep 17 00:00:00 2001 From: mmusich Date: Mon, 9 Mar 2020 11:54:59 +0100 Subject: [PATCH 1/2] Revert "introduce run4_PixelCPEGeneric modifier and use it where appropriate" This reverts commit 406a9d2228c6333d96180432aa5403282be8a076. --- .../ProcessModifiers/python/run4_PixelCPEGeneric_cff.py | 5 ----- .../python/trackingRecoMaterialAnalyzer_cfi.py | 3 --- .../python/lowPtGsfElectronSeeds_cfi.py | 4 ---- .../SiPixelRecHits/python/PixelCPEClusterRepair_cfi.py | 5 ----- .../SiPixelRecHits/python/PixelCPEGeneric_cfi.py | 9 --------- .../SiPixelRecHits/python/PixelCPETemplateReco_cfi.py | 5 ----- .../python/MergeDisplacedTrackCollections_cff.py | 2 -- .../GlobalTrackingTools/python/GlobalMuonRefitter_cff.py | 3 --- .../python/GlobalTrajectoryBuilderCommon_cff.py | 6 ------ .../MuonIdentification/python/TrackerKinkFinder_cfi.py | 2 -- RecoMuon/TrackingTools/python/MuonTrackLoader_cff.py | 2 -- .../PFTracking/python/trackerDrivenElectronSeeds_cfi.py | 3 --- .../python/MergeTrackCollections_cff.py | 2 -- .../python/inOutSeedsFromTrackerMuons_cfi.py | 2 -- RecoTracker/TrackProducer/python/TrackProducer_cfi.py | 3 --- 15 files changed, 56 deletions(-) delete mode 100644 Configuration/ProcessModifiers/python/run4_PixelCPEGeneric_cff.py diff --git a/Configuration/ProcessModifiers/python/run4_PixelCPEGeneric_cff.py b/Configuration/ProcessModifiers/python/run4_PixelCPEGeneric_cff.py deleted file mode 100644 index d37b83062d024..0000000000000 --- a/Configuration/ProcessModifiers/python/run4_PixelCPEGeneric_cff.py +++ /dev/null @@ -1,5 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This modifier is to run the Pixel Generic CPE algorithm in Run 4 workflows - -run4_PixelCPEGeneric = cms.Modifier() diff --git a/DQM/TrackingMonitor/python/trackingRecoMaterialAnalyzer_cfi.py b/DQM/TrackingMonitor/python/trackingRecoMaterialAnalyzer_cfi.py index 22e803729f8f6..c5fdd6ba83b27 100644 --- a/DQM/TrackingMonitor/python/trackingRecoMaterialAnalyzer_cfi.py +++ b/DQM/TrackingMonitor/python/trackingRecoMaterialAnalyzer_cfi.py @@ -20,9 +20,6 @@ PropagatorOpposite = cms.string("RungeKuttaTrackerPropagatorOpposite") ) -from Configuration.ProcessModifiers.run4_PixelCPEGeneric_cff import run4_PixelCPEGeneric -run4_PixelCPEGeneric.toModify(materialDumperAnalyzer, TrackerRecHitBuilder='WithTrackAngle') - materialDumper = cms.Sequence(materialDumperAnalyzer) materialDumper_step = cms.Path(materialDumper) diff --git a/RecoEgamma/EgammaElectronProducers/python/lowPtGsfElectronSeeds_cfi.py b/RecoEgamma/EgammaElectronProducers/python/lowPtGsfElectronSeeds_cfi.py index 4f5bd7d39bcda..e2ebe3e89dbeb 100644 --- a/RecoEgamma/EgammaElectronProducers/python/lowPtGsfElectronSeeds_cfi.py +++ b/RecoEgamma/EgammaElectronProducers/python/lowPtGsfElectronSeeds_cfi.py @@ -43,10 +43,6 @@ def thresholds( wp ) : _fastSim_lowPtGsfElectronSeeds.PreGsfLabel = cms.string("") fastSim.toReplaceWith(lowPtGsfElectronSeeds,_fastSim_lowPtGsfElectronSeeds) -# Modifiers for phase2 -from Configuration.ProcessModifiers.run4_PixelCPEGeneric_cff import run4_PixelCPEGeneric -run4_PixelCPEGeneric.toModify(lowPtGsfElectronSeeds, TTRHBuilder = 'WithTrackAngle') - # Modifiers for BParking from Configuration.Eras.Modifier_bParking_cff import bParking bParking.toModify(lowPtGsfElectronSeeds, ModelThresholds = thresholds("VL") ) diff --git a/RecoLocalTracker/SiPixelRecHits/python/PixelCPEClusterRepair_cfi.py b/RecoLocalTracker/SiPixelRecHits/python/PixelCPEClusterRepair_cfi.py index ee602614b23da..f3f0697ca8a77 100644 --- a/RecoLocalTracker/SiPixelRecHits/python/PixelCPEClusterRepair_cfi.py +++ b/RecoLocalTracker/SiPixelRecHits/python/PixelCPEClusterRepair_cfi.py @@ -3,8 +3,3 @@ from RecoLocalTracker.SiPixelRecHits._templates2_default_cfi import _templates2_default templates2 = _templates2_default.clone() -from Configuration.ProcessModifiers.run4_PixelCPEGeneric_cff import run4_PixelCPEGeneric -run4_PixelCPEGeneric.toModify(templates2, - LoadTemplatesFromDB = False, - DoLorentz = False, - ) diff --git a/RecoLocalTracker/SiPixelRecHits/python/PixelCPEGeneric_cfi.py b/RecoLocalTracker/SiPixelRecHits/python/PixelCPEGeneric_cfi.py index 3bf76a01595dc..b9e7cef17f9e9 100644 --- a/RecoLocalTracker/SiPixelRecHits/python/PixelCPEGeneric_cfi.py +++ b/RecoLocalTracker/SiPixelRecHits/python/PixelCPEGeneric_cfi.py @@ -8,12 +8,3 @@ from Configuration.Eras.Modifier_run3_common_cff import run3_common run3_common.toModify(PixelCPEGenericESProducer, IrradiationBiasCorrection = True) -from Configuration.ProcessModifiers.run4_PixelCPEGeneric_cff import run4_PixelCPEGeneric -run4_PixelCPEGeneric.toModify(PixelCPEGenericESProducer, - UseErrorsFromTemplates = False, - LoadTemplatesFromDB = False, - TruncatePixelCharge = False, - IrradiationBiasCorrection = False, - DoCosmics = False, - Upgrade = cms.bool(True) -) diff --git a/RecoLocalTracker/SiPixelRecHits/python/PixelCPETemplateReco_cfi.py b/RecoLocalTracker/SiPixelRecHits/python/PixelCPETemplateReco_cfi.py index 6b278436cd560..3c74bbe3c75ff 100644 --- a/RecoLocalTracker/SiPixelRecHits/python/PixelCPETemplateReco_cfi.py +++ b/RecoLocalTracker/SiPixelRecHits/python/PixelCPETemplateReco_cfi.py @@ -3,8 +3,3 @@ from RecoLocalTracker.SiPixelRecHits._templates_default_cfi import _templates_default templates = _templates_default.clone() -from Configuration.ProcessModifiers.run4_PixelCPEGeneric_cff import run4_PixelCPEGeneric -run4_PixelCPEGeneric.toModify(templates, - LoadTemplatesFromDB = False, - DoLorentz = False, -) diff --git a/RecoMuon/Configuration/python/MergeDisplacedTrackCollections_cff.py b/RecoMuon/Configuration/python/MergeDisplacedTrackCollections_cff.py index 327124cb8af1c..89216e0cf3f49 100644 --- a/RecoMuon/Configuration/python/MergeDisplacedTrackCollections_cff.py +++ b/RecoMuon/Configuration/python/MergeDisplacedTrackCollections_cff.py @@ -55,5 +55,3 @@ ) displacedTracksSequence = cms.Sequence(displacedTracksTask) -from Configuration.ProcessModifiers.run4_PixelCPEGeneric_cff import run4_PixelCPEGeneric -run4_PixelCPEGeneric.toModify(duplicateDisplacedTrackCandidates, ttrhBuilderName = "WithTrackAngle") diff --git a/RecoMuon/GlobalTrackingTools/python/GlobalMuonRefitter_cff.py b/RecoMuon/GlobalTrackingTools/python/GlobalMuonRefitter_cff.py index df950b1c8c6d7..a4b3b58d0e3b9 100644 --- a/RecoMuon/GlobalTrackingTools/python/GlobalMuonRefitter_cff.py +++ b/RecoMuon/GlobalTrackingTools/python/GlobalMuonRefitter_cff.py @@ -53,9 +53,6 @@ RefitFlag = cms.bool( True ) ) -from Configuration.ProcessModifiers.run4_PixelCPEGeneric_cff import run4_PixelCPEGeneric -run4_PixelCPEGeneric.toModify(GlobalMuonRefitter, TrackerRecHitBuilder = 'WithTrackAngle') - from Configuration.Eras.Modifier_fastSim_cff import fastSim # FastSim doesn't use Runge Kute for propagation fastSim.toModify(GlobalMuonRefitter, Propagator = "SmartPropagatorAny") diff --git a/RecoMuon/GlobalTrackingTools/python/GlobalTrajectoryBuilderCommon_cff.py b/RecoMuon/GlobalTrackingTools/python/GlobalTrajectoryBuilderCommon_cff.py index 3b14c1d0e7320..ce28bf73694dc 100644 --- a/RecoMuon/GlobalTrackingTools/python/GlobalTrajectoryBuilderCommon_cff.py +++ b/RecoMuon/GlobalTrackingTools/python/GlobalTrajectoryBuilderCommon_cff.py @@ -79,9 +79,3 @@ ), ) -from Configuration.ProcessModifiers.run4_PixelCPEGeneric_cff import run4_PixelCPEGeneric -run4_PixelCPEGeneric.toModify(GlobalTrajectoryBuilderCommon, - TrackerRecHitBuilder = 'WithTrackAngle', - TrackTransformer = dict(TrackerRecHitBuilder = 'WithTrackAngle'), - GlbRefitterParameters = dict(TrackerRecHitBuilder = 'WithTrackAngle'), -) diff --git a/RecoMuon/MuonIdentification/python/TrackerKinkFinder_cfi.py b/RecoMuon/MuonIdentification/python/TrackerKinkFinder_cfi.py index d907bae024a9d..a0c86ac1d4cbf 100644 --- a/RecoMuon/MuonIdentification/python/TrackerKinkFinder_cfi.py +++ b/RecoMuon/MuonIdentification/python/TrackerKinkFinder_cfi.py @@ -19,5 +19,3 @@ ) ) -from Configuration.ProcessModifiers.run4_PixelCPEGeneric_cff import run4_PixelCPEGeneric -run4_PixelCPEGeneric.toModify(TrackerKinkFinderParametersBlock, TrackerKinkFinderParameters = dict(TrackerRecHitBuilder = 'WithTrackAngle')) diff --git a/RecoMuon/TrackingTools/python/MuonTrackLoader_cff.py b/RecoMuon/TrackingTools/python/MuonTrackLoader_cff.py index 1865e9ef55c14..592b6959f4f3b 100644 --- a/RecoMuon/TrackingTools/python/MuonTrackLoader_cff.py +++ b/RecoMuon/TrackingTools/python/MuonTrackLoader_cff.py @@ -88,5 +88,3 @@ ) ) -from Configuration.ProcessModifiers.run4_PixelCPEGeneric_cff import run4_PixelCPEGeneric -run4_PixelCPEGeneric.toModify(MuonTrackLoaderForGLB, TrackLoaderParameters = dict(TTRHBuilder = 'WithTrackAngle')) diff --git a/RecoParticleFlow/PFTracking/python/trackerDrivenElectronSeeds_cfi.py b/RecoParticleFlow/PFTracking/python/trackerDrivenElectronSeeds_cfi.py index fefeea15a898b..2bbe0f2c41b83 100644 --- a/RecoParticleFlow/PFTracking/python/trackerDrivenElectronSeeds_cfi.py +++ b/RecoParticleFlow/PFTracking/python/trackerDrivenElectronSeeds_cfi.py @@ -49,9 +49,6 @@ Min_dr = cms.double(0.2) ) -from Configuration.ProcessModifiers.run4_PixelCPEGeneric_cff import run4_PixelCPEGeneric -run4_PixelCPEGeneric.toModify(trackerDrivenElectronSeeds, TTRHBuilder = 'WithTrackAngle') - from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 for e in [pp_on_XeXe_2017, pp_on_AA_2018]: diff --git a/RecoTracker/FinalTrackSelectors/python/MergeTrackCollections_cff.py b/RecoTracker/FinalTrackSelectors/python/MergeTrackCollections_cff.py index e9efbc96bea3a..2de90d010cd38 100644 --- a/RecoTracker/FinalTrackSelectors/python/MergeTrackCollections_cff.py +++ b/RecoTracker/FinalTrackSelectors/python/MergeTrackCollections_cff.py @@ -31,8 +31,6 @@ duplicateTrackClassifier.mva.min3DLayers = [0,0,0] duplicateTrackClassifier.mva.maxLostLayers = [99,99,99] -from Configuration.ProcessModifiers.run4_PixelCPEGeneric_cff import run4_PixelCPEGeneric -run4_PixelCPEGeneric.toModify(duplicateTrackCandidates, ttrhBuilderName = "WithTrackAngle") generalTracks = DuplicateListMerger.clone() generalTracks.originalSource = cms.InputTag("preDuplicateMergingGeneralTracks") diff --git a/RecoTracker/SpecialSeedGenerators/python/inOutSeedsFromTrackerMuons_cfi.py b/RecoTracker/SpecialSeedGenerators/python/inOutSeedsFromTrackerMuons_cfi.py index c70e675b21962..a65b614d11764 100644 --- a/RecoTracker/SpecialSeedGenerators/python/inOutSeedsFromTrackerMuons_cfi.py +++ b/RecoTracker/SpecialSeedGenerators/python/inOutSeedsFromTrackerMuons_cfi.py @@ -22,5 +22,3 @@ Propagator = cms.string('SmartPropagatorAnyRKOpposite'), ) -from Configuration.ProcessModifiers.run4_PixelCPEGeneric_cff import run4_PixelCPEGeneric -run4_PixelCPEGeneric.toModify(inOutSeedsFromTrackerMuons, TrackerRecHitBuilder = 'WithTrackAngle') diff --git a/RecoTracker/TrackProducer/python/TrackProducer_cfi.py b/RecoTracker/TrackProducer/python/TrackProducer_cfi.py index 10f88c53c91c4..adb0d87786d3f 100644 --- a/RecoTracker/TrackProducer/python/TrackProducer_cfi.py +++ b/RecoTracker/TrackProducer/python/TrackProducer_cfi.py @@ -26,6 +26,3 @@ MeasurementTracker = cms.string(''), MeasurementTrackerEvent = cms.InputTag('MeasurementTrackerEvent'), ) - -from Configuration.ProcessModifiers.run4_PixelCPEGeneric_cff import run4_PixelCPEGeneric -run4_PixelCPEGeneric.toModify(TrackProducer, TTRHBuilder = 'WithTrackAngle') From 4f6575fc1de87982fcfe7b8fca1f7b6aaa184bd3 Mon Sep 17 00:00:00 2001 From: mmusich Date: Mon, 9 Mar 2020 13:10:21 +0100 Subject: [PATCH 2/2] introduce phase2_PixelCPEGeneric and use it only in the TTRHBuilder --- .../python/phase2_PixelCPEGeneric_cff.py | 4 ++++ .../python/upgradeWorkflowComponents.py | 2 +- .../SiPixelRecHits/python/PixelCPEGeneric_cfi.py | 11 +++++++++++ .../python/TTRHBuilderWithTemplate_cfi.py | 4 ++++ 4 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 Configuration/ProcessModifiers/python/phase2_PixelCPEGeneric_cff.py diff --git a/Configuration/ProcessModifiers/python/phase2_PixelCPEGeneric_cff.py b/Configuration/ProcessModifiers/python/phase2_PixelCPEGeneric_cff.py new file mode 100644 index 0000000000000..699fd95523c3e --- /dev/null +++ b/Configuration/ProcessModifiers/python/phase2_PixelCPEGeneric_cff.py @@ -0,0 +1,4 @@ +import FWCore.ParameterSet.Config as cms + +# This modifier is to run the Pixel Generic CPE algorithm in Phase-2 workflows +phase2_PixelCPEGeneric = cms.Modifier() diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index 854fd424798ec..d3e3d69a7600d 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -759,7 +759,7 @@ def workflow_(self, workflows, num, fragment, stepList): 'Geom' : 'Extended2026D54', 'HLTmenu': '@fake2', 'GT' : 'auto:phase2_realistic_T19', - 'ProcessModifier': 'run4_PixelCPEGeneric', + 'ProcessModifier': 'phase2_PixelCPEGeneric', 'Era' : 'Phase2C9', 'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'], }, diff --git a/RecoLocalTracker/SiPixelRecHits/python/PixelCPEGeneric_cfi.py b/RecoLocalTracker/SiPixelRecHits/python/PixelCPEGeneric_cfi.py index b9e7cef17f9e9..6a5f5f5a5991d 100644 --- a/RecoLocalTracker/SiPixelRecHits/python/PixelCPEGeneric_cfi.py +++ b/RecoLocalTracker/SiPixelRecHits/python/PixelCPEGeneric_cfi.py @@ -8,3 +8,14 @@ from Configuration.Eras.Modifier_run3_common_cff import run3_common run3_common.toModify(PixelCPEGenericESProducer, IrradiationBiasCorrection = True) +# customize the Pixel CPE generic producer in order not to use any +# template information +from Configuration.ProcessModifiers.phase2_PixelCPEGeneric_cff import phase2_PixelCPEGeneric +phase2_PixelCPEGeneric.toModify(PixelCPEGenericESProducer, + UseErrorsFromTemplates = False, # no GenErrors + LoadTemplatesFromDB = False, # do not load templates + TruncatePixelCharge = False, + IrradiationBiasCorrection = False, # set IBC off (needs GenErrors) + DoCosmics = False, + Upgrade = cms.bool(True) # use hard-coded CPE errors (for Upgrade) +) diff --git a/RecoTracker/TransientTrackingRecHit/python/TTRHBuilderWithTemplate_cfi.py b/RecoTracker/TransientTrackingRecHit/python/TTRHBuilderWithTemplate_cfi.py index bb8c745055f53..0a12477ddbf70 100644 --- a/RecoTracker/TransientTrackingRecHit/python/TTRHBuilderWithTemplate_cfi.py +++ b/RecoTracker/TransientTrackingRecHit/python/TTRHBuilderWithTemplate_cfi.py @@ -15,3 +15,7 @@ from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel phase1Pixel.toModify(TTRHBuilderAngleAndTemplate, PixelCPE = cms.string('PixelCPEClusterRepair')) +# uncomment these two lines to turn on Cluster Repair CPE +from Configuration.ProcessModifiers.phase2_PixelCPEGeneric_cff import phase2_PixelCPEGeneric +phase2_PixelCPEGeneric.toModify(TTRHBuilderAngleAndTemplate, PixelCPE = cms.string('PixelCPEGeneric')) +