Skip to content

Commit 5da7be9

Browse files
committed
fix a bunch of failing unit tests after D88 and D92 went missing
1 parent 635e97f commit 5da7be9

20 files changed

+44
-44
lines changed

Alignment/OfflineValidation/python/TkAlAllInOneTool/defaultInputFiles_cff.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
filesDefaultMC_DoubleMuonPUPhase_string = '/store/mc/Phase2Fall22DRMiniAOD/DYJetsToMuMu_M-50_TuneCP5_14TeV-madgraphMLM-pythia8/ALCARECO/TkAlZMuMu-PU200ALCA_TkAlPU200_125X_mcRun4_realistic_v5-v1/60000/9382696c-70fd-4b37-8a0f-24bd02aeda5f.root'
2424

2525
filesDefaultMC_MinBiasPUPhase2RECO = cms.untracked.vstring(
26-
'/store/relval/CMSSW_12_5_3/RelValMinBias_14TeV/GEN-SIM-RECO/125X_mcRun4_realistic_v5_2026D88PU-v1/2590000/22e22ae6-a353-4f2e-815e-cc5efee37af9.root',
26+
'/store/relval/CMSSW_14_1_0_pre6/RelValMinBias_14TeV/GEN-SIM-RECO/PU_141X_mcRun4_realistic_v1_STD_2026D110_PU-v3/2560000/c22f1cbd-50e3-458e-aba9-b0a327e4c971.root'
2727
)
2828

2929
filesDefaultMC_TTbarPhase2RECO = cms.untracked.vstring(
30-
'/store/relval/CMSSW_12_6_0_pre5/RelValTTbar_14TeV/GEN-SIM-RECO/125X_mcRun4_realistic_v5_2026D88noPU-v1/2590000/57cbe250-487d-4a47-998b-48f9028a0058.root',
30+
'/store/relval/CMSSW_14_1_0_pre5/RelValTTbar_14TeV/GEN-SIM-RECO/140X_mcRun4_realistic_v4_STD_2026D110_noPU-v1/2580000/b8c9ef5e-9c45-4c47-aae3-4db1304cd66e.root',
3131
)
3232

3333
filesDefaultData_JetHTRun2018D = cms.untracked.vstring(

Alignment/OfflineValidation/test/testPrimaryVertexRelatedValidations_cfg.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ class RefitType(Enum):
104104
# Standard loads
105105
###################################################################
106106
if(options.isPhase2):
107-
process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff')
107+
process.load('Configuration.Geometry.GeometryExtended2026DefaultReco_cff')
108108
else:
109109
process.load("Configuration.Geometry.GeometryRecoDB_cff")
110110

@@ -118,7 +118,7 @@ class RefitType(Enum):
118118
####################################################################
119119
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
120120
from Configuration.AlCa.GlobalTag import GlobalTag
121-
process.GlobalTag = GlobalTag(process.GlobalTag, ('auto:phase2_realistic_T21' if options.isPhase2 else 'auto:phase1_2022_realistic'), '')
121+
process.GlobalTag = GlobalTag(process.GlobalTag, ('auto:phase2_realistic_T33' if options.isPhase2 else 'auto:phase1_2022_realistic'), '')
122122

123123
if _allFromGT:
124124
print("############ testPVValidation_cfg.py: msg%-i: All is taken from GT")

Alignment/TrackerAlignment/test/Misalignments/createRandomlyMisalignedGeometry_Phase2_cfg.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@
4646
###################################################################
4747
# Ideal geometry producer and standard includes
4848
###################################################################
49-
process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff')
49+
process.load('Configuration.Geometry.GeometryExtended2026DefaultReco_cff')
5050
process.trackerGeometry.applyAlignment = True
5151

5252
###################################################################
5353
# Just state the Global Tag (and pick some run)
5454
###################################################################
5555
process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
5656
from Configuration.AlCa.GlobalTag import GlobalTag
57-
process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T21', '') # using realistic Phase 2 geom
57+
process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T33', '') # using realistic Phase 2 geom
5858
print("Using global tag:", process.GlobalTag.globaltag.value())
5959

6060
###################################################################

CondTools/SiPhase2Tracker/test/SiPhase2BadStripChannelBuilder_cfg.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
engineName = cms.untracked.string('TRandom3')
1818
)
1919

20-
## specify detector D88, as the geometry is needed (will take tracker T24)
21-
process.load("Configuration.Geometry.GeometryExtended2026D88_cff")
22-
process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff')
20+
## specify detector D110, as the geometry is needed (will take tracker T35)
21+
process.load("Configuration.Geometry.GeometryExtended2026Default_cff")
22+
process.load('Configuration.Geometry.GeometryExtended2026DefaultReco_cff')
2323

2424
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
2525
from Configuration.AlCa.GlobalTag import GlobalTag
26-
process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T21', '')
26+
process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T33', '')
2727

