Merge pull request #1 from mmusich/inclusionOf3DPixelsIntoCMSSW

Deal with lack of templates for 3D pixels
lecriste · Mar 9, 2020 · da2ff29 · da2ff29
2 parents 4b29757 + 4f6575f
commit da2ff29
Show file tree

Hide file tree

Showing 18 changed files with 17 additions and 54 deletions.
diff --git a/Configuration/ProcessModifiers/python/phase2_PixelCPEGeneric_cff.py 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/ProcessModifiers/python/run4_PixelCPEGeneric_cff.py b/Configuration/ProcessModifiers/python/run4_PixelCPEGeneric_cff.py
diff --git 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/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
@@ -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
@@ -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
@@ -8,12 +8,14 @@
 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,
+# 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,
+  IrradiationBiasCorrection = False, # set IBC off (needs GenErrors)
   DoCosmics = False,
-  Upgrade = cms.bool(True)
+  Upgrade = cms.bool(True)           # use hard-coded CPE errors (for Upgrade)
 )
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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')
diff --git 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'))
+
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,5 +19,3 @@ @@
         )
     )
-    from Configuration.ProcessModifiers.run4_PixelCPEGeneric_cff import run4_PixelCPEGeneric
-    run4_PixelCPEGeneric.toModify(TrackerKinkFinderParametersBlock, TrackerKinkFinderParameters = dict(TrackerRecHitBuilder = 'WithTrackAngle'))