Merge pull request #28387 from kpedro88/Phase2-WF51

Consolidate and simplify MTD modifiers
cms-sw · Nov 17, 2019 · 2d4a652 · 2d4a652
2 parents 955a7f5 + b6e659a
commit 2d4a652
Show file tree

Hide file tree

Showing 63 changed files with 140 additions and 292 deletions.
diff --git a/Configuration/Eras/python/Era_Phase2C10_timing_cff.py b/Configuration/Eras/python/Era_Phase2C10_timing_cff.py
diff --git a/Configuration/Eras/python/Era_Phase2C10_timing_layer_bar_cff.py b/Configuration/Eras/python/Era_Phase2C10_timing_layer_bar_cff.py
diff --git a/Configuration/Eras/python/Era_Phase2C4_timing_cff.py b/Configuration/Eras/python/Era_Phase2C4_timing_cff.py
diff --git a/Configuration/Eras/python/Era_Phase2C4_timing_layer_bar_cff.py b/Configuration/Eras/python/Era_Phase2C4_timing_layer_bar_cff.py
diff --git a/Configuration/Eras/python/Era_Phase2C6_timing_cff.py b/Configuration/Eras/python/Era_Phase2C6_timing_cff.py
diff --git a/Configuration/Eras/python/Era_Phase2C6_timing_layer_bar_cff.py b/Configuration/Eras/python/Era_Phase2C6_timing_layer_bar_cff.py
diff --git a/Configuration/Eras/python/Era_Phase2C8_timing_cff.py b/Configuration/Eras/python/Era_Phase2C8_timing_cff.py
diff --git a/Configuration/Eras/python/Era_Phase2C8_timing_layer_bar_cff.py b/Configuration/Eras/python/Era_Phase2C8_timing_layer_bar_cff.py
diff --git a/Configuration/Eras/python/Era_Phase2C9_timing_cff.py b/Configuration/Eras/python/Era_Phase2C9_timing_cff.py
diff --git a/Configuration/Eras/python/Era_Phase2C9_timing_layer_bar_cff.py b/Configuration/Eras/python/Era_Phase2C9_timing_layer_bar_cff.py
diff --git a/Configuration/Eras/python/Era_Phase2_cff.py b/Configuration/Eras/python/Era_Phase2_cff.py
@@ -11,6 +11,7 @@
 from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel
 from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1
 from Configuration.Eras.Modifier_hcalHardcodeConditions_cff import hcalHardcodeConditions
+from Configuration.Eras.Modifier_phase2_timing_cff import phase2_timing
+from Configuration.Eras.Modifier_phase2_timing_layer_cff import phase2_timing_layer
 
-
-Phase2 = cms.ModifierChain(Run3.copyAndExclude([phase1Pixel,trackingPhase1]), phase2_common, phase2_tracker, trackingPhase2PU140, phase2_ecal, phase2_hcal, phase2_hgcal, phase2_muon, hcalHardcodeConditions)
+Phase2 = cms.ModifierChain(Run3.copyAndExclude([phase1Pixel,trackingPhase1]), phase2_common, phase2_tracker, trackingPhase2PU140, phase2_ecal, phase2_hcal, phase2_hgcal, phase2_muon, hcalHardcodeConditions, phase2_timing, phase2_timing_layer)
diff --git a/Configuration/Eras/python/Era_Phase2_timing_cff.py b/Configuration/Eras/python/Era_Phase2_timing_cff.py
diff --git a/Configuration/Eras/python/Era_Phase2_timing_layer_bar_cff.py b/Configuration/Eras/python/Era_Phase2_timing_layer_bar_cff.py
diff --git a/Configuration/Eras/python/Era_Phase2_timing_layer_cff.py b/Configuration/Eras/python/Era_Phase2_timing_layer_cff.py
diff --git a/Configuration/Eras/python/Era_Phase2_timing_layer_tile_cff.py b/Configuration/Eras/python/Era_Phase2_timing_layer_tile_cff.py
diff --git a/Configuration/Eras/python/Modifier_phase2_timing_layer_bar_cff.py b/Configuration/Eras/python/Modifier_phase2_timing_layer_bar_cff.py
diff --git a/Configuration/Eras/python/Modifier_phase2_timing_layer_tile_cff.py b/Configuration/Eras/python/Modifier_phase2_timing_layer_tile_cff.py
diff --git a/Configuration/Geometry/python/dict2026Geometry.py b/Configuration/Geometry/python/dict2026Geometry.py
@@ -883,7 +883,7 @@
             'from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *',
             'mtdGeometry.applyAlignment = cms.bool(False)'
         ],
