Skip to content

Commit 702ffcd

Browse files
cmsbuildcmsbuild
authored
Merge pull request #45307 from mandrenguyen/hiEras2024
Update heavy-ion eras for 2024 + add MC RelVal workflows
2 parents b832be6 + de91238 commit 702ffcd

File tree

10 files changed

+120
-17
lines changed

10 files changed

+120
-17
lines changed

Configuration/Eras/python/Era_Run3_UPC_cff.py renamed to Configuration/Eras/python/Era_Run3_2024_UPC_cff.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import FWCore.ParameterSet.Config as cms
22

3-
from Configuration.Eras.Era_Run3_cff import Run3
3+
from Configuration.Eras.Era_Run3_2024_cff import Run3_2024
44
from Configuration.ProcessModifiers.egamma_lowPt_exclusive_cff import egamma_lowPt_exclusive
55
from Configuration.Eras.Modifier_highBetaStar_2018_cff import highBetaStar_2018
66
from Configuration.Eras.Modifier_run3_upc_cff import run3_upc
77

8-
Run3_UPC = cms.ModifierChain(Run3, egamma_lowPt_exclusive, highBetaStar_2018, run3_upc)
8+
Run3_2024_UPC = cms.ModifierChain(Run3_2024, egamma_lowPt_exclusive, highBetaStar_2018, run3_upc)

‎Configuration/Eras/python/Era_Run3_2024_ppRef_cff.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import FWCore.ParameterSet.Config as cms
22

3-
from Configuration.Eras.Era_Run3_cff import Run3
3+
from Configuration.Eras.Era_Run3_2024_cff import Run3_2024
44
from Configuration.Eras.Modifier_ppRef_2017_cff import ppRef_2017
55
from Configuration.Eras.Modifier_ppRef_2024_cff import ppRef_2024
66
from Configuration.ProcessModifiers.storeZDCDigis_cff import storeZDCDigis
77

8-
Run3_2024_ppRef = cms.ModifierChain(Run3, ppRef_2017, ppRef_2024, storeZDCDigis)
8+
Run3_2024_ppRef = cms.ModifierChain(Run3_2024, ppRef_2017, ppRef_2024, storeZDCDigis)

‎Configuration/Eras/python/Era_Run3_pp_on_PbPb_2024_cff.py‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import FWCore.ParameterSet.Config as cms
2+
3+
from Configuration.Eras.Era_Run3_2024_cff import Run3_2024
4+
from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA
5+
from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3
6+
from Configuration.Eras.Modifier_pp_on_PbPb_run3_2024_cff import pp_on_PbPb_run3_2024
7+
8+
Run3_pp_on_PbPb_2024 = cms.ModifierChain(Run3_2024, pp_on_AA, pp_on_PbPb_run3, pp_on_PbPb_run3_2024)

‎Configuration/Eras/python/Era_Run3_pp_on_PbPb_approxSiStripClusters_2024_cff.py‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import FWCore.ParameterSet.Config as cms
2+
3+
from Configuration.Eras.Era_Run3_2024_cff import Run3_2024
4+
from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA
5+
from Configuration.ProcessModifiers.approxSiStripClusters_cff import approxSiStripClusters
6+
from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3
7+
8+
Run3_pp_on_PbPb_approxSiStripClusters_2024 = cms.ModifierChain(Run3_2024, pp_on_AA, approxSiStripClusters, pp_on_PbPb_run3)

‎Configuration/Eras/python/Modifier_pp_on_PbPb_run3_2024_cff.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import FWCore.ParameterSet.Config as cms
2+
3+
pp_on_PbPb_run3_2024 = cms.Modifier()
4+

‎Configuration/PyReleaseValidation/python/relval_standard.py‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -574,8 +574,8 @@
574574
workflows[142.0] = ['',['RunHIPhysicsRawPrime2023A','HLTDR3_HI2023ARawprime','RECOHIRUN3_reHLT_2023','HARVESTRUN3_HI2023A']]
575575

