Merge pull request #46608 from mmusich/mm_fixes_post-46582

fix a bunch of tests broken by #46582
cms-sw · Nov 8, 2024 · e773726 · e773726
2 parents aca061d + 3412226
commit e773726
Show file tree

Hide file tree

Showing 12 changed files with 59 additions and 30 deletions.
diff --git a/CalibTracker/StandaloneTrackerTopology/test/testStandaloneTrackerTopology.sh b/CalibTracker/StandaloneTrackerTopology/test/testStandaloneTrackerTopology.sh
@@ -6,4 +6,4 @@ echo " testing CalibTracker/StandalonTrackerTopology"
 
 cmsRun ${SCRAM_TEST_PATH}/testStandaloneTrackerTopology_cfg.py || die "Failure using cmsRun testPixelTopologyMapTest_cfg.py (Phase-0 test)" $?
 cmsRun ${SCRAM_TEST_PATH}/testStandaloneTrackerTopology_cfg.py runNumber=300000 || die "Failure using cmsRun testPixelTopologyMapTest_cfg.py (Phase-1 test)" $?
-cmsRun ${SCRAM_TEST_PATH}/testStandaloneTrackerTopology_cfg.py globalTag=auto:phase2_realistic_T21 || die "Failure using cmsRun testPixelTopologyMapTest_cfg.py (Phase-2 test)" $?
+cmsRun ${SCRAM_TEST_PATH}/testStandaloneTrackerTopology_cfg.py isPhase2=True || die "Failure using cmsRun testPixelTopologyMapTest_cfg.py (Phase-2 test)" $?
diff --git a/CalibTracker/StandaloneTrackerTopology/test/testStandaloneTrackerTopology_cfg.py b/CalibTracker/StandaloneTrackerTopology/test/testStandaloneTrackerTopology_cfg.py
@@ -1,7 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 import FWCore.ParameterSet.VarParsing as VarParsing
 
-process = cms.Process("TopologyAnalysis")
 options = VarParsing.VarParsing("analysis")
 
 options.register ('globalTag',
@@ -16,8 +15,25 @@
                   VarParsing.VarParsing.varType.int,          # string, int, or float
                   "run number")
 
+options.register ('isPhase2',
+                  False,
+                  VarParsing.VarParsing.multiplicity.singleton, # singleton or list
+                  VarParsing.VarParsing.varType.bool,          # string, int, or float
+                  "is phase2?")
+
 options.parseArguments()
 
+###################################################################
+# Set default phase-2 settings
+###################################################################
+import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings
+_PH2_GLOBAL_TAG, _PH2_ERA = _settings.get_era_and_conditions(_settings.DEFAULT_VERSION)
+
+if(options.isPhase2):
+    process = cms.Process("TopologyAnalysis",_PH2_ERA)
+else:
+    process = cms.Process("TopologyAnalysis")
+
 ###################################################################
 # Message logger service
 ###################################################################
@@ -29,9 +45,9 @@
 ###################################################################
 process.load("Configuration.StandardSequences.Services_cff")
 
-if 'phase2' in options.globalTag:
-    process.load("Configuration.Geometry.GeometryExtended2026D98_cff")
-    process.load("Configuration.Geometry.GeometryExtended2026D98Reco_cff")
+if(options.isPhase2):
+    process.load("Configuration.Geometry.GeometryExtendedRun4Default_cff")
+    process.load("Configuration.Geometry.GeometryExtendedRun4DefaultReco_cff")
 else:
     process.load("Configuration.StandardSequences.GeometryRecoDB_cff")
 
@@ -40,7 +56,10 @@
 ####################################################################
 process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
 from Configuration.AlCa.GlobalTag import GlobalTag
-process.GlobalTag = GlobalTag(process.GlobalTag, options.globalTag, '')
+if(options.isPhase2):
+    process.GlobalTag = GlobalTag(process.GlobalTag, _PH2_GLOBAL_TAG, '')
+else:
+    process.GlobalTag = GlobalTag(process.GlobalTag, options.globalTag, '')
 
 ###################################################################
 # Empty Source

diff --git a/Geometry/MTDCommonData/test/testMTDinDD4hep.py b/Geometry/MTDCommonData/test/testMTDinDD4hep.py
@@ -1,9 +1,10 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings
+_PH2_GLOBAL_TAG, _PH2_ERA = _settings.get_era_and_conditions(_settings.DEFAULT_VERSION)
 from Configuration.ProcessModifiers.dd4hep_cff import dd4hep
 