-        "era" : "phase2_timing, phase2_timing_layer_bar",
+        "era" : "phase2_timing, phase2_timing_layer",
     },
     "I7" : {
         1 : [
@@ -911,7 +911,7 @@
             'from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *',
             'mtdGeometry.applyAlignment = cms.bool(False)'
         ],
-        "era" : "phase2_timing, phase2_timing_layer_bar",
+        "era" : "phase2_timing, phase2_timing_layer",
     },
     "I9" : {
         1 : [
@@ -939,7 +939,7 @@
             'from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *',
             'mtdGeometry.applyAlignment = cms.bool(False)'
         ],
-        "era" : "phase2_timing, phase2_timing_layer_bar",
+        "era" : "phase2_timing, phase2_timing_layer",
     },
     "I10" : {
         1 : [
@@ -967,7 +967,7 @@
             'from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *',
             'mtdGeometry.applyAlignment = cms.bool(False)'
         ],
-        "era" : "phase2_timing, phase2_timing_layer_bar",
+        "era" : "phase2_timing, phase2_timing_layer",
     },
 }
 

diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
@@ -554,63 +554,63 @@ def condition(self, fragment, stepList, key, hasHarvest):
         'Geom' : 'Extended2026D35',
         'HLTmenu': '@fake2',
         'GT' : 'auto:phase2_realistic_T6',
-        'Era' : 'Phase2C4_timing_layer_bar',
+        'Era' : 'Phase2C4',
         'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
     },
     '2026D41' : {
         'Geom' : 'Extended2026D41',
         'HLTmenu': '@fake2',
         'GT' : 'auto:phase2_realistic_T14',
-        'Era' : 'Phase2C8_timing_layer_bar',
+        'Era' : 'Phase2C8',
         'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
     },
     '2026D43' : {
         'Geom' : 'Extended2026D43',
         'HLTmenu': '@fake2',
         'GT' : 'auto:phase2_realistic_T14',
-        'Era' : 'Phase2C4_timing_layer_bar',
+        'Era' : 'Phase2C4',
         'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
     },
     '2026D44' : {
         'Geom' : 'Extended2026D44',
         'HLTmenu': '@fake2',
         'GT' : 'auto:phase2_realistic_T14',
-        'Era' : 'Phase2C6_timing_layer_bar',
+        'Era' : 'Phase2C6',
         'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
     },
     '2026D45' : {
         'Geom' : 'Extended2026D45',
         'HLTmenu': '@fake2',
         'GT' : 'auto:phase2_realistic_T15',
-        'Era' : 'Phase2C8_timing_layer_bar',
+        'Era' : 'Phase2C8',
         'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
     },
     '2026D46' : {
         'Geom' : 'Extended2026D46',
         'HLTmenu': '@fake2',
         'GT' : 'auto:phase2_realistic_T15',
-        'Era' : 'Phase2C9_timing_layer_bar',
+        'Era' : 'Phase2C9',
         'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
     },
     '2026D47' : {
         'Geom' : 'Extended2026D47',
         'HLTmenu': '@fake2',
         'GT' : 'auto:phase2_realistic_T15',
-        'Era' : 'Phase2C10_timing_layer_bar',
+        'Era' : 'Phase2C10',
         'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
     },
     '2026D48' : {
         'Geom' : 'Extended2026D48',
         'HLTmenu': '@fake2',
         'GT' : 'auto:phase2_realistic_T15',
-        'Era' : 'Phase2C9_timing_layer_bar',
+        'Era' : 'Phase2C9',
         'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
     },
     '2026D49' : {
         'Geom' : 'Extended2026D49',
         'HLTmenu': '@fake2',
         'GT' : 'auto:phase2_realistic_T15',
-        'Era' : 'Phase2C9_timing_layer_bar',
+        'Era' : 'Phase2C9',
         'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
     },
 }

diff --git a/Configuration/StandardSequences/python/Eras.py b/Configuration/StandardSequences/python/Eras.py
@@ -33,25 +33,11 @@ def __init__(self):
                  'Run2_2018_highBetaStar',
                  'Run3',
                  'Phase2',
-                 'Phase2_timing',
-                 'Phase2_timing_layer',
-                 'Phase2_timing_layer_tile',
-                 'Phase2_timing_layer_bar',
                  'Phase2C4',
-                 'Phase2C4_timing',
-                 'Phase2C4_timing_layer_bar',
                  'Phase2C6',
-                 'Phase2C6_timing',
-                 'Phase2C6_timing_layer_bar',
                  'Phase2C8',
-                 'Phase2C8_timing',
-                 'Phase2C8_timing_layer_bar',
                  'Phase2C9',
-                 'Phase2C9_timing',
-                 'Phase2C9_timing_layer_bar',
                  'Phase2C10',