576576
### run3-2024 (2024 HI UPC data)
577-
workflows[142.901] = ['',['RunUPC2023','RECODR3_UPC','HARVESTDPROMPTR3']]
578-
workflows[142.902] = ['',['RunUPC2023','RECODR3_HIN','HARVESTDPROMPTR3']]
577+
workflows[142.901] = ['',['RunUPC2023','RECODR3_2024_UPC','HARVESTDPROMPTR3']]
578+
workflows[142.902] = ['',['RunUPC2023','RECODR3_2024_HIN','HARVESTDPROMPTR3']]
579579

580580
### fastsim ###
581581
workflows[5.1] = ['TTbarFS', ['TTbarFS','HARVESTFS']]
@@ -845,12 +845,21 @@
845845
workflows[160.4] = ['',['ZEE_5362_HI_2023','DIGIHI2023PPRECO','RECOHI2023PPRECO','HARVESTHI2023PPRECO']]
846846
# Patatrack Pixel Tracks on CPU
847847
workflows[160.501] = ['',['HydjetQ_MinBias_5362GeV_2023_ppReco','DIGIHI2023PPRECO','RAWPRIMESIMHI18','RECOHI2023PPRECOMB_PatatrackCPU','MINIHI2023PROD']]
848+
### Run 3 cond., 2024
849+
workflows[161] = ['',['HydjetQ_B12_5362GeV_2024','DIGIHI2024','RECOHI2024MB','ALCARECOHI2023PPRECO','HARVESTHI2024']]
850+
workflows[161.02] = ['',['HydjetQ_B12_5362GeV_2024','DIGIHI2024','RAWPRIMESIMHI18','RECOHI2024MBAPPROXCLUSTERS','ALCARECOHI2024','HARVESTHI2024S4']]
851+
workflows[161.03] = ['',['HydjetQ_MinBias_5362GeV_2024','DIGIHI2024','RAWPRIMESIMHI18','RECOHI2024PROD','MINIHI2023PROD']]
852+
workflows[161.1] = ['',['QCD_Pt_80_120_5362_HI_2024','DIGIHI2024','RECOHI2024','HARVESTHI2024']]
853+
workflows[161.2] = ['',['PhotonJets_Pt_10_5362_HI_2024','DIGIHI2024','RECOHI2024','HARVESTHI2024']]
854+
workflows[161.3] = ['',['ZMM_5362_HI_2024','DIGIHI2024','RECOHI2024','HARVESTHI2024']]
855+
workflows[161.4] = ['',['ZEE_5362_HI_2024','DIGIHI2024','RECOHI2024','HARVESTHI2024']]
856+
848857

849858
### UPC test ###
850859
workflows[180] = ['',['Pythia8_GammaNucleus_5360_HI_2023','DIGIHI2023PPRECO','RECOUPC2023','ALCARECOUPC2023','HARVESTUPC2023']]
851860
workflows[180.1] = ['',['Starlight_DoubleDiffraction_5360_HI_2023','DIGIHI2023PPRECO','RECOUPC2023','ALCARECOUPC2023','HARVESTUPC2023']]
852-
workflows[181] = ['',['Pythia8_GammaNucleus_5360_HI_2024','DIGIHI2024PPRECO','RECOUPC2024','ALCARECOUPC2024','HARVESTUPC2024']]
853-
workflows[181.1] = ['',['Starlight_DoubleDiffraction_5360_HI_2024','DIGIHI2024PPRECO','RECOUPC2024','ALCARECOUPC2024','HARVESTUPC2024']]
861+
workflows[181] = ['',['Pythia8_GammaNucleus_5360_HI_2024','DIGIHI2024','RECOUPC2024','ALCARECOUPC2024','HARVESTUPC2024']]
862+
workflows[181.1] = ['',['Starlight_DoubleDiffraction_5360_HI_2024','DIGIHI2024','RECOUPC2024','ALCARECOUPC2024','HARVESTUPC2024']]
854863

