Skip to content

Commit

Permalink
Merge pull request #13267 from hengne/from-CMSSW_8_0_0_pre6_relval_re…
Browse files Browse the repository at this point in the history 
…base

relval GT reference change to autoCond.py for fullSim workflows
  • Loading branch information
@cmsbuild
cmsbuild committed Feb 15, 2016
2 parents b72be6c + c4ca9f3 commit d4c91a7
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 18 deletions.
1 change: 1 addition & 0 deletions Configuration/PyReleaseValidation/python/MatrixUtil.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ def queries(self):

if len(self.run) is not 0:
return ["file {0}={1} run={2} site=T2_CH_CERN".format(query_by, query_source, query_run) for query_run in self.run]
#return ["file {0}={1} run={2} ".format(query_by, query_source, query_run) for query_run in self.run]
else:
return ["file {0}={1} site=T2_CH_CERN".format(query_by, query_source)]

Expand Down
36 changes: 18 additions & 18 deletions Configuration/PyReleaseValidation/python/relval_steps.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@ def genS(fragment,howMuch):
U2000by1={'--relval': '2000,1'}
U80by1={'--relval': '80,1'}

hiAlca = {'--conditions':'auto:run2_mc_HIon', '--era':'Run2_HI'}
hiAlca = {'--conditions':'auto:run2_mc_hi', '--era':'Run2_HI'}
hiAlca2011 = {'--conditions':'auto:run1_mc_hi'}

hiDefaults2011=merge([hiAlca2011,{'--scenario':'HeavyIons','-n':2,'--beamspot':'RealisticHI2011Collision'}])
Expand Down Expand Up @@ -551,7 +551,7 @@ def genS(fragment,howMuch):
step1Defaults])
step1FastUpg2015Defaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,L1Reco,RECO,EI,HLT:@relval25ns,VALIDATION',
'--fast':'',
'--conditions' :'auto:run2_mc_'+autoHLT['relval25ns'],
'--conditions' :'auto:run2_mc',
'--beamspot' : 'Realistic50ns13TeVCollision',
'--era' :'Run2_25ns',
'--eventcontent':'FEVTDEBUGHLT,DQM',
Expand Down Expand Up @@ -816,13 +816,13 @@ def identityFS(wf):
}
#for 2015
step2Upg2015Defaults = {'-s' :'DIGI:pdigi_valid,L1,DIGI2RAW,HLT:@relval25ns',
'--conditions' :'auto:run2_mc_'+autoHLT['relval25ns'],
'--conditions' :'auto:run2_mc',
'--datatier' :'GEN-SIM-DIGI-RAW-HLTDEBUG',
'--eventcontent':'FEVTDEBUGHLT',
'--era' :'Run2_25ns',
'-n' :'10'
}
step2Upg2015Defaults50ns = merge([{'-s':'DIGI:pdigi_valid,L1,DIGI2RAW,HLT:@relval50ns','--conditions':'auto:run2_mc_'+autoHLT['relval50ns'],'--era':'Run2_50ns'},step2Upg2015Defaults])
step2Upg2015Defaults50ns = merge([{'-s':'DIGI:pdigi_valid,L1,DIGI2RAW,HLT:@relval50ns','--conditions':'auto:run2_mc_50ns','--era':'Run2_50ns'},step2Upg2015Defaults])