-                 'Phase2C10_timing',
-                 'Phase2C10_timing_layer_bar',
         ]
 
         internalUseMods = ['run2_common', 'run2_25ns_specific',
@@ -65,7 +51,7 @@ def __init__(self):
                            'run2_CSC_2018',
                            'phase2_common', 'phase2_tracker',
                            'phase2_hgcal', 'phase2_muon', 'phase2_timing', 'phase2_hgcalV9', 'phase2_hfnose', 'phase2_hgcalV10', 'phase2_hgcalV11',
-                           'phase2_timing_layer','phase2_timing_layer_tile','phase2_timing_layer_bar','phase2_hcal',
+                           'phase2_timing_layer', 'phase2_hcal',
                            'trackingLowPU', 'trackingPhase1', 'ctpps_2016', 'ctpps_2017', 'ctpps_2018', 'trackingPhase2PU140','highBetaStar_2018',
                            'tracker_apv_vfp30_2016', 'pf_badHcalMitigation', 'run2_miniAOD_80XLegacy','run2_miniAOD_94XFall17', 'run2_nanoAOD_92X',
                            'run2_nanoAOD_94XMiniAODv1', 'run2_nanoAOD_94XMiniAODv2', 'run2_nanoAOD_94X2016',

diff --git a/Configuration/StandardSequences/python/Reconstruction_cff.py b/Configuration/StandardSequences/python/Reconstruction_cff.py
@@ -122,9 +122,7 @@
 
 _phase2_timing_layer_globalreco_tracking = globalreco_tracking.copy()
 _phase2_timing_layer_globalreco_tracking += fastTimingGlobalReco
-from Configuration.Eras.Modifier_phase2_timing_layer_tile_cff import phase2_timing_layer_tile
-from Configuration.Eras.Modifier_phase2_timing_layer_bar_cff import phase2_timing_layer_bar
-(phase2_timing_layer_tile | phase2_timing_layer_bar).toReplaceWith(globalreco_tracking,_phase2_timing_layer_globalreco_tracking)
+phase2_timing_layer.toReplaceWith(globalreco_tracking,_phase2_timing_layer_globalreco_tracking)
 
 globalreco = cms.Sequence(globalreco_tracking*
                           particleFlowCluster*

diff --git a/Geometry/GEMGeometry/test/runGEMDetIdAnalysis_cfg.py b/Geometry/GEMGeometry/test/runGEMDetIdAnalysis_cfg.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('PROD',eras.Phase2C4_timing_layer_bar)
+process = cms.Process('PROD',eras.Phase2C4)
 process.load('FWCore.MessageService.MessageLogger_cfi')
 process.load('DataFormats.MuonDetId.gemDetIdAnalyzer_cfi')
 

diff --git a/Geometry/HGCalGeometry/test/python/testHGCalGeometryCheck_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalGeometryCheck_cfg.py
@@ -5,8 +5,8 @@
 #process.load('Configuration.Geometry.GeometryExtended2026D35_cff')
 #process.load('Configuration.Geometry.GeometryExtended2026D35Reco_cff')
 
-from Configuration.Eras.Era_Phase2C4_timing_layer_bar_cff import Phase2C4_timing_layer_bar
-process = cms.Process('PROD',Phase2C4_timing_layer_bar)
+from Configuration.Eras.Era_Phase2C4_cff import Phase2C4
+process = cms.Process('PROD',Phase2C4)
 process.load('Configuration.Geometry.GeometryExtended2026D41_cff')
 process.load('Configuration.Geometry.GeometryExtended2026D41Reco_cff')
 

diff --git a/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV10Imp2_cfg.py b/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV10Imp2_cfg.py
@@ -2,7 +2,7 @@
 
 from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('DIGI',eras.Phase2C8_timing_layer_bar)
+process = cms.Process('DIGI',eras.Phase2C8)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')

diff --git a/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV10_cfg.py b/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV10_cfg.py
@@ -2,7 +2,7 @@
 
 from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('DIGI',eras.Phase2C8_timing_layer_bar)
+process = cms.Process('DIGI',eras.Phase2C8)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')

diff --git a/RecoLocalFastTime/Configuration/python/RecoLocalFastTime_cff.py b/RecoLocalFastTime/Configuration/python/RecoLocalFastTime_cff.py
@@ -16,12 +16,10 @@
 
 _phase2_timing_layer_fastTimingLocalReco = cms.Sequence(mtdUncalibratedRecHits*mtdRecHits*mtdClusters*mtdTrackingRecHits)
 
-from Configuration.Eras.Modifier_phase2_timing_layer_tile_cff import phase2_timing_layer_tile
-from Configuration.Eras.Modifier_phase2_timing_layer_bar_cff import phase2_timing_layer_bar
+from Configuration.Eras.Modifier_phase2_timing_layer_cff import phase2_timing_layer
 
-(phase2_timing_layer_bar | phase2_timing_layer_tile).toReplaceWith(fastTimingLocalReco, 
-                                                                   _phase2_timing_layer_fastTimingLocalReco)
+phase2_timing_layer.toReplaceWith(fastTimingLocalReco, _phase2_timing_layer_fastTimingLocalReco)
 
-(phase2_timing_layer_tile | phase2_timing_layer_bar).toModify(mtdRecHits, 
-                                                              barrelUncalibratedRecHits = 'mtdUncalibratedRecHits:FTLBarrel', 
-                                                              endcapUncalibratedRecHits = 'mtdUncalibratedRecHits:FTLEndcap')
+phase2_timing_layer.toModify(mtdRecHits, 
+                              barrelUncalibratedRecHits = 'mtdUncalibratedRecHits:FTLBarrel', 
+                              endcapUncalibratedRecHits = 'mtdUncalibratedRecHits:FTLEndcap')
diff --git a/RecoParticleFlow/PFProducer/python/particleFlowBlock_cfi.py b/RecoParticleFlow/PFProducer/python/particleFlowBlock_cfi.py
@@ -196,8 +196,7 @@ def _findIndicesByModule(name):
                              ) 
                    )
 
