From 2d58980b62988d186f02fc29da79fde3ff07f740 Mon Sep 17 00:00:00 2001 From: zhen Date: Tue, 18 Sep 2018 17:58:19 +0200 Subject: [PATCH] add 3 production workflows for premix2018 --- .../PyReleaseValidation/python/relval_premix.py | 5 +++-- .../PyReleaseValidation/python/relval_steps.py | 16 ++++++++++++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_premix.py b/Configuration/PyReleaseValidation/python/relval_premix.py index 7821afc598bd8..6a18eaeb404ab 100644 --- a/Configuration/PyReleaseValidation/python/relval_premix.py +++ b/Configuration/PyReleaseValidation/python/relval_premix.py @@ -63,8 +63,9 @@ workflows[250200.1]=['ProdZEE_13_pmx25ns',['ProdZEE_13','DIGIPRMXUP15_PROD_PU25','RECOPRMXUP15PROD_PU25']] workflows[500200.1]=['ProdZEE_13_pmx50ns',['ProdZEE_13','DIGIPRMXUP15_PROD_PU50','RECOPRMXUP15PROD_PU50']] workflows[250200.117]=['ProdZEE_13_pmx25ns',['ProdZEE_13UP17','DIGIPRMXUP17_PROD_PU25','RECOPRMXUP17PROD_PU25']] -workflows[250200.118]=['ProdZEE_13_pmx25ns',['ProdZEE_13UP18','DIGIPRMXUP18_PROD_PU25','RECOPRMXUP18PROD_PU25']] - +workflows[250200.118]=['ProdZEE_13_pmx25ns',['ProdZEE_13UP18','DIGIPRMXUP18_PROD_PU25','RECOPRMXUP18PROD_PU25','NANOEDMMC2018_PROD']] +workflows[250206.118]=['ProdZMM_13_pmx25ns',['ProdZMM_13UP18','DIGIPRMXUP18_PROD_PU25','RECOPRMXUP18PROD_PU25','NANOEDMMC2018_PROD']] +workflows[250202.118]=['ProdTTbar_13_pmx25ns',['ProdTTbar_13UP18','DIGIPRMXUP18_PROD_PU25','RECOPRMXUP18PROD_PU25','NANOEDMMC2018_PROD']] #fastsim, 25ns ## premixed minbias diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 11a79d1840532..2be666c8ea1ae 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -25,6 +25,8 @@ step1Up2017Defaults = merge ([{'--conditions':'auto:phase1_2017_realistic','--era':'Run2_2017','--beamspot':'Realistic25ns13TeVEarly2017Collision'},step1Up2015Defaults]) # step1 gensim: for 2018 step1Up2018Defaults = merge ([{'--conditions':'auto:phase1_2018_realistic','--era':'Run2_2018'},step1Up2017Defaults]) +# step1 gensim: for 2018 prod +step1Up2018ProdDefaults = merge ([{'--beamspot':'Realistic25ns13TeVEarly2018Collision','--eventcontent':'RAWSIM','--geometry':'DB:Extended'},step1Up2018Defaults]) steps = Steps() @@ -471,6 +473,9 @@ def gen2017(fragment,howMuch): def gen2018(fragment,howMuch): global step1Up2018Defaults return merge([{'cfg':fragment},howMuch,step1Up2018Defaults]) +def gen2018prod(fragment,howMuch): + global step1Up2018ProdDefaults + return merge([{'cfg':fragment},howMuch,step1Up2018ProdDefaults]) ### Production test: 13 TeV equivalents steps['ProdMinBias_13']=gen2015('MinBias_13TeV_pythia8_TuneCUETP8M1_cfi',Kby(9,100)) @@ -561,9 +566,11 @@ def gen2018(fragment,howMuch): ### 2018 wf: only the ones for premixing (for the moment) steps['NuGun_UP18']=gen2018('SingleNuE10_cfi.py',Kby(9,50)) +steps['ProdTTbar_13UP18']=gen2018prod('TTbar_13TeV_TuneCUETP8M1_cfi',Kby(9,50)) steps['TTbar_13UP18']=gen2018('TTbar_13TeV_TuneCUETP8M1_cfi',Kby(9,50)) -steps['ProdZEE_13UP18']=gen2018('ZEE_13TeV_TuneCUETP8M1_cfi',Kby(9,50)) +steps['ProdZEE_13UP18']=gen2018prod('ZEE_13TeV_TuneCUETP8M1_cfi',Kby(9,50)) steps['ZEE_13UP18']=gen2018('ZEE_13TeV_TuneCUETP8M1_cfi',Kby(9,50)) +steps['ProdZMM_13UP18']=gen2018prod('ZMM_13TeV_TuneCUETP8M1_cfi',Kby(18,100)) steps['ZMM_13UP18']=gen2018('ZMM_13TeV_TuneCUETP8M1_cfi',Kby(18,100)) steps['ZTT_13UP18']=gen2018('ZTT_All_hadronic_13TeV_TuneCUETP8M1_cfi',Kby(9,80)) steps['H125GGgluonfusion_13UP18']=gen2018('H125GGgluonfusion_13TeV_TuneCUETP8M1_cfi',Kby(9,50)) @@ -1455,7 +1462,7 @@ def lhegensim2017(fragment,howMuch): '--datatier' : 'PREMIXRAW'} premixProd50ns = merge([{'-s':'DIGI,DATAMIX,L1,DIGI2RAW,HLT:@relval50ns'},premixProd25ns]) premixProd25ns2017 = merge([{'-s':'DIGI,DATAMIX,L1,DIGI2RAW,HLT:@relval2017'},premixProd25ns]) -premixProd25ns2018 = merge([{'-s':'DIGI,DATAMIX,L1,DIGI2RAW,HLT:@relval2018','--datatier':'GEN-SIM-RAW'},premixProd25ns]) +premixProd25ns2018 = merge([{'-s':'DIGI,DATAMIX,L1,DIGI2RAW,HLT:@relval2018','--datatier':'GEN-SIM-RAW','--geometry':'DB:Extended'},premixProd25ns]) steps['DIGIPRMXUP15_PROD_PU25']=merge([premixProd25ns,digiPremixUp2015Defaults25ns]) steps['DIGIPRMXUP15_PROD_PU50']=merge([premixProd50ns,digiPremixUp2015Defaults50ns]) @@ -2019,7 +2026,7 @@ def gen2018HiMix(fragment,howMuch): steps['RECOPRMXUP17PROD_PU25']=merge([recoPremixUp17prod]) -steps['RECOPRMXUP18PROD_PU25']=merge([{'--era':'Run2_2018','--conditions':'auto:phase1_2018_realistic'},recoPremixUp17prod]) +steps['RECOPRMXUP18PROD_PU25']=merge([{'--era':'Run2_2018','--conditions':'auto:phase1_2018_realistic','--procModifiers':'premix_stage2'},recoPremixUp17prod]) steps['RECOPUDBG']=merge([{'--eventcontent':'RECODEBUG,MINIAODSIM,DQM'},steps['RECOPU1']]) @@ -2519,7 +2526,7 @@ def gen2018HiMix(fragment,howMuch): stepNanoAODMC = merge([{ '--mc':'' , '--eventcontent' : 'NANOAODSIM,DQM','--datatier': 'NANOAODSIM,DQMIO' }, stepNanoAODDefaults ]) stepNanoEDMData = merge([{ '--data':'', '--eventcontent' : 'NANOEDMAOD,DQM' ,'--datatier': 'NANOAOD,DQMIO' }, stepNanoAODDefaults ]) stepNanoEDMMC = merge([{ '--mc':'' , '--eventcontent' : 'NANOEDMAODSIM,DQM','--datatier': 'NANOAODSIM,DQMIO' }, stepNanoAODDefaults ]) - +stepNanoEDMMCProd = merge([{ '--mc':'', '-s': 'NANO', '--eventcontent' : 'NANOEDMAODSIM','--datatier': 'NANOAODSIM' }, stepNanoAODDefaults ]) steps['NANOAOD2016'] = merge([{'--conditions': 'auto:run2_data_relval', '--era': 'Run2_2016'}, stepNanoAODData ]) steps['NANOAOD2017'] = merge([{'--conditions': 'auto:run2_data_relval', '--era': 'Run2_2017'}, stepNanoAODData ]) @@ -2542,6 +2549,7 @@ def gen2018HiMix(fragment,howMuch): steps['NANOEDMMC2017_94XMiniAODv1'] = merge([{'--era': 'Run2_2017,run2_nanoAOD_94XMiniAODv1'}, steps['NANOEDMMC2017'] ]) steps['NANOEDMMC2017_94XMiniAODv2'] = merge([{'--era': 'Run2_2017,run2_nanoAOD_94XMiniAODv2'}, steps['NANOEDMMC2017'] ]) steps['NANOEDMMC2016_80X'] = merge([{'--conditions': 'auto:run2_mc', '--era': 'Run2_2016,run2_miniAOD_80XLegacy'}, steps['NANOEDMMC2017'] ]) +steps['NANOEDMMC2018_PROD'] = merge([{'--conditions': 'auto:phase1_2018_realistic', '--era': 'Run2_2018', '--filein':'file:step3_inMINIAODSIM.root'}, stepNanoEDMMCProd ]) steps['NANOEDM2017'] = merge([{'--conditions': 'auto:run2_data_relval', '--era': 'Run2_2017'}, stepNanoEDMData ]) steps['NANOEDM2017_92X'] = merge([{'--era': 'Run2_2017,run2_nanoAOD_92X'}, steps['NANOEDM2017'] ])