Skip to content

Commit e773726

Browse files
cmsbuildcmsbuild
authored
Merge pull request #46608 from mmusich/mm_fixes_post-46582
fix a bunch of tests broken by #46582
2 parents aca061d + 3412226 commit e773726

File tree

12 files changed

+59
-30
lines changed

12 files changed

+59
-30
lines changed

‎CalibTracker/StandaloneTrackerTopology/test/testStandaloneTrackerTopology.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ echo " testing CalibTracker/StandalonTrackerTopology"
66

77
cmsRun ${SCRAM_TEST_PATH}/testStandaloneTrackerTopology_cfg.py || die "Failure using cmsRun testPixelTopologyMapTest_cfg.py (Phase-0 test)" $?
88
cmsRun ${SCRAM_TEST_PATH}/testStandaloneTrackerTopology_cfg.py runNumber=300000 || die "Failure using cmsRun testPixelTopologyMapTest_cfg.py (Phase-1 test)" $?
9-
cmsRun ${SCRAM_TEST_PATH}/testStandaloneTrackerTopology_cfg.py globalTag=auto:phase2_realistic_T21 || die "Failure using cmsRun testPixelTopologyMapTest_cfg.py (Phase-2 test)" $?
9+
cmsRun ${SCRAM_TEST_PATH}/testStandaloneTrackerTopology_cfg.py isPhase2=True || die "Failure using cmsRun testPixelTopologyMapTest_cfg.py (Phase-2 test)" $?

‎CalibTracker/StandaloneTrackerTopology/test/testStandaloneTrackerTopology_cfg.py

+24-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import FWCore.ParameterSet.Config as cms
22
import FWCore.ParameterSet.VarParsing as VarParsing
33

4-
process = cms.Process("TopologyAnalysis")
54
options = VarParsing.VarParsing("analysis")
65

76
options.register ('globalTag',
@@ -16,8 +15,25 @@
1615
VarParsing.VarParsing.varType.int, # string, int, or float
1716
"run number")
1817

18+
options.register ('isPhase2',
19+
False,
20+
VarParsing.VarParsing.multiplicity.singleton, # singleton or list
21+
VarParsing.VarParsing.varType.bool, # string, int, or float
22+
"is phase2?")
23+
1924
options.parseArguments()
2025

26+
###################################################################
27+
# Set default phase-2 settings
28+
###################################################################
29+
import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings
30+
_PH2_GLOBAL_TAG, _PH2_ERA = _settings.get_era_and_conditions(_settings.DEFAULT_VERSION)
31+
32+
if(options.isPhase2):
33+
process = cms.Process("TopologyAnalysis",_PH2_ERA)
34+
else:
35+
process = cms.Process("TopologyAnalysis")
36+
2137
###################################################################
2238
# Message logger service
2339
###################################################################
@@ -29,9 +45,9 @@
2945
###################################################################
3046
process.load("Configuration.StandardSequences.Services_cff")
3147

32-
if 'phase2' in options.globalTag:
33-
process.load("Configuration.Geometry.GeometryExtended2026D98_cff")
34-
process.load("Configuration.Geometry.GeometryExtended2026D98Reco_cff")
48+
if(options.isPhase2):
49+
process.load("Configuration.Geometry.GeometryExtendedRun4Default_cff")
50+
process.load("Configuration.Geometry.GeometryExtendedRun4DefaultReco_cff")
3551
else:
3652
process.load("Configuration.StandardSequences.GeometryRecoDB_cff")
3753

@@ -40,7 +56,10 @@
4056
####################################################################
4157
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
4258
from Configuration.AlCa.GlobalTag import GlobalTag
43-
process.GlobalTag = GlobalTag(process.GlobalTag, options.globalTag, '')
59+
if(options.isPhase2):
60+
process.GlobalTag = GlobalTag(process.GlobalTag, _PH2_GLOBAL_TAG, '')
61+
else:
62+
process.GlobalTag = GlobalTag(process.GlobalTag, options.globalTag, '')
4463

4564
###################################################################
4665
# Empty Source

‎Geometry/MTDCommonData/test/testMTDinDD4hep.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import FWCore.ParameterSet.Config as cms
22

3-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
3+
import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings
4+
_PH2_GLOBAL_TAG, _PH2_ERA = _settings.get_era_and_conditions(_settings.DEFAULT_VERSION)
45
from Configuration.ProcessModifiers.dd4hep_cff import dd4hep
56

