From e2bfbcb5eb60bcb0bc3a69840847affca1117201 Mon Sep 17 00:00:00 2001
From: lgray <lindsey.gray@gmail.com>
Date: Mon, 7 Nov 2016 19:04:08 -0600
Subject: [PATCH] add new timing_layer modifier chain to factorize things

---
 Configuration/Eras/python/Era_Phase2C2_timing_layer_cff.py | 7 +++++++
 .../Eras/python/Modifier_phase2_timing_layer_cff.py        | 4 ++++
 Configuration/Geometry/scripts/dict2023Geometry.py         | 2 +-
 .../python/upgradeWorkflowComponents.py                    | 2 +-
 Configuration/StandardSequences/python/Eras.py             | 5 +++--
 SimGeneral/MixingModule/python/digitizers_cfi.py           | 3 ++-
 SimGeneral/MixingModule/python/mixObjects_cfi.py           | 4 ++--
 7 files changed, 20 insertions(+), 7 deletions(-)
 create mode 100644 Configuration/Eras/python/Era_Phase2C2_timing_layer_cff.py
 create mode 100644 Configuration/Eras/python/Modifier_phase2_timing_layer_cff.py

diff --git a/Configuration/Eras/python/Era_Phase2C2_timing_layer_cff.py b/Configuration/Eras/python/Era_Phase2C2_timing_layer_cff.py
new file mode 100644
index 0000000000000..ad11e124d51c7
--- /dev/null
+++ b/Configuration/Eras/python/Era_Phase2C2_timing_layer_cff.py
@@ -0,0 +1,7 @@
+import FWCore.ParameterSet.Config as cms
+
+from Configuration.Eras.Era_Phase2C2_timing_cff import Phase2C2_timing
+from Configuration.Eras.Modifier_phase2_timing_layer_cff import phase2_timing_layer
+
+Phase2C2_timing_layer = cms.ModifierChain(Phase2C2_timing, phase2_timing_layer)
+
diff --git a/Configuration/Eras/python/Modifier_phase2_timing_layer_cff.py b/Configuration/Eras/python/Modifier_phase2_timing_layer_cff.py
new file mode 100644
index 0000000000000..345b8f68bdab5
--- /dev/null
+++ b/Configuration/Eras/python/Modifier_phase2_timing_layer_cff.py
@@ -0,0 +1,4 @@
+import FWCore.ParameterSet.Config as cms
+
+phase2_timing_layer =  cms.Modifier()
+
diff --git a/Configuration/Geometry/scripts/dict2023Geometry.py b/Configuration/Geometry/scripts/dict2023Geometry.py
index 9c3c6b2967f25..8d1cf76b7e6dd 100644
--- a/Configuration/Geometry/scripts/dict2023Geometry.py
+++ b/Configuration/Geometry/scripts/dict2023Geometry.py
@@ -497,7 +497,7 @@
             'from Geometry.HGCalCommonData.fastTimeParametersInitialization_cfi import *',
             'from Geometry.HGCalCommonData.fastTimeNumberingInitialization_cfi import *',
         ],
-        "era" : "phase2_timing",
+        "era" : "phase2_timing, phase2_timing_layer",
     }
 }
 
diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
index 94c3d593b6f75..fca7e41cd4ec0 100644
--- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
+++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
@@ -117,7 +117,7 @@
         'Geom' : 'Extended2023D5',
         'HLTmenu': '@fake',
         'GT' : 'auto:phase2_realistic',
-        'Era' : 'Phase2C2_timing',
+        'Era' : 'Phase2C2_timing_layer',
         'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFull','RecoFullGlobal', 'HARVESTFullGlobal'],
     },
     '2023D6' : {
diff --git a/Configuration/StandardSequences/python/Eras.py b/Configuration/StandardSequences/python/Eras.py
index 837ab19a24a49..ae9d4d14b1a21 100644
--- a/Configuration/StandardSequences/python/Eras.py
+++ b/Configuration/StandardSequences/python/Eras.py
@@ -26,7 +26,8 @@ def __init__(self):
                  'Phase2C1',
                  'Phase2C2',
                  'Phase2C1_timing',
-                 'Phase2C2_timing']
+                 'Phase2C2_timing',
+                 'Phase2C2_timing_layer']
 
         internalUseMods = ['run2_common', 'run2_25ns_specific',
                            'run2_50ns_specific', 'run2_HI_specific',
@@ -38,7 +39,7 @@ def __init__(self):
                            'phase1Pixel', 'run3_GEM',
                            'phase2_common', 'phase2_tracker',
                            'phase2_hgcal', 'phase2_muon', 'phase2_timing',
-                           'phase2_hcal',
+                           'phase2_timing_layer','phase2_hcal',
                            'trackingLowPU', 'trackingPhase1', 'trackingPhase1PU70', 'ctpps_2016', 'trackingPhase2PU140',
                            'tracker_apv_vfp30_2016']
         internalUseModChains = ['run2_2017_core']
diff --git a/SimGeneral/MixingModule/python/digitizers_cfi.py b/SimGeneral/MixingModule/python/digitizers_cfi.py
index aa8654c2fbc9c..2ce850fdfea68 100644
--- a/SimGeneral/MixingModule/python/digitizers_cfi.py
+++ b/SimGeneral/MixingModule/python/digitizers_cfi.py
@@ -57,11 +57,12 @@
 
 from SimGeneral.MixingModule.ecalTimeDigitizer_cfi import ecalTimeDigitizer
 from Configuration.Eras.Modifier_phase2_timing_cff import phase2_timing
+from Configuration.Eras.Modifier_phase2_timing_layer_cff import phase2_timing_layer
 phase2_timing.toModify( theDigitizers,
                         ecalTime = ecalTimeDigitizer.clone() )
     
 from SimFastTiming.Configuration.SimFastTiming_cff import fastTimeDigitizer
-phase2_timing.toModify( theDigitizers,
+phase2_timing_layer.toModify( theDigitizers,
                         fastTimingLayer = fastTimeDigitizer.clone() )
 
 theDigitizersValid = cms.PSet(
diff --git a/SimGeneral/MixingModule/python/mixObjects_cfi.py b/SimGeneral/MixingModule/python/mixObjects_cfi.py
index 097df09d8c2aa..3836aae20b677 100644
--- a/SimGeneral/MixingModule/python/mixObjects_cfi.py
+++ b/SimGeneral/MixingModule/python/mixObjects_cfi.py
@@ -247,8 +247,8 @@
     )
 )
 
-from Configuration.Eras.Modifier_phase2_timing_cff import phase2_timing
-phase2_timing.toModify( theMixObjects,
+from Configuration.Eras.Modifier_phase2_timing_layer_cff import phase2_timing_layer
+phase2_timing_layer.toModify( theMixObjects,
     mixSH = dict(
         input = theMixObjects.mixSH.input + [ cms.InputTag("g4SimHits","FastTimerHitsBarrel"), cms.InputTag("g4SimHits","FastTimerHitsEndcap") ],
         subdets = theMixObjects.mixSH.subdets + [ 'FastTimerHitsBarrel','FastTimerHitsEndcap' ],