855864
### pp reference test ###
856865
workflows[149] = ['',['QCD_Pt_80_120_13_PPREF','DIGIPPREF2017','RECOPPREF2017','HARVESTPPREF2017']]

‎Configuration/PyReleaseValidation/python/relval_steps.py‎

Lines changed: 71 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
# step1 gensim: for 2024
4141
step1Up2024Defaults = merge ([{'--conditions':'auto:phase1_2024_realistic','--era':'Run3','--beamspot':'Realistic25ns13p6TeVEarly2023Collision'},step1Up2018Defaults])
4242
# step1 gensim: for 2024 HI prod
43-
step1Up2024HiProdDefaults = merge ([{'--conditions':'auto:phase1_2024_realistic_hi','--era':'Run3_pp_on_PbPb','--beamspot':'Realistic2023PbPbCollision'},step1Up2023HiProdDefaults])
43+
step1Up2024HiProdDefaults = merge ([{'--conditions':'auto:phase1_2024_realistic_hi','--era':'Run3_pp_on_PbPb_2024','--beamspot':'Realistic2023PbPbCollision'},step1Up2023HiProdDefaults])
4444

4545
steps = Steps()
4646

@@ -1196,8 +1196,9 @@ def genS(fragment,howMuch):
11961196
hiDefaults2023_ppReco = {'--conditions':'auto:phase1_2023_realistic_hi', '--era':'Run3_pp_on_PbPb_2023'}
11971197
hiDefaults2023_ppReco_approxClusters = {'--conditions':'auto:phase1_2023_realistic_hi', '--era':'Run3_pp_on_PbPb_approxSiStripClusters_2023'}
11981198
upcDefaults2023 = {'--conditions':'auto:phase1_2023_realistic_hi', '--era':'Run3_2023_UPC'}
1199-
hiDefaults2024_ppReco = {'--conditions':'auto:phase1_2024_realistic_hi', '--era':'Run3_pp_on_PbPb'}
1200-
upcDefaults2024 = {'--conditions':'auto:phase1_2024_realistic_hi', '--era':'Run3_UPC'}
1199+
hiDefaults2024 = {'--conditions':'auto:phase1_2024_realistic_hi', '--era':'Run3_pp_on_PbPb_2024'}
1200+
hiDefaults2024_approxClusters = {'--conditions':'auto:phase1_2024_realistic_hi', '--era':'Run3_pp_on_PbPb_approxSiStripClusters_2024'}
1201+
upcDefaults2024 = {'--conditions':'auto:phase1_2024_realistic_hi', '--era':'Run3_2024_UPC'}
12011202

12021203
steps['Hydjet2Q_MinBias_5020GeV_2018_ppReco']=merge([{'-n':1},hiDefaults2018_ppReco,gen2018hiprod('Hydjet2_Quenched_MinBias_5020GeV_cfi',U2000by1)])
12031204
steps['HydjetQ_MinBias_XeXe_5442GeV_2017']=merge([{'-n':1},hiDefaults2017,gen2017('Hydjet_Quenched_MinBias_XeXe_5442GeV_cfi',U2000by1)])
@@ -1206,6 +1207,8 @@ def genS(fragment,howMuch):
12061207
steps['HydjetQ_MinBias_5020GeV_2022_ppReco']=merge([{'-n':1},hiDefaults2022_ppReco,gen2022hiprod('Hydjet_Quenched_MinBias_5020GeV_cfi',U2000by1)])
12071208
steps['HydjetQ_B12_5362GeV_2023_ppReco']=merge([{'-n':1},hiDefaults2023_ppReco,gen2023hiprod('Hydjet_Quenched_B12_5362GeV_cfi',U2000by1)])
12081209
steps['HydjetQ_MinBias_5362GeV_2023_ppReco']=merge([{'-n':1},hiDefaults2023_ppReco,gen2023hiprod('Hydjet_Quenched_MinBias_5362GeV_cfi',U2000by1)])
1210+
steps['HydjetQ_B12_5362GeV_2024']=merge([{'-n':1},hiDefaults2024,gen2024hiprod('Hydjet_Quenched_B12_5362GeV_cfi',U2000by1)])
1211+
steps['HydjetQ_MinBias_5362GeV_2024']=merge([{'-n':1},hiDefaults2024,gen2024hiprod('Hydjet_Quenched_MinBias_5362GeV_cfi',U2000by1)])
12091212