-from Configuration.Eras.Modifier_phase2_timing_layer_tile_cff import phase2_timing_layer_tile
-from Configuration.Eras.Modifier_phase2_timing_layer_bar_cff import phase2_timing_layer_bar
+from Configuration.Eras.Modifier_phase2_timing_layer_cff import phase2_timing_layer
 _addTimingLayer = particleFlowBlock.elementImporters.copy()
 _addTimingLayer.append( cms.PSet( importerName = cms.string("TrackTimingImporter"),
                              timeValueMap = cms.InputTag("tofPID:t0"),
@@ -215,7 +214,7 @@ def _findIndicesByModule(name):
     elementImporters = _addTiming
 )
 
-(phase2_timing_layer_tile | phase2_timing_layer_bar).toModify(
+phase2_timing_layer.toModify(
     particleFlowBlock,
     elementImporters = _addTimingLayer
 )

diff --git a/RecoParticleFlow/PFProducer/python/simPFProducer_cfi.py b/RecoParticleFlow/PFProducer/python/simPFProducer_cfi.py
@@ -25,9 +25,8 @@
     gsfTrackTimeErrorMap = cms.InputTag("gsfTrackTimeValueMapProducer:electronGsfTracksConfigurableFlatResolutionModelResolution"),
 )
 
-from Configuration.Eras.Modifier_phase2_timing_layer_tile_cff import phase2_timing_layer_tile
-from Configuration.Eras.Modifier_phase2_timing_layer_bar_cff import phase2_timing_layer_bar
-(phase2_timing_layer_tile | phase2_timing_layer_bar).toModify(
+from Configuration.Eras.Modifier_phase2_timing_layer_cff import phase2_timing_layer
+phase2_timing_layer.toModify(
     simPFProducer,
     trackTimeValueMap = cms.InputTag("tofPID:t0"),
     trackTimeErrorMap = cms.InputTag("tofPID:sigmat0"),

diff --git a/RecoVertex/Configuration/python/RecoVertex_EventContent_cff.py b/RecoVertex/Configuration/python/RecoVertex_EventContent_cff.py
@@ -28,8 +28,7 @@
 )
 
 from Configuration.Eras.Modifier_phase2_timing_cff import phase2_timing
-from Configuration.Eras.Modifier_phase2_timing_layer_tile_cff import phase2_timing_layer_tile
-from Configuration.Eras.Modifier_phase2_timing_layer_bar_cff import phase2_timing_layer_bar
+from Configuration.Eras.Modifier_phase2_timing_layer_cff import phase2_timing_layer
 
 _phase2_tktiming_RecoVertexEventContent = [ 'keep *_offlinePrimaryVertices4D__*',
                                             'keep *_offlinePrimaryVertices4DWithBS__*',
@@ -51,7 +50,7 @@ def _phase2_tktiming_AddNewContent(mod):
 
 def _phase2_tktiming_layer_AddNewContent(mod):
     temp = mod.outputCommands + _phase2_tktiming_layer_RecoVertexEventContent
-    (phase2_timing_layer_tile | phase2_timing_layer_bar).toModify( mod, outputCommands = temp )
+    phase2_timing_layer.toModify( mod, outputCommands = temp )
 
 _phase2_tktiming_layer_AddNewContent(RecoVertexFEVT)
 _phase2_tktiming_layer_AddNewContent(RecoVertexRECO)