steps['DIGIUP15']=merge([step2Upg2015Defaults])
steps['DIGIUP15PROD1']=merge([{'-s':'DIGI,L1,DIGI2RAW,HLT:@relval25ns','--eventcontent':'RAWSIM','--datatier':'GEN-SIM-RAW'},step2Upg2015Defaults])
Expand Down Expand Up @@ -860,20 +860,20 @@ def identityFS(wf):
'--evt_type' : 'SingleNuE10_cfi',
'-s' : 'GEN,SIM,DIGIPREMIX:pdigi_valid,L1,DIGI2RAW',
'-n' : '10',
'--conditions' : 'auto:run2_mc_'+autoHLT['relval25ns'], # 25ns GT; dedicated dict for 50ns
'--conditions' : 'auto:run2_mc', # 25ns GT; dedicated dict for 50ns
'--datatier' : 'GEN-SIM-DIGI-RAW',
'--eventcontent': 'PREMIX',
'--era' : 'Run2_25ns' # temporary replacement for premix; to be brought back to customisePostLS1 *EDIT - This comment possibly no longer relevant with switch to eras
}
premixUp2015Defaults50ns = merge([{'--conditions':'auto:run2_mc_'+autoHLT['relval50ns']},
premixUp2015Defaults50ns = merge([{'--conditions':'auto:run2_mc_50ns'},
{'--era':'Run2_50ns'},
premixUp2015Defaults])

steps['PREMIXUP15_PU25']=merge([PU25,Kby(100,100),premixUp2015Defaults])
steps['PREMIXUP15_PU50']=merge([PU50,Kby(100,100),premixUp2015Defaults50ns])

digiPremixUp2015Defaults25ns = {
'--conditions' : 'auto:run2_mc_'+autoHLT['relval25ns'],
'--conditions' : 'auto:run2_mc',
'-s' : 'DIGIPREMIX_S2:pdigi_valid,DATAMIX,L1,DIGI2RAW,HLT:@relval25ns',
'--pileup_input' : 'das:/RelValPREMIXUP15_PU25/%s/GEN-SIM-DIGI-RAW'%baseDataSetRelease[5],
'--eventcontent' : 'FEVTDEBUGHLT',
Expand All @@ -882,7 +882,7 @@ def identityFS(wf):
'--era' : 'Run2_25ns'
}
digiPremixUp2015Defaults50ns=merge([{'-s':'DIGIPREMIX_S2:pdigi_valid,DATAMIX,L1,DIGI2RAW,HLT:@relval50ns'},
{'--conditions':'auto:run2_mc_'+autoHLT['relval50ns']},
{'--conditions':'auto:run2_mc_50ns'},
{'--pileup_input' : 'das:/RelValPREMIXUP15_PU50/%s/GEN-SIM-DIGI-RAW'%baseDataSetRelease[6]},
{'--era' : 'Run2_50ns'},
digiPremixUp2015Defaults25ns])
Expand Down Expand Up @@ -1019,20 +1019,20 @@ def identityFS(wf):
#'-s':'RAW2DIGI,L1Reco,RECO,EI,VALIDATION,DQM',
'-s':'RAW2DIGI,L1Reco,RECO,EI,PAT,VALIDATION:@standardValidation+@miniAODValidation,DQM:@standardDQM+@miniAODDQM',
'--runUnscheduled':'',
'--conditions':'auto:run2_mc_'+autoHLT['relval25ns'],
'--conditions':'auto:run2_mc',
'-n':'10',
'--datatier':'GEN-SIM-RECO,MINIAODSIM,DQMIO',
'--eventcontent':'RECOSIM,MINIAODSIM,DQM',
'--era' : 'Run2_25ns'
}

step3Up2015Defaults50ns = merge([{'-s':'RAW2DIGI,L1Reco,RECO,EI,PAT,VALIDATION:@standardValidation+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM','--conditions':'auto:run2_mc_'+autoHLT['relval50ns'],'--era':'Run2_50ns'},step3Up2015Defaults])
step3Up2015Defaults50ns = merge([{'-s':'RAW2DIGI,L1Reco,RECO,EI,PAT,VALIDATION:@standardValidation+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM','--conditions':'auto:run2_mc_50ns','--era':'Run2_50ns'},step3Up2015Defaults])

step3Up2015DefaultsAlCaCalo = merge([{'-s':'RAW2DIGI,L1Reco,RECO,EI,ALCA:EcalCalZElectron+EcalCalWElectron+EcalUncalZElectron+EcalUncalWElectron+HcalCalIsoTrk,VALIDATION,DQM'},step3Up2015Defaults])
step3Up2015DefaultsAlCaCalo50ns = merge([{'--conditions':'auto:run2_mc_'+autoHLT['relval50ns'],'--era':'Run2_50ns'},step3Up2015DefaultsAlCaCalo])
step3Up2015DefaultsAlCaCalo50ns = merge([{'--conditions':'auto:run2_mc_50ns','--era':'Run2_50ns'},step3Up2015DefaultsAlCaCalo])

step3Up2015Hal = {'-s' :'RAW2DIGI,L1Reco,RECO,EI,VALIDATION,DQM',
'--conditions':'auto:run2_mc_'+autoHLT['relval25ns'],
'--conditions' :'auto:run2_mc',
'--datatier' :'GEN-SIM-RECO,DQMIO',
'--eventcontent':'RECOSIM,DQM',
'-n' :'10',
Expand Down Expand Up @@ -1105,7 +1105,7 @@ def identityFS(wf):
steps['RECOPRMXUP15PROD_PU25']=merge([
recoPremixUp15prod])
steps['RECOPRMXUP15PROD_PU50']=merge([
{'--conditions':'auto:run2_mc_'+autoHLT['relval50ns']},
{'--conditions':'auto:run2_mc_50ns'},
{'--era':'Run2_50ns'},
recoPremixUp15prod])

Expand Down Expand Up @@ -1160,7 +1160,7 @@ def identityFS(wf):
step4Up2015Defaults = {
'-s' : 'ALCA:TkAlMuonIsolated+TkAlMinBias+MuAlOverlaps+EcalESAlign',
'-n' : 1000,
'--conditions' : 'auto:run2_mc_'+autoHLT['relval25ns'],
'--conditions' : 'auto:run2_mc',
'--era' : 'Run2_25ns',
'--datatier' : 'ALCARECO',
'--eventcontent': 'ALCARECO',
Expand Down Expand Up @@ -1275,7 +1275,7 @@ def identityFS(wf):
'--filetype':'DQM',
'--scenario':'cosmics'}
steps['HARVESTHAL']={'-s' :'HARVESTING:dqmHarvesting',
'--conditions':'auto:run2_mc_'+autoHLT['relval25ns'],
'--conditions':'auto:run2_mc',
'--mc' :'',
'--filein' :'file:step3_inDQM.root',
'--scenario' :'cosmics',
Expand Down Expand Up @@ -1308,7 +1308,7 @@ def identityFS(wf):
steps['HARVESTUP15']={
# '-s':'HARVESTING:validationHarvesting+dqmHarvesting', # todo: remove UP from label
'-s':'HARVESTING:@standardValidation+@standardDQM+@miniAODValidation+@miniAODDQM', # todo: remove UP from label
'--conditions':'auto:run2_mc_'+autoHLT['relval25ns'],
'--conditions':'auto:run2_mc',
'--mc':'',
'--era' : 'Run2_25ns',
'--filetype':'DQM',
Expand Down Expand Up @@ -1412,11 +1412,11 @@ def identityFS(wf):
#steps['MINIAODDATAs2'] =merge([{'--filein':'file:step2.root'},stepMiniAODData])
steps['MINIAODMCUP15'] =merge([stepMiniAODMC])
#steps['MINIAODMCUP1550'] =merge([{'--conditions':'auto:run2_mc_50ns','--era':'Run2_50ns'},stepMiniAODMC])
#steps['MINIAODMCUP15HI'] =merge([{'--conditions':'auto:run2_mc_HIon','--era':'Run2_HI'},stepMiniAODMC])
#steps['MINIAODMCUP15HI'] =merge([{'--conditions':'auto:run2_mc_hi','--era':'Run2_HI'},stepMiniAODMC])
steps['MINIAODMCUP15FS'] =merge([{'--filein':'file:step1.root','--fast':''},stepMiniAODMC])
steps['MINIAODMCUP15FS50'] =merge([{'--conditions':'auto:run2_mc_50ns','--era':'Run2_50ns'},steps['MINIAODMCUP15FS']])

steps['DBLMINIAODMCUP15NODQM'] = merge([{'--conditions':'auto:run2_mc_'+autoHLT['relval25ns'],
steps['DBLMINIAODMCUP15NODQM'] = merge([{'--conditions':'auto:run2_mc',
'-s':'PAT',
'--datatier' : 'MINIAODSIM',
'--eventcontent':'MINIAOD',},stepMiniAODMC])
Expand Down

0 comments on commit d4c91a7

Please sign in to comment.