Merge pull request #1 from mmusich/add_Era_Phase2C11I13T25M9

add Era Phase2C11I13T25M9 and use it where appropriate
forthommel · Mar 19, 2021 · b5e07d5 · b5e07d5
2 parents 15c94cd + f4843d6
commit b5e07d5
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 11 deletions.
diff --git a/Configuration/Eras/python/Era_Phase2C11I13T25M9_cff.py b/Configuration/Eras/python/Era_Phase2C11I13T25M9_cff.py
@@ -0,0 +1,7 @@
+import FWCore.ParameterSet.Config as cms
+
+from Configuration.Eras.Era_Phase2C11I13_cff import Phase2C11I13
+from Configuration.Eras.Modifier_phase2_3DPixels_cff import phase2_3DPixels
+from Configuration.Eras.Modifier_phase2_GE0_cff import phase2_GE0
+
+Phase2C11I13T25M9 = cms.ModifierChain(Phase2C11I13, phase2_3DPixels, phase2_GE0)
diff --git a/Configuration/Geometry/python/dict2026Geometry.py b/Configuration/Geometry/python/dict2026Geometry.py
@@ -325,7 +325,7 @@
             'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *',
             'trackerGeometry.applyAlignment = cms.bool(False)',
         ],
-        "era" : "phase2_tracker, trackingPhase2PU140",
+        "era" : "phase2_tracker, phase2_3DPixels, trackingPhase2PU140",
     },
     "T26" : {
         1 : [

diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
@@ -1288,14 +1288,14 @@ def condition(self, fragment, stepList, key, hasHarvest):
         'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'],
     },
     '2026D80' : {
-        'Geom' : 'Extended2026D80', # N.B.: Geometry with 3D pixels in the Inner Tracker.
+        'Geom' : 'Extended2026D80', # N.B.: Geometry with 3D pixels in the Inner Tracker L1.
         'HLTmenu': '@fake2',
         'GT' : 'auto:phase2_realistic_T25',
-        'Era' : 'Phase2C11I13M9', 
+        'Era' : 'Phase2C11I13T25M9', # customized for 3D pixels and Muon M9
         'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'],
     },
     '2026D81' : {
-        'Geom' : 'Extended2026D81', # N.B.: Geometry with 3D pixels and square 50x50 um2 pixels in the Inner Tracker.
+        'Geom' : 'Extended2026D81', # N.B.: Geometry with 3D pixels (TBPX,L1) and square 50x50 um2 pixels (TFPX+TEPX) in the Inner Tracker.
         'HLTmenu': '@fake2',
         'GT' : 'auto:phase2_realistic_T26',
         'Era' : 'Phase2C11I13T26M9', # customized for square pixels and Muon M9

diff --git a/Configuration/StandardSequences/python/Eras.py b/Configuration/StandardSequences/python/Eras.py
@@ -50,6 +50,7 @@ def __init__(self):
                  'Phase2C11I13M9',
                  'Phase2C11I13T22M9',
                  'Phase2C11I13T23M9',
+                 'Phase2C11I13T25M9',
                  'Phase2C11I13T26M9'
         ]
 

diff --git a/RecoLocalTracker/SiPixelRecHits/python/PixelCPEGeneric_cfi.py b/RecoLocalTracker/SiPixelRecHits/python/PixelCPEGeneric_cfi.py
@@ -23,16 +23,17 @@
 # customize the Pixel CPE generic producer for phase2 3D pixels
 # Will remove any usage of template / genError payloads from the reconstruction
 from Configuration.Eras.Modifier_phase2_3DPixels_cff import phase2_3DPixels
-(phase2_tracker & phase2_3DPixels).toModify(PixelCPEGenericESProducer,
-                                            UseErrorsFromTemplates = False,    # no GenErrors
-                                            LoadTemplatesFromDB = False,       # do not load templates
-                                            )
+from Configuration.ProcessModifiers.PixelCPEGeneric_cff import PixelCPEGeneric
+(phase2_tracker & (phase2_3DPixels & PixelCPEGeneric)).toModify(PixelCPEGenericESProducer,
+                                                                UseErrorsFromTemplates = False,    # no GenErrors
+                                                                LoadTemplatesFromDB = False,       # do not load templates
+                                                                )
 
 # customize the Pixel CPE generic producer for phase2 square pixels
 # Do use Template errors for square pixels even in the first tracking step
 # This is needed because hardcoded errors in https://github.com/cms-sw/cmssw/blob/master/RecoLocalTracker/SiPixelRecHits/src/PixelCPEGeneric.cc#L113
 # have been optimized for rectangular 25x100 pixels, and in the current generic reco setup we use hardcoded errors for the first tracking pass
 from Configuration.Eras.Modifier_phase2_squarePixels_cff import phase2_squarePixels
-(phase2_tracker & phase2_squarePixels).toModify(PixelCPEGenericESProducer,
-                                                NoTemplateErrorsWhenNoTrkAngles = False # use genErrors in the seeding step (when no track angles are available)
-                                                )
+(phase2_tracker & (phase2_squarePixels | phase2_3DPixels)).toModify(PixelCPEGenericESProducer,
+                                                                    NoTemplateErrorsWhenNoTrkAngles = False # use genErrors in the seeding step (when no track angles are available)
+                                                                    )