From 450cc4f7dec52a7a2db9b2020e69e90c27d4e934 Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Fri, 21 Nov 2025 11:42:11 -0600 Subject: [PATCH 1/4] update relvals to use D121 --- .../PyReleaseValidation/python/relval_Run4.py | 2 +- .../python/relval_steps.py | 1 + .../scripts/runTheMatrix.py | 57 ++++++++++--------- 3 files changed, 31 insertions(+), 29 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_Run4.py b/Configuration/PyReleaseValidation/python/relval_Run4.py index 8dc6fafa9eb67..58c8f7e0dac32 100644 --- a/Configuration/PyReleaseValidation/python/relval_Run4.py +++ b/Configuration/PyReleaseValidation/python/relval_Run4.py @@ -11,7 +11,7 @@ from Configuration.PyReleaseValidation.relval_upgrade import workflows as _upgrade_workflows #just define all of them -prefixDet = 29600 #update this line when change the default version +prefixDet = 34400 #update this line when change the default version #Run4 WFs to run in IB (TTbar) numWFIB = [] diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index f88a2b1334adb..dee38830b6931 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -4768,6 +4768,7 @@ def gen2024HiMix(fragment,howMuch): defaultDataSets['Run4D96']='CMSSW_13_1_0_pre1-130X_mcRun4_realistic_v2_2026D96noPU-v' defaultDataSets['Run4D98']='CMSSW_13_2_0_pre1-131X_mcRun4_realistic_v5_2026D98noPU-v' defaultDataSets['Run4D110']='CMSSW_15_1_0_pre5-150X_mcRun4_realistic_v1_STD_RegeneratedGS_Run4D110_noPU-v' +defaultDataSets['Run4D121']='' ## HIN defaultDataSets['2023HIN']='CCMSSW_14_1_0-PU_140X_mcRun3_2023_realistic_HI_v4_STD_2023HIN_PU-v' diff --git a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py index b21de405e5c1c..fea9edae36532 100755 --- a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py +++ b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py @@ -7,6 +7,7 @@ from Configuration.PyReleaseValidation.MatrixRunner import MatrixRunner from Configuration.PyReleaseValidation.MatrixInjector import MatrixInjector,performInjectionOptionTest from Configuration.PyReleaseValidation.MatrixUtil import cleanComputeCapabilities +from Configuration.PyReleaseValidation.relval_Run4 import prefixDet # ================================================================================ def showRaw(opt): @@ -133,13 +134,13 @@ def runSelected(opt): 'phase2' : [ ###### MC (generated from scratch or from RelVals) # Phase2 - 29634.0, # RelValTTbar_14TeV phase2_realistic_T33 ExtendedRun4D110 (Phase-2 baseline) - 29634.911, # TTbar_14TeV_TuneCP5 phase2_realistic_T33 DD4hepExtendedRun4D110 DD4Hep (HLLHC14TeV BeamSpot) - 29834.999, # RelValTTbar_14TeV (PREMIX) phase2_realistic_T33 ExtendedRun4D110 AVE_50_BX_25ns_m3p3 - 29696.0, # RelValCloseByPGun_CE_E_Front_120um phase2_realistic_T33 ExtendedRun4D110 - 29700.0, # RelValCloseByPGun_CE_H_Coarse_Scint phase2_realistic_T33 ExtendedRun4D110 + prefixDet+34.0, # RelValTTbar_14TeV phase2_realistic_T33 ExtendedRun4D121 (Phase-2 baseline) + prefixDet+34.911, # TTbar_14TeV_TuneCP5 phase2_realistic_T33 DD4hepExtendedRun4D121 DD4Hep (HLLHC14TeV BeamSpot) + prefixDet+234.999, # RelValTTbar_14TeV (PREMIX) phase2_realistic_T33 ExtendedRun4D121 AVE_50_BX_25ns_m3p3 + prefixDet+96.0, # RelValCloseByPGun_CE_E_Front_120um phase2_realistic_T33 ExtendedRun4D121 + prefixDet+100.0, # RelValCloseByPGun_CE_H_Coarse_Scint phase2_realistic_T33 ExtendedRun4D121 #23234.0, # Need new workflow with HFNose - 29634.75, # RelValTTbar_14TeV phase2_realistic_T33 ExtendedRun4D110 (Phase-2 baseline - but using timing menu, and only up to step 2) + prefixDet+34.75, # RelValTTbar_14TeV phase2_realistic_T33 ExtendedRun4D121 (Phase-2 baseline - but using timing menu, and only up to step 2) ], 'heavyIons' : [ @@ -155,28 +156,28 @@ def runSelected(opt): 'metmc' : [5.1, 15, 25, 37, 38, 39], #MC 'muonmc' : [5.1, 124.4, 124.5, 20, 21, 22, 23, 25, 30], #MC - 'ph2_hlt' : [29634.75, # HLT phase-2 timing menu - 29634.7501, # HLT phase-2 tracking-only menu - 29634.751, # HLT phase-2 timing menu Alpaka variant - 29634.7511, # HLT phase-2 timing menu Phase2CAExtension variant - 29634.752, # HLT phase-2 timing menu ticl_v5 variant - 29634.753, # HLT phase-2 timing menu Alpaka, single tracking iteration variant - 29634.754, # HLT phase-2 timing menu Alpaka, single tracking iteration, LST building variant - 29634.755, # HLT phase-2 timing menu Alpaka, LST building variant - 29634.756, # HLT phase-2 timing menu trimmed tracking - 29634.7561, # HLT phase-2 timing menu Alpaka, trimmed tracking - 29634.7562, # HLT phase-2 timing menu Alpaka, trimmed tracking, single tracking iteration variant - 29634.757, # HLT phase-2 timing menu Alpaka, single tracking iteration, LST seeding + CKF building variant - 29634.7571, # HLT phase-2 timing menu Alpaka, single tracking iteration, Phase2CAExtension+LST seeding + mkFit building variant - 29634.7572, # HLT phase-2 timing menu Alpaka, single tracking iteration, Phase2CAExtension+LST seeding + mkFit building and fitting variant - 29634.758, # HLT phase-2 timing menu ticl_barrel variant - 29634.759, # HLT phase-2 timing menu, with NANO:@Phase2HLT - 29634.77, # HLT phase-2 NGT Scouting menu - 29634.771, # HLT phase-2 NGT Scouting menu, Alpaka, TICL-v5, TICL-Barrel, CA Extension - 29634.772, # HLT phase-2 NGT Scouting menu, with NANO:@NGTScouting - 29634.773, # HLT phase-2 NGT Scouting menu, with NANO:@NGTScoutingVal - 29634.774, # HLT phase-2 NGT Scouting menu, Phase2CAExtension as GeneralTracks - 29634.775], # HLT phase-2 NGT Scouting menu, Phase2CAExtension&LSTT5 as GeneralTracks + 'ph2_hlt' : [prefixDet+34.75, # HLT phase-2 timing menu + prefixDet+34.7501, # HLT phase-2 tracking-only menu + prefixDet+34.751, # HLT phase-2 timing menu Alpaka variant + prefixDet+34.7511, # HLT phase-2 timing menu Phase2CAExtension variant + prefixDet+34.752, # HLT phase-2 timing menu ticl_v5 variant + prefixDet+34.753, # HLT phase-2 timing menu Alpaka, single tracking iteration variant + prefixDet+34.754, # HLT phase-2 timing menu Alpaka, single tracking iteration, LST building variant + prefixDet+34.755, # HLT phase-2 timing menu Alpaka, LST building variant + prefixDet+34.756, # HLT phase-2 timing menu trimmed tracking + prefixDet+34.7561, # HLT phase-2 timing menu Alpaka, trimmed tracking + prefixDet+34.7562, # HLT phase-2 timing menu Alpaka, trimmed tracking, single tracking iteration variant + prefixDet+34.757, # HLT phase-2 timing menu Alpaka, single tracking iteration, LST seeding + CKF building variant + prefixDet+34.7571, # HLT phase-2 timing menu Alpaka, single tracking iteration, Phase2CAExtension+LST seeding + mkFit building variant + prefixDet+34.7572, # HLT phase-2 timing menu Alpaka, single tracking iteration, Phase2CAExtension+LST seeding + mkFit building and fitting variant + prefixDet+34.758, # HLT phase-2 timing menu ticl_barrel variant + prefixDet+34.759, # HLT phase-2 timing menu, with NANO:@Phase2HLT + prefixDet+34.77, # HLT phase-2 NGT Scouting menu + prefixDet+34.771, # HLT phase-2 NGT Scouting menu, Alpaka, TICL-v5, TICL-Barrel, CA Extension + prefixDet+34.772, # HLT phase-2 NGT Scouting menu, with NANO:@NGTScouting + prefixDet+34.773, # HLT phase-2 NGT Scouting menu, with NANO:@NGTScoutingVal + prefixDet+34.774, # HLT phase-2 NGT Scouting menu, Phase2CAExtension as GeneralTracks + prefixDet+34.775], # HLT phase-2 NGT Scouting menu, Phase2CAExtension&LSTT5 as GeneralTracks } predefinedSet['limited'] = ( From 783293f01d46343180c80d447c7c68b839320a60 Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Fri, 21 Nov 2025 11:43:16 -0600 Subject: [PATCH 2/4] update CondTools/Geometry to use D121 --- CondTools/Geometry/test/calogeometryRun4writer.py | 2 +- CondTools/Geometry/test/hgcalgeometrywriter.py | 2 +- CondTools/Geometry/test/me0geometrywriter.py | 2 +- .../Geometry/test/writehelpers/geometryExtendedRun4_writer.py | 4 ++-- .../test/writehelpers/geometryExtendedRun4_xmlwriter.py | 4 ++-- .../Geometry/test/writehelpers/splitExtendedRun4Database.sh | 2 +- .../StandardSequences/python/DD4hep_GeometrySimPhase2_cff.py | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CondTools/Geometry/test/calogeometryRun4writer.py b/CondTools/Geometry/test/calogeometryRun4writer.py index 96ffd66002bd8..2e8f4af7efe30 100644 --- a/CondTools/Geometry/test/calogeometryRun4writer.py +++ b/CondTools/Geometry/test/calogeometryRun4writer.py @@ -3,7 +3,7 @@ from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 process = cms.Process("CaloGeometryWriter",Phase2C17I13M9) process.load('CondCore.CondDB.CondDB_cfi') -process.load('Configuration.Geometry.GeometryExtendedRun4D110_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D121_cff') process.load('Geometry.CaloEventSetup.CaloGeometryRun4DBWriter_cfi') process.load('CondTools.Geometry.HcalParametersWriter_cff') diff --git a/CondTools/Geometry/test/hgcalgeometrywriter.py b/CondTools/Geometry/test/hgcalgeometrywriter.py index f4bca01f69f1e..5f018813408cd 100644 --- a/CondTools/Geometry/test/hgcalgeometrywriter.py +++ b/CondTools/Geometry/test/hgcalgeometrywriter.py @@ -3,7 +3,7 @@ from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 process = cms.Process("HGCalGeometryWriter",Phase2C17I13M9) process.load('CondCore.CondDB.CondDB_cfi') -process.load('Configuration.Geometry.GeometryExtendedRun4D110_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D121_cff') process.source = cms.Source("EmptyIOVSource", lastValue = cms.uint64(1), diff --git a/CondTools/Geometry/test/me0geometrywriter.py b/CondTools/Geometry/test/me0geometrywriter.py index b08d57a3ac895..b9d89247fc003 100644 --- a/CondTools/Geometry/test/me0geometrywriter.py +++ b/CondTools/Geometry/test/me0geometrywriter.py @@ -3,7 +3,7 @@ from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 process = cms.Process("ME0GeometryWriter",Phase2C17I13M9) process.load('CondCore.CondDB.CondDB_cfi') -process.load('Configuration.Geometry.GeometryExtendedRun4D110_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D121_cff') process.load('Geometry.MuonNumbering.muonNumberingInitialization_cfi') process.load("Geometry.MuonNumbering.muonGeometryConstants_cff") process.load('Configuration.StandardSequences.DD4hep_GeometrySimPhase2_cff') diff --git a/CondTools/Geometry/test/writehelpers/geometryExtendedRun4_writer.py b/CondTools/Geometry/test/writehelpers/geometryExtendedRun4_writer.py index 2a8b05785b3df..7ccee858a6207 100644 --- a/CondTools/Geometry/test/writehelpers/geometryExtendedRun4_writer.py +++ b/CondTools/Geometry/test/writehelpers/geometryExtendedRun4_writer.py @@ -9,7 +9,7 @@ # 2) GEM, if Configuration.Geometry.GeometryExtendedRun4D77_cff is used (ScenarioRun4D77 has to be set in DD4hep_GeometrySimPhase2_cff) # Please add the right Scenario (D110 or ..) also in geometryExtendedRun4_xmlwriter.py and in splitExtendedRun4Database.sh # -process.load('Configuration.Geometry.GeometryExtendedRun4D110_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D121_cff') process.load('Geometry.MuonNumbering.muonNumberingInitialization_cfi') process.load("Geometry.MuonNumbering.muonGeometryConstants_cff") process.load('Configuration.StandardSequences.DD4hep_GeometrySimPhase2_cff') @@ -51,7 +51,7 @@ process.CondDB.connect = cms.string('sqlite_file:myfile.db') process.PoolDBOutputService = cms.Service("PoolDBOutputService", process.CondDB, - toPut = cms.VPSet(cms.PSet(record = cms.string('GeometryFileRcd'), tag = cms.string('XMLFILE_Geometry_TagXX_ExtendedRun4D110_mc')), + toPut = cms.VPSet(cms.PSet(record = cms.string('GeometryFileRcd'), tag = cms.string('XMLFILE_Geometry_TagXX_ExtendedRun4D121_mc')), cms.PSet(record = cms.string('IdealGeometryRecord'), tag = cms.string('TKRECO_Geometry_TagXX')), cms.PSet(record = cms.string('PTrackerParametersRcd'), tag = cms.string('TKParameters_Geometry_TagXX')), cms.PSet(record = cms.string('PTrackerAdditionalParametersPerDetRcd'), tag = cms.string('TKAdditionalParametersPerDet_Geometry_TagXX')), diff --git a/CondTools/Geometry/test/writehelpers/geometryExtendedRun4_xmlwriter.py b/CondTools/Geometry/test/writehelpers/geometryExtendedRun4_xmlwriter.py index 055edcd1a0938..e92c573877ef0 100644 --- a/CondTools/Geometry/test/writehelpers/geometryExtendedRun4_xmlwriter.py +++ b/CondTools/Geometry/test/writehelpers/geometryExtendedRun4_xmlwriter.py @@ -2,7 +2,7 @@ process = cms.Process("GeometryXMLWriter") -process.load('Configuration.Geometry.GeometryExtendedRun4D110_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D121_cff') process.source = cms.Source("EmptyIOVSource", lastValue = cms.uint64(1), @@ -13,7 +13,7 @@ process.BigXMLWriter = cms.EDAnalyzer("OutputDDToDDL", rotNumSeed = cms.int32(0), - fileName = cms.untracked.string("./geD110SingleBigFile.xml") + fileName = cms.untracked.string("./geD121SingleBigFile.xml") ) diff --git a/CondTools/Geometry/test/writehelpers/splitExtendedRun4Database.sh b/CondTools/Geometry/test/writehelpers/splitExtendedRun4Database.sh index 370f5e0f3f309..093186562357e 100755 --- a/CondTools/Geometry/test/writehelpers/splitExtendedRun4Database.sh +++ b/CondTools/Geometry/test/writehelpers/splitExtendedRun4Database.sh @@ -1,6 +1,6 @@ #!/bin/sh -conddb -f sqlite_file:myfile.db -c sqlite_file:GeometryFileExtendedRun4D110.db -t XMLFILE_Geometry_TagXX_ExtendedRun4D110_mc -i XMLFILE_Geometry_TagXX_ExtendedRun4D110_mc +conddb -f sqlite_file:myfile.db -c sqlite_file:GeometryFileExtendedRun4D121.db -t XMLFILE_Geometry_TagXX_ExtendedRun4D121_mc -i XMLFILE_Geometry_TagXX_ExtendedRun4D121_mc conddb -f sqlite_file:myfile.db -c sqlite_file:TKRECO_Geometry.db -t TKRECO_Geometry_TagXX -i TKRECO_Geometry_TagXX conddb -f sqlite_file:myfile.db -c sqlite_file:TKParameters_Geometry.db -t TKParameters_Geometry_TagXX -i TKParameters_Geometry_TagXX conddb -f sqlite_file:myfile.db -c sqlite_file:EBRECO_Geometry.db -t EBRECO_Geometry_TagXX -i EBRECO_Geometry_TagXX diff --git a/Configuration/StandardSequences/python/DD4hep_GeometrySimPhase2_cff.py b/Configuration/StandardSequences/python/DD4hep_GeometrySimPhase2_cff.py index 449ca7777a4ca..57760c7cd16d9 100644 --- a/Configuration/StandardSequences/python/DD4hep_GeometrySimPhase2_cff.py +++ b/Configuration/StandardSequences/python/DD4hep_GeometrySimPhase2_cff.py @@ -1,3 +1,3 @@ import FWCore.ParameterSet.Config as cms -from Configuration.Geometry.GeometryDD4hepExtendedRun4D110_cff import * +from Configuration.Geometry.GeometryDD4hepExtendedRun4D121_cff import * From aa1fe97a5954f71e73258a3013d80733a2c1b224 Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Mon, 24 Nov 2025 13:51:01 -0600 Subject: [PATCH 3/4] add D121 relval string --- Configuration/PyReleaseValidation/python/relval_steps.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index dee38830b6931..0295003252a62 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -4768,7 +4768,7 @@ def gen2024HiMix(fragment,howMuch): defaultDataSets['Run4D96']='CMSSW_13_1_0_pre1-130X_mcRun4_realistic_v2_2026D96noPU-v' defaultDataSets['Run4D98']='CMSSW_13_2_0_pre1-131X_mcRun4_realistic_v5_2026D98noPU-v' defaultDataSets['Run4D110']='CMSSW_15_1_0_pre5-150X_mcRun4_realistic_v1_STD_RegeneratedGS_Run4D110_noPU-v' -defaultDataSets['Run4D121']='' +defaultDataSets['Run4D121']='CMSSW_16_0_0_pre2-150X_mcRun4_realistic_v1_STD_RegeneratedGS_Run4D121_noPU-v' ## HIN defaultDataSets['2023HIN']='CCMSSW_14_1_0-PU_140X_mcRun3_2023_realistic_HI_v4_STD_2023HIN_PU-v' From 893cc1c635d0bd251f01d89c94945409ede585d7 Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Wed, 26 Nov 2025 09:12:10 -0600 Subject: [PATCH 4/4] update era for D121 --- CondTools/Geometry/test/calogeometryRun4writer.py | 4 ++-- CondTools/Geometry/test/hgcalgeometrywriter.py | 4 ++-- CondTools/Geometry/test/me0geometrywriter.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CondTools/Geometry/test/calogeometryRun4writer.py b/CondTools/Geometry/test/calogeometryRun4writer.py index 2e8f4af7efe30..083decafcfc8b 100644 --- a/CondTools/Geometry/test/calogeometryRun4writer.py +++ b/CondTools/Geometry/test/calogeometryRun4writer.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 -process = cms.Process("CaloGeometryWriter",Phase2C17I13M9) +from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 +process = cms.Process("CaloGeometryWriter",Phase2C22I13M9) process.load('CondCore.CondDB.CondDB_cfi') process.load('Configuration.Geometry.GeometryExtendedRun4D121_cff') process.load('Geometry.CaloEventSetup.CaloGeometryRun4DBWriter_cfi') diff --git a/CondTools/Geometry/test/hgcalgeometrywriter.py b/CondTools/Geometry/test/hgcalgeometrywriter.py index 5f018813408cd..f552dae277bd8 100644 --- a/CondTools/Geometry/test/hgcalgeometrywriter.py +++ b/CondTools/Geometry/test/hgcalgeometrywriter.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 -process = cms.Process("HGCalGeometryWriter",Phase2C17I13M9) +from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 +process = cms.Process("HGCalGeometryWriter",Phase2C22I13M9) process.load('CondCore.CondDB.CondDB_cfi') process.load('Configuration.Geometry.GeometryExtendedRun4D121_cff') diff --git a/CondTools/Geometry/test/me0geometrywriter.py b/CondTools/Geometry/test/me0geometrywriter.py index b9d89247fc003..92159c1b35743 100644 --- a/CondTools/Geometry/test/me0geometrywriter.py +++ b/CondTools/Geometry/test/me0geometrywriter.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 -process = cms.Process("ME0GeometryWriter",Phase2C17I13M9) +from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 +process = cms.Process("ME0GeometryWriter",Phase2C22I13M9) process.load('CondCore.CondDB.CondDB_cfi') process.load('Configuration.Geometry.GeometryExtendedRun4D121_cff') process.load('Geometry.MuonNumbering.muonNumberingInitialization_cfi')