Skip to content
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

Jump to bottom

tracking specific relval IB test workflows #14540

Merged
merged 10 commits into from Jun 2, 2016
Merged

tracking specific relval IB test workflows #14540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0197ad3
fix typo and change RECODR2 jobs splitting to be 5 lumis per job
hengne May 17, 2016
519f4cd
Add variant of wf 1325 with trackingOnly RECO,VALIDATION,DQM
makortel May 13, 2016
3d8a4e9
Add variant of wf 135.1 with trackingOnly VALIDATION
makortel May 13, 2016
2a15e84
Add variants of wf 1325 with Run2_2016_trackingLowPU era with full an…
makortel May 13, 2016
8107e3d
Add variant of wf 10024 with trackingOnly RECO,VALIDATION,DQM
makortel May 13, 2016
a652469
Add variants of wf 10024 with Run2_2017_trackingRun2 and _trackingPha…
makortel May 13, 2016
695d511
add some notes in the codes about these new IB test tracking specific…
hengne May 17, 2016
81fe570
rebase and solve confilicts
hengne May 22, 2016
5b744b0
Merge remote-tracking branch 'official-cmssw/CMSSW_8_1_X' into from-C…
hengne May 23, 2016
ef84003
solve conflict in rebasing
hengne Jun 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions Configuration/PyReleaseValidation/python/MatrixInjector.py
View file
Open in desktop
Expand Up @@ -183,9 +183,9 @@ def prepare(self,mReader, directories, mode='init'):
wmsplit['TTbar_13_ID']=1
wmsplit['SingleMuPt10FS_ID']=1
wmsplit['TTbarFS_ID']=1
wmsplit['RECODR2_50nsreHLT']=1
wmsplit['RECODR2_25nsreHLT']=1
wmsplit['RECODR2_2016sreHLT']=1
wmsplit['RECODR2_50nsreHLT']=5
wmsplit['RECODR2_25nsreHLT']=5
wmsplit['RECODR2_2016reHLT']=5
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

its beginning to look like these things should become properties of the workflows themselves rather than having a long list in MatrixInjector (which should know much about specific workflows)
@hengne

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@davidlange6 good idea! let me think how to implement this idea after i finished the tasks for reHLT. i will either just implement it, or will come back to in case i see a show stopper.

wmsplit['HLTDR2_50ns']=1
wmsplit['HLTDR2_25ns']=1
wmsplit['HLTDR2_2016']=1
Expand Down
41 changes: 41 additions & 0 deletions Configuration/PyReleaseValidation/python/relval_2017.py
View file
Open in desktop
Expand Up @@ -33,3 +33,44 @@
if numWF in numWFIB:
workflows[numWF] = [ upgradeDatasetFromFragment[frag], stepList]
numWF+=1

# Tracking-specific special workflows
def _trackingOnly(stepList):
res = []
for step in stepList:
s = step
if 'RecoFull' in step or 'HARVESTFull' in step:
s = s.replace('Full', 'Full_trackingOnly')
res.append(s)
return res
def _trackingRun2(stepList):
res = []
for step in stepList:
s = step
if 'RecoFull' in step:
if 'trackingOnly' in step:
s = s.replace('Only', 'OnlyRun2')
else:
s = s.replace('Full', 'Full_trackingRun2')
res.append(s)
return res
def _trackingPhase1PU70(stepList):
res = []
for step in stepList:
s = step
if 'RecoFull' in step:
if 'trackingOnly' in step:
s = s.replace('Only', 'OnlyPhase1PU70')
else:
s = s.replace('Full', 'Full_trackingPhase1PU70')
res.append(s)
return res

