From 91a880106f34dfbee53eac6d71554af3ed1b3db9 Mon Sep 17 00:00:00 2001 From: Andrea Date: Wed, 4 Oct 2017 19:00:03 +0200 Subject: [PATCH 01/11] initial addition of NanoAOD to runTheMatrix --- .../python/relval_standard.py | 2 +- .../python/relval_steps.py | 27 +++++++++++++++++++ .../python/upgradeWorkflowComponents.py | 3 ++- 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_standard.py b/Configuration/PyReleaseValidation/python/relval_standard.py index 516365e2b3f82..8bbb4cfa029fa 100644 --- a/Configuration/PyReleaseValidation/python/relval_standard.py +++ b/Configuration/PyReleaseValidation/python/relval_standard.py @@ -229,7 +229,7 @@ workflows[136.785] = ['',['RunMuonEG2017B','HLTDR2_2017','RECODR2_2017reHLT_skimMuonEG_Prompt','HARVEST2017']] workflows[136.786] = ['',['RunSingleEl2017B','HLTDR2_2017','RECODR2_2017reHLT_Prompt','HARVEST2017']] workflows[136.787] = ['',['RunSingleMu2017B','HLTDR2_2017','RECODR2_2017reHLT_skimSingleMu_Prompt_Lumi','HARVEST2017']] -workflows[136.788] = ['',['RunSinglePh2017B','HLTDR2_2017','RECODR2_2017reHLT_skimSinglePh_Prompt','HARVEST2017']] +workflows[136.788] = ['',['RunSinglePh2017B','HLTDR2_2017','RECODR2_2017reHLT_skimSinglePh_Prompt','HARVEST2017','NANOAOD2017']] workflows[136.789] = ['',['RunZeroBias2017B','HLTDR2_2017','RECODR2_2017reHLT_Prompt','HARVEST2017']] workflows[136.790] = ['',['RunMuOnia2017B','HLTDR2_2017','RECODR2_2017reHLT_skimMuOnia_Prompt','HARVEST2017']] workflows[136.791] = ['',['RunNoBPTX2017B','HLTDR2_2017','RECODR2_2017reHLTAlCaTkCosmics_Prompt','HARVEST2017']] diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 5868a3630c052..16ac45e63bd54 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -1939,6 +1939,24 @@ def gen2018HiMix(fragment,howMuch): '--datatier' : 'MINIAODSIM', '--eventcontent':'MINIAOD',},stepMiniAODMC]) + +stepNanoAODDefaults = { '-s': 'NANO', '--datatier': 'NANO', '-n': 1000 } +stepNanoAODData = merge([{ '--data':'', '--eventcontent' : 'NANOAOD' }, stepNanoAODDefaults ]) +stepNanoAODMC = merge([{ '--mc':'' , '--eventcontent' : '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 ]) + +steps['NANOAOD2016_80X'] = merge([{'--era': 'Run2_2016,run2_miniAOD_80XLegacy'}, steps['NANOAOD2016'] ]) +steps['NANOAOD2017_92X'] = merge([{'--era': 'Run2_2017,run2_nanoAOD_92X'}, steps['NANOAOD2017'] ]) + +steps['NANOAODMC2016'] = merge([{'--conditions': 'auto:run2_mc', '--era': 'Run2_2016'}, stepNanoAODMC ]) +steps['NANOAODMC2017'] = merge([{'--conditions': 'auto:phase1_2017_realistic', '--era': 'Run2_2017'}, stepNanoAODMC ]) + +steps['NANOAODMC2016_80X'] = merge([{'--era': 'Run2_2016,run2_miniAOD_80XLegacy'}, steps['NANOAODMC2016'] ]) +steps['NANOAODMC2017_92X'] = merge([{'--era': 'Run2_2017,run2_nanoAOD_92X'}, steps['NANOAODMC2017'] ]) + + ################################################################################# ####From this line till the end of the file : ####UPGRADE WORKFLOWS IN PREPARATION - Gaelle's sandbox - @@ -2120,6 +2138,15 @@ def gen2018HiMix(fragment,howMuch): '--scenario' : 'pp' } + upgradeStepDict['NanoFull'][k] = {'-s':'NANO', + '--conditions':gt, + '--datatier':'NANO', + '-n':'10', + '--eventcontent':'NANOAODSIM', + '--geometry' : geom + } + + # setup baseline customizations and PU for step in upgradeSteps['baseline']['steps']: if cust is not None: upgradeStepDict[step][k]['--customise']=cust diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index 0c25b2e82cb65..cdc968c01cae4 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -67,6 +67,7 @@ 'HARVESTFast', 'HARVESTFullGlobal', 'ALCAFull', + 'NanoFull', ], 'PU' : [ 'DigiFullTrigger', @@ -121,7 +122,7 @@ 'GT' : 'auto:phase1_2017_realistic', 'HLTmenu': '@relval2017', 'Era' : 'Run2_2017', - 'ScenToRun' : ['GenSimFull','DigiFull','RecoFull','ALCAFull','HARVESTFull'], + 'ScenToRun' : ['GenSimFull','DigiFull','RecoFull','ALCAFull','HARVESTFull','NanoFull'], }, '2017Design' : { 'Geom' : 'DB:Extended', From 86f3ce0e1be68d6e9ff491114ce228e7b3f0825d Mon Sep 17 00:00:00 2001 From: Andrea Date: Wed, 4 Oct 2017 20:51:48 +0200 Subject: [PATCH 02/11] fix input --- Configuration/PyReleaseValidation/python/relval_steps.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 16ac45e63bd54..d1f1f2279310c 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -2143,6 +2143,7 @@ def gen2018HiMix(fragment,howMuch): '--datatier':'NANO', '-n':'10', '--eventcontent':'NANOAODSIM', + '--filein':'file:step3_inMINIAODSIM.root', '--geometry' : geom } From 9b4b6a30306107c3aa38e5b60e922e292f5c8814 Mon Sep 17 00:00:00 2001 From: Andrea Date: Wed, 11 Oct 2017 12:38:28 +0200 Subject: [PATCH 03/11] allow NANO central production --- Configuration/Applications/python/ConfigBuilder.py | 2 +- Configuration/EventContent/python/EventContent_cff.py | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Configuration/Applications/python/ConfigBuilder.py b/Configuration/Applications/python/ConfigBuilder.py index 4493b7dd96a09..860494c92f848 100644 --- a/Configuration/Applications/python/ConfigBuilder.py +++ b/Configuration/Applications/python/ConfigBuilder.py @@ -626,7 +626,7 @@ def doNotInlineEventContent(instance,label = "cms.untracked.vstring(process."+th if self._options.timeoutOutput: CppType='TimeoutPoolOutputModule' if streamType=='DQM' and tier=='DQMIO': CppType='DQMRootOutputModule' - if "NANOAOD" in streamType and tier=='NANO': CppType='NanoAODOutputModule' + if "NANOAOD" in streamType and 'NANOAOD' in tier : CppType='NanoAODOutputModule' output = cms.OutputModule(CppType, theEventContent, fileName = cms.untracked.string(theFileName), diff --git a/Configuration/EventContent/python/EventContent_cff.py b/Configuration/EventContent/python/EventContent_cff.py index c577a42e1bfda..4f20ae6cafdd2 100644 --- a/Configuration/EventContent/python/EventContent_cff.py +++ b/Configuration/EventContent/python/EventContent_cff.py @@ -91,6 +91,14 @@ # # from DQMOffline.Configuration.DQMOffline_EventContent_cff import * +# +# +# NANOAOD +# +# +from PhysicsTools.NanoAOD.NanoAODEDMEventContent_cff import * + + # # # FastSim From 9535b274e9738280b8a7676910014e44df277e89 Mon Sep 17 00:00:00 2001 From: Andrea Date: Wed, 11 Oct 2017 14:10:45 +0200 Subject: [PATCH 04/11] Add nanoaod testing workflows --- .../python/relval_standard.py | 9 +++++++++ .../python/relval_steps.py | 20 +++++++++++++++---- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_standard.py b/Configuration/PyReleaseValidation/python/relval_standard.py index 717a2f8f06e3b..34c828717ed55 100644 --- a/Configuration/PyReleaseValidation/python/relval_standard.py +++ b/Configuration/PyReleaseValidation/python/relval_standard.py @@ -357,6 +357,15 @@ # reminiaod wf on 80X MC workflows[1325.5] = ['', ['TTbar_13_reminiaodINPUT','REMINIAOD_mc2016','HARVESTDR2_REMINIAOD_mc2016']] +# nanoaod wf without intermediate EDM, starting from existing MINIAOD inputs +workflows[1325.6] = ['', ['TTbar_13_92XNanoAODINPUT','NANOAODMC2017_92X']] +workflows[1325.7] = ['', ['TTbar_13_94XNanoAODINPUT','NANOAODMC2017']] +# nanoaod wf with intermediate EDM and merge step, starting from existing MINIAOD inputs +workflows[1325.8] = ['', ['TTbar_13_92XNanoAODINPUT','NANOEDMMC2017','NANOMERGE']] +workflows[1325.9] = ['', ['TTbar_13_94XNanoAODINPUT','NANOEDMMC2017_92X','NANOMERGE']] + + + workflows[1326] = ['', ['WE_13','DIGIUP15','RECOUP15','HARVESTUP15']] workflows[1329] = ['', ['ZEE_13','DIGIUP15','RECOUP15','HARVESTUP15']] workflows[1356] = ['', ['ZEE_13_DBLMINIAOD','DIGIUP15','RECOAODUP15','HARVESTUP15','DBLMINIAODMCUP15NODQM']] diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index e343659cd2767..300e3eed804e3 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -458,6 +458,11 @@ def identitySim(wf): # INPUT command for reminiAOD wf on 80X relval input steps['TTbar_13_reminiaodINPUT']={'INPUT':InputInfo(dataSet='/RelValTTbar_13/CMSSW_8_0_21-80X_mcRun2_asymptotic_2016_TrancheIV_v6_Tr4GT_v6-v1/GEN-SIM-RECO',label='reminiaod',location='STD')} +#input for a NANOAOD from MINIAOD workflow +#steps['TTbar_13_80XNanoAODINPUT']={'INPUT':InputInfo(dataSet='/RelValTTbar_13/',label='nanoaod80X',location='STD')} +steps['TTbar_13_92XNanoAODINPUT']={'INPUT':InputInfo(dataSet='/RelValTTbar_13/CMSSW_9_2_12-PU25ns_92X_upgrade2017_realistic_v11-v1/MINIAODSIM',label='nanoaod92X',location='STD')} +steps['TTbar_13_94XNanoAODINPUT']={'INPUT':InputInfo(dataSet='/RelValTTbar_13/CMSSW_9_4_0_pre1-PU25ns_93X_mc2017_realistic_v3-v1/MINIAODSIM',label='nanoaod94X',location='STD')} + # 13 TeV recycle GEN-SIM input steps['MinBias_13INPUT']={'INPUT':InputInfo(dataSet='/RelValMinBias_13/%s/GEN-SIM'%(baseDataSetRelease[3],),location='STD')} steps['QCD_Pt_3000_3500_13INPUT']={'INPUT':InputInfo(dataSet='/RelValQCD_Pt_3000_3500_13/%s/GEN-SIM'%(baseDataSetRelease[3],),location='STD')} @@ -1944,9 +1949,11 @@ def gen2018HiMix(fragment,howMuch): '--eventcontent':'MINIAOD',},stepMiniAODMC]) -stepNanoAODDefaults = { '-s': 'NANO', '--datatier': 'NANO', '-n': 1000 } -stepNanoAODData = merge([{ '--data':'', '--eventcontent' : 'NANOAOD' }, stepNanoAODDefaults ]) -stepNanoAODMC = merge([{ '--mc':'' , '--eventcontent' : 'NANOAODSIM' }, stepNanoAODDefaults ]) +stepNanoAODDefaults = { '-s': 'NANO', '-n': 1000 } +stepNanoAODData = merge([{ '--data':'', '--eventcontent' : 'NANOAOD' ,'--datatier': 'NANOAOD' }, stepNanoAODDefaults ]) +stepNanoAODMC = merge([{ '--mc':'' , '--eventcontent' : 'NANOAODSIM','--datatier': 'NANOAODSIM' }, stepNanoAODDefaults ]) +stepNanoEDMData = merge([{ '--data':'', '--eventcontent' : 'NANOAOD' }, stepNanoAODDefaults ]) +stepNanoEDMMC = merge([{ '--mc':'' , '--eventcontent' : '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 ]) @@ -1960,6 +1967,11 @@ def gen2018HiMix(fragment,howMuch): steps['NANOAODMC2016_80X'] = merge([{'--era': 'Run2_2016,run2_miniAOD_80XLegacy'}, steps['NANOAODMC2016'] ]) steps['NANOAODMC2017_92X'] = merge([{'--era': 'Run2_2017,run2_nanoAOD_92X'}, steps['NANOAODMC2017'] ]) +steps['NANOEDMMC2017'] = merge([{'--conditions': 'auto:phase1_2017_realistic', '--era': 'Run2_2017'}, stepNanoEDMMC ]) +steps['NANOEDMMC2017_92X'] = merge([{'--era': 'Run2_2017,run2_nanoAOD_92X'}, steps['NANOAODEDMMC2017'] ]) + + +steps['NANOMERGE'] = { '-s': 'ENDJOB', '-n': 1000 , '--eventcontent' : 'NANOAODSIM','--datatier': 'NANOAODSIM' } ################################################################################# ####From this line till the end of the file : @@ -2144,7 +2156,7 @@ def gen2018HiMix(fragment,howMuch): upgradeStepDict['NanoFull'][k] = {'-s':'NANO', '--conditions':gt, - '--datatier':'NANO', + '--datatier':'NANOAODSIM', '-n':'10', '--eventcontent':'NANOAODSIM', '--filein':'file:step3_inMINIAODSIM.root', From 57db674829dc38665b295a35c52766b83d414c94 Mon Sep 17 00:00:00 2001 From: Andrea Date: Wed, 11 Oct 2017 15:16:14 +0200 Subject: [PATCH 05/11] add 80X workflow with ZEE --- .../PyReleaseValidation/python/relval_standard.py | 10 ++++++---- .../PyReleaseValidation/python/relval_steps.py | 7 ++++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_standard.py b/Configuration/PyReleaseValidation/python/relval_standard.py index 34c828717ed55..23d6a6f874489 100644 --- a/Configuration/PyReleaseValidation/python/relval_standard.py +++ b/Configuration/PyReleaseValidation/python/relval_standard.py @@ -358,16 +358,18 @@ workflows[1325.5] = ['', ['TTbar_13_reminiaodINPUT','REMINIAOD_mc2016','HARVESTDR2_REMINIAOD_mc2016']] # nanoaod wf without intermediate EDM, starting from existing MINIAOD inputs -workflows[1325.6] = ['', ['TTbar_13_92XNanoAODINPUT','NANOAODMC2017_92X']] -workflows[1325.7] = ['', ['TTbar_13_94XNanoAODINPUT','NANOAODMC2017']] +workflows[1325.6] = ['', ['TTbar_13_94XNanoAODINPUT','NANOAODMC2017']] # nanoaod wf with intermediate EDM and merge step, starting from existing MINIAOD inputs -workflows[1325.8] = ['', ['TTbar_13_92XNanoAODINPUT','NANOEDMMC2017','NANOMERGE']] -workflows[1325.9] = ['', ['TTbar_13_94XNanoAODINPUT','NANOEDMMC2017_92X','NANOMERGE']] +workflows[1325.7] = ['', ['TTbar_13_92XNanoAODINPUT','NANOEDMMC2017','NANOMERGE']] +workflows[1325.8] = ['', ['TTbar_13_94XNanoAODINPUT','NANOEDMMC2017_92X','NANOMERGE']] +#using ZEE as I cannot find TT at CERN +workflows[1329.1] = ['', ['ZEE_13_80XNanoAODINPUT','NANOEDMMC2016_80X','NANOMERGE']] workflows[1326] = ['', ['WE_13','DIGIUP15','RECOUP15','HARVESTUP15']] workflows[1329] = ['', ['ZEE_13','DIGIUP15','RECOUP15','HARVESTUP15']] + workflows[1356] = ['', ['ZEE_13_DBLMINIAOD','DIGIUP15','RECOAODUP15','HARVESTUP15','DBLMINIAODMCUP15NODQM']] workflows[1331] = ['', ['ZTT_13','DIGIUP15','RECOUP15','HARVESTUP15']] workflows[1332] = ['', ['H125GGgluonfusion_13','DIGIUP15','RECOUP15','HARVESTUP15']] diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 300e3eed804e3..86b888c70cf53 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -459,7 +459,7 @@ def identitySim(wf): steps['TTbar_13_reminiaodINPUT']={'INPUT':InputInfo(dataSet='/RelValTTbar_13/CMSSW_8_0_21-80X_mcRun2_asymptotic_2016_TrancheIV_v6_Tr4GT_v6-v1/GEN-SIM-RECO',label='reminiaod',location='STD')} #input for a NANOAOD from MINIAOD workflow -#steps['TTbar_13_80XNanoAODINPUT']={'INPUT':InputInfo(dataSet='/RelValTTbar_13/',label='nanoaod80X',location='STD')} +steps['ZEE_13_80XNanoAODINPUT']={'INPUT':InputInfo(dataSet='/RelValZEE_13/CMSSW_8_0_21-PU25ns_80X_mcRun2_asymptotic_2016_TrancheIV_v6_Tr4GT_v6-v1/MINIAODSIM',label='nanoaod80X',location='STD')} steps['TTbar_13_92XNanoAODINPUT']={'INPUT':InputInfo(dataSet='/RelValTTbar_13/CMSSW_9_2_12-PU25ns_92X_upgrade2017_realistic_v11-v1/MINIAODSIM',label='nanoaod92X',location='STD')} steps['TTbar_13_94XNanoAODINPUT']={'INPUT':InputInfo(dataSet='/RelValTTbar_13/CMSSW_9_4_0_pre1-PU25ns_93X_mc2017_realistic_v3-v1/MINIAODSIM',label='nanoaod94X',location='STD')} @@ -1968,10 +1968,11 @@ def gen2018HiMix(fragment,howMuch): steps['NANOAODMC2017_92X'] = merge([{'--era': 'Run2_2017,run2_nanoAOD_92X'}, steps['NANOAODMC2017'] ]) steps['NANOEDMMC2017'] = merge([{'--conditions': 'auto:phase1_2017_realistic', '--era': 'Run2_2017'}, stepNanoEDMMC ]) -steps['NANOEDMMC2017_92X'] = merge([{'--era': 'Run2_2017,run2_nanoAOD_92X'}, steps['NANOAODEDMMC2017'] ]) +steps['NANOEDMMC2017_92X'] = merge([{'--era': 'Run2_2017,run2_nanoAOD_92X'}, steps['NANOEDMMC2017'] ]) +steps['NANOEDMMC2016_80X'] = merge([{'--conditions': 'auto:run2_mc', '--era': 'Run2_2016,run2_miniAOD_80XLegacy'}, steps['NANOEDMMC2017'] ]) -steps['NANOMERGE'] = { '-s': 'ENDJOB', '-n': 1000 , '--eventcontent' : 'NANOAODSIM','--datatier': 'NANOAODSIM' } +steps['NANOMERGE'] = { '-s': 'ENDJOB', '-n': 1000 , '--eventcontent' : 'NANOAODSIM','--datatier': 'NANOAODSIM', '--conditions': 'auto:run2_mc' } ################################################################################# ####From this line till the end of the file : From 3bf4cd189068cfdc2f8393d57b43492fa79cec4a Mon Sep 17 00:00:00 2001 From: Giovanni Date: Thu, 28 Sep 2017 14:17:51 +0200 Subject: [PATCH 06/11] cmsDriver: get --hltProcess to work with NanoAOD --- Configuration/Applications/python/ConfigBuilder.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Configuration/Applications/python/ConfigBuilder.py b/Configuration/Applications/python/ConfigBuilder.py index 860494c92f848..767e7a176b711 100644 --- a/Configuration/Applications/python/ConfigBuilder.py +++ b/Configuration/Applications/python/ConfigBuilder.py @@ -1701,6 +1701,11 @@ def prepare_NANO(self, sequence = "nanoAOD"): self._options.customisation_file_unsch.insert(0,"PhysicsTools/NanoAOD/nano_cff."+custom) else: self._options.customisation_file.insert(0,"PhysicsTools/NanoAOD/nano_cff."+custom) + if self._options.hltProcess: + if len(self._options.customise_commands) > 1: + self._options.customise_commands = self._options.customise_commands + " \n" + self._options.customise_commands = self._options.customise_commands + "process.unpackedPatTrigger.triggerResults= cms.InputTag( 'TriggerResults::"+self._options.hltProcess+"' )\n" + def prepare_EI(self, sequence = None): ''' Enrich the schedule with event interpretation ''' From 2b2450cadf8705d43ce8ac41fb9cccecfa46d7fe Mon Sep 17 00:00:00 2001 From: Andrea Date: Wed, 11 Oct 2017 16:45:32 +0200 Subject: [PATCH 07/11] fix swapped 92X / 94X --- Configuration/PyReleaseValidation/python/relval_standard.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_standard.py b/Configuration/PyReleaseValidation/python/relval_standard.py index 23d6a6f874489..049756177797b 100644 --- a/Configuration/PyReleaseValidation/python/relval_standard.py +++ b/Configuration/PyReleaseValidation/python/relval_standard.py @@ -360,8 +360,8 @@ # nanoaod wf without intermediate EDM, starting from existing MINIAOD inputs workflows[1325.6] = ['', ['TTbar_13_94XNanoAODINPUT','NANOAODMC2017']] # nanoaod wf with intermediate EDM and merge step, starting from existing MINIAOD inputs -workflows[1325.7] = ['', ['TTbar_13_92XNanoAODINPUT','NANOEDMMC2017','NANOMERGE']] -workflows[1325.8] = ['', ['TTbar_13_94XNanoAODINPUT','NANOEDMMC2017_92X','NANOMERGE']] +workflows[1325.7] = ['', ['TTbar_13_94XNanoAODINPUT','NANOEDMMC2017','NANOMERGE']] +workflows[1325.8] = ['', ['TTbar_13_92XNanoAODINPUT','NANOEDMMC2017_92X','NANOMERGE']] #using ZEE as I cannot find TT at CERN workflows[1329.1] = ['', ['ZEE_13_80XNanoAODINPUT','NANOEDMMC2016_80X','NANOMERGE']] From 2659b762ce230d20d8275c23c0d01df855b11bfe Mon Sep 17 00:00:00 2001 From: Andrea Date: Thu, 12 Oct 2017 11:58:18 +0200 Subject: [PATCH 08/11] temporary disable Nano in standard workflows --- Configuration/PyReleaseValidation/python/relval_standard.py | 2 +- .../PyReleaseValidation/python/upgradeWorkflowComponents.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_standard.py b/Configuration/PyReleaseValidation/python/relval_standard.py index 049756177797b..79499b6ca9c63 100644 --- a/Configuration/PyReleaseValidation/python/relval_standard.py +++ b/Configuration/PyReleaseValidation/python/relval_standard.py @@ -229,7 +229,7 @@ workflows[136.785] = ['',['RunMuonEG2017B','HLTDR2_2017','RECODR2_2017reHLT_skimMuonEG_Prompt','HARVEST2017']] workflows[136.786] = ['',['RunSingleEl2017B','HLTDR2_2017','RECODR2_2017reHLT_Prompt','HARVEST2017']] workflows[136.787] = ['',['RunSingleMu2017B','HLTDR2_2017','RECODR2_2017reHLT_skimSingleMu_Prompt_Lumi','HARVEST2017']] -workflows[136.788] = ['',['RunSinglePh2017B','HLTDR2_2017','RECODR2_2017reHLT_skimSinglePh_Prompt','HARVEST2017','NANOAOD2017']] +workflows[136.788] = ['',['RunSinglePh2017B','HLTDR2_2017','RECODR2_2017reHLT_skimSinglePh_Prompt','HARVEST2017']] workflows[136.789] = ['',['RunZeroBias2017B','HLTDR2_2017','RECODR2_2017reHLT_Prompt','HARVEST2017']] workflows[136.790] = ['',['RunMuOnia2017B','HLTDR2_2017','RECODR2_2017reHLT_skimMuOnia_Prompt','HARVEST2017']] workflows[136.791] = ['',['RunNoBPTX2017B','HLTDR2_2017','RECODR2_2017reHLTAlCaTkCosmics_Prompt','HARVEST2017']] diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index 604345591300b..5d9e44d3d1c8f 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -122,7 +122,7 @@ 'GT' : 'auto:phase1_2017_realistic', 'HLTmenu': '@relval2017', 'Era' : 'Run2_2017', - 'ScenToRun' : ['GenSimFull','DigiFull','RecoFull','ALCAFull','HARVESTFull','NanoFull'], + 'ScenToRun' : ['GenSimFull','DigiFull','RecoFull','ALCAFull','HARVESTFull'], }, '2017Design' : { 'Geom' : 'DB:Extended', From b475e67b71ef7af20462af4f64c1c43767faf0e0 Mon Sep 17 00:00:00 2001 From: Andrea Date: Thu, 12 Oct 2017 15:05:05 +0200 Subject: [PATCH 09/11] add one Nano from Mini workflow in the limited runthematrix set --- Configuration/PyReleaseValidation/scripts/runTheMatrix.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py index 3ba3b3f181d8d..61cbf5f619543 100755 --- a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py +++ b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py @@ -59,6 +59,7 @@ def runSelected(opt): 136.7611, #2016E JetHT reMINIAOD from 80X legacy 136.788, #2017B Photon data 140.53, #2011 HI data + 1325.7, #test NanoAOD from existing MINI 1330, #Run2 MC Zmm 135.4, #Run 2 Zee ttbar 10042.0, #2017 ZMM From 2372cc34f7532e6165d48bacfb4b53247729c5bb Mon Sep 17 00:00:00 2001 From: Andrea Date: Thu, 12 Oct 2017 15:06:20 +0200 Subject: [PATCH 10/11] fix silly indent --- Configuration/PyReleaseValidation/scripts/runTheMatrix.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py index 61cbf5f619543..7cc2fb11b15a1 100755 --- a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py +++ b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py @@ -59,7 +59,7 @@ def runSelected(opt): 136.7611, #2016E JetHT reMINIAOD from 80X legacy 136.788, #2017B Photon data 140.53, #2011 HI data - 1325.7, #test NanoAOD from existing MINI + 1325.7, #test NanoAOD from existing MINI 1330, #Run2 MC Zmm 135.4, #Run 2 Zee ttbar 10042.0, #2017 ZMM From b41b549e1af50d47b12928570643a2b12fa76d1b Mon Sep 17 00:00:00 2001 From: Andrea Date: Thu, 12 Oct 2017 16:15:53 +0200 Subject: [PATCH 11/11] update tier names --- PhysicsTools/NanoAOD/test/runtests.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PhysicsTools/NanoAOD/test/runtests.sh b/PhysicsTools/NanoAOD/test/runtests.sh index bb43e5a0e5912..ba91908cf92af 100755 --- a/PhysicsTools/NanoAOD/test/runtests.sh +++ b/PhysicsTools/NanoAOD/test/runtests.sh @@ -4,8 +4,8 @@ function die { echo $1: status $2 ; exit $2; } #to be enabled with the right files #cmsDriver.py test80X -s NANO --mc --eventcontent NANOAODSIM --datatier NANO --filein /store/relval/CMSSW_8_0_0/RelValTTbar_13/MINIAODSIM/PU25ns_80X_mcRun2_asymptotic_v4-v1/10000/A65CD249-BFDA-E511-813A-0025905A6066.root --conditions auto:run2_mc -n 100 --era Run2_2016,run2_miniAOD_80XLegacy || die 'Failure using cmsdriver 80X' $? -cmsDriver.py test92X -s NANO --mc --eventcontent NANOAODSIM --datatier NANO --filein /store/relval/CMSSW_9_2_12/RelValTTbar_13/MINIAODSIM/PU25ns_92X_upgrade2017_realistic_v11-v1/00000/080E2624-F59D-E711-ACEE-0CC47A7C35A4.root --conditions auto:phase1_2017_realistic -n 100 --era Run2_2017,run2_nanoAOD_92X || die 'Failure using cmsdriver 92X' $? +cmsDriver.py test92X -s NANO --mc --eventcontent NANOAODSIM --datatier NANOAODSIM --filein /store/relval/CMSSW_9_2_12/RelValTTbar_13/MINIAODSIM/PU25ns_92X_upgrade2017_realistic_v11-v1/00000/080E2624-F59D-E711-ACEE-0CC47A7C35A4.root --conditions auto:phase1_2017_realistic -n 100 --era Run2_2017,run2_nanoAOD_92X || die 'Failure using cmsdriver 92X' $? -cmsDriver.py test94X -s NANO --mc --eventcontent NANOAODSIM --datatier NANO --filein /store/relval/CMSSW_9_4_0_pre1/RelValTTbar_13/MINIAODSIM/PU25ns_93X_mc2017_realistic_v3-v1/00000/92FD5642-509D-E711-ADAB-0025905B85C6.root --conditions auto:phase1_2017_realistic -n 100 --era Run2_2017 || die 'Failure using cmsdriver 94X' $? +cmsDriver.py test94X -s NANO --mc --eventcontent NANOAODSIM --datatier NANOAODSIM --filein /store/relval/CMSSW_9_4_0_pre1/RelValTTbar_13/MINIAODSIM/PU25ns_93X_mc2017_realistic_v3-v1/00000/92FD5642-509D-E711-ADAB-0025905B85C6.root --conditions auto:phase1_2017_realistic -n 100 --era Run2_2017 || die 'Failure using cmsdriver 94X' $?