2828
###################################################################
2929
# Messages
@@ -61,10 +61,10 @@
6161
authenticationPath = cms.untracked.string('')
6262
),
6363
timetype = cms.untracked.string('runnumber'),
64-
connect = cms.string('sqlite_file:SiStripBadStripPhase2_T21_v0.db'),
64+
connect = cms.string('sqlite_file:SiStripBadStripPhase2_T33_v0.db'),
6565
toPut = cms.VPSet(cms.PSet(
6666
record = cms.string('SiStripBadStripRcd'),
67-
tag = cms.string('SiStripBadStripPhase2_T21')
67+
tag = cms.string('SiStripBadStripPhase2_T33')
6868
))
6969
)
7070

CondTools/SiPhase2Tracker/test/SiPhase2BadStripChannelReader_cfg.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,16 @@
4848
# Input data
4949
###################################################################
5050
if(options.fromESSource):
51-
process.load("Configuration.Geometry.GeometryExtended2026D88_cff")
52-
process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff')
51+
process.load("Configuration.Geometry.GeometryExtended2026Default_cff")
52+
process.load('Configuration.Geometry.GeometryExtended2026DefaultReco_cff')
5353
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
5454
from Configuration.AlCa.GlobalTag import GlobalTag
55-
process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T21', '')
55+
process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T33', '')
5656
#process.load("SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff") # already included
5757
#process.SiPhase2OTFakeBadStripsESSource.printDebug = cms.untracked.bool(True) # this makes it verbose
5858
process.SiPhase2OTFakeBadStripsESSource.badComponentsFraction = cms.double(0.05) # bad components fraction is 5%
5959
else:
60-
tag = 'SiStripBadStripPhase2_T21'
60+
tag = 'SiStripBadStripPhase2_T33'
6161
suffix = 'v0'
6262
inFile = tag+'_'+suffix+'.db'
6363
inDB = 'sqlite_file:'+inFile

CondTools/SiPhase2Tracker/test/SiPhase2OuterTrackerLorentzAngleReader_cfg.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
###################################################################
3737
# Input data
3838
###################################################################
39-
tag = 'SiPhase2OuterTrackerLorentzAngle_T21'
39+
tag = 'SiPhase2OuterTrackerLorentzAngle_T33'
4040
suffix = 'v0'
4141
inFile = tag+'_'+suffix+'.db'
4242
inDB = 'sqlite_file:'+inFile
@@ -58,7 +58,7 @@
5858
###################################################################
5959
process.get = cms.EDAnalyzer("EventSetupRecordDataGetter",
6060
toGet = cms.VPSet(cms.PSet(
61-
record = cms.string(' SiPhase2OuterTrackerLorentzAngleRcd'),
61+
record = cms.string('SiPhase2OuterTrackerLorentzAngleRcd'),
6262
data = cms.vstring('SiPhase2OuterTrackerLorentzAngle')
6363
)),
6464
verbose = cms.untracked.bool(True)

CondTools/SiPhase2Tracker/test/SiPhase2OuterTrackerLorentzAngleWriter_cfg.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
SiPhase2OuterTrackerLorentzAngle = cms.untracked.PSet( limit = cms.untracked.int32(-1)),
2626
)
2727

28-
tag = 'SiPhase2OuterTrackerLorentzAngle_T21'
28+
tag = 'SiPhase2OuterTrackerLorentzAngle_T33'
2929
suffix = 'v0'
3030
outfile = tag+'_'+suffix+'.db'
3131
outdb = 'sqlite_file:'+outfile
@@ -38,12 +38,12 @@
3838
process.load("CondCore.CondDB.CondDB_cfi")
3939
process.CondDB.connect = cms.string(outdb)
4040

41-
process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff')
42-
process.load('Configuration.Geometry.GeometryExtended2026D88_cff')
41+
process.load('Configuration.Geometry.GeometryExtended2026DefaultReco_cff')
42+
process.load('Configuration.Geometry.GeometryExtended2026Default_cff')
4343

4444
process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
4545
from Configuration.AlCa.GlobalTag import GlobalTag
46-
process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T21')
46+
process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T33')
4747
process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(1) )
4848

4949
process.source = cms.Source("EmptyIOVSource",
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
import FWCore.ParameterSet.Config as cms
22

3-
from Configuration.Geometry.GeometryDD4hepExtended2026D98Reco_cff import *
3+
from Configuration.Geometry.GeometryDD4hepExtended2026D110Reco_cff import *
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
import FWCore.ParameterSet.Config as cms
22

3-
from Configuration.Geometry.GeometryDD4hepExtended2026D98_cff import *
3+
from Configuration.Geometry.GeometryDD4hepExtended2026D110_cff import *
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
import FWCore.ParameterSet.Config as cms
22

3-
from Configuration.Geometry.GeometryExtended2026D98Reco_cff import *
3+
from Configuration.Geometry.GeometryExtended2026D110Reco_cff import *

0 commit comments

Comments
 (0)