# compose and adding tracking specific workflows in the IB test.
# NB. those workflows are expected to be only used forIB test.
# if you really want to run them locally, do runTheMatrix.py --what 2017 -l workflow numbers
workflows[10024.1] = [ workflows[10024.0][0], _trackingOnly(workflows[10024.0][1]) ]
workflows[10024.2] = [ workflows[10024.0][0], _trackingRun2(workflows[10024.0][1]) ]
workflows[10024.3] = [ workflows[10024.1][0], _trackingRun2(workflows[10024.1][1]) ]
workflows[10024.4] = [ workflows[10024.0][0], _trackingPhase1PU70(workflows[10024.0][1]) ]
workflows[10024.5] = [ workflows[10024.1][0], _trackingPhase1PU70(workflows[10024.1][1]) ]
6 changes: 6 additions & 0 deletions Configuration/PyReleaseValidation/python/relval_standard.py
View file
Open in desktop
Expand Up @@ -168,6 +168,7 @@
workflows[135.9] = ['ZMM_13',['ZMMFS_13','HARVESTUP15FS','MINIAODMCUP15FS']]
workflows[135.11] = ['SMS-T1tttt_mGl-1500_mLSP-100_13', ['SMS-T1tttt_mGl-1500_mLSP-100FS_13','HARVESTUP15FS','MINIAODMCUP15FS']]
workflows[135.12] = ['QCD_Pt_80_120_13', ['QCD_Pt_80_120FS_13','HARVESTUP15FS','MINIAODMCUP15FS']]
workflows[135.13] = ['TTbar_13', ['TTbarFS_13_trackingOnlyValidation','HARVESTUP15FS_trackingOnly']]

### MinBias fastsim_13 TeV for mixing ###
workflows[135.8] = ['',['MinBiasFS_13_ForMixing']]
Expand Down Expand Up @@ -252,6 +253,11 @@
workflows[1350] = ['', ['JpsiMuMu_Pt-8','DIGIUP15','RECOUP15','HARVESTUP15']]

workflows[1325] = ['', ['TTbar_13','DIGIUP15','RECOUP15','HARVESTUP15','ALCATTUP15']]
# the 3 workflows below are for tracking-specific ib test, not to be run in standard relval set.
workflows[1325.1] = ['', ['TTbar_13','DIGIUP15','RECOUP15_trackingOnly','HARVESTUP15_trackingOnly']]
workflows[1325.2] = ['', ['TTbar_13','DIGIUP15','RECOUP15_trackingLowPU','HARVESTUP15']]
workflows[1325.3] = ['', ['TTbar_13','DIGIUP15','RECOUP15_trackingOnlyLowPU','HARVESTUP15_trackingOnly']]

workflows[1326] = ['', ['WE_13','DIGIUP15','RECOUP15','HARVESTUP15']]
workflows[1329] = ['', ['ZEE_13','DIGIUP15','RECOUP15','HARVESTUP15']]
workflows[1356] = ['', ['ZEE_13_DBLMINIAOD','DIGIUP15','RECOAODUP15','HARVESTUP15','DBLMINIAODMCUP15NODQM']]
Expand Down
27 changes: 27 additions & 0 deletions Configuration/PyReleaseValidation/python/relval_steps.py
View file
Open in desktop
Expand Up @@ -572,6 +572,8 @@ def genS(fragment,howMuch):
'--eventcontent':'FASTPU',
'--datatier':'GEN-SIM-RECO'},
step1FastUpg2015Defaults])
step1FastUpg2015_trackingOnlyValidation = merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,RECO,VALIDATION:@trackingOnlyValidation'},
step1FastUpg2015Defaults])


#step1FastDefaults
Expand All @@ -592,6 +594,7 @@ def genS(fragment,howMuch):

