Skip to content
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.

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

updates in relvals #20461

Merged
merged 4 commits into from Sep 15, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions Configuration/PyReleaseValidation/python/MatrixInjector.py
Expand Up @@ -211,6 +211,7 @@ def prepare(self,mReader, directories, mode='init'):
wmsplit['HLTDR2_50ns']=1
wmsplit['HLTDR2_25ns']=1
wmsplit['HLTDR2_2016']=1
wmsplit['HLTDR2_2017']=1
wmsplit['Hadronizer']=1
wmsplit['DIGIUP15']=1
wmsplit['RECOUP15']=1
Expand All @@ -227,6 +228,8 @@ def prepare(self,mReader, directories, mode='init'):
wmsplit['RECOUP17']=1
wmsplit['DIGIUP17_PU25']=1
wmsplit['RECOUP17_PU25']=1
wmsplit['DIGICOS_UP17']=1
wmsplit['RECOCOS_UP17']=1


#import pprint
Expand Down
1 change: 1 addition & 0 deletions Configuration/PyReleaseValidation/python/relval_premix.py
Expand Up @@ -32,6 +32,7 @@
workflows[250205.17]=['',['ZTT_13UP17','DIGIPRMXUP17_PU25','RECOPRMXUP17_PU25','HARVESTUP17_PU25']]
workflows[250206.17]=['',['ZMM_13UP17','DIGIPRMXUP17_PU25','RECOPRMXUP17_PU25','HARVESTUP17_PU25']]
workflows[250207.17]=['',['NuGun_UP17','DIGIPRMXUP17_PU25','RECOPRMXUP17_PU25','HARVESTUP17_PU25']]
workflows[250208.17]=['',['SMS-T1tttt_mGl-1500_mLSP-100_13UP17','DIGIPRMXUP17_PU25','RECOPRMXUP17_PU25','HARVESTUP17_PU25']]

# 50ns pile up overlay using premix
workflows[500200]=['',['ZEE_13','DIGIPRMXUP15_PU50','RECOPRMXUP15_PU50','HARVESTUP15_PU50']]
Expand Down
21 changes: 11 additions & 10 deletions Configuration/PyReleaseValidation/python/relval_steps.py
Expand Up @@ -390,6 +390,7 @@ def gen2017(fragment,howMuch):
steps['ZTT_13UP17']=gen2017('ZTT_All_hadronic_13TeV_TuneCUETP8M1_cfi',Kby(9,80))
steps['H125GGgluonfusion_13UP17']=gen2017('H125GGgluonfusion_13TeV_TuneCUETP8M1_cfi',Kby(9,50))
steps['QQH1352T_13UP17']=gen2017('QQH1352T_13TeV_TuneCUETP8M1_cfi',Kby(9,50))
steps['SMS-T1tttt_mGl-1500_mLSP-100_13UP17']=gen2017('SMS-T1tttt_mGl-1500_mLSP-100_13TeV-pythia8_cfi',Kby(9,50))

# 13TeV High Stats samples
steps['ZMM_13_HS']=gen2015('ZMM_13TeV_TuneCUETP8M1_cfi',Kby(209,100))
Expand All @@ -404,22 +405,22 @@ def identitySim(wf):