6-
process = cms.Process("CompareGeometryTest",Phase2C17I13M9,dd4hep)
7+
process = cms.Process("CompareGeometryTest",_PH2_ERA,dd4hep)
78

89
process.source = cms.Source("EmptySource")
910
process.maxEvents = cms.untracked.PSet(
@@ -54,7 +55,7 @@
5455
threshold = cms.untracked.string('INFO')
5556
)
5657

57-
process.load('Configuration.Geometry.GeometryDD4hepExtended2026D110_cff')
58+
process.load('Configuration.Geometry.GeometryDD4hepExtendedRun4Default_cff')
5859

5960
process.testBTL = cms.EDAnalyzer("DD4hep_TestMTDIdealGeometry",
6061
DDDetector = cms.ESInputTag('',''),

‎Geometry/MTDCommonData/test/testMTDinDDD.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import FWCore.ParameterSet.Config as cms
22

3-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
3+
import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings
4+
_PH2_GLOBAL_TAG, _PH2_ERA = _settings.get_era_and_conditions(_settings.DEFAULT_VERSION)
45

5-
process = cms.Process("CompareGeometryTest",Phase2C17I13M9)
6+
process = cms.Process("CompareGeometryTest", _PH2_ERA)
67

78
process.source = cms.Source("EmptySource")
89
process.maxEvents = cms.untracked.PSet(
@@ -53,7 +54,7 @@
5354
threshold = cms.untracked.string('INFO')
5455
)
5556

56-
process.load('Configuration.Geometry.GeometryExtended2026D110_cff')
57+
process.load('Configuration.Geometry.GeometryExtendedRun4Default_cff')
5758

5859
process.testBTL = cms.EDAnalyzer("TestMTDIdealGeometry",
5960
ddTopNodeName = cms.untracked.string('BarrelTimingLayer')

‎Geometry/MTDGeometryBuilder/test/dd4hep_mtd_cfg.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import FWCore.ParameterSet.Config as cms
22

3-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
3+
import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings
4+
_PH2_GLOBAL_TAG, _PH2_ERA = _settings.get_era_and_conditions(_settings.DEFAULT_VERSION)
5+
46
from Configuration.ProcessModifiers.dd4hep_cff import dd4hep
57

6-
process = cms.Process("GeometryTest",Phase2C17I13M9,dd4hep)
8+
process = cms.Process("GeometryTest",_PH2_ERA,dd4hep)
79

810
process.source = cms.Source("EmptyIOVSource",
911
lastValue = cms.uint64(1),
@@ -50,7 +52,7 @@
5052
threshold = cms.untracked.string('INFO')
5153
)
5254

53-
process.load("Configuration.Geometry.GeometryDD4hepExtended2026D110Reco_cff")
55+
process.load("Configuration.Geometry.GeometryDD4hepExtendedRun4DefaultReco_cff")
5456

5557
process.Timing = cms.Service("Timing")
5658

‎Geometry/MTDGeometryBuilder/test/mtd_cfg.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import FWCore.ParameterSet.Config as cms
22

3-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
3+
import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings
4+
_PH2_GLOBAL_TAG, _PH2_ERA = _settings.get_era_and_conditions(_settings.DEFAULT_VERSION)
45

5-
process = cms.Process("GeometryTest",Phase2C17I13M9)
6+
process = cms.Process("GeometryTest", _PH2_ERA)
67

78
process.source = cms.Source("EmptyIOVSource",
89
lastValue = cms.uint64(1),
@@ -46,7 +47,7 @@
4647
threshold = cms.untracked.string('INFO')
4748
)
4849

49-
process.load("Configuration.Geometry.GeometryExtended2026D110_cff")
50+
process.load("Configuration.Geometry.GeometryExtendedRun4Default_cff")
5051

5152
process.load("Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff")
5253

‎Geometry/MTDNumberingBuilder/test/dd4hep_mtd_cfg.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import FWCore.ParameterSet.Config as cms
22

3-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
3+
import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings
4+
_PH2_GLOBAL_TAG, _PH2_ERA = _settings.get_era_and_conditions(_settings.DEFAULT_VERSION)
5+
46
from Configuration.ProcessModifiers.dd4hep_cff import dd4hep
57

6-
process = cms.Process("GeometryTest",Phase2C17I13M9,dd4hep)
8+
process = cms.Process("GeometryTest",_PH2_ERA,dd4hep)
79

810
process.source = cms.Source("EmptyIOVSource",
911
lastValue = cms.uint64(1),
@@ -47,7 +49,7 @@
4749
threshold = cms.untracked.string('INFO')
4850
)
4951

50-
process.load("Configuration.Geometry.GeometryDD4hepExtended2026D110Reco_cff")
52+
process.load("Configuration.Geometry.GeometryDD4hepExtendedRun4DefaultReco_cff")
5153

5254
process.prod = cms.EDAnalyzer("GeometricTimingDetAnalyzer")
5355

‎Geometry/MTDNumberingBuilder/test/mtd_cfg.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import FWCore.ParameterSet.Config as cms
22

3-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
3+
import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings
4+
_PH2_GLOBAL_TAG, _PH2_ERA = _settings.get_era_and_conditions(_settings.DEFAULT_VERSION)
45

5-
process = cms.Process("GeometryTest",Phase2C17I13M9)
6+
process = cms.Process("GeometryTest",_PH2_ERA)
67

78
process.source = cms.Source("EmptyIOVSource",
89
lastValue = cms.uint64(1),
@@ -46,7 +47,7 @@
4647
threshold = cms.untracked.string('INFO')
4748
)
4849

49-
process.load("Configuration.Geometry.GeometryExtended2026D110Reco_cff")
50+
process.load("Configuration.Geometry.GeometryExtendedRun4DefaultReco_cff")
5051

5152
process.Timing = cms.Service("Timing")
5253

‎HLTrigger/Configuration/python/HLT_75e33/test/runHLTTiming.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ ALL_FILES="${ALL_FILES%?}"
3737
echo "Discovered files: $ALL_FILES"
3838

3939
cmsDriver.py Phase2 -s L1P2GT,HLT:75e33_timing --processName=HLTX \
40-
--conditions auto:phase2_realistic_T33 --geometry Extended2026D110 \
40+
--conditions auto:phase2_realistic_T33 --geometry ExtendedRun4D110 \
4141
--era Phase2C17I13M9 \
4242
--customise SLHCUpgradeSimulations/Configuration/aging.customise_aging_1000 \
4343
--eventcontent FEVTDEBUGHLT \

‎HLTrigger/Configuration/scripts/hltPhase2UpgradeIntegrationTests

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ _PH2_GLOBAL_TAG, _PH2_ERA = _settings.get_era_and_conditions(_settings.DEFAULT_V
1616
_PH2_GEOMETRY = f"Extended{_settings.DEFAULT_VERSION}"
1717

1818
# Get the actual era name from the version key
19-
_PH2_ERA_NAME = _settings.properties[2026][_settings.DEFAULT_VERSION]['Era']
19+
_PH2_ERA_NAME = _settings.properties['Run4'][_settings.DEFAULT_VERSION]['Era']
2020

2121
# Function to display help information
2222
def print_help():

‎RecoTracker/TkNavigation/test/NavigationSchoolAnalyzer_Phase2_cfg.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
import FWCore.ParameterSet.Config as cms
22

33
# set the geometry and the GlobalTag
4+
import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings
5+
_PH2_GLOBAL_TAG, _PH2_ERA = _settings.get_era_and_conditions(_settings.DEFAULT_VERSION)
46

5-
process = cms.Process("NavigationSchoolAnalyzer")
7+
process = cms.Process("NavigationSchoolAnalyzer",_PH2_ERA)
68

79
# the following lines are kept for when the phase-2 geometry wil be moved to DB
810
#process.load("Configuration.StandardSequences.GeometryDB_cff")
911
#process.load('Configuration.StandardSequences.GeometryRecoDB_cff')
1012

11-
process.load('Configuration.Geometry.GeometryExtended2026D98Reco_cff')
13+
process.load('Configuration.Geometry.GeometryExtendedRun4DefaultReco_cff')
1214
process.load("Configuration.StandardSequences.MagneticField_cff")
1315
process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
1416
from Configuration.AlCa.GlobalTag import GlobalTag
15-
process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T25', '')
17+
process.GlobalTag = GlobalTag(process.GlobalTag, _PH2_GLOBAL_TAG, '')
1618
process.load("RecoTracker.TkNavigation.NavigationSchoolESProducer_cff")
1719

1820
#process.MessageLogger = cms.Service("MessageLogger",

‎Validation/Geometry/test/genHGCalPlots.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash -ex
22

3-
geom=Extended2026D110
3+
geom=ExtendedRun4D110
44
VGEO_DIR=${CMSSW_BASE}/src/Validation/Geometry/test
55
TEST_DIR=.
66

0 commit comments

Comments
 (0)