From 3a3313718a26595802870d323e24167e57e1784f Mon Sep 17 00:00:00 2001 From: Francesco Date: Sat, 28 Oct 2017 11:15:19 +0200 Subject: [PATCH 1/3] add datatier for intermediate EDM NANOAOD stuff --- Configuration/PyReleaseValidation/python/relval_steps.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index cf50453503ce1..961e8101fab23 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -1982,8 +1982,8 @@ def gen2018HiMix(fragment,howMuch): 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 ]) +stepNanoEDMData = merge([{ '--data':'', '--eventcontent' : 'NANOAOD' ,'--datatier': 'NANOEDMAOD' }, stepNanoAODDefaults ]) +stepNanoEDMMC = merge([{ '--mc':'' , '--eventcontent' : 'NANOAODSIM','--datatier': 'NANOEDMAODSIM' }, 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 ]) From d787efb84a526411c2a7e30d7eb8de9ab179d99b Mon Sep 17 00:00:00 2001 From: Francesco Date: Sat, 28 Oct 2017 17:08:50 +0200 Subject: [PATCH 2/3] setting GT of NANOMERGE equal to GT of NANOEDM --- Configuration/PyReleaseValidation/python/MatrixInjector.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Configuration/PyReleaseValidation/python/MatrixInjector.py b/Configuration/PyReleaseValidation/python/MatrixInjector.py index 51348bae8f0e9..9a200ff603884 100644 --- a/Configuration/PyReleaseValidation/python/MatrixInjector.py +++ b/Configuration/PyReleaseValidation/python/MatrixInjector.py @@ -261,6 +261,7 @@ def prepare(self,mReader, directories, mode='init'): thisLabel=thisLabel+"_dblMiniAOD" processStrPrefix='' setPrimaryDs=None + nanomergeGT='' for step in s[3]: if 'INPUT' in step or (not isinstance(s[2][index],str)): @@ -342,6 +343,11 @@ def prepare(self,mReader, directories, mode='init'): chainDict['nowmTasklist'][-1]['ConfigCacheID']='%s/%s.py'%(dir,step) chainDict['nowmTasklist'][-1]['GlobalTag']=chainDict['nowmTasklist'][-1]['nowmIO']['GT'] # copy to the proper parameter name chainDict['GlobalTag']=chainDict['nowmTasklist'][-1]['nowmIO']['GT'] #set in general to the last one of the chain + if 'NANOEDM' in step : + nanomergeGT = chainDict['nowmTasklist'][-1]['nowmIO']['GT'] + if 'NANOMERGE' in step : + chainDict['nowmTasklist'][-1]['GlobalTag'] = nanomergeGT + chainDict['GlobalTag'] = nanomergeGT if 'pileup' in chainDict['nowmTasklist'][-1]['nowmIO']: chainDict['nowmTasklist'][-1]['MCPileup']=chainDict['nowmTasklist'][-1]['nowmIO']['pileup'] if '--pileup ' in s[2][index]: # catch --pileup (scenarion) and not --pileup_ (dataset to be mixed) => works also making PRE-MIXed dataset From 577870b13d5b46779235bb9815c90e40c0c66a6a Mon Sep 17 00:00:00 2001 From: Francesco Date: Mon, 30 Oct 2017 10:52:12 +0100 Subject: [PATCH 3/3] set process string to use GT of NANOEDM step --- .../PyReleaseValidation/python/MatrixInjector.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/MatrixInjector.py b/Configuration/PyReleaseValidation/python/MatrixInjector.py index 9a200ff603884..aa9a8b5dba602 100644 --- a/Configuration/PyReleaseValidation/python/MatrixInjector.py +++ b/Configuration/PyReleaseValidation/python/MatrixInjector.py @@ -261,7 +261,7 @@ def prepare(self,mReader, directories, mode='init'): thisLabel=thisLabel+"_dblMiniAOD" processStrPrefix='' setPrimaryDs=None - nanomergeGT='' + nanoedmGT='' for step in s[3]: if 'INPUT' in step or (not isinstance(s[2][index],str)): @@ -344,10 +344,9 @@ def prepare(self,mReader, directories, mode='init'): chainDict['nowmTasklist'][-1]['GlobalTag']=chainDict['nowmTasklist'][-1]['nowmIO']['GT'] # copy to the proper parameter name chainDict['GlobalTag']=chainDict['nowmTasklist'][-1]['nowmIO']['GT'] #set in general to the last one of the chain if 'NANOEDM' in step : - nanomergeGT = chainDict['nowmTasklist'][-1]['nowmIO']['GT'] + nanoedmGT = chainDict['nowmTasklist'][-1]['nowmIO']['GT'] if 'NANOMERGE' in step : - chainDict['nowmTasklist'][-1]['GlobalTag'] = nanomergeGT - chainDict['GlobalTag'] = nanomergeGT + chainDict['GlobalTag'] = nanoedmGT if 'pileup' in chainDict['nowmTasklist'][-1]['nowmIO']: chainDict['nowmTasklist'][-1]['MCPileup']=chainDict['nowmTasklist'][-1]['nowmIO']['pileup'] if '--pileup ' in s[2][index]: # catch --pileup (scenarion) and not --pileup_ (dataset to be mixed) => works also making PRE-MIXed dataset @@ -366,10 +365,14 @@ def prepare(self,mReader, directories, mode='init'): #chainDict['AcquisitionEra'][step]=(chainDict['CMSSWVersion']+'-PU_'+chainDict['nowmTasklist'][-1]['GlobalTag']).replace('::All','')+thisLabel chainDict['AcquisitionEra'][step]=chainDict['CMSSWVersion'] chainDict['ProcessingString'][step]=processStrPrefix+chainDict['nowmTasklist'][-1]['GlobalTag'].replace('::All','').replace('-','_')+thisLabel + if 'NANOMERGE' in step : + chainDict['ProcessingString'][step]=processStrPrefix+nanoedmGT.replace('::All','').replace('-','_')+thisLabel else: #chainDict['nowmTasklist'][-1]['AcquisitionEra']=(chainDict['CMSSWVersion']+'-PU_'+chainDict['nowmTasklist'][-1]['GlobalTag']).replace('::All','')+thisLabel chainDict['nowmTasklist'][-1]['AcquisitionEra']=chainDict['CMSSWVersion'] chainDict['nowmTasklist'][-1]['ProcessingString']=processStrPrefix+chainDict['nowmTasklist'][-1]['GlobalTag'].replace('::All','').replace('-','_')+thisLabel + if 'NANOMERGE' in step : + chainDict['nowmTasklist'][-1]['ProcessingString']=processStrPrefix+nanoedmGT.replace('::All','').replace('-','_')+thisLabel if (self.batchName): chainDict['nowmTasklist'][-1]['Campaign'] = chainDict['nowmTasklist'][-1]['AcquisitionEra']+self.batchName