Skip to content

Move default Run 4 workflows to D121 #49437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 26, 2025
Merged

Move default Run 4 workflows to D121 #49437

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
450cc4f
update relvals to use D121
kpedro88 Nov 21, 2025
783293f
update CondTools/Geometry to use D121
kpedro88 Nov 21, 2025
aa1fe97
add D121 relval string
kpedro88 Nov 24, 2025
893cc1c
update era for D121
kpedro88 Nov 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CondTools/Geometry/test/calogeometryRun4writer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
Copy link
Contributor

@perrotta perrotta Nov 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just checking: is this era correct for D121?

Copy link
Contributor Author

@kpedro88 kpedro88 Nov 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, you are right, it should be Phase2C22I13M9 because the calorimeter changes:

cmssw/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py

Line 3876 in 1dbeb02

'Era' : 'Phase2C22I13M9',

I will propagate this update.

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')

Expand Down
2 changes: 1 addition & 1 deletion CondTools/Geometry/test/hgcalgeometrywriter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion CondTools/Geometry/test/me0geometrywriter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
4 changes: 2 additions & 2 deletions CondTools/Geometry/test/writehelpers/geometryExtendedRun4_writer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down Expand Up @@ -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')),
Expand Down
4 changes: 2 additions & 2 deletions CondTools/Geometry/test/writehelpers/geometryExtendedRun4_xmlwriter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand All @@ -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")
)


Expand Down
2 changes: 1 addition & 1 deletion CondTools/Geometry/test/writehelpers/splitExtendedRun4Database.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Configuration/PyReleaseValidation/python/relval_Run4.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = []
Expand Down
1 change: 1 addition & 0 deletions Configuration/PyReleaseValidation/python/relval_steps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']=''
Copy link
Contributor Author

@kpedro88 kpedro88 Nov 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cms-sw/pdmv-l2 is there anything that we can put here? I could not find any D121 samples in DAS.

Copy link
Contributor

@srimanob srimanob Nov 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we ever produce relvals with D121?

Copy link
Contributor

@AdrianoDee AdrianoDee Nov 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not really. We can produce them.

In general I think that if we want to move definetly to D121, we'd need a validation campaign.

Copy link
Contributor Author

@kpedro88 kpedro88 Nov 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should hopefully be very straightforward to validate, because the changes for all subdetectors are quite minor. We expect larger changes in 2026, but we wanted to complete this move first (which started in the summer).

Copy link
Contributor

@srimanob srimanob Nov 21, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe @AdrianoDee could help to submit minbias relvals with D121 with existing release (e.g. 16_0_0_pre1 or pre2). Then, within the next few days, when dataset is available, this PR can be updated.

Copy link
Contributor

@srimanob srimanob Nov 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

By the way, not sure how short matrix for PR test will work for now, as it will try to run D121+PU workflow, right?

Copy link
Contributor Author

@kpedro88 kpedro88 Nov 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Including pre2 relvals for this geometry in this PR would be ideal.

Indeed, a few tests may fail, but I think most do not include PU.

Copy link
Contributor

@AdrianoDee AdrianoDee Nov 24, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've sent a set of D121 relvals here. Most of them are already done. So there you can use CMSSW_16_0_0_pre2-150X_mcRun4_realistic_v1_STD_RegeneratedGS_Run4D121_noPU-v.

For D121 validation itself, since it should be minor, I would proceed by just having both D110 and D121 samples produced for the incoming 16_0_0_pre3 campaign and have the validators inspect them there.

Copy link
Contributor Author

@kpedro88 kpedro88 Nov 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @AdrianoDee ! Your proposal for validation sounds good to me.

Copy link
Contributor

@bsunanda bsunanda Nov 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I shall update the ones in Geometry package


## HIN
defaultDataSets['2023HIN']='CCMSSW_14_1_0-PU_140X_mcRun3_2023_realistic_HI_v4_STD_2023HIN_PU-v'
Expand Down
57 changes: 29 additions & 28 deletions Configuration/PyReleaseValidation/scripts/runTheMatrix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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' : [
Expand All @@ -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'] = (
Expand Down
2 changes: 1 addition & 1 deletion Configuration/StandardSequences/python/DD4hep_GeometrySimPhase2_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import FWCore.ParameterSet.Config as cms

from Configuration.Geometry.GeometryDD4hepExtendedRun4D110_cff import *
from Configuration.Geometry.GeometryDD4hepExtendedRun4D121_cff import *