Skip to content

Commit 586d4cf

Browse files
cmsbuildcmsbuild
authored
Merge pull request #48634 from stahlleiton/HIWF_2025
Add 2025 HI relval workflows
2 parents 348ffc7 + 0302483 commit 586d4cf

File tree

3 files changed

+83
-3
lines changed

3 files changed

+83
-3
lines changed

‎Configuration/AlCa/python/autoCond.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@
107107
'phase1_2025_realistic' : '151X_mcRun3_2025_realistic_v4',
108108
# GlobalTag for MC production (cosmics) with realistic conditions for Phase1 2025, Strip tracker in DECO mode
109109
'phase1_2025_cosmics' : '150X_mcRun3_2025cosmics_realistic_deco_v4',
110+
# GlobalTag for MC production with realistic conditions for Phase1 2025 detector for Heavy Ion
111+
'phase1_2025_realistic_hi' : '151X_mcRun3_2025_realistic_HI_v1',
110112
# GlobalTag for MC production with realistic conditions for Phase2
111113
'phase2_realistic' : '150X_mcRun4_realistic_v1'
112114
}

‎Configuration/PyReleaseValidation/python/relval_standard.py‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -889,6 +889,14 @@
889889
workflows[161.2] = ['',['PhotonJets_Pt_10_5362_HI_2024','DIGIHI2024','RECOHI2024','HARVESTHI2024']]
890890
workflows[161.3] = ['',['ZMM_5362_HI_2024','DIGIHI2024','RECOHI2024','HARVESTHI2024']]
891891
workflows[161.4] = ['',['ZEE_5362_HI_2024','DIGIHI2024','RECOHI2024','HARVESTHI2024']]
892+
### Run 3 cond., 2025
893+
workflows[162] = ['',['HydjetQ_B12_5362GeV_2025','DIGIHI2025','RECOHI2025MB','ALCARECOHI2023PPRECO','HARVESTHI2025']]
894+
workflows[162.02] = ['',['HydjetQ_B12_5362GeV_2025','DIGIHI2025','RAWPRIMESIMHI18','RECOHI2025MBAPPROXCLUSTERS','ALCARECOHI2025','HARVESTHI2025S4']]
895+
workflows[162.03] = ['',['HydjetQ_MinBias_5362GeV_2025','DIGIHI2025','RAWPRIMESIMHI18','RECOHI2025PROD','MINIHI2025PROD']]
896+
workflows[162.1] = ['',['QCD_Pt_80_120_5362_HI_2025','DIGIHI2025','RECOHI2025','HARVESTHI2025']]
897+
workflows[162.2] = ['',['PhotonJets_Pt_10_5362_HI_2025','DIGIHI2025','RECOHI2025','HARVESTHI2025']]
898+
workflows[162.3] = ['',['ZMM_5362_HI_2025','DIGIHI2025','RECOHI2025','HARVESTHI2025']]
899+
workflows[162.4] = ['',['ZEE_5362_HI_2025','DIGIHI2025','RECOHI2025','HARVESTHI2025']]
892900

893901

894902
### UPC test ###

‎Configuration/PyReleaseValidation/python/relval_steps.py‎

Lines changed: 73 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,10 @@
4444
step1Up2024HiProdDefaults = merge ([{'--conditions':'auto:phase1_2024_realistic_hi','--era':'Run3_pp_on_PbPb_2024','--beamspot':'DBrealistic'},step1Up2023HiProdDefaults])
4545
# step1 gensim: for 2024 UPC prod
4646
step1Up2024UPCProdDefaults = merge ([{'--era':'Run3_2024_UPC'},step1Up2024HiProdDefaults])
47+
# step1 gensim: for 2025 HI prod
48+
step1Up2025HiProdDefaults = merge ([{'--conditions':'auto:phase1_2025_realistic_hi','--era':'Run3_pp_on_PbPb_2025','--beamspot':'DBrealistic'},step1Up2024HiProdDefaults])
4749
# step1 gensim: for 2025 UPC prod
48-
step1Up2025UPCProdDefaults = merge ([{'--era':'Run3_2025_UPC'},step1Up2024HiProdDefaults])
50+
step1Up2025UPCProdDefaults = merge ([{'--era':'Run3_2025_UPC'},step1Up2025HiProdDefaults])
4951

5052
steps = Steps()
5153

@@ -876,6 +878,9 @@ def gen2024hiprod(fragment,howMuch):
876878
def gen2024upcprod(fragment,howMuch):
877879
global step1Up2024UPCProdDefaults
878880
return merge([{'cfg':fragment},howMuch,step1Up2024UPCProdDefaults])
881+
def gen2025hiprod(fragment,howMuch):
882+
global step1Up2025HiProdDefaults
883+
return merge([{'cfg':fragment},howMuch,step1Up2025HiProdDefaults])
879884
def gen2025upcprod(fragment,howMuch):
880885
global step1Up2025UPCProdDefaults
881886
return merge([{'cfg':fragment},howMuch,step1Up2025UPCProdDefaults])
@@ -1332,7 +1337,9 @@ def genS(fragment,howMuch):
13321337
hiDefaults2024 = {'--conditions':'auto:phase1_2024_realistic_hi', '--era':'Run3_pp_on_PbPb_2024'}
13331338
hiDefaults2024_approxClusters = {'--conditions':'auto:phase1_2024_realistic_hi', '--era':'Run3_pp_on_PbPb_approxSiStripClusters_2024'}
13341339
upcDefaults2024 = {'--conditions':'auto:phase1_2024_realistic_hi', '--era':'Run3_2024_UPC'}
1335-
upcDefaults2025 = {'--conditions':'auto:phase1_2024_realistic_hi', '--era':'Run3_2025_UPC'}
1340+
hiDefaults2025 = {'--conditions':'auto:phase1_2025_realistic_hi', '--era':'Run3_pp_on_PbPb_2025'}
1341+
hiDefaults2025_approxClusters = {'--conditions':'auto:phase1_2025_realistic_hi', '--era':'Run3_pp_on_PbPb_approxSiStripClusters_2025'}
1342+
upcDefaults2025 = {'--conditions':'auto:phase1_2025_realistic_hi', '--era':'Run3_2025_UPC'}
13361343
oxyDefaults2025 = {'--conditions':'auto:phase1_2024_realistic_hi', '--era':'Run3_2025_OXY'}
13371344
upcOxyDefaults2025 = {'--conditions':'auto:phase1_2024_realistic_hi', '--era':'Run3_2025_UPC_OXY'}
13381345

@@ -1345,6 +1352,8 @@ def genS(fragment,howMuch):
13451352
steps['HydjetQ_MinBias_5362GeV_2023_ppReco']=merge([{'-n':1},hiDefaults2023_ppReco,gen2023hiprod('Hydjet_Quenched_MinBias_5362GeV_cfi',U2000by1)])
13461353
steps['HydjetQ_B12_5362GeV_2024']=merge([{'-n':1},hiDefaults2024,gen2024hiprod('Hydjet_Quenched_B12_5362GeV_cfi',U2000by1)])
13471354
steps['HydjetQ_MinBias_5362GeV_2024']=merge([{'-n':1},hiDefaults2024,gen2024hiprod('Hydjet_Quenched_MinBias_5362GeV_cfi',U2000by1)])
1355+
steps['HydjetQ_B12_5362GeV_2025']=merge([{'-n':1},hiDefaults2025,gen2025hiprod('Hydjet_Quenched_B12_5362GeV_cfi',U2000by1)])
1356+
steps['HydjetQ_MinBias_5362GeV_2025']=merge([{'-n':1},hiDefaults2025,gen2025hiprod('Hydjet_Quenched_MinBias_5362GeV_cfi',U2000by1)])
13481357

13491358
steps['QCD_Pt_80_120_13_HI']=merge([hiDefaults2018_ppReco,gen2018hiprod('QCD_Pt_80_120_13TeV_TuneCUETP8M1_cfi',Kby(9,150))])
13501359
steps['PhotonJets_Pt_10_13_HI']=merge([hiDefaults2018_ppReco,gen2018hiprod('PhotonJet_Pt_10_13TeV_TuneCUETP8M1_cfi',Kby(9,150))])
@@ -1365,6 +1374,11 @@ def genS(fragment,howMuch):
13651374
steps['ZMM_5362_HI_2024']=merge([hiDefaults2024,gen2024hiprod('ZMM_5362GeV_TuneCP5_cfi',Kby(18,300))])
13661375
steps['ZEE_5362_HI_2024']=merge([hiDefaults2024,gen2024hiprod('ZEE_5362GeV_TuneCP5_cfi',Kby(18,300))])
13671376

1377+
steps['QCD_Pt_80_120_5362_HI_2025']=merge([hiDefaults2025,gen2025hiprod('QCD_Pt_80_120_5362GeV_TuneCP5_cfi',Kby(9,150))])
1378+
steps['PhotonJets_Pt_10_5362_HI_2025']=merge([hiDefaults2025,gen2025hiprod('PhotonJet_Pt_10_5362GeV_TuneCP5_cfi',Kby(9,150))])
1379+
steps['ZMM_5362_HI_2025']=merge([hiDefaults2025,gen2025hiprod('ZMM_5362GeV_TuneCP5_cfi',Kby(18,300))])
1380+
steps['ZEE_5362_HI_2025']=merge([hiDefaults2025,gen2025hiprod('ZEE_5362GeV_TuneCP5_cfi',Kby(18,300))])
1381+
13681382
steps['Starlight_DoubleDiffraction_5360_HI_2023']=merge([{'-s':'LHE,GEN,SIM'},gen2023hiprod('Configuration/Generator/python/Starlight_DoubleDiffraction_5p36TeV_cfi.py',Kby(9,150))])
13691383
steps['Starlight_DoubleDiffraction_5360_UPC_2024']=merge([{'-s':'LHE,GEN,SIM'},gen2024upcprod('Configuration/Generator/python/Starlight_DoubleDiffraction_5p36TeV_cfi.py',Kby(9,150))])
13701384
steps['Starlight_DoubleDiffraction_5360_UPC_2025']=merge([{'-s':'LHE,GEN,SIM'},gen2025upcprod('Configuration/Generator/python/Starlight_DoubleDiffraction_5p36TeV_cfi.py',Kby(9,150))])
@@ -2115,7 +2129,9 @@ def lhegensim2018ml(fragment,howMuch):
21152129
#steps['RESIMDIGI']=merge([{'-s':'reGEN,reSIM,DIGI,L1,DIGI2RAW,HLT:@fake,RAW2DIGI,L1Reco','-n':10,'--restoreRNDSeeds':'','--process':'HLT'},steps['DIGI']])
21162130

21172131

2118-
steps['DIGIUPC2025']=merge([{'-s':'DIGI,L1,DIGI2RAW,HLT:HIon'}, upcDefaults2025, step2Upg2015Defaults])
2132+
steps['DIGIHI2025APPROXCLUSTERS']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2'}, hiDefaults2025_approxClusters, {'--pileup':'HiMixNoPU'}, step2Upg2015Defaults])
2133+
steps['DIGIHI2025']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2'}, hiDefaults2025, {'--pileup':'HiMixNoPU'}, step2Upg2015Defaults])
2134+
steps['DIGIUPC2025']=merge([{'-s':'DIGI,L1,DIGI2RAW,HLT:@fake2'}, upcDefaults2025, step2Upg2015Defaults])
21192135
steps['DIGIUPC2024']=merge([{'-s':'DIGI,L1,DIGI2RAW,HLT:HIon'}, upcDefaults2024, step2Upg2015Defaults])
21202136
steps['DIGIHI2024APPROXCLUSTERS']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:HIon'}, hiDefaults2024_approxClusters, {'--pileup':'HiMixNoPU'}, step2Upg2015Defaults])
21212137
steps['DIGIHI2024']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:HIon'}, hiDefaults2024, {'--pileup':'HiMixNoPU'}, step2Upg2015Defaults])
@@ -3433,6 +3449,41 @@ def gen2024HiMix(fragment,howMuch):
34333449
steps['ALCARECOUPC2023']=merge([upcDefaults2023,{'-s':'ALCA:TkAlMinBias+SiStripCalMinBias','--datatier':'ALCARECO','--eventcontent':'ALCARECO'}])
34343450

34353451

3452+
steps['RECOHI2025']=merge([hiDefaults2025,{'-s':'RAW2DIGI,L1Reco,RECO,PAT,VALIDATION:@standardValidation+@miniAODValidation,DQM:@standardDQM+@miniAODDQM',
3453+
'--datatier':'GEN-SIM-RECO,MINIAODSIM,DQMIO',
3454+
'--eventcontent':'RECOSIM,MINIAODSIM,DQM',
3455+
},step3Up2015Defaults])
3456+
steps['RECOHI2025MB']=merge([hiDefaults2025,{'-s':'RAW2DIGI,L1Reco,RECO,PAT,VALIDATION:@standardValidation+@miniAODValidation,DQM:@standardDQM+@miniAODDQM',
3457+
'--datatier':'GEN-SIM-RECO,MINIAODSIM,DQMIO',
3458+
'--eventcontent':'RECOSIM,MINIAODSIM,DQM',
3459+
'--era':'Run3_pp_on_PbPb_2025',
3460+
'--procModifiers':'genJetSubEvent',
3461+
},step3Up2015Defaults])
3462+
steps['RECOHI2025PROD']=merge([hiDefaults2025_approxClusters,{'-s':'RAW2DIGI,L1Reco,RECO',
3463+
'--datatier':'AODSIM',
3464+
'--eventcontent':'AODSIM',
3465+
'--era':'Run3_pp_on_PbPb_2025',
3466+
},step3Up2015Defaults])
3467+
3468+
steps['RECOHI2025MBAPPROXCLUSTERS']=merge([hiDefaults2025_approxClusters,{'-s':'RAW2DIGI,L1Reco,RECO,PAT,VALIDATION:@standardValidation+@miniAODValidation,DQM:@standardDQM+@miniAODDQM',
3469+
'--datatier':'GEN-SIM-RECO,MINIAODSIM,DQMIO',
3470+
'--eventcontent':'RECOSIM,MINIAODSIM,DQM',
3471+
'--era':'Run3_pp_on_PbPb_2025',
3472+
'--procModifiers':'genJetSubEvent',
3473+
},step3Up2015Defaults])
3474+
3475+
steps['MINIHI2025PROD']=merge([hiDefaults2025,{'-s':'PAT',
3476+
'--datatier':'MINIAODSIM',
3477+
'--eventcontent':'MINIAODSIM',
3478+
'--era':'Run3_pp_on_PbPb_2025',
3479+
'--procModifiers':'genJetSubEvent',
3480+
},step3Up2015Defaults])
3481+
3482+
steps['ALCARECOHI2025']=merge([hiDefaults2025,{'-s':'ALCA:TkAlMinBias+SiStripCalMinBias',
3483+
'--datatier':'ALCARECO',
3484+
'--eventcontent':'ALCARECO'
3485+
}])
3486+
34363487
steps['RECOHI2024']=merge([hiDefaults2024,{'-s':'RAW2DIGI,L1Reco,RECO,PAT,VALIDATION:@standardValidation+@miniAODValidation,DQM:@standardDQM+@miniAODDQM',
34373488
'--datatier':'GEN-SIM-RECO,MINIAODSIM,DQMIO',
34383489
'--eventcontent':'RECOSIM,MINIAODSIM,DQM',
@@ -4250,6 +4301,25 @@ def gen2024HiMix(fragment,howMuch):
42504301
steps['HARVESTUPC2024']=merge([upcDefaults2024,{'-s':'HARVESTING:validationHarvesting+dqmHarvesting','--filein':'file:step3_inDQM.root','--mc':'','--filetype':'DQM'}])
42514302
steps['HARVESTUPC2023']=merge([upcDefaults2023,{'-s':'HARVESTING:validationHarvestingNoHLT+dqmHarvestingFakeHLT','--filein':'file:step3_inDQM.root','--mc':'','--filetype':'DQM'}])
42524303

4304+
steps['HARVESTHI2025']=merge([hiDefaults2025,{'-s':'HARVESTING:validationHarvesting+dqmHarvesting',
4305+
'--filein':'file:step3_inDQM.root',
4306+
'--mc':'',
4307+
'--era' : 'Run3_pp_on_PbPb_2025',
4308+
'--filetype':'DQM'}])
4309+
4310+
steps['HARVESTHI2025S4']=merge([hiDefaults2025,{'-s':'HARVESTING:validationHarvesting+dqmHarvesting',
4311+
'--filein':'file:step4_inDQM.root',
4312+
'--mc':'',
4313+
'--era' : 'Run3_pp_on_PbPb_2025',
4314+
'--filetype':'DQM'}])
4315+
4316+
steps['HARVESTHI2025MINIAOD']=merge([{'-s':'HARVESTING:@miniAODValidation+@miniAODDQM',
4317+
'--filein':'file:step2_inDQM.root',
4318+
'--mc':'',
4319+
'--era' : 'Run3_pp_on_PbPb_2025',
4320+
'--filetype':'DQM',
4321+
'-n':100},hiDefaults2025])
4322+
42534323
steps['HARVESTHI2024']=merge([hiDefaults2024,{'-s':'HARVESTING:validationHarvesting+dqmHarvesting',
42544324
'--filein':'file:step3_inDQM.root',
42554325
'--mc':'',

0 commit comments

Comments
 (0)