-process = cms.Process("CompareGeometryTest",Phase2C17I13M9,dd4hep)
+process = cms.Process("CompareGeometryTest",_PH2_ERA,dd4hep)
 
 process.source = cms.Source("EmptySource")
 process.maxEvents = cms.untracked.PSet(
@@ -54,7 +55,7 @@
     threshold = cms.untracked.string('INFO')
 )
 
-process.load('Configuration.Geometry.GeometryDD4hepExtended2026D110_cff')
+process.load('Configuration.Geometry.GeometryDD4hepExtendedRun4Default_cff')
 
 process.testBTL = cms.EDAnalyzer("DD4hep_TestMTDIdealGeometry",
                                  DDDetector = cms.ESInputTag('',''),

diff --git a/Geometry/MTDCommonData/test/testMTDinDDD.py b/Geometry/MTDCommonData/test/testMTDinDDD.py
@@ -1,8 +1,9 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings
+_PH2_GLOBAL_TAG, _PH2_ERA = _settings.get_era_and_conditions(_settings.DEFAULT_VERSION)
 
-process = cms.Process("CompareGeometryTest",Phase2C17I13M9)
+process = cms.Process("CompareGeometryTest", _PH2_ERA)
 
 process.source = cms.Source("EmptySource")
 process.maxEvents = cms.untracked.PSet(
@@ -53,7 +54,7 @@
     threshold = cms.untracked.string('INFO')
 )
 
-process.load('Configuration.Geometry.GeometryExtended2026D110_cff')
+process.load('Configuration.Geometry.GeometryExtendedRun4Default_cff')
 
 process.testBTL = cms.EDAnalyzer("TestMTDIdealGeometry",
                                ddTopNodeName = cms.untracked.string('BarrelTimingLayer')

diff --git a/Geometry/MTDGeometryBuilder/test/dd4hep_mtd_cfg.py b/Geometry/MTDGeometryBuilder/test/dd4hep_mtd_cfg.py
@@ -1,9 +1,11 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings
+_PH2_GLOBAL_TAG, _PH2_ERA = _settings.get_era_and_conditions(_settings.DEFAULT_VERSION)
+
 from Configuration.ProcessModifiers.dd4hep_cff import dd4hep
 
-process = cms.Process("GeometryTest",Phase2C17I13M9,dd4hep)
+process = cms.Process("GeometryTest",_PH2_ERA,dd4hep)
 
 process.source = cms.Source("EmptyIOVSource",
                             lastValue = cms.uint64(1),
@@ -50,7 +52,7 @@
     threshold = cms.untracked.string('INFO')
 )
 
-process.load("Configuration.Geometry.GeometryDD4hepExtended2026D110Reco_cff")
+process.load("Configuration.Geometry.GeometryDD4hepExtendedRun4DefaultReco_cff")
 
 process.Timing = cms.Service("Timing")
 

diff --git a/Geometry/MTDGeometryBuilder/test/mtd_cfg.py b/Geometry/MTDGeometryBuilder/test/mtd_cfg.py
@@ -1,8 +1,9 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings
+_PH2_GLOBAL_TAG, _PH2_ERA = _settings.get_era_and_conditions(_settings.DEFAULT_VERSION)
 
-process = cms.Process("GeometryTest",Phase2C17I13M9)
+process = cms.Process("GeometryTest", _PH2_ERA)
 
 process.source = cms.Source("EmptyIOVSource",
                             lastValue = cms.uint64(1),
@@ -46,7 +47,7 @@
     threshold = cms.untracked.string('INFO')
 )
 
-process.load("Configuration.Geometry.GeometryExtended2026D110_cff")
+process.load("Configuration.Geometry.GeometryExtendedRun4Default_cff")
 
 process.load("Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff")
 

diff --git a/Geometry/MTDNumberingBuilder/test/dd4hep_mtd_cfg.py b/Geometry/MTDNumberingBuilder/test/dd4hep_mtd_cfg.py
@@ -1,9 +1,11 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings
+_PH2_GLOBAL_TAG, _PH2_ERA = _settings.get_era_and_conditions(_settings.DEFAULT_VERSION)
+
 from Configuration.ProcessModifiers.dd4hep_cff import dd4hep
 
-process = cms.Process("GeometryTest",Phase2C17I13M9,dd4hep)
+process = cms.Process("GeometryTest",_PH2_ERA,dd4hep)
 
 process.source = cms.Source("EmptyIOVSource",
                             lastValue = cms.uint64(1),
@@ -47,7 +49,7 @@
     threshold = cms.untracked.string('INFO')
 )
 
-process.load("Configuration.Geometry.GeometryDD4hepExtended2026D110Reco_cff")
+process.load("Configuration.Geometry.GeometryDD4hepExtendedRun4DefaultReco_cff")
 
 process.prod = cms.EDAnalyzer("GeometricTimingDetAnalyzer")
 

diff --git a/Geometry/MTDNumberingBuilder/test/mtd_cfg.py b/Geometry/MTDNumberingBuilder/test/mtd_cfg.py
@@ -1,8 +1,9 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings
+_PH2_GLOBAL_TAG, _PH2_ERA = _settings.get_era_and_conditions(_settings.DEFAULT_VERSION)
 
-process = cms.Process("GeometryTest",Phase2C17I13M9)
+process = cms.Process("GeometryTest",_PH2_ERA)
 
 process.source = cms.Source("EmptyIOVSource",
                             lastValue = cms.uint64(1),
@@ -46,7 +47,7 @@
     threshold = cms.untracked.string('INFO')
 )
 
-process.load("Configuration.Geometry.GeometryExtended2026D110Reco_cff")
+process.load("Configuration.Geometry.GeometryExtendedRun4DefaultReco_cff")
 
 process.Timing = cms.Service("Timing")
 

diff --git a/HLTrigger/Configuration/python/HLT_75e33/test/runHLTTiming.sh b/HLTrigger/Configuration/python/HLT_75e33/test/runHLTTiming.sh
@@ -37,7 +37,7 @@ ALL_FILES="${ALL_FILES%?}"
 echo "Discovered files: $ALL_FILES"
 
 cmsDriver.py Phase2 -s L1P2GT,HLT:75e33_timing --processName=HLTX \
-  --conditions auto:phase2_realistic_T33 --geometry Extended2026D110 \
+  --conditions auto:phase2_realistic_T33 --geometry ExtendedRun4D110 \
   --era Phase2C17I13M9 \
   --customise SLHCUpgradeSimulations/Configuration/aging.customise_aging_1000 \
   --eventcontent FEVTDEBUGHLT \

diff --git a/HLTrigger/Configuration/scripts/hltPhase2UpgradeIntegrationTests b/HLTrigger/Configuration/scripts/hltPhase2UpgradeIntegrationTests
@@ -16,7 +16,7 @@ _PH2_GLOBAL_TAG, _PH2_ERA = _settings.get_era_and_conditions(_settings.DEFAULT_V
 _PH2_GEOMETRY = f"Extended{_settings.DEFAULT_VERSION}"
 
 # Get the actual era name from the version key
-_PH2_ERA_NAME = _settings.properties[2026][_settings.DEFAULT_VERSION]['Era']
+_PH2_ERA_NAME = _settings.properties['Run4'][_settings.DEFAULT_VERSION]['Era']
 
 # Function to display help information
 def print_help():

diff --git a/RecoTracker/TkNavigation/test/NavigationSchoolAnalyzer_Phase2_cfg.py b/RecoTracker/TkNavigation/test/NavigationSchoolAnalyzer_Phase2_cfg.py
@@ -1,18 +1,20 @@
 import FWCore.ParameterSet.Config as cms
 
 # set the geometry and the GlobalTag
+import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings
+_PH2_GLOBAL_TAG, _PH2_ERA = _settings.get_era_and_conditions(_settings.DEFAULT_VERSION)
 
-process = cms.Process("NavigationSchoolAnalyzer")
+process = cms.Process("NavigationSchoolAnalyzer",_PH2_ERA)
 
 # the following lines are kept for when the phase-2 geometry wil be moved to DB
 #process.load("Configuration.StandardSequences.GeometryDB_cff")
 #process.load('Configuration.StandardSequences.GeometryRecoDB_cff')
 
-process.load('Configuration.Geometry.GeometryExtended2026D98Reco_cff')
+process.load('Configuration.Geometry.GeometryExtendedRun4DefaultReco_cff')
 process.load("Configuration.StandardSequences.MagneticField_cff")
 process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
 from Configuration.AlCa.GlobalTag import GlobalTag
-process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T25', '')
+process.GlobalTag = GlobalTag(process.GlobalTag, _PH2_GLOBAL_TAG, '')
 process.load("RecoTracker.TkNavigation.NavigationSchoolESProducer_cff")
 
 #process.MessageLogger = cms.Service("MessageLogger",

diff --git a/Validation/Geometry/test/genHGCalPlots.sh b/Validation/Geometry/test/genHGCalPlots.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -ex
 
-geom=Extended2026D110
+geom=ExtendedRun4D110
 VGEO_DIR=${CMSSW_BASE}/src/Validation/Geometry/test
 TEST_DIR=.