diff --git a/Configuration/Eras/python/Era_Phase2C10_timing_cff.py b/Configuration/Eras/python/Era_Phase2C10_timing_cff.py deleted file mode 100644 index a691de246605f..0000000000000 --- a/Configuration/Eras/python/Era_Phase2C10_timing_cff.py +++ /dev/null @@ -1,7 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from Configuration.Eras.Era_Phase2C10_cff import Phase2C10 -from Configuration.Eras.Modifier_phase2_timing_cff import phase2_timing - -Phase2C10_timing = cms.ModifierChain(Phase2C10, phase2_timing) - diff --git a/Configuration/Eras/python/Era_Phase2C10_timing_layer_bar_cff.py b/Configuration/Eras/python/Era_Phase2C10_timing_layer_bar_cff.py deleted file mode 100644 index ff6d32943ac59..0000000000000 --- a/Configuration/Eras/python/Era_Phase2C10_timing_layer_bar_cff.py +++ /dev/null @@ -1,8 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from Configuration.Eras.Era_Phase2C10_timing_cff import Phase2C10_timing -from Configuration.Eras.Modifier_phase2_timing_layer_cff import phase2_timing_layer -from Configuration.Eras.Modifier_phase2_timing_layer_bar_cff import phase2_timing_layer_bar - -Phase2C10_timing_layer_bar = cms.ModifierChain(Phase2C10_timing, phase2_timing_layer, phase2_timing_layer_bar) - diff --git a/Configuration/Eras/python/Era_Phase2C4_timing_cff.py b/Configuration/Eras/python/Era_Phase2C4_timing_cff.py deleted file mode 100644 index 6574a056798c7..0000000000000 --- a/Configuration/Eras/python/Era_Phase2C4_timing_cff.py +++ /dev/null @@ -1,7 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from Configuration.Eras.Era_Phase2C4_cff import Phase2C4 -from Configuration.Eras.Modifier_phase2_timing_cff import phase2_timing - -Phase2C4_timing = cms.ModifierChain(Phase2C4, phase2_timing) - diff --git a/Configuration/Eras/python/Era_Phase2C4_timing_layer_bar_cff.py b/Configuration/Eras/python/Era_Phase2C4_timing_layer_bar_cff.py deleted file mode 100644 index ba907565a95a7..0000000000000 --- a/Configuration/Eras/python/Era_Phase2C4_timing_layer_bar_cff.py +++ /dev/null @@ -1,8 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from Configuration.Eras.Era_Phase2C4_timing_cff import Phase2C4_timing -from Configuration.Eras.Modifier_phase2_timing_layer_cff import phase2_timing_layer -from Configuration.Eras.Modifier_phase2_timing_layer_bar_cff import phase2_timing_layer_bar - -Phase2C4_timing_layer_bar = cms.ModifierChain(Phase2C4_timing, phase2_timing_layer, phase2_timing_layer_bar) - diff --git a/Configuration/Eras/python/Era_Phase2C6_timing_cff.py b/Configuration/Eras/python/Era_Phase2C6_timing_cff.py deleted file mode 100644 index 2fb615ab2530c..0000000000000 --- a/Configuration/Eras/python/Era_Phase2C6_timing_cff.py +++ /dev/null @@ -1,7 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from Configuration.Eras.Era_Phase2C6_cff import Phase2C6 -from Configuration.Eras.Modifier_phase2_timing_cff import phase2_timing - -Phase2C6_timing = cms.ModifierChain(Phase2C6, phase2_timing) - diff --git a/Configuration/Eras/python/Era_Phase2C6_timing_layer_bar_cff.py b/Configuration/Eras/python/Era_Phase2C6_timing_layer_bar_cff.py deleted file mode 100644 index 87cd5389df344..0000000000000 --- a/Configuration/Eras/python/Era_Phase2C6_timing_layer_bar_cff.py +++ /dev/null @@ -1,8 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from Configuration.Eras.Era_Phase2C6_timing_cff import Phase2C6_timing -from Configuration.Eras.Modifier_phase2_timing_layer_cff import phase2_timing_layer -from Configuration.Eras.Modifier_phase2_timing_layer_bar_cff import phase2_timing_layer_bar - -Phase2C6_timing_layer_bar = cms.ModifierChain(Phase2C6_timing, phase2_timing_layer, phase2_timing_layer_bar) - diff --git a/Configuration/Eras/python/Era_Phase2C8_timing_cff.py b/Configuration/Eras/python/Era_Phase2C8_timing_cff.py deleted file mode 100644 index 1eae0f72d44c3..0000000000000 --- a/Configuration/Eras/python/Era_Phase2C8_timing_cff.py +++ /dev/null @@ -1,7 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from Configuration.Eras.Era_Phase2C8_cff import Phase2C8 -from Configuration.Eras.Modifier_phase2_timing_cff import phase2_timing - -Phase2C8_timing = cms.ModifierChain(Phase2C8, phase2_timing) - diff --git a/Configuration/Eras/python/Era_Phase2C8_timing_layer_bar_cff.py b/Configuration/Eras/python/Era_Phase2C8_timing_layer_bar_cff.py deleted file mode 100644 index d36c9c071bd1b..0000000000000 --- a/Configuration/Eras/python/Era_Phase2C8_timing_layer_bar_cff.py +++ /dev/null @@ -1,8 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from Configuration.Eras.Era_Phase2C8_timing_cff import Phase2C8_timing -from Configuration.Eras.Modifier_phase2_timing_layer_cff import phase2_timing_layer -from Configuration.Eras.Modifier_phase2_timing_layer_bar_cff import phase2_timing_layer_bar - -Phase2C8_timing_layer_bar = cms.ModifierChain(Phase2C8_timing, phase2_timing_layer, phase2_timing_layer_bar) - diff --git a/Configuration/Eras/python/Era_Phase2C9_timing_cff.py b/Configuration/Eras/python/Era_Phase2C9_timing_cff.py deleted file mode 100644 index e9a8fd9193ecf..0000000000000 --- a/Configuration/Eras/python/Era_Phase2C9_timing_cff.py +++ /dev/null @@ -1,7 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from Configuration.Eras.Era_Phase2C9_cff import Phase2C9 -from Configuration.Eras.Modifier_phase2_timing_cff import phase2_timing - -Phase2C9_timing = cms.ModifierChain(Phase2C9, phase2_timing) - diff --git a/Configuration/Eras/python/Era_Phase2C9_timing_layer_bar_cff.py b/Configuration/Eras/python/Era_Phase2C9_timing_layer_bar_cff.py deleted file mode 100644 index 0820c91fb24e9..0000000000000 --- a/Configuration/Eras/python/Era_Phase2C9_timing_layer_bar_cff.py +++ /dev/null @@ -1,8 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from Configuration.Eras.Era_Phase2C9_timing_cff import Phase2C9_timing -from Configuration.Eras.Modifier_phase2_timing_layer_cff import phase2_timing_layer -from Configuration.Eras.Modifier_phase2_timing_layer_bar_cff import phase2_timing_layer_bar - -Phase2C9_timing_layer_bar = cms.ModifierChain(Phase2C9_timing, phase2_timing_layer, phase2_timing_layer_bar) - diff --git a/Configuration/Eras/python/Era_Phase2_cff.py b/Configuration/Eras/python/Era_Phase2_cff.py index 6969b27acdcbe..2d68cd70839aa 100644 --- 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 deleted file mode 100644 index 97a66567ac204..0000000000000 --- a/Configuration/Eras/python/Era_Phase2_timing_cff.py +++ /dev/null @@ -1,7 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from Configuration.Eras.Era_Phase2_cff import Phase2 -from Configuration.Eras.Modifier_phase2_timing_cff import phase2_timing - -Phase2_timing = cms.ModifierChain(Phase2, phase2_timing) - diff --git a/Configuration/Eras/python/Era_Phase2_timing_layer_bar_cff.py b/Configuration/Eras/python/Era_Phase2_timing_layer_bar_cff.py deleted file mode 100644 index 5a51a21259715..0000000000000 --- a/Configuration/Eras/python/Era_Phase2_timing_layer_bar_cff.py +++ /dev/null @@ -1,8 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from Configuration.Eras.Era_Phase2_timing_cff import Phase2_timing -from Configuration.Eras.Modifier_phase2_timing_layer_cff import phase2_timing_layer -from Configuration.Eras.Modifier_phase2_timing_layer_bar_cff import phase2_timing_layer_bar - -Phase2_timing_layer_bar = cms.ModifierChain(Phase2_timing, phase2_timing_layer, phase2_timing_layer_bar) - diff --git a/Configuration/Eras/python/Era_Phase2_timing_layer_cff.py b/Configuration/Eras/python/Era_Phase2_timing_layer_cff.py deleted file mode 100644 index 9677c4212d973..0000000000000 --- a/Configuration/Eras/python/Era_Phase2_timing_layer_cff.py +++ /dev/null @@ -1,7 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from Configuration.Eras.Era_Phase2_timing_cff import Phase2_timing -from Configuration.Eras.Modifier_phase2_timing_layer_cff import phase2_timing_layer - -Phase2_timing_layer = cms.ModifierChain(Phase2_timing, phase2_timing_layer) - diff --git a/Configuration/Eras/python/Era_Phase2_timing_layer_tile_cff.py b/Configuration/Eras/python/Era_Phase2_timing_layer_tile_cff.py deleted file mode 100644 index 1529e54593366..0000000000000 --- a/Configuration/Eras/python/Era_Phase2_timing_layer_tile_cff.py +++ /dev/null @@ -1,8 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from Configuration.Eras.Era_Phase2_timing_cff import Phase2_timing -from Configuration.Eras.Modifier_phase2_timing_layer_cff import phase2_timing_layer -from Configuration.Eras.Modifier_phase2_timing_layer_tile_cff import phase2_timing_layer_tile - -Phase2_timing_layer_tile = cms.ModifierChain(Phase2_timing, phase2_timing_layer, phase2_timing_layer_tile) - diff --git a/Configuration/Eras/python/Modifier_phase2_timing_layer_bar_cff.py b/Configuration/Eras/python/Modifier_phase2_timing_layer_bar_cff.py deleted file mode 100644 index 556fce1a356da..0000000000000 --- a/Configuration/Eras/python/Modifier_phase2_timing_layer_bar_cff.py +++ /dev/null @@ -1,4 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -phase2_timing_layer_bar = cms.Modifier() - diff --git a/Configuration/Eras/python/Modifier_phase2_timing_layer_tile_cff.py b/Configuration/Eras/python/Modifier_phase2_timing_layer_tile_cff.py deleted file mode 100644 index 69e7f3072bf80..0000000000000 --- a/Configuration/Eras/python/Modifier_phase2_timing_layer_tile_cff.py +++ /dev/null @@ -1,4 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -phase2_timing_layer_tile = cms.Modifier() - diff --git a/Configuration/Geometry/python/dict2026Geometry.py b/Configuration/Geometry/python/dict2026Geometry.py index bb74fedd949db..a5d77ec4b854d 100644 --- 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 index 698ddf0dfc34a..1ba1874bad75c 100644 --- 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 index fc7f9bb803279..3e185236a5553 100644 --- 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 index 3ee4b5429591d..4b606b213d1cb 100644 --- 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 index 13f8fff004482..856cc3066f952 100644 --- 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 index 774b16d3c2be1..31f3b4abe189c 100644 --- 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 index f5d98ad1fee58..cc6a2dff9f3c2 100644 --- 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 index e7d6de858b30c..5569951433b88 100644 --- 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 index 15a587d3d01e7..9cb274a226778 100644 --- 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 index 24a3544448260..2fc05db4b7e2a 100644 --- 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 index f40fc66d9a6af..9065039167c9c 100644 --- 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 index fe2a4b5bff9ef..abdf7a934a1f3 100644 --- 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) diff --git a/RecoVertex/Configuration/python/RecoVertex_cff.py b/RecoVertex/Configuration/python/RecoVertex_cff.py index c354e6e798402..40bbdd525bd35 100644 --- a/RecoVertex/Configuration/python/RecoVertex_cff.py +++ b/RecoVertex/Configuration/python/RecoVertex_cff.py @@ -85,11 +85,10 @@ from Configuration.Eras.Modifier_phase2_timing_cff import phase2_timing phase2_timing.toReplaceWith(vertexrecoTask, _phase2_tktiming_vertexrecoTask) -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(vertexrecoTask, _phase2_tktiming_layer_vertexrecoTask) -(phase2_timing_layer_tile | phase2_timing_layer_bar).toReplaceWith(unsortedOfflinePrimaryVertices4D, unsortedOfflinePrimaryVertices4DwithPID.clone()) -(phase2_timing_layer_tile | phase2_timing_layer_bar).toReplaceWith(offlinePrimaryVertices4D, offlinePrimaryVertices4DwithPID.clone()) -(phase2_timing_layer_tile | phase2_timing_layer_bar).toReplaceWith(offlinePrimaryVertices4DWithBS, offlinePrimaryVertices4DwithPIDWithBS.clone()) -(phase2_timing_layer_tile | phase2_timing_layer_bar).toModify(offlinePrimaryVertices4D, vertices = "unsortedOfflinePrimaryVertices4D", particles = "trackRefsForJetsBeforeSorting4D") -(phase2_timing_layer_tile | phase2_timing_layer_bar).toModify(offlinePrimaryVertices4DWithBS, vertices = "unsortedOfflinePrimaryVertices4D:WithBS", particles = "trackRefsForJetsBeforeSorting4D") +from Configuration.Eras.Modifier_phase2_timing_layer_cff import phase2_timing_layer +phase2_timing_layer.toReplaceWith(vertexrecoTask, _phase2_tktiming_layer_vertexrecoTask) +phase2_timing_layer.toReplaceWith(unsortedOfflinePrimaryVertices4D, unsortedOfflinePrimaryVertices4DwithPID.clone()) +phase2_timing_layer.toReplaceWith(offlinePrimaryVertices4D, offlinePrimaryVertices4DwithPID.clone()) +phase2_timing_layer.toReplaceWith(offlinePrimaryVertices4DWithBS, offlinePrimaryVertices4DwithPIDWithBS.clone()) +phase2_timing_layer.toModify(offlinePrimaryVertices4D, vertices = "unsortedOfflinePrimaryVertices4D", particles = "trackRefsForJetsBeforeSorting4D") +phase2_timing_layer.toModify(offlinePrimaryVertices4DWithBS, vertices = "unsortedOfflinePrimaryVertices4D:WithBS", particles = "trackRefsForJetsBeforeSorting4D") diff --git a/SLHCUpgradeSimulations/Geometry/test/phase2_digi_reco_pixelntuple_cfg.py b/SLHCUpgradeSimulations/Geometry/test/phase2_digi_reco_pixelntuple_cfg.py index a2cf02032f66d..c28fcf922342b 100644 --- a/SLHCUpgradeSimulations/Geometry/test/phase2_digi_reco_pixelntuple_cfg.py +++ b/SLHCUpgradeSimulations/Geometry/test/phase2_digi_reco_pixelntuple_cfg.py @@ -6,8 +6,8 @@ import FWCore.ParameterSet.Config as cms -from Configuration.Eras.Era_Phase2C8_timing_layer_bar_cff import Phase2C8_timing_layer_bar -process = cms.Process('Phase2PixelNtuple',Phase2C8_timing_layer_bar) +from Configuration.Eras.Era_Phase2C8_cff import Phase2C8 +process = cms.Process('Phase2PixelNtuple',Phase2C8) # import of standard configurations process.load('Configuration.StandardSequences.Services_cff') diff --git a/SimFastTiming/Configuration/python/SimFastTiming_cff.py b/SimFastTiming/Configuration/python/SimFastTiming_cff.py index 835ad0e0c9012..c82fc33a8f3ec 100644 --- a/SimFastTiming/Configuration/python/SimFastTiming_cff.py +++ b/SimFastTiming/Configuration/python/SimFastTiming_cff.py @@ -3,7 +3,3 @@ from SimFastTiming.FastTimingCommon.fastTimeDigitizer_cfi import * from SimFastTiming.FastTimingCommon.mtdDigitizer_cfi import * -from SimFastTiming.FastTimingCommon.mtdDigitizer_cfi import _barrel_bar_MTDDigitizer - -from Configuration.Eras.Modifier_phase2_timing_layer_bar_cff import phase2_timing_layer_bar -phase2_timing_layer_bar.toModify(mtdDigitizer, barrelDigitizer = _barrel_bar_MTDDigitizer.clone()) diff --git a/SimFastTiming/FastTimingCommon/python/mtdDigitizer_cfi.py b/SimFastTiming/FastTimingCommon/python/mtdDigitizer_cfi.py index 24de0eae4a05f..92d51a5215226 100644 --- a/SimFastTiming/FastTimingCommon/python/mtdDigitizer_cfi.py +++ b/SimFastTiming/FastTimingCommon/python/mtdDigitizer_cfi.py @@ -108,7 +108,7 @@ makeDigiSimLinks = cms.bool(False), verbosity = cms.untracked.uint32(0), - barrelDigitizer = _barrel_tile_MTDDigitizer, + barrelDigitizer = _barrel_bar_MTDDigitizer, endcapDigitizer = _endcap_MTDDigitizer ) diff --git a/SimGeneral/MixingModule/python/digitizers_cfi.py b/SimGeneral/MixingModule/python/digitizers_cfi.py index 7c6a1a3841163..12682181c7264 100644 --- a/SimGeneral/MixingModule/python/digitizers_cfi.py +++ b/SimGeneral/MixingModule/python/digitizers_cfi.py @@ -72,19 +72,13 @@ 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_layer.toModify( theDigitizers, - fastTimingLayer = fastTimeDigitizer.clone() ) - from SimFastTiming.Configuration.SimFastTiming_cff import mtdDigitizer -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( theDigitizers, - fastTimingLayer = mtdDigitizer.clone() ) +from Configuration.Eras.Modifier_phase2_timing_layer_cff import phase2_timing_layer +phase2_timing_layer.toModify( theDigitizers, + fastTimingLayer = mtdDigitizer.clone() ) premix_stage2.toModify(theDigitizers, ecal = None, @@ -98,7 +92,7 @@ (premix_stage2 & phase2_hfnose).toModify(theDigitizers, hfnoseDigitizer = dict(premixStage1 = True), ) -(premix_stage2 & (phase2_timing_layer_tile | phase2_timing_layer_bar)).toModify(theDigitizers, +(premix_stage2 & phase2_timing_layer).toModify(theDigitizers, fastTimingLayer = dict( barrelDigitizer = dict(premixStage1 = True), endcapDigitizer = dict(premixStage1 = True) diff --git a/SimGeneral/MixingModule/python/fullMixCustomize_cff.py b/SimGeneral/MixingModule/python/fullMixCustomize_cff.py index 9aa122be1a645..bde953c3971eb 100644 --- a/SimGeneral/MixingModule/python/fullMixCustomize_cff.py +++ b/SimGeneral/MixingModule/python/fullMixCustomize_cff.py @@ -60,8 +60,8 @@ def setCrossingFrameOn(process): crossingFrames = process.mix.mixObjects.mixSH.crossingFrames + [ 'MuonME0Hits' ] ) ) - from Configuration.Eras.Modifier_phase2_timing_layer_bar_cff import phase2_timing_layer_bar - phase2_timing_layer_bar.toModify( process.mix.mixObjects, + from Configuration.Eras.Modifier_phase2_timing_layer_cff import phase2_timing_layer + phase2_timing_layer.toModify( process.mix.mixObjects, mixSH = dict( crossingFrames = process.mix.mixObjects.mixSH.crossingFrames + [ 'FastTimerHitsBarrel', 'FastTimerHitsEndcap' ] ) diff --git a/SimGeneral/PreMixingModule/python/mixOne_premix_on_sim_cfi.py b/SimGeneral/PreMixingModule/python/mixOne_premix_on_sim_cfi.py index 8d369e5e6c93f..fa159664b6a11 100644 --- a/SimGeneral/PreMixingModule/python/mixOne_premix_on_sim_cfi.py +++ b/SimGeneral/PreMixingModule/python/mixOne_premix_on_sim_cfi.py @@ -202,8 +202,7 @@ from Configuration.Eras.Modifier_phase2_common_cff import phase2_common from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker -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 from Configuration.Eras.Modifier_phase2_hcal_cff import phase2_hcal from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal from Configuration.Eras.Modifier_phase2_hfnose_cff import phase2_hfnose @@ -241,7 +240,7 @@ ) # MTD -(phase2_timing_layer_tile | phase2_timing_layer_bar).toModify(mixData, +phase2_timing_layer.toModify(mixData, workers = dict( mtdBarrel = cms.PSet( mtdDigitizer.barrelDigitizer, diff --git a/Validation/Configuration/python/globalValidation_cff.py b/Validation/Configuration/python/globalValidation_cff.py index 54239aa38a640..35dc6ffb99a91 100644 --- a/Validation/Configuration/python/globalValidation_cff.py +++ b/Validation/Configuration/python/globalValidation_cff.py @@ -203,6 +203,5 @@ phase2_muon.toReplaceWith( globalValidation, _phase2_globalValidation ) from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 pp_on_AA_2018.toReplaceWith(globalValidation, globalValidation.copyAndExclude([pfTauRunDQMValidation])) -from Configuration.Eras.Modifier_phase2_timing_layer_bar_cff import phase2_timing_layer_bar -from Configuration.Eras.Modifier_phase2_timing_layer_tile_cff import phase2_timing_layer_tile -(phase2_timing_layer_tile | phase2_timing_layer_bar).toReplaceWith(globalValidationMTD, cms.Sequence(mtdSimValid+mtdDigiValid+mtdRecoValid)) +from Configuration.Eras.Modifier_phase2_timing_layer_cff import phase2_timing_layer +phase2_timing_layer.toReplaceWith(globalValidationMTD, cms.Sequence(mtdSimValid+mtdDigiValid+mtdRecoValid)) diff --git a/Validation/HGCalValidation/test/python/digiClient_cfg.py b/Validation/HGCalValidation/test/python/digiClient_cfg.py index daa32c9977a12..ea393f6004ed1 100644 --- a/Validation/HGCalValidation/test/python/digiClient_cfg.py +++ b/Validation/HGCalValidation/test/python/digiClient_cfg.py @@ -1,8 +1,8 @@ import FWCore.ParameterSet.Config as cms import os -from Configuration.Eras.Era_Phase2C9_timing_layer_bar_cff import Phase2C9_timing_layer_bar -process = cms.Process('CLIENT',Phase2C9_timing_layer_bar) +from Configuration.Eras.Era_Phase2C9_cff import Phase2C9 +process = cms.Process('CLIENT',Phase2C9) process.load("Configuration.StandardSequences.Reconstruction_cff") process.load('Configuration.Geometry.GeometryExtended2026D46Reco_cff') diff --git a/Validation/HGCalValidation/test/python/digiValidation_cfg.py b/Validation/HGCalValidation/test/python/digiValidation_cfg.py index 516a27579097f..1f38fb5b37da4 100644 --- a/Validation/HGCalValidation/test/python/digiValidation_cfg.py +++ b/Validation/HGCalValidation/test/python/digiValidation_cfg.py @@ -1,8 +1,8 @@ import FWCore.ParameterSet.Config as cms import six -from Configuration.Eras.Era_Phase2C9_timing_layer_bar_cff import Phase2C9_timing_layer_bar -process = cms.Process('testHGCalDigiLocal',Phase2C9_timing_layer_bar) +from Configuration.Eras.Era_Phase2C9_cff import Phase2C9 +process = cms.Process('testHGCalDigiLocal',Phase2C9) # import of standard configurations process.load('Configuration.StandardSequences.Services_cff') diff --git a/Validation/HGCalValidation/test/python/recHitClient_cfg.py b/Validation/HGCalValidation/test/python/recHitClient_cfg.py index 72f55e44b4b80..ed5bdbf623836 100644 --- a/Validation/HGCalValidation/test/python/recHitClient_cfg.py +++ b/Validation/HGCalValidation/test/python/recHitClient_cfg.py @@ -1,8 +1,8 @@ import FWCore.ParameterSet.Config as cms import os -from Configuration.Eras.Era_Phase2C9_timing_layer_bar_cff import Phase2C9_timing_layer_bar -process = cms.Process('CLIENT',Phase2C9_timing_layer_bar) +from Configuration.Eras.Era_Phase2C9_cff import Phase2C9 +process = cms.Process('CLIENT',Phase2C9) process.load("Configuration.StandardSequences.Reconstruction_cff") process.load('Configuration.Geometry.GeometryExtended2026D46Reco_cff') diff --git a/Validation/HGCalValidation/test/python/rechitValidation_cfg.py b/Validation/HGCalValidation/test/python/rechitValidation_cfg.py index 1c8eb92ef765b..b0d100ce16d8f 100644 --- a/Validation/HGCalValidation/test/python/rechitValidation_cfg.py +++ b/Validation/HGCalValidation/test/python/rechitValidation_cfg.py @@ -1,8 +1,8 @@ import FWCore.ParameterSet.Config as cms import six -from Configuration.Eras.Era_Phase2C9_timing_layer_bar_cff import Phase2C9_timing_layer_bar -process = cms.Process('testHGCalRECLocal',Phase2C9_timing_layer_bar) +from Configuration.Eras.Era_Phase2C9_cff import Phase2C9 +process = cms.Process('testHGCalRECLocal',Phase2C9) # import of standard configurations process.load('Configuration.StandardSequences.Services_cff') diff --git a/Validation/HGCalValidation/test/python/runHFNoseDigiStudy_cfg.py b/Validation/HGCalValidation/test/python/runHFNoseDigiStudy_cfg.py index 0fc8b2a2dd4a0..7c37aa53fb115 100644 --- a/Validation/HGCalValidation/test/python/runHFNoseDigiStudy_cfg.py +++ b/Validation/HGCalValidation/test/python/runHFNoseDigiStudy_cfg.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -from Configuration.Eras.Era_Phase2C6_timing_layer_bar_cff import Phase2C6_timing_layer_bar -process = cms.Process('PROD',Phase2C6_timing_layer_bar) +from Configuration.Eras.Era_Phase2C6_cff import Phase2C6 +process = cms.Process('PROD',Phase2C6) process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi") process.load('Configuration.Geometry.GeometryExtended2026D44_cff') diff --git a/Validation/HGCalValidation/test/python/runHFNoseRecHitStudy_cfg.py b/Validation/HGCalValidation/test/python/runHFNoseRecHitStudy_cfg.py index 7eeeb4fe263e2..5a73bb92ccb85 100644 --- a/Validation/HGCalValidation/test/python/runHFNoseRecHitStudy_cfg.py +++ b/Validation/HGCalValidation/test/python/runHFNoseRecHitStudy_cfg.py @@ -1,8 +1,8 @@ import FWCore.ParameterSet.Config as cms import FWCore.Utilities.FileUtils as FileUtils -from Configuration.Eras.Era_Phase2C6_timing_layer_bar_cff import Phase2C6_timing_layer_bar -process = cms.Process('PROD',Phase2C6_timing_layer_bar) +from Configuration.Eras.Era_Phase2C6_cff import Phase2C6 +process = cms.Process('PROD',Phase2C6) process.load('Configuration.Geometry.GeometryExtended2026D44_cff') process.load('Configuration.Geometry.GeometryExtended2026D44Reco_cff') diff --git a/Validation/HGCalValidation/test/python/runHFNoseSimHitStudy_cfg.py b/Validation/HGCalValidation/test/python/runHFNoseSimHitStudy_cfg.py index 1a52ea329131b..877a6d7d76881 100644 --- a/Validation/HGCalValidation/test/python/runHFNoseSimHitStudy_cfg.py +++ b/Validation/HGCalValidation/test/python/runHFNoseSimHitStudy_cfg.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -from Configuration.Eras.Era_Phase2C6_timing_layer_bar_cff import Phase2C6_timing_layer_bar -process = cms.Process('PROD',Phase2C6_timing_layer_bar) +from Configuration.Eras.Era_Phase2C6_cff import Phase2C6 +process = cms.Process('PROD',Phase2C6) process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi") process.load("IOMC.EventVertexGenerators.VtxSmearedGauss_cfi") diff --git a/Validation/HGCalValidation/test/python/runHGCGeomCheck_cfg.py b/Validation/HGCalValidation/test/python/runHGCGeomCheck_cfg.py index 47086f84a3ce2..d016369205ea1 100644 --- a/Validation/HGCalValidation/test/python/runHGCGeomCheck_cfg.py +++ b/Validation/HGCalValidation/test/python/runHGCGeomCheck_cfg.py @@ -1,17 +1,17 @@ import FWCore.ParameterSet.Config as cms -#from Configuration.Eras.Era_Phase2C4_timing_layer_bar_cff import Phase2C4_timing_layer_bar -#process = cms.Process('HGCGeomAnalysis',Phase2C4_timing_layer_bar) +#from Configuration.Eras.Era_Phase2C4_cff import Phase2C4 +#process = cms.Process('HGCGeomAnalysis',Phase2C4) #process.load('Configuration.Geometry.GeometryExtended2026D35_cff') #process.load('Configuration.Geometry.GeometryExtended2026D35Reco_cff') -from Configuration.Eras.Era_Phase2C8_timing_layer_bar_cff import Phase2C8_timing_layer_bar -process = cms.Process('HGCGeomAnalysis',Phase2C8_timing_layer_bar) +from Configuration.Eras.Era_Phase2C8_cff import Phase2C8 +process = cms.Process('HGCGeomAnalysis',Phase2C8) process.load('Configuration.Geometry.GeometryExtended2026D41_cff') process.load('Configuration.Geometry.GeometryExtended2026D41Reco_cff') -#from Configuration.Eras.Era_Phase2C9_timing_layer_bar_cff import Phase2C9_timing_layer_bar -#process = cms.Process('HGCGeomAnalysis',Phase2C9_timing_layer_bar) +#from Configuration.Eras.Era_Phase2C9_cff import Phase2C9 +#process = cms.Process('HGCGeomAnalysis',Phase2C9) #process.load('Configuration.Geometry.GeometryExtended2026D46_cff') #process.load('Configuration.Geometry.GeometryExtended2026D46Reco_cff') diff --git a/Validation/HGCalValidation/test/python/runHGCHitAnalyzer_cfg.py b/Validation/HGCalValidation/test/python/runHGCHitAnalyzer_cfg.py index 291af5df9bd35..ab1b6f1d065d6 100644 --- a/Validation/HGCalValidation/test/python/runHGCHitAnalyzer_cfg.py +++ b/Validation/HGCalValidation/test/python/runHGCHitAnalyzer_cfg.py @@ -1,17 +1,17 @@ import FWCore.ParameterSet.Config as cms -#from Configuration.Eras.Era_Phase2C4_timing_layer_bar_cff import Phase2C4_timing_layer_bar -#process = cms.Process('HGCGeomAnalysis',Phase2C4_timing_layer_bar) +#from Configuration.Eras.Era_Phase2C4_cff import Phase2C4 +#process = cms.Process('HGCGeomAnalysis',Phase2C4) #process.load('Configuration.Geometry.GeometryExtended2026D35_cff') #process.load('Configuration.Geometry.GeometryExtended2026D35Reco_cff') -from Configuration.Eras.Era_Phase2C8_timing_layer_bar_cff import Phase2C8_timing_layer_bar -process = cms.Process('HGCGeomAnalysis',Phase2C8_timing_layer_bar) +from Configuration.Eras.Era_Phase2C8_cff import Phase2C8 +process = cms.Process('HGCGeomAnalysis',Phase2C8) process.load('Configuration.Geometry.GeometryExtended2026D41_cff') process.load('Configuration.Geometry.GeometryExtended2026D41Reco_cff') -#from Configuration.Eras.Era_Phase2C9_timing_layer_bar_cff import Phase2C9_timing_layer_bar -#process = cms.Process('HGCGeomAnalysis',Phase2C9_timing_layer_bar) +#from Configuration.Eras.Era_Phase2C9_cff import Phase2C9 +#process = cms.Process('HGCGeomAnalysis',Phase2C9) #process.load('Configuration.Geometry.GeometryExtended2026D46_cff') #process.load('Configuration.Geometry.GeometryExtended2026D46Reco_cff') diff --git a/Validation/HGCalValidation/test/python/runHGCalDigiStudy_cfg.py b/Validation/HGCalValidation/test/python/runHGCalDigiStudy_cfg.py index 37e7a86508987..0203a0044f363 100644 --- a/Validation/HGCalValidation/test/python/runHGCalDigiStudy_cfg.py +++ b/Validation/HGCalValidation/test/python/runHGCalDigiStudy_cfg.py @@ -1,17 +1,17 @@ import FWCore.ParameterSet.Config as cms -#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.GeometryExtended2026D35_cff') #process.load('Configuration.Geometry.GeometryExtended2026D35Reco_cff') -from Configuration.Eras.Era_Phase2C8_timing_layer_bar_cff import Phase2C8_timing_layer_bar -process = cms.Process('PROD',Phase2C8_timing_layer_bar) +from Configuration.Eras.Era_Phase2C8_cff import Phase2C8 +process = cms.Process('PROD',Phase2C8) process.load('Configuration.Geometry.GeometryExtended2026D41_cff') process.load('Configuration.Geometry.GeometryExtended2026D41Reco_cff') -#from Configuration.Eras.Era_Phase2C9_timing_layer_bar_cff import Phase2C9_timing_layer_bar -#process = cms.Process('PROD',Phase2C9_timing_layer_bar) +#from Configuration.Eras.Era_Phase2C9_cff import Phase2C9 +#process = cms.Process('PROD',Phase2C9) #process.load('Configuration.Geometry.GeometryExtended2026D46_cff') #process.load('Configuration.Geometry.GeometryExtended2026D46Reco_cff') diff --git a/Validation/HGCalValidation/test/python/runHGCalHitCalibration_cfg.py b/Validation/HGCalValidation/test/python/runHGCalHitCalibration_cfg.py index b433b0589f1c4..fccc919ead7a6 100644 --- a/Validation/HGCalValidation/test/python/runHGCalHitCalibration_cfg.py +++ b/Validation/HGCalValidation/test/python/runHGCalHitCalibration_cfg.py @@ -1,18 +1,18 @@ import FWCore.ParameterSet.Config as cms import FWCore.Utilities.FileUtils as FileUtils -#from Configuration.Eras.Era_Phase2C4_timing_layer_bar_cff import Phase2C4_timing_layer_bar -#process = cms.Process('HGCGeomAnalysis',Phase2C4_timing_layer_bar) +#from Configuration.Eras.Era_Phase2C4_cff import Phase2C4 +#process = cms.Process('HGCGeomAnalysis',Phase2C4) #process.load('Configuration.Geometry.GeometryExtended2026D35_cff') #process.load('Configuration.Geometry.GeometryExtended2026D35Reco_cff') -from Configuration.Eras.Era_Phase2C8_timing_layer_bar_cff import Phase2C8_timing_layer_bar -process = cms.Process('HGCGeomAnalysis',Phase2C8_timing_layer_bar) +from Configuration.Eras.Era_Phase2C8_cff import Phase2C8 +process = cms.Process('HGCGeomAnalysis',Phase2C8) process.load('Configuration.Geometry.GeometryExtended2026D41_cff') process.load('Configuration.Geometry.GeometryExtended2026D41Reco_cff') -#from Configuration.Eras.Era_Phase2C9_timing_layer_bar_cff import Phase2C9_timing_layer_bar -#process = cms.Process('HGCGeomAnalysis',Phase2C9_timing_layer_bar) +#from Configuration.Eras.Era_Phase2C9_cff import Phase2C9 +#process = cms.Process('HGCGeomAnalysis',Phase2C9) #process.load('Configuration.Geometry.GeometryExtended2026D46_cff') #process.load('Configuration.Geometry.GeometryExtended2026D46Reco_cff') diff --git a/Validation/HGCalValidation/test/python/runHGCalRecHitStudy_cfg.py b/Validation/HGCalValidation/test/python/runHGCalRecHitStudy_cfg.py index 33d3ff44acc50..8408d20473720 100644 --- a/Validation/HGCalValidation/test/python/runHGCalRecHitStudy_cfg.py +++ b/Validation/HGCalValidation/test/python/runHGCalRecHitStudy_cfg.py @@ -1,18 +1,18 @@ import FWCore.ParameterSet.Config as cms import FWCore.Utilities.FileUtils as FileUtils -#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.GeometryExtended2026D35_cff') #process.load('Configuration.Geometry.GeometryExtended2026D35Reco_cff') -from Configuration.Eras.Era_Phase2C8_timing_layer_bar_cff import Phase2C8_timing_layer_bar -process = cms.Process('PROD',Phase2C8_timing_layer_bar) +from Configuration.Eras.Era_Phase2C8_cff import Phase2C8 +process = cms.Process('PROD',Phase2C8) process.load('Configuration.Geometry.GeometryExtended2026D41_cff') process.load('Configuration.Geometry.GeometryExtended2026D41Reco_cff') -#from Configuration.Eras.Era_Phase2C9_timing_layer_bar_cff import Phase2C9_timing_layer_bar -#process = cms.Process('PROD',Phase2C9_timing_layer_bar) +#from Configuration.Eras.Era_Phase2C9_cff import Phase2C9 +#process = cms.Process('PROD',Phase2C9) #process.load('Configuration.Geometry.GeometryExtended2026D46_cff') #process.load('Configuration.Geometry.GeometryExtended2026D46Reco_cff') diff --git a/Validation/HGCalValidation/test/python/runHGCalSimHitStudy_cfg.py b/Validation/HGCalValidation/test/python/runHGCalSimHitStudy_cfg.py index 15ec0922af273..8cb7602e0f9a0 100644 --- a/Validation/HGCalValidation/test/python/runHGCalSimHitStudy_cfg.py +++ b/Validation/HGCalValidation/test/python/runHGCalSimHitStudy_cfg.py @@ -1,17 +1,17 @@ import FWCore.ParameterSet.Config as cms -#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.GeometryExtended2026D35_cff') #process.load('Configuration.Geometry.GeometryExtended2026D35Reco_cff') -from Configuration.Eras.Era_Phase2C8_timing_layer_bar_cff import Phase2C8_timing_layer_bar -process = cms.Process('PROD',Phase2C8_timing_layer_bar) +from Configuration.Eras.Era_Phase2C8_cff import Phase2C8 +process = cms.Process('PROD',Phase2C8) process.load('Configuration.Geometry.GeometryExtended2026D41_cff') process.load('Configuration.Geometry.GeometryExtended2026D41Reco_cff') -#from Configuration.Eras.Era_Phase2C9_timing_layer_bar_cff import Phase2C9_timing_layer_bar -#process = cms.Process('PROD',Phase2C9_timing_layer_bar) +#from Configuration.Eras.Era_Phase2C9_cff import Phase2C9 +#process = cms.Process('PROD',Phase2C9) #process.load('Configuration.Geometry.GeometryExtended2026D46_cff') #process.load('Configuration.Geometry.GeometryExtended2026D46Reco_cff') diff --git a/Validation/HGCalValidation/test/python/runHGCalWaferStudy_cfg.py b/Validation/HGCalValidation/test/python/runHGCalWaferStudy_cfg.py index 66f9429d894e8..80c499dc733a4 100644 --- a/Validation/HGCalValidation/test/python/runHGCalWaferStudy_cfg.py +++ b/Validation/HGCalValidation/test/python/runHGCalWaferStudy_cfg.py @@ -1,17 +1,17 @@ import FWCore.ParameterSet.Config as cms -#from Configuration.Eras.Era_Phase2C4_timing_layer_bar_cff import Phase2C4_timing_layer_bar -#process = cms.Process('HGCGeomAnalysis',Phase2C4_timing_layer_bar) +#from Configuration.Eras.Era_Phase2C4_cff import Phase2C4 +#process = cms.Process('HGCGeomAnalysis',Phase2C4) #process.load('Configuration.Geometry.GeometryExtended2026D35_cff') #process.load('Configuration.Geometry.GeometryExtended2026D35Reco_cff') -from Configuration.Eras.Era_Phase2C8_timing_layer_bar_cff import Phase2C8_timing_layer_bar -process = cms.Process('HGCGeomAnalysis',Phase2C8_timing_layer_bar) +from Configuration.Eras.Era_Phase2C8_cff import Phase2C8 +process = cms.Process('HGCGeomAnalysis',Phase2C8) process.load('Configuration.Geometry.GeometryExtended2026D41_cff') process.load('Configuration.Geometry.GeometryExtended2026D41Reco_cff') -#from Configuration.Eras.Era_Phase2C9_timing_layer_bar_cff import Phase2C9_timing_layer_bar -#process = cms.Process('HGCGeomAnalysis',Phase2C9_timing_layer_bar) +#from Configuration.Eras.Era_Phase2C9_cff import Phase2C9 +#process = cms.Process('HGCGeomAnalysis',Phase2C9) #process.load('Configuration.Geometry.GeometryExtended2026D46_cff') #process.load('Configuration.Geometry.GeometryExtended2026D46Reco_cff') diff --git a/Validation/HGCalValidation/test/python/simHitClient_cfg.py b/Validation/HGCalValidation/test/python/simHitClient_cfg.py index ea92cdae7c852..d19e0ff7e3990 100644 --- a/Validation/HGCalValidation/test/python/simHitClient_cfg.py +++ b/Validation/HGCalValidation/test/python/simHitClient_cfg.py @@ -1,8 +1,8 @@ import FWCore.ParameterSet.Config as cms import os -from Configuration.Eras.Era_Phase2C9_timing_layer_bar_cff import Phase2C9_timing_layer_bar -process = cms.Process('CLIENT',Phase2C9_timing_layer_bar) +from Configuration.Eras.Era_Phase2C9_cff import Phase2C9 +process = cms.Process('CLIENT',Phase2C9) process.load("Configuration.StandardSequences.Reconstruction_cff") process.load('Configuration.Geometry.GeometryExtended2026D46Reco_cff') diff --git a/Validation/HGCalValidation/test/python/simHitValidation_cfg.py b/Validation/HGCalValidation/test/python/simHitValidation_cfg.py index 1094ed43dcf2e..f2569a850f963 100644 --- a/Validation/HGCalValidation/test/python/simHitValidation_cfg.py +++ b/Validation/HGCalValidation/test/python/simHitValidation_cfg.py @@ -1,8 +1,8 @@ import FWCore.ParameterSet.Config as cms import six -from Configuration.Eras.Era_Phase2C9_timing_layer_bar_cff import Phase2C9_timing_layer_bar -process = cms.Process('testHGCalSIMLocal',Phase2C9_timing_layer_bar) +from Configuration.Eras.Era_Phase2C9_cff import Phase2C9 +process = cms.Process('testHGCalSIMLocal',Phase2C9) # import of standard configurations process.load('Configuration.StandardSequences.Services_cff') diff --git a/Validation/HGCalValidation/test/python/testHFNoseSimHitStudy_cfg.py b/Validation/HGCalValidation/test/python/testHFNoseSimHitStudy_cfg.py index 0f0d5d10ce6b2..ca16933e46adf 100644 --- a/Validation/HGCalValidation/test/python/testHFNoseSimHitStudy_cfg.py +++ b/Validation/HGCalValidation/test/python/testHFNoseSimHitStudy_cfg.py @@ -1,8 +1,8 @@ import FWCore.ParameterSet.Config as cms -from Configuration.Eras.Era_Phase2C6_timing_layer_bar_cff import Phase2C6_timing_layer_bar +from Configuration.Eras.Era_Phase2C6_cff import Phase2C6 -process = cms.Process('SIM',Phase2C6_timing_layer_bar) +process = cms.Process('SIM',Phase2C6) # import of standard configurations process.load('Configuration.StandardSequences.Services_cff') diff --git a/Validation/HGCalValidation/test/python/testHGCalBHValid_cfg.py b/Validation/HGCalValidation/test/python/testHGCalBHValid_cfg.py index c1ac67e5c1b16..cd3a51a47cd5b 100644 --- a/Validation/HGCalValidation/test/python/testHGCalBHValid_cfg.py +++ b/Validation/HGCalValidation/test/python/testHGCalBHValid_cfg.py @@ -1,18 +1,18 @@ import FWCore.ParameterSet.Config as cms import six -#from Configuration.Eras.Era_Phase2C4_timing_layer_bar_cff import Phase2C4_timing_layer_bar -#process = cms.Process('HGCGeomAnalysis',Phase2C4_timing_layer_bar) +#from Configuration.Eras.Era_Phase2C4_cff import Phase2C4 +#process = cms.Process('HGCGeomAnalysis',Phase2C4) #process.load('Configuration.Geometry.GeometryExtended2026D35_cff') #process.load('Configuration.Geometry.GeometryExtended2026D35Reco_cff') -from Configuration.Eras.Era_Phase2C8_timing_layer_bar_cff import Phase2C8_timing_layer_bar -process = cms.Process('HGCGeomAnalysis',Phase2C8_timing_layer_bar) +from Configuration.Eras.Era_Phase2C8_cff import Phase2C8 +process = cms.Process('HGCGeomAnalysis',Phase2C8) process.load('Configuration.Geometry.GeometryExtended2026D41_cff') process.load('Configuration.Geometry.GeometryExtended2026D41Reco_cff') -#from Configuration.Eras.Era_Phase2C9_timing_layer_bar_cff import Phase2C9_timing_layer_bar -#process = cms.Process('HGCGeomAnalysis',Phase2C9_timing_layer_bar) +#from Configuration.Eras.Era_Phase2C9_cff import Phase2C9 +#process = cms.Process('HGCGeomAnalysis',Phase2C9) #process.load('Configuration.Geometry.GeometryExtended2026D46_cff') #process.load('Configuration.Geometry.GeometryExtended2026D46Reco_cff') diff --git a/Validation/HGCalValidation/test/python/testHGCalSimHitStudy_cfg.py b/Validation/HGCalValidation/test/python/testHGCalSimHitStudy_cfg.py index 33d0e54f25a41..c331062294314 100644 --- a/Validation/HGCalValidation/test/python/testHGCalSimHitStudy_cfg.py +++ b/Validation/HGCalValidation/test/python/testHGCalSimHitStudy_cfg.py @@ -1,17 +1,17 @@ import FWCore.ParameterSet.Config as cms -#from Configuration.Eras.Era_Phase2C4_timing_layer_bar_cff import Phase2C4_timing_layer_bar -#process = cms.Process('HGCGeomAnalysis',Phase2C4_timing_layer_bar) +#from Configuration.Eras.Era_Phase2C4_cff import Phase2C4 +#process = cms.Process('HGCGeomAnalysis',Phase2C4) #process.load('Configuration.Geometry.GeometryExtended2026D35_cff') #process.load('Configuration.Geometry.GeometryExtended2026D35Reco_cff') -from Configuration.Eras.Era_Phase2C8_timing_layer_bar_cff import Phase2C8_timing_layer_bar -process = cms.Process('HGCGeomAnalysis',Phase2C8_timing_layer_bar) +from Configuration.Eras.Era_Phase2C8_cff import Phase2C8 +process = cms.Process('HGCGeomAnalysis',Phase2C8) process.load('Configuration.Geometry.GeometryExtended2026D41_cff') process.load('Configuration.Geometry.GeometryExtended2026D41Reco_cff') -#from Configuration.Eras.Era_Phase2C9_timing_layer_bar_cff import Phase2C9_timing_layer_bar -#process = cms.Process('HGCGeomAnalysis',Phase2C9_timing_layer_bar) +#from Configuration.Eras.Era_Phase2C9_cff import Phase2C9 +#process = cms.Process('HGCGeomAnalysis',Phase2C9) #process.load('Configuration.Geometry.GeometryExtended2026D46_cff') #process.load('Configuration.Geometry.GeometryExtended2026D46Reco_cff') diff --git a/Validation/HGCalValidation/test/python/testHGCalSimWatcherV10_cfg.py b/Validation/HGCalValidation/test/python/testHGCalSimWatcherV10_cfg.py index 586b009c77eb8..44a64c9b8cb9b 100644 --- a/Validation/HGCalValidation/test/python/testHGCalSimWatcherV10_cfg.py +++ b/Validation/HGCalValidation/test/python/testHGCalSimWatcherV10_cfg.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -from Configuration.Eras.Era_Phase2C8_timing_layer_bar_cff import Phase2C8_timing_layer_bar -process = cms.Process('testHGCalRecoLocal',Phase2C8_timing_layer_bar) +from Configuration.Eras.Era_Phase2C8_cff import Phase2C8 +process = cms.Process('testHGCalRecoLocal',Phase2C8) # import of standard configurations process.load('Configuration.StandardSequences.Services_cff') diff --git a/Validation/HGCalValidation/test/python/testHGCalSimWatcherV11_cfg.py b/Validation/HGCalValidation/test/python/testHGCalSimWatcherV11_cfg.py index 7e1588451b295..89ab92b0013af 100644 --- a/Validation/HGCalValidation/test/python/testHGCalSimWatcherV11_cfg.py +++ b/Validation/HGCalValidation/test/python/testHGCalSimWatcherV11_cfg.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -from Configuration.Eras.Era_Phase2C9_timing_layer_bar_cff import Phase2C9_timing_layer_bar -process = cms.Process('testHGCalRecoLocal',Phase2C9_timing_layer_bar) +from Configuration.Eras.Era_Phase2C9_cff import Phase2C9 +process = cms.Process('testHGCalRecoLocal',Phase2C9) # import of standard configurations process.load('Configuration.StandardSequences.Services_cff') diff --git a/Validation/HGCalValidation/test/python/testHGCalSimWatcherV9_cfg.py b/Validation/HGCalValidation/test/python/testHGCalSimWatcherV9_cfg.py index ad9de5f353d55..b5ce21fa98c2f 100644 --- a/Validation/HGCalValidation/test/python/testHGCalSimWatcherV9_cfg.py +++ b/Validation/HGCalValidation/test/python/testHGCalSimWatcherV9_cfg.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -from Configuration.Eras.Era_Phase2C4_timing_layer_bar_cff import Phase2C4_timing_layer_bar -process = cms.Process('testHGCalRecoLocal',Phase2C4_timing_layer_bar) +from Configuration.Eras.Era_Phase2C4_cff import Phase2C4 +process = cms.Process('testHGCalRecoLocal',Phase2C4) # import of standard configurations process.load('Configuration.StandardSequences.Services_cff') diff --git a/Validation/HcalRecHits/test/runHcalDumpHits_cfg.py b/Validation/HcalRecHits/test/runHcalDumpHits_cfg.py index 6aee9d7968c4b..49fc9b23e587c 100644 --- a/Validation/HcalRecHits/test/runHcalDumpHits_cfg.py +++ b/Validation/HcalRecHits/test/runHcalDumpHits_cfg.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -from Configuration.Eras.Era_Phase2C8_timing_layer_bar_cff import Phase2C8_timing_layer_bar +from Configuration.Eras.Era_Phase2C8_cff import Phase2C8 -process = cms.Process("HcalValid",Phase2C8_timing_layer_bar) +process = cms.Process("HcalValid",Phase2C8) process.load("Configuration.Geometry.GeometryExtended2023D41Reco_cff") process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi") diff --git a/Validation/RecoParticleFlow/README.md b/Validation/RecoParticleFlow/README.md index 9bcb86935eb2f..bfe2ba5003c7c 100644 --- a/Validation/RecoParticleFlow/README.md +++ b/Validation/RecoParticleFlow/README.md @@ -134,7 +134,7 @@ Take note that the CMSSW python configuration for running the RECO sequence is d # For example (default for 2018): #CONDITIONS=auto:phase1_2017_realistic ERA=Run2_2017 # for 2017 scenarios CONDITIONS=auto:phase1_2018_realistic ERA=Run2_2018 # for 2018 scenarios -#CONDITIONS=auto:phase2_realistic ERA=Phase2C8_timing_layer_bar # for phase2 +#CONDITIONS=auto:phase2_realistic ERA=Phase2C8 # for phase2 #Running with 2 threads allows to use more memory on grid NTHREADS=2 TMPDIR=tmp diff --git a/Validation/RecoParticleFlow/test/run_relval.sh b/Validation/RecoParticleFlow/test/run_relval.sh index 9defcc88d4ec8..b1b8ae0368983 100755 --- a/Validation/RecoParticleFlow/test/run_relval.sh +++ b/Validation/RecoParticleFlow/test/run_relval.sh @@ -26,7 +26,7 @@ CONDITIONS=auto:phase1_2018_realistic ERA=Run2_2018 GEOM=DB:Extended #CONDITIONS=auto:phase1_2017_realistic ERA=Run2_2017,run2_nanoAOD_94XMiniAODv1 GEOM=DB.Extended # #conditions - phase2 -#CONDITIONS=auto:phase2_realistic ERA=Phase2C8_timing_layer_bar GEOM=Extended2023D41 +#CONDITIONS=auto:phase2_realistic ERA=Phase2C8 GEOM=Extended2023D41 #Running with 2 threads allows to use more memory on grid NTHREADS=2 diff --git a/Validation/RecoTrack/python/TrackValidation_cff.py b/Validation/RecoTrack/python/TrackValidation_cff.py index 835740ca495fc..e41680625c069 100644 --- a/Validation/RecoTrack/python/TrackValidation_cff.py +++ b/Validation/RecoTrack/python/TrackValidation_cff.py @@ -857,8 +857,8 @@ def _uniqueFirstLayers(layerList): ## customization for timing from Configuration.Eras.Modifier_phase2_timing_layer_cff import phase2_timing_layer phase2_timing_layer.toModify( generalTracksFromPV, - timesTag = cms.InputTag('trackTimeValueMapProducer:generalTracksConfigurableFlatResolutionModel'), - timeResosTag = cms.InputTag('trackTimeValueMapProducer:generalTracksConfigurableFlatResolutionModelResolution'), + timesTag = cms.InputTag('tofPID:t0'), + timeResosTag = cms.InputTag('tofPID:sigmat0'), nSigmaDtVertex = cms.double(3) ) phase2_timing_layer.toModify( trackValidatorStandalone, label_vertex = cms.untracked.InputTag('offlinePrimaryVertices4D') ) @@ -870,9 +870,3 @@ def _uniqueFirstLayers(layerList): label_vertex = cms.untracked.InputTag('offlinePrimaryVertices4D') ) phase2_timing_layer.toModify( trackValidatorGsfTracks, label_vertex = cms.untracked.InputTag('offlinePrimaryVertices4D') ) - -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( generalTracksFromPV, - timesTag = cms.InputTag('tofPID:t0'), - timeResosTag = cms.InputTag('tofPID:sigmat0') )