Skip to content

From cmssw 9 4 0 pre3 nanoedmtest #34

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.

Sign up for GitHub

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

Open
arizzi wants to merge 3 commits into
base: fixcmsdriver
Choose a base branch
from
Open

From cmssw 9 4 0 pre3 nanoedmtest #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a33137
add datatier for intermediate EDM NANOAOD stuff
fabozzi Oct 28, 2017
d787efb
setting GT of NANOMERGE equal to GT of NANOEDM
fabozzi Oct 28, 2017
577870b
set process string to use GT of NANOEDM step
fabozzi Oct 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions Configuration/PyReleaseValidation/python/MatrixInjector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,7 @@ def prepare(self,mReader, directories, mode='init'):
thisLabel=thisLabel+"_dblMiniAOD"
processStrPrefix=''
setPrimaryDs=None
nanoedmGT=''
for step in s[3]:

if 'INPUT' in step or (not isinstance(s[2][index],str)):
Expand Down Expand Up @@ -342,6 +343,10 @@ 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 :
nanoedmGT = chainDict['nowmTasklist'][-1]['nowmIO']['GT']
if 'NANOMERGE' in step :
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
Expand All @@ -360,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
Expand Down
4 changes: 2 additions & 2 deletions Configuration/PyReleaseValidation/python/relval_steps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ])
Expand Down