#step1FastUpg2015Defaults
steps['TTbarFS_13']=merge([{'cfg':'TTbar_13TeV_TuneCUETP8M1_cfi'},Kby(100,1000),step1FastUpg2015Defaults])
steps['TTbarFS_13_trackingOnlyValidation']=merge([{'cfg':'TTbar_13TeV_TuneCUETP8M1_cfi'},Kby(100,1000),step1FastUpg2015_trackingOnlyValidation])
steps['SMS-T1tttt_mGl-1500_mLSP-100FS_13']=merge([{'cfg':'SMS-T1tttt_mGl-1500_mLSP-100_13TeV-pythia8_cfi'},Kby(100,1000),step1FastUpg2015Defaults])
steps['NuGunFS_UP15']=merge([{'cfg':'SingleNuE10_cfi'},Kby(100,1000),step1FastUpg2015Defaults])
steps['ZEEFS_13']=merge([{'cfg':'ZEE_13TeV_TuneCUETP8M1_cfi'},Kby(100,2000),step1FastUpg2015Defaults])
Expand Down Expand Up @@ -1101,6 +1104,16 @@ def lhegensim(fragment,howMuch):
'--era' :'Run2_2016'
}

step3_trackingOnly = {
'-s': 'RAW2DIGI,RECO:reconstruction_trackingOnly,VALIDATION:@trackingOnlyValidation,DQM:@trackingOnlyDQM',
'--datatier':'GEN-SIM-RECO,DQMIO',
'--eventcontent':'RECOSIM,DQM',
}
step3_trackingLowPU = {
'--era': 'Run2_2016_trackingLowPU'
}
step3Up2015Defaults_trackingOnly = merge([step3_trackingOnly, remove(step3Up2015Defaults, "--runUnscheduled")])

# mask away - to be removed once we'll migrate the matrix to be fully unscheduled for RECO step
#unSchOverrides={'--runUnscheduled':'','-s':'RAW2DIGI,L1Reco,RECO,EI,PAT,VALIDATION:@standardValidation+@miniAODValidation,DQM:@standardDQM+@miniAODDQM','--eventcontent':'RECOSIM,MINIAODSIM,DQM','--datatier':'GEN-SIM-RECO,MINIAODSIM,DQMIO'}
#step3Up2015DefaultsUnsch = merge([unSchOverrides,step3Up2015Defaults])
Expand All @@ -1109,6 +1122,9 @@ def lhegensim(fragment,howMuch):
steps['RECOUP15']=merge([step3Up2015Defaults]) # todo: remove UP from label
steps['RECOUP15AlCaCalo']=merge([step3Up2015DefaultsAlCaCalo]) # todo: remove UP from label

steps['RECOUP15_trackingOnly']=merge([step3Up2015Defaults_trackingOnly]) # todo: remove UP from label
steps['RECOUP15_trackingLowPU']=merge([step3_trackingLowPU, step3Up2015Defaults]) # todo: remove UP from label
steps['RECOUP15_trackingOnlyLowPU']=merge([step3_trackingLowPU, step3Up2015Defaults_trackingOnly]) # todo: remove UP from label

#steps['RECOUP15PROD1']=merge([{ '-s' : 'RAW2DIGI,L1Reco,RECO,EI,DQM:DQMOfflinePOGMC', '--datatier' : 'AODSIM,DQMIO', '--eventcontent' : 'AODSIM,DQM'},step3Up2015Defaults])

Expand Down Expand Up @@ -1402,6 +1418,8 @@ def lhegensim(fragment,howMuch):

steps['HARVESTUP15_PU50']=merge([{'-s':'HARVESTING:@standardValidation+@standardDQMFakeHLT+@miniAODValidation+@miniAODDQM','--era' : 'Run2_50ns'},steps['HARVESTUP15']])

steps['HARVESTUP15_trackingOnly']=merge([{'-s': 'HARVESTING:@trackingOnlyValidation+@trackingOnlyDQM'}, steps['HARVESTUP15']])

# unSchHarvestOverrides={'-s':'HARVESTING:@standardValidation+@standardDQM+@miniAODValidation+@miniAODDQM'}
# steps['HARVESTmAODUP15']=merge([unSchHarvestOverrides,steps['HARVESTUP15']])

Expand All @@ -1411,6 +1429,7 @@ def lhegensim(fragment,howMuch):
'--era':'Run2_2016',
'--filetype':'DQM',
'--scenario':'pp'}
steps['HARVESTUP15FS_trackingOnly']=merge([{'-s': 'HARVESTING:@trackingOnlyValidation+@trackingOnlyDQM'}, steps['HARVESTUP15FS']])