baseDataSetRelease=[
'CMSSW_9_2_4-91X_mcRun1_realistic_v2-v1', # 0 run1 samples; note TTbar GENSIM has v2 (see TTbarINPUT below)
'CMSSW_9_3_0_pre4-93X_mc2017_realistic_v1-v1', # 1 GEN-SIM for HI RunII, 2018
'CMSSW_9_3_0_pre5-93X_mc2017_realistic_v2-v1', # 1 GEN-SIM for HI RunII, 2018
'CMSSW_6_2_0_pre8-PRE_ST62_V8_FastSim-v1', # 2 for fastsim id test
# 'CMSSW_7_1_0_pre5-START71_V1-v2', # 3 8 TeV , for the one sample which is part of the routine relval production (RelValZmumuJets_Pt_20_300, because of -v2)
# THIS ABOVE IS NOT USED, AT THE MOMENT
'CMSSW_9_2_4-91X_mcRun2_asymptotic_v3-v1', # 3 - GEN-SIM input for 13 TeV 2016 workfows
'CMSSW_7_3_0_pre1-PRE_LS172_V15_FastSim-v1', # 4 - fast sim GEN-SIM-DIGI-RAW-HLTDEBUG for id tests
'CMSSW_9_0_0_pre4-PU25ns_90X_mcRun2_asymptotic_v1-v1', # 5 - fullSim PU 25ns premix
'CMSSW_8_1_0_pre15-PU50ns_81X_mcRun2_startup_v12-v1', # 6 - fullSim PU 50ns premix
'CMSSW_9_3_0_pre4-93X_mcRun2_asymptotic_v0_FastSim-v1', # 7 - fastSim MinBias for mixing
'CMSSW_9_3_0_pre4-PU25ns_93X_mcRun2_asymptotic_v0_FastSim-v1',# 8 - fastSim premixed MinBias
'CMSSW_9_3_0_pre4-93X_mc2017_realistic_v1-v1', # 9 - Run2 HI GEN-SIM for mixing
'CMSSW_9_3_0_pre5-93X_mcRun2_asymptotic_v0_FastSim-v1', # 7 - fastSim MinBias for mixing
'CMSSW_9_3_0_pre5-PU25ns_93X_mcRun2_asymptotic_v0_FastSim-v1',# 8 - fastSim premixed MinBias
'CMSSW_9_3_0_pre5-93X_mc2017_realistic_v2-v1', # 9 - Run2 HI GEN-SIM for mixing
'CMSSW_7_6_0-76X_mcRun2_asymptotic_v11-v1', # 10 - 13 TeV High Stats GEN-SIM
'CMSSW_7_6_0_pre7-76X_mcRun2_asymptotic_v9_realBS-v1', # 11 - 13 TeV High Stats MiniBias for mixing GEN-SIM
'CMSSW_8_1_0_pre9_Geant4102-81X_mcRun2cosmics_startup_peak_v2-v1', # 12 - GEN-SIM input for 1307 cosmics wf from 810_p2
'CMSSW_9_3_0_pre4-93X_mc2017_realistic_v1-v1', # 13 - 13 TeV samples with GEN-SIM from PhaseI upgrade
'CMSSW_9_3_0_pre4-PU25ns_93X_mc2017_realistic_v1-v1', # 14 - fullSim PU 25ns UP17 premix
'CMSSW_9_3_0_pre5-93X_mc2017_realistic_v2-v1', # 13 - 13 TeV samples with GEN-SIM from PhaseI upgrade
'CMSSW_9_3_0_pre5-PU25ns_93X_mc2017_realistic_v2-v1', # 14 - fullSim PU 25ns UP17 premix
]


Expand Down Expand Up @@ -536,7 +537,7 @@ def identitySim(wf):
steps['H125GGgluonfusion_13UP17INPUT']={'INPUT':InputInfo(dataSet='/RelValH125GGgluonfusion_13/%s/GEN-SIM'%(baseDataSetRelease[13],),location='STD')}
steps['QQH1352T_13UP17INPUT']={'INPUT':InputInfo(dataSet='/RelValQQH1352T_13/%s/GEN-SIM'%(baseDataSetRelease[13],),location='STD')}
steps['NuGun_UP17INPUT']={'INPUT':InputInfo(dataSet='/RelValNuGun/%s/GEN-SIM'%(baseDataSetRelease[13],),location='STD')}

steps['SMS-T1tttt_mGl-1500_mLSP-100_13UP17INPUT']={'INPUT':InputInfo(dataSet='/RelValSMS-T1tttt_mGl-1500_mLSP-100_13/%s/GEN-SIM'%(baseDataSetRelease[13],),location='STD')}


#input for fast sim workflows to be added - TODO
Expand Down Expand Up @@ -1940,9 +1941,9 @@ def gen2018HiMix(fragment,howMuch):
from Configuration.PyReleaseValidation.upgradeWorkflowComponents import *

defaultDataSets={}
defaultDataSets['2017']='CMSSW_9_3_0_pre4-93X_mc2017_realistic_v1-v'
defaultDataSets['2017Design']='CMSSW_9_3_0_pre4-93X_mc2017_design_IdealBS_v1-v'
#defaultDataSets['2018']='CMSSW_9_3_0_pre4-93X_upgrade2018_realistic_v0-v'
defaultDataSets['2017']='CMSSW_9_3_0_pre5-93X_mc2017_realistic_v2-v'
defaultDataSets['2017Design']='CMSSW_9_3_0_pre5-93X_mc2017_design_IdealBS_v2-v'
#defaultDataSets['2018']='CMSSW_9_3_0_pre5-93X_upgrade2018_realistic_v1-v'
#defaultDataSets['2018Design']='CMSSW_8_1_0_pre16-81X_upgrade2017_design_IdealBS_v6-v'
#defaultDataSets['2019']=''
#defaultDataSets['2019Design']=''
Expand Down