Merge pull request #41971 from mandrenguyen/hiMixing23RelVal

Add HI mixing wfs for 2023 MC
cms-sw · Jun 20, 2023 · 59535a5 · 59535a5
2 parents 9cde8d9 + f9ec7fa
commit 59535a5
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 20 deletions.
diff --git a/Configuration/Generator/python/Pyquen_DiJet_pt80to120_5362GeV_cfi.py b/Configuration/Generator/python/Pyquen_DiJet_pt80to120_5362GeV_cfi.py
@@ -3,7 +3,7 @@
 from Configuration.Generator.PyquenDefaultSettings_cff import *
 
 generator = cms.EDFilter("PyquenGeneratorFilter",
-                        collisionParameters5362,
+                        collisionParameters5362GeV,
                         qgpParameters,
                         pyquenParameters,
                         doQuench = cms.bool(True),

diff --git a/Configuration/Generator/python/Pyquen_GammaJet_pt20_5362GeV_cfi.py b/Configuration/Generator/python/Pyquen_GammaJet_pt20_5362GeV_cfi.py
@@ -3,7 +3,7 @@
 from Configuration.Generator.PyquenDefaultSettings_cff import *
 
 generator = cms.EDFilter("PyquenGeneratorFilter",
-                         collisionParameters5362,
+                         collisionParameters5362GeV,
                          qgpParameters,
                          pyquenParameters,
                          doQuench = cms.bool(True),

diff --git a/Configuration/Generator/python/Pyquen_ZeemumuJets_pt10_5362GeV_cfi.py b/Configuration/Generator/python/Pyquen_ZeemumuJets_pt10_5362GeV_cfi.py
@@ -3,7 +3,7 @@
 from Configuration.Generator.PyquenDefaultSettings_cff import *
 
 generator = cms.EDFilter("PyquenGeneratorFilter",
-                         collisionParameters5362,
+                         collisionParameters5362GeV,
                          qgpParameters,
                          pyquenParameters,
                          doQuench = cms.bool(True),

diff --git a/Configuration/PyReleaseValidation/python/relval_pileup.py b/Configuration/PyReleaseValidation/python/relval_pileup.py
@@ -23,9 +23,9 @@
 workflows[310]=['Pyquen_GammaJet_pt20_2760GeV_2022',['Pyquen_GammaJet_pt20_2760GeV_2022','DIGIHI2022MIX','RECOHI2022MIX','HARVESTHI2022PPRECO']]
 workflows[311]=['Pyquen_DiJet_pt80to120_2760GeV_2022',['Pyquen_DiJet_pt80to120_2760GeV_2022','DIGIHI2022MIX','RECOHI2022MIX','HARVESTHI2022PPRECO']]
 workflows[312]=['Pyquen_ZeemumuJets_pt10_2760GeV_2022',['Pyquen_ZeemumuJets_pt10_2760GeV_2022','DIGIHI2022MIX','RECOHI2022MIX','HARVESTHI2022PPRECO']]
-#workflows[320]=['Pyquen_GammaJet_pt20_5362GeV_2023',['Pyquen_GammaJet_pt20_5362GeV_2023','DIGIHI2023MIX','RECOHI2023MIX','HARVESTHI2023PPRECO']]
-#workflows[321]=['Pyquen_DiJet_pt80to120_5362GeV_2023',['Pyquen_DiJet_pt80to120_5362GeV_2023','DIGIHI2023MIX','RECOHI2023MIX','HARVESTHI2023PPRECO']]
-#workflows[322]=['Pyquen_ZeemumuJets_pt10_5362GeV_2023',['Pyquen_ZeemumuJets_pt10_5362GeV_2023','DIGIHI2023MIX','RECOHI2023MIX','HARVESTHI2023PPRECO']]
+workflows[320]=['Pyquen_GammaJet_pt20_5362GeV_2023',['Pyquen_GammaJet_pt20_5362GeV_2023','DIGIHI2023MIX','RECOHI2023MIX','HARVESTHI2023PPRECO']]
+workflows[321]=['Pyquen_DiJet_pt80to120_5362GeV_2023',['Pyquen_DiJet_pt80to120_5362GeV_2023','DIGIHI2023MIX','RECOHI2023MIX','HARVESTHI2023PPRECO']]
+workflows[322]=['Pyquen_ZeemumuJets_pt10_5362GeV_2023',['Pyquen_ZeemumuJets_pt10_5362GeV_2023','DIGIHI2023MIX','RECOHI2023MIX','HARVESTHI2023PPRECO']]
 
 # 50 ns at 13 TeV and POSTLS1
 workflows[50200]=['',['ZEE_13','DIGIUP15_PU50','RECOUP15_PU50_L1TEgDQM','HARVESTUP15_PU50_L1TEgDQM']]

diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py
@@ -804,8 +804,9 @@ def identitySim(wf):
     'CMSSW_10_6_0-PU25ns_106X_upgrade2018_realistic_v4_FastSim-v1',# 20 - fastSim premix library UP18
     'CMSSW_10_6_0-106X_mc2017_realistic_v3-v1',         # 21 - GEN-SIM inputs for LHE-GEN-SIM 2017 workflows
     'CMSSW_10_6_0-106X_upgrade2018_realistic_v4-v1',            # 22 - GEN-SIM inputs for LHE-GEN-SIM 2018 workflows
-    'CMSSW_12_5_1-125X_mcRun3_2022_realistic_HI_v5-v1',    #23 - Run3 HI GEN-SIM for mixing
+    'CMSSW_12_5_1-125X_mcRun3_2022_realistic_HI_v5-v1',    #23 - 2022 HI GEN-SIM for mixing
     'CMSSW_11_2_0_pre8-PU_112X_upgrade2018_realistic_v4-v1', # 24 - 2018 Run-Dependent premix library
+    'CMSSW_13_2_0_pre1-131X_mcRun3_2023_realistic_HI_v11-v1', # 2023 HI GEN-SIM for mixing
     ]
 
 # note: INPUT commands to be added once GEN-SIM w/ 13TeV+PostLS1Geo will be available
@@ -1733,7 +1734,7 @@ def lhegensim2018ml(fragment,howMuch):
 PU50={'-n':10,'--pileup':'AVE_35_BX_50ns','--pileup_input':'das:/RelValMinBias_13/%s/GEN-SIM'%(baseDataSetRelease[3],)}
 PUHI={'-n':10,'--pileup_input':'das:/RelValHydjetQ_B12_5020GeV_2018/%s/GEN-SIM'%(baseDataSetRelease[9])}
 PUHI2022={'-n':10,'--pileup_input':'das:/RelValHydjetQ_B12_5020GeV_2021_ppReco/%s/GEN-SIM'%(baseDataSetRelease[23])}
-#PUHI2023={'-n':10,'--pileup_input':'das:/RelValHydjetQ_B12_5020GeV_2023_ppReco/%s/GEN-SIM'%(baseDataSetRelease[XX])}
+PUHI2023={'-n':10,'--pileup_input':'das:/RelValHydjetQ_MinBias_5362GeV_2023_ppReco/%s/GEN-SIM'%(baseDataSetRelease[25])}
 PU25UP17={'-n':10,'--pileup':'AVE_35_BX_25ns','--pileup_input':'das:/RelValMinBias_13/%s/GEN-SIM'%(baseDataSetRelease[13],)}
 PU25UP18={'-n':10,'--pileup':'AVE_50_BX_25ns','--pileup_input':'das:/RelValMinBias_13/%s/GEN-SIM'%(baseDataSetRelease[18],)}
 
@@ -1862,7 +1863,7 @@ def lhegensim2018ml(fragment,howMuch):
 steps['DIGIHI2017']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2'}, hiDefaults2017, step2Upg2015Defaults])
 steps['DIGIHI2015']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake'}, hiDefaults2015, {'--pileup':'HiMixNoPU'}, step2Upg2015Defaults])
 steps['DIGIHI2011']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake'}, hiDefaults2011, {'--pileup':'HiMixNoPU'}, step2Defaults])
-#steps['DIGIHI2023MIX']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2', '-n':2}, hiDefaults2023_ppReco, {'--pileup':'HiMix'}, PUHI2023, step2Upg2015Defaults])
+steps['DIGIHI2023MIX']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2', '-n':2}, hiDefaults2023_ppReco, {'--pileup':'HiMix'}, PUHI2023, step2Upg2015Defaults])
 steps['DIGIHI2022MIX']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2', '-n':2}, hiDefaults2022_ppReco, {'--pileup':'HiMix'}, PUHI2022, step2Upg2015Defaults])
 steps['DIGIHIMIX']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2', '-n':2}, hiDefaults2018_ppReco, {'--pileup':'HiMix'}, PUHI, step2Upg2015Defaults])
 
@@ -2605,20 +2606,20 @@ def gen2022HiMix(fragment,howMuch):
     global step1Up2022HiMixDefaults
     return merge([{'cfg':fragment},howMuch,step1Up2022HiMixDefaults])
 
-#step1Up2023HiMixDefaults = merge ([{'--beamspot':'MatchHI', '--pileup':'HiMixGEN', '--scenario':'HeavyIons'},hiDefaults2023_ppReco,PUHI2023,step1Up2023HiProdDefaults])
-#def gen2023HiMix(fragment,howMuch):
-#    global step1Up2023HiMixDefaults
-#    return merge([{'cfg':fragment},howMuch,step1Up2023HiMixDefaults])
+step1Up2023HiMixDefaults = merge ([{'--beamspot':'MatchHI', '--pileup':'HiMixGEN', '--scenario':'HeavyIons'},hiDefaults2023_ppReco,PUHI2023,step1Up2023HiProdDefaults])
+def gen2023HiMix(fragment,howMuch):
+    global step1Up2023HiMixDefaults
+    return merge([{'cfg':fragment},howMuch,step1Up2023HiMixDefaults])
 
 steps['Pyquen_GammaJet_pt20_2760GeV']=gen2018HiMix('Pyquen_GammaJet_pt20_2760GeV_cfi',Kby(9,100))
 steps['Pyquen_DiJet_pt80to120_2760GeV']=gen2018HiMix('Pyquen_DiJet_pt80to120_2760GeV_cfi',Kby(9,100))
 steps['Pyquen_ZeemumuJets_pt10_2760GeV']=gen2018HiMix('Pyquen_ZeemumuJets_pt10_2760GeV_cfi',Kby(9,100))
 steps['Pyquen_GammaJet_pt20_2760GeV_2022']=gen2022HiMix('Pyquen_GammaJet_pt20_2760GeV_cfi',Kby(9,100))
 steps['Pyquen_DiJet_pt80to120_2760GeV_2022']=gen2022HiMix('Pyquen_DiJet_pt80to120_2760GeV_cfi',Kby(9,100))
 steps['Pyquen_ZeemumuJets_pt10_2760GeV_2022']=gen2022HiMix('Pyquen_ZeemumuJets_pt10_2760GeV_cfi',Kby(9,100))
-#steps['Pyquen_GammaJet_pt20_5362GeV_2023']=gen2023HiMix('Pyquen_GammaJet_pt20_5362GeV_cfi',Kby(9,100))
-#steps['Pyquen_DiJet_pt80to120_5362GeV_2023']=gen2023HiMix('Pyquen_DiJet_pt80to120_5362GeV_cfi',Kby(9,100))
-#steps['Pyquen_ZeemumuJets_pt10_5362GeV_2023']=gen2023HiMix('Pyquen_ZeemumuJets_pt10_5362GeV_cfi',Kby(9,100))
+steps['Pyquen_GammaJet_pt20_5362GeV_2023']=gen2023HiMix('Pyquen_GammaJet_pt20_5362GeV_cfi',Kby(9,100))
+steps['Pyquen_DiJet_pt80to120_5362GeV_2023']=gen2023HiMix('Pyquen_DiJet_pt80to120_5362GeV_cfi',Kby(9,100))
+steps['Pyquen_ZeemumuJets_pt10_5362GeV_2023']=gen2023HiMix('Pyquen_ZeemumuJets_pt10_5362GeV_cfi',Kby(9,100))
 
 # step3
 step3Defaults = {
@@ -3056,10 +3057,10 @@ def gen2022HiMix(fragment,howMuch):
                                                           '--procModifiers':'genJetSubEvent',
                                                       },step3Up2015Defaults])
 
-#steps['RECOHI2023MIX']=merge([hiDefaults2023_ppReco,{'-s':'RAW2DIGI,L1Reco,RECO,PAT,VALIDATION:@standardValidationNoHLTHiMix+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM',
-#                                                     '--pileup':'HiMix',
-#                                                     '--pileup_input':'das:/RelValHydjetQ_B12_5362GeV_2023_ppReco/%s/GEN-SIM'%(baseDataSetRelease[23])
-#                                                 },step3Up2015Defaults])
+steps['RECOHI2023MIX']=merge([hiDefaults2023_ppReco,{'-s':'RAW2DIGI,L1Reco,RECO,PAT,VALIDATION:@standardValidationNoHLTHiMix+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM',
+                                                     '--pileup':'HiMix',
+                                                     '--pileup_input':'das:/RelValHydjetQ_MinBias_5362GeV_2023_ppReco/%s/GEN-SIM'%(baseDataSetRelease[25])
+                                                 },step3Up2015Defaults])
 
 steps['RECOHI2022MIX']=merge([hiDefaults2022_ppReco,{'-s':'RAW2DIGI,L1Reco,RECO,PAT,VALIDATION:@standardValidationNoHLTHiMix+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM',
                                                      '--pileup':'HiMix',