steps['ALCASPLIT']={'-s':'ALCAOUTPUT:@allForPrompt',
Expand Down Expand Up @@ -1629,6 +1648,7 @@ def lhegensim(fragment,howMuch):
}
if cust!=None : upgradeStepDict['RecoFull'][k]['--customise']=cust
if era is not None: upgradeStepDict['RecoFull'][k]['--era']=era
upgradeStepDict['RecoFull_trackingOnly'][k] = merge([{'-s': 'RAW2DIGI,RECO:reconstruction_trackingOnly,VALIDATION:@trackingOnlyValidation,DQM:@trackingOnlyDQM'}, upgradeStepDict['RecoFull'][k]])

if k2 in PUDataSets:
upgradeStepDict['RecoFullPU'][k]=merge([PUDataSets[k2],upgradeStepDict['RecoFull'][k]])
Expand Down Expand Up @@ -1679,6 +1699,7 @@ def lhegensim(fragment,howMuch):
}
if cust!=None : upgradeStepDict['HARVESTFull'][k]['--customise']=cust
if era is not None: upgradeStepDict['HARVESTFull'][k]['--era']=era
upgradeStepDict['HARVESTFull_trackingOnly'][k] = merge([{'-s': 'HARVESTING:@trackingOnlyValidation+@trackingOnlyDQM'}, upgradeStepDict['HARVESTFull'][k]])

if k2 in PUDataSets:
upgradeStepDict['HARVESTFullPU'][k]=merge([PUDataSets[k2],upgradeStepDict['HARVESTFull'][k]])
Expand Down Expand Up @@ -1724,3 +1745,9 @@ def lhegensim(fragment,howMuch):
k=step+'_'+key
if step in upgradeStepDict and key in upgradeStepDict[step]:
steps[k]=merge([upgradeStepDict[step][key]])

# 2017 tracking specific eras
steps['RecoFull_trackingRun2_2017'] = merge([{'--era': 'Run2_2017_trackingRun2'}, steps['RecoFull_2017']])
steps['RecoFull_trackingOnlyRun2_2017'] = merge([{'--era': 'Run2_2017_trackingRun2'}, steps['RecoFull_trackingOnly_2017']])
steps['RecoFull_trackingPhase1PU70_2017'] = merge([{'--era': 'Run2_2017_trackingPhase1PU70'}, steps['RecoFull_2017']])
steps['RecoFull_trackingOnlyPhase1PU70_2017'] = merge([{'--era': 'Run2_2017_trackingPhase1PU70'}, steps['RecoFull_trackingOnly_2017']])
3 changes: 2 additions & 1 deletion Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
View file
Open in desktop
Expand Up @@ -101,7 +101,8 @@
# step5 is digi+l1tracktrigger
# step6 is fastsim
# step7 is fastsim harvesting
upgradeSteps=['GenSimFull','GenSimHLBeamSpotFull','DigiFull','RecoFullLocal','RecoFull','RecoFullHGCAL','RecoFullTracking','RecoFullTrackingPU','HARVESTFull','DigiTrkTrigFull','FastSim','HARVESTFast','DigiFullPU','RecoFullPU','RecoFullPUHGCAL','RecoFullPUTracking','HARVESTFullPU','DigiFullTrigger']

upgradeSteps=['GenSimFull','GenSimHLBeamSpotFull','DigiFull','RecoFullLocal','RecoFull','RecoFullHGCAL','RecoFullTracking','RecoFullTrackingPU','HARVESTFull','DigiTrkTrigFull','FastSim','HARVESTFast','DigiFullPU','RecoFullPU','RecoFullPUHGCAL','RecoFullPUTracking','HARVESTFullPU','DigiFullTrigger','RecoFull_trackingOnly','HARVESTFull_trackingOnly']

upgradeScenToRun={ '2017':['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
#'2017':['GenSimFull'],
Expand Down