12101213
steps['QCD_Pt_80_120_13_HI']=merge([hiDefaults2018_ppReco,gen2018hiprod('QCD_Pt_80_120_13TeV_TuneCUETP8M1_cfi',Kby(9,150))])
12111214
steps['PhotonJets_Pt_10_13_HI']=merge([hiDefaults2018_ppReco,gen2018hiprod('PhotonJet_Pt_10_13TeV_TuneCUETP8M1_cfi',Kby(9,150))])
@@ -1221,6 +1224,11 @@ def genS(fragment,howMuch):
12211224
steps['ZMM_5362_HI_2023']=merge([hiDefaults2023_ppReco,gen2023hiprod('ZMM_5362GeV_TuneCP5_cfi',Kby(18,300))])
12221225
steps['ZEE_5362_HI_2023']=merge([hiDefaults2023_ppReco,gen2023hiprod('ZEE_5362GeV_TuneCP5_cfi',Kby(18,300))])
12231226

1227+
steps['QCD_Pt_80_120_5362_HI_2024']=merge([hiDefaults2024,gen2024hiprod('QCD_Pt_80_120_5362GeV_TuneCP5_cfi',Kby(9,150))])
1228+
steps['PhotonJets_Pt_10_5362_HI_2024']=merge([hiDefaults2024,gen2024hiprod('PhotonJet_Pt_10_5362GeV_TuneCP5_cfi',Kby(9,150))])
1229+
steps['ZMM_5362_HI_2024']=merge([hiDefaults2024,gen2024hiprod('ZMM_5362GeV_TuneCP5_cfi',Kby(18,300))])
1230+
steps['ZEE_5362_HI_2024']=merge([hiDefaults2024,gen2024hiprod('ZEE_5362GeV_TuneCP5_cfi',Kby(18,300))])
1231+
12241232
steps['Starlight_DoubleDiffraction_5360_HI_2023']=merge([{'-s':'LHE,GEN,SIM'},gen2023hiprod('Configuration/Generator/python/Starlight_DoubleDiffraction_5p36TeV_cfi.py',Kby(9,150))])
12251233
steps['Starlight_DoubleDiffraction_5360_HI_2024']=merge([{'-s':'LHE,GEN,SIM'},gen2024hiprod('Configuration/Generator/python/Starlight_DoubleDiffraction_5p36TeV_cfi.py',Kby(9,150))])
12261234
steps['Pythia8_GammaNucleus_5360_HI_2023']=gen2023hiprod('Pythia8_GammaNucleus_5p36TeV_cfi',Kby(9,150))
@@ -1963,7 +1971,8 @@ def lhegensim2018ml(fragment,howMuch):
19631971
#steps['RESIMDIGI']=merge([{'-s':'reGEN,reSIM,DIGI,L1,DIGI2RAW,HLT:@fake,RAW2DIGI,L1Reco','-n':10,'--restoreRNDSeeds':'','--process':'HLT'},steps['DIGI']])
19641972

19651973

1966-
steps['DIGIHI2024PPRECO']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2'}, hiDefaults2024_ppReco, {'--pileup':'HiMixNoPU'}, step2Upg2015Defaults])
1974+
steps['DIGIHI2024APPROXCLUSTERS']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2'}, hiDefaults2024_approxClusters, {'--pileup':'HiMixNoPU'}, step2Upg2015Defaults])
1975+
steps['DIGIHI2024']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2'}, hiDefaults2024, {'--pileup':'HiMixNoPU'}, step2Upg2015Defaults])
19671976
steps['DIGIHI2023PPRECOAPPROXCLUSTERS']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2'}, hiDefaults2023_ppReco_approxClusters, {'--pileup':'HiMixNoPU'}, step2Upg2015Defaults])
19681977
steps['DIGIHI2023PPRECO']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:HIon'}, hiDefaults2023_ppReco, {'--pileup':'HiMixNoPU'}, step2Upg2015Defaults])
19691978
steps['DIGIHI2022PPRECOAPPROXCLUSTERS']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2'}, hiDefaults2022_ppReco_approxClusters, {'--pileup':'HiMixNoPU'}, step2Upg2015Defaults])
@@ -2683,15 +2692,16 @@ def lhegensim2018ml(fragment,howMuch):
26832692
'--customise':'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3'},dataReco])
26842693

26852694
steps['RECODR3_2023']=merge([{'--era':'Run3_2023'},steps['RECODR3']])
2695+
steps['RECODR3_2024']=merge([{'--era':'Run3_2024'},steps['RECODR3']])
26862696

26872697
steps['RECODR3_reHLT_2022']=merge([{'--conditions':'auto:run3_data_relval', '--hltProcess':'reHLT'},steps['RECODR3']])
26882698
steps['RECODR3_reHLT_2023']=merge([{'--conditions':'auto:run3_data_prompt_relval', '--hltProcess':'reHLT'},steps['RECODR3_2023']])
26892699
steps['RECODR3_reHLT_2023B']=merge([{'--conditions':'auto:run3_data_prompt_relval', '--hltProcess':'reHLT'},steps['RECODR3']])
26902700

26912701
steps['RECODR3_2023_HIN']=merge([{'--conditions':'auto:run3_data_prompt', '-s':'RAW2DIGI,L1Reco,RECO,DQM:@commonFakeHLT+@standardDQMFakeHLT', '--repacked':'', '-n':1000},steps['RECODR3_2023']])
26922702
steps['RECODR3_2023_UPC']=merge([{'--era':'Run3_2023_UPC'},steps['RECODR3_2023_HIN']])
2693-
steps['RECODR3_HIN']=merge([{'--conditions':'auto:run3_data_prompt', '-s':'RAW2DIGI,L1Reco,RECO,DQM:@commonFakeHLT+@standardDQMFakeHLT', '--repacked':'', '-n':1000},steps['RECODR3']])
2694-
steps['RECODR3_UPC']=merge([{'--era':'Run3_UPC'},steps['RECODR3_HIN']])
2703+
steps['RECODR3_2024_HIN']=merge([{'--conditions':'auto:run3_data_prompt', '-s':'RAW2DIGI,L1Reco,RECO,DQM:@commonFakeHLT+@standardDQMFakeHLT', '--repacked':'', '-n':1000},steps['RECODR3_2024']])
2704+
steps['RECODR3_2024_UPC']=merge([{'--era':'Run3_2024_UPC'},steps['RECODR3_2024_HIN']])
26952705

26962706
steps['RECODR3Splash']=merge([{'-n': 2,
26972707
'-s': 'RAW2DIGI,L1Reco,RECO,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@standardDQMFakeHLT+@miniAODDQM'
@@ -3147,6 +3157,42 @@ def gen2023HiMix(fragment,howMuch):
31473157
steps['MINIUPC2023']=merge([upcDefaults2023,{'-s':'PAT','--datatier':'MINIAODSIM','--eventcontent':'MINIAODSIM'},step3Up2015Defaults])
31483158
steps['ALCARECOUPC2023']=merge([upcDefaults2023,{'-s':'ALCA:TkAlMinBias+SiStripCalMinBias','--datatier':'ALCARECO','--eventcontent':'ALCARECO'}])
31493159

3160+
3161+
steps['RECOHI2024']=merge([hiDefaults2024,{'-s':'RAW2DIGI,L1Reco,RECO,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM',
3162+
'--datatier':'GEN-SIM-RECO,MINIAODSIM,DQMIO',
3163+
'--eventcontent':'RECOSIM,MINIAODSIM,DQM',
3164+
},step3Up2015Defaults])
3165+
steps['RECOHI2024MB']=merge([hiDefaults2024,{'-s':'RAW2DIGI,L1Reco,RECO,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM',
3166+
'--datatier':'GEN-SIM-RECO,MINIAODSIM,DQMIO',
3167+
'--eventcontent':'RECOSIM,MINIAODSIM,DQM',
3168+
'--era':'Run3_pp_on_PbPb_2024',
3169+
'--procModifiers':'genJetSubEvent',
3170+
},step3Up2015Defaults])
3171+
steps['RECOHI2024PROD']=merge([hiDefaults2024_approxClusters,{'-s':'RAW2DIGI,L1Reco,RECO',
3172+
'--datatier':'AODSIM',
3173+
'--eventcontent':'AODSIM',
3174+
'--era':'Run3_pp_on_PbPb_2024',
3175+
},step3Up2015Defaults])
3176+
3177+
steps['RECOHI2024MBAPPROXCLUSTERS']=merge([hiDefaults2024_approxClusters,{'-s':'RAW2DIGI,L1Reco,RECO,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM',
3178+
'--datatier':'GEN-SIM-RECO,MINIAODSIM,DQMIO',
3179+
'--eventcontent':'RECOSIM,MINIAODSIM,DQM',
3180+
'--era':'Run3_pp_on_PbPb_2024',
3181+
'--procModifiers':'genJetSubEvent',
3182+
},step3Up2015Defaults])
3183+
3184+
steps['MINIHI2024PROD']=merge([hiDefaults2024,{'-s':'PAT',
3185+
'--datatier':'MINIAODSIM',
3186+
'--eventcontent':'MINIAODSIM',
3187+
'--era':'Run3_pp_on_PbPb_2024',
3188+
'--procModifiers':'genJetSubEvent',
3189+
},step3Up2015Defaults])
3190+
3191+
steps['ALCARECOHI2024']=merge([hiDefaults2024,{'-s':'ALCA:TkAlMinBias+SiStripCalMinBias',
3192+
'--datatier':'ALCARECO',
3193+
'--eventcontent':'ALCARECO'
3194+
}])
3195+
31503196
steps['RECOHI2023PPRECOAPPROXCLUSTERS']=merge([hiDefaults2023_ppReco_approxClusters,{'-s':'RAW2DIGI,L1Reco,RECO,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM',
31513197
'--datatier':'GEN-SIM-RECO,MINIAODSIM,DQMIO',
31523198
'--eventcontent':'RECOSIM,MINIAODSIM,DQM',
@@ -3854,6 +3900,25 @@ def gen2023HiMix(fragment,howMuch):
38543900
steps['HARVESTUPC2024']=merge([upcDefaults2024,{'-s':'HARVESTING:validationHarvestingNoHLT+dqmHarvestingFakeHLT','--filein':'file:step3_inDQM.root','--mc':'','--filetype':'DQM'}])
38553901
steps['HARVESTUPC2023']=merge([upcDefaults2023,{'-s':'HARVESTING:validationHarvestingNoHLT+dqmHarvestingFakeHLT','--filein':'file:step3_inDQM.root','--mc':'','--filetype':'DQM'}])
38563902

3903+
steps['HARVESTHI2024']=merge([hiDefaults2024,{'-s':'HARVESTING:validationHarvestingNoHLT+dqmHarvestingFakeHLT',
3904+
'--filein':'file:step3_inDQM.root',
3905+
'--mc':'',
3906+
'--era' : 'Run3_pp_on_PbPb_2024',
3907+
'--filetype':'DQM'}])
3908+
3909+
steps['HARVESTHI2024S4']=merge([hiDefaults2024,{'-s':'HARVESTING:validationHarvestingNoHLT+dqmHarvestingFakeHLT',
3910+
'--filein':'file:step4_inDQM.root',
3911+
'--mc':'',
3912+
'--era' : 'Run3_pp_on_PbPb_2024',
3913+
'--filetype':'DQM'}])
3914+
3915+
steps['HARVESTHI2024MINIAOD']=merge([{'-s':'HARVESTING:@miniAODValidation+@miniAODDQM',
3916+
'--filein':'file:step2_inDQM.root',
3917+
'--mc':'',
3918+
'--era' : 'Run3_pp_on_PbPb_2024',
3919+
'--filetype':'DQM',
3920+
'-n':100},hiDefaults2024])
3921+
38573922
steps['HARVESTHI2023PPRECO']=merge([hiDefaults2023_ppReco,{'-s':'HARVESTING:validationHarvestingNoHLT+dqmHarvestingFakeHLT',
38583923
'--filein':'file:step3_inDQM.root',
38593924
'--mc':'',

‎Configuration/StandardSequences/python/Eras.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,16 @@ def __init__(self):
4242
'Run3_pp_on_PbPb_approxSiStripClusters',
4343
'Run3_pp_on_PbPb_2023',
4444
'Run3_pp_on_PbPb_approxSiStripClusters_2023',
45+
'Run3_pp_on_PbPb_2024',
46+
'Run3_pp_on_PbPb_approxSiStripClusters_2024',
4547
'Run3_dd4hep',
4648
'Run3_DDD',
4749
'Run3_FastSim',
4850
'Run3_2023_FastSim',
4951
'Run3_2023_ZDC',
5052
'Run3_2023_UPC',
5153
'Run3_2024_ppRef',
52-
'Run3_UPC',
54+
'Run3_2024_UPC',
5355
'Phase2',
5456
'Phase2C9',
5557
'Phase2C10',

‎SimCalorimetry/HcalTrigPrimProducers/python/hcaltpdigi_cff.py‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,10 @@
4242
pp_on_PbPb_run3.toModify(HcalTPGCoderULUT, FG_HF_thresholds = [14, 19])
4343

4444
from Configuration.Eras.Modifier_pp_on_PbPb_run3_2023_cff import pp_on_PbPb_run3_2023
45-
pp_on_PbPb_run3_2023.toModify(HcalTPGCoderULUT, FG_HF_thresholds = [16, 19])
45+
from Configuration.Eras.Era_Run3_2023_UPC_cff import Run3_2023_UPC
46+
(pp_on_PbPb_run3_2023 | Run3_2023_UPC).toModify(HcalTPGCoderULUT, FG_HF_thresholds = [16, 19])
47+
48+
#placedholder values for 2024, copied from 2023
49+
from Configuration.Eras.Modifier_pp_on_PbPb_run3_2024_cff import pp_on_PbPb_run3_2024
50+
from Configuration.Eras.Era_Run3_2024_UPC_cff import Run3_2024_UPC
51+
(pp_on_PbPb_run3_2024 | Run3_2024_UPC).toModify(HcalTPGCoderULUT, FG_HF_thresholds = [16, 19])

‎SimG4Core/Application/python/g4SimHits_cfi.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -700,7 +700,8 @@
700700
## Disable PPS from Run 3 PbPb runs and enable ZDC
701701
##
702702
from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3
703-
pp_on_PbPb_run3.toModify(g4SimHits, LHCTransport = False)
703+
from Configuration.Eras.Modifier_run3_upc_cff import run3_upc
704+
(pp_on_PbPb_run3 | run3_upc).toModify(g4SimHits, LHCTransport = False)
704705
# SteppingAction = dict(
705706
# CMStoZDCtransport = True) )
706707

0 commit comments

Comments
 (0)