Skip to content

Commit

Permalink
Merge pull request #40106 from vlimant/runthematrix_shortnames
Browse files Browse the repository at this point in the history 
short names for matrix workflows
  • Loading branch information
@cmsbuild
cmsbuild committed Dec 3, 2022
2 parents 9cda2fa + c469770 commit e0b82ef
Show file tree
Hide file tree
Showing 7 changed files with 174 additions and 169 deletions.
10 changes: 5 additions & 5 deletions Configuration/PyReleaseValidation/python/MatrixReader.py
View file
Expand Up @@ -221,6 +221,7 @@ def readMatrix(self, fileNameIn, useInput=None, refRel=None, fromScratch=None):
if len(wfSuffix)>0: name = name+wfSuffix
stepIndex=0
ranStepList=[]
name_for_workflow = name

#first resolve INPUT possibilities
if num in fromInput:
Expand Down Expand Up @@ -308,8 +309,7 @@ def readMatrix(self, fileNameIn, useInput=None, refRel=None, fromScratch=None):
commands.append(cmd)
ranStepList.append(stepName)
stepIndex+=1

self.workFlowSteps[(num,prefix)] = (num, name, commands, ranStepList)
self.workFlowSteps[(num,prefix)] = (num, name_for_workflow, commands, ranStepList)

return

Expand Down Expand Up @@ -352,7 +352,6 @@ def showRaw(self, useInput, refRel=None, fromScratch=None, what='all',step1Only=
#trick to skip the HImix IB test
if key[0]==203.1 or key[0]==204.1 or key[0]==205.1 or key[0]==4.51 or key[0]==4.52: continue
num, name, commands, stepList = self.workFlowSteps[key]

wfName,stepNames= name.split('+',1)

stepNames=stepNames.replace('+SKIMCOSD','')
Expand Down Expand Up @@ -452,7 +451,8 @@ def showWorkFlows(self, selected=None, extended=True, cafVeto=True):
#pad with zeros
for i in range(len(N),len(wf.cmds)): N.append(0)
N[len(wf.cmds)-1]+=1
wfName, stepNames = wf.nameId.split('+',1)
wfName = wf.nameId
stepNames = '+'.join(wf.stepList)
for i,s in enumerate(wf.cmds):
if extended:
if i==0:
Expand Down Expand Up @@ -491,7 +491,7 @@ def createWorkFlows(self, fileNameIn):
else:
self.nameList[nameId] = val

self.workFlows.append(WorkFlow(num, name, commands=commands))
self.workFlows.append(WorkFlow(num, name, commands=commands, stepList=stepList))

return

Expand Down
6 changes: 4 additions & 2 deletions Configuration/PyReleaseValidation/python/WorkFlow.py
View file
Expand Up @@ -5,7 +5,7 @@

class WorkFlow(object):

def __init__(self, num, nameID, inputInfo=None, commands=None):
def __init__(self, num, nameID, inputInfo=None, commands=None, stepList=None):

self.numId = num
self.nameId = nameID
Expand All @@ -15,7 +15,9 @@ def __init__(self, num, nameID, inputInfo=None, commands=None):
for (i,c) in enumerate(commands):
nToRun=10 + (i!=0)*90
self.check(c,nToRun)

self.stepList = stepList
if commands and stepList:
assert(len(commands)==len(stepList))

# run on real data requested:
self.input = inputInfo
Expand Down
2 changes: 1 addition & 1 deletion Configuration/PyReleaseValidation/python/WorkFlowRunner.py
View file
Expand Up @@ -207,7 +207,7 @@ def closeCmd(i,ID):
logStat=''
for i,s in enumerate(self.stat):
logStat+='Step%d-%s '%(i,s)
self.report='%s_%s %s - time %s; exit: '%(self.wf.numId,self.wf.nameId,logStat,tottime)+' '.join(map(str,self.retStep))+'\n'
self.report='%s_%s+%s %s - time %s; exit: '%(self.wf.numId,self.wf.nameId,'+'.join(self.wf.stepList),logStat,tottime)+' '.join(map(str,self.retStep))+'\n'

return

7 changes: 4 additions & 3 deletions Configuration/PyReleaseValidation/python/relval_gpu.py
View file
Expand Up @@ -66,8 +66,9 @@
# Patatrack HCAL-only: RunHLTPhy2018D on GPU (optional), RunJetHT2018D on GPU (optional)

workflows[136.885502] = ['',['RunHLTPhy2018D','HLTDR2_2018','RECODR2_2018reHLT_Patatrack_PixelOnlyGPU','HARVEST2018_pixelTrackingOnly']]
workflows[136.888502] = ['',['RunJetHT2018D','HLTDR2_2018','RECODR2_2018reHLT_Patatrack_PixelOnlyGPU','HARVEST2018_pixelTrackingOnly']]
workflows[136.888502] = ['RunJetHT2018DpixelGPU',['RunJetHT2018D','HLTDR2_2018','RECODR2_2018reHLT_Patatrack_PixelOnlyGPU','HARVEST2018_pixelTrackingOnly']]
workflows[136.885512] = ['',['RunHLTPhy2018D','HLTDR2_2018','RECODR2_2018reHLT_ECALOnlyGPU','HARVEST2018_ECALOnly']]
workflows[136.888512] = ['',['RunJetHT2018D','HLTDR2_2018','RECODR2_2018reHLT_ECALOnlyGPU','HARVEST2018_ECALOnly']]
workflows[136.888512] = ['RunJetHT2018DecalGPU',['RunJetHT2018D','HLTDR2_2018','RECODR2_2018reHLT_ECALOnlyGPU','HARVEST2018_ECALOnly']]
workflows[136.885522] = ['',['RunHLTPhy2018D','HLTDR2_2018','RECODR2_2018reHLT_HCALOnlyGPU','HARVEST2018_HCALOnly']]
workflows[136.888522] = ['',['RunJetHT2018D','HLTDR2_2018','RECODR2_2018reHLT_HCALOnlyGPU','HARVEST2018_HCALOnly']]
workflows[136.888522] = ['RunJetHT2018DhcalGPU',['RunJetHT2018D','HLTDR2_2018','RECODR2_2018reHLT_HCALOnlyGPU','HARVEST2018_HCALOnly']]

28 changes: 14 additions & 14 deletions Configuration/PyReleaseValidation/python/relval_nano.py
View file
Expand Up @@ -134,32 +134,32 @@

################
#10.6 input
workflows[2500.31 ] = ['mc106Xul17v2', ['TTbarMINIAOD10.6_UL16v2','NANO_mc10.6ul16v2', 'HRV_NANO_mc']]
workflows[2500.311] = ['mc106Xul17v2', ['TTbarMINIAOD10.6_UL17v2','NANO_mc10.6ul17v2', 'HRV_NANO_mc']]
workflows[2500.312] = ['mc106Xul17v2', ['TTbarMINIAOD10.6_UL18v2','NANO_mc10.6ul18v2', 'HRV_NANO_mc']]
workflows[2500.31 ] = ['NANOmc106Xul16v2', ['TTbarMINIAOD10.6_UL16v2','NANO_mc10.6ul16v2', 'HRV_NANO_mc']]
workflows[2500.311] = ['NANOmc106Xul17v2', ['TTbarMINIAOD10.6_UL17v2','NANO_mc10.6ul17v2', 'HRV_NANO_mc']]
workflows[2500.312] = ['NANOmc106Xul18v2', ['TTbarMINIAOD10.6_UL18v2','NANO_mc10.6ul18v2', 'HRV_NANO_mc']]

workflows[2500.33 ] = ['data106Xul16v2', ['MuonEG2016MINIAOD10.6v2', 'NANO_data10.6ul16v2', 'HRV_NANO_data']]
workflows[2500.331] = ['data106Xul17v2', ['MuonEG2017MINIAOD10.6v2', 'NANO_data10.6ul17v2', 'HRV_NANO_data']]
workflows[2500.332] = ['data106Xul18v2', ['MuonEG2018MINIAOD10.6v2', 'NANO_data10.6ul18v2', 'HRV_NANO_data']]
workflows[2500.33 ] = ['NANOdata106Xul16v2', ['MuonEG2016MINIAOD10.6v2', 'NANO_data10.6ul16v2', 'HRV_NANO_data']]
workflows[2500.331] = ['NANOdata106Xul17v2', ['MuonEG2017MINIAOD10.6v2', 'NANO_data10.6ul17v2', 'HRV_NANO_data']]
workflows[2500.332] = ['NANOdata106Xul18v2', ['MuonEG2018MINIAOD10.6v2', 'NANO_data10.6ul18v2', 'HRV_NANO_data']]

################
#12.2 input
workflows[2500.4 ] = ['mc122Xrun3_v10', ['TTbarMINIAOD12.2','NANO_mc12.2_v10', 'HRV_NANO_mc']]
workflows[2500.401] = ['mc122Xrun3', ['TTbarMINIAOD12.2','NANO_mc12.2', 'HRV_NANO_mc']]
workflows[2500.4 ] = ['NANOmc122Xrun3_v10', ['TTbarMINIAOD12.2','NANO_mc12.2_v10', 'HRV_NANO_mc']]
workflows[2500.401] = ['NANOmc122Xrun3', ['TTbarMINIAOD12.2','NANO_mc12.2', 'HRV_NANO_mc']]

################
#12.4 input
## these are borken because of tau configuration in NANO ATM: they should be re-enabled when a fix gets in
workflows[2500.5 ] = ['mc124Xrun3_v10', ['TTbarMINIAOD12.4','NANO_mc12.4_v10', 'HRV_NANO_mc']]
workflows[2500.501] = ['mc124Xrun3', ['TTbarMINIAOD12.4','NANO_mc12.4', 'HRV_NANO_mc']]
workflows[2500.5 ] = ['NANOmc124Xrun3_v10', ['TTbarMINIAOD12.4','NANO_mc12.4_v10', 'HRV_NANO_mc']]
workflows[2500.501] = ['NANOmc124Xrun3', ['TTbarMINIAOD12.4','NANO_mc12.4', 'HRV_NANO_mc']]

workflows[2500.51 ] = ['data124Xrun3_v10', ['MuonEG2022MINIAOD12.4','NANO_data12.4_v10', 'HRV_NANO_data']]
workflows[2500.511] = ['data124Xrun3', ['MuonEG2022MINIAOD12.4','NANO_data12.4', 'HRV_NANO_data']]
workflows[2500.51 ] = ['NANOdata124Xrun3_v10', ['MuonEG2022MINIAOD12.4','NANO_data12.4_v10', 'HRV_NANO_data']]
workflows[2500.511] = ['NANOdata124Xrun3', ['MuonEG2022MINIAOD12.4','NANO_data12.4', 'HRV_NANO_data']]

################
#12.6 workflows
## these two workflows should be creating a sample "from scratch" instead of using a pre-release sample as input
workflows[2500.6 ] = ['mc126X_v10', ['TTBarMINIAOD12.6','NANO_mc12.6_v10', 'HRV_NANO_mc']]
workflows[2500.601] = ['mc126X', ['TTBarMINIAOD12.6','NANO_mc12.6', 'HRV_NANO_mc']]
workflows[2500.6 ] = ['NANOmc126X_v10', ['TTBarMINIAOD12.6','NANO_mc12.6_v10', 'HRV_NANO_mc']]
workflows[2500.601] = ['NANOmc126X', ['TTBarMINIAOD12.6','NANO_mc12.6', 'HRV_NANO_mc']]

################
11 changes: 6 additions & 5 deletions Configuration/PyReleaseValidation/python/relval_premix.py
View file
Expand Up @@ -18,7 +18,7 @@
# 25ns pile up overlay using premix
workflows[250200]=['',['ZEE_13','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVESTUP15_PU25']]
workflows[250202]=['',['TTbar_13','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVESTUP15_PU25']]
workflows[250202.1]=['',['TTbar_13','PREMIXUP15_PU25','DIGIPRMXLOCALUP15_PU25','RECOPRMXUP15_PU25','HARVESTUP15_PU25']]
workflows[250202.1]=['ProdTTbar13TeVPUpmx',['TTbar_13','PREMIXUP15_PU25','DIGIPRMXLOCALUP15_PU25','RECOPRMXUP15_PU25','HARVESTUP15_PU25']]
workflows[250202.2]=['',['TTbar_13','DIGIPRMXUP15APVSimu_PU25','RECOPRMXUP15_PU25','HARVESTUP15_PU25']]
workflows[250202.3]=['',['TTbar_13','PREMIXUP15_PU25','DIGIPRMXLOCALUP15APVSimu_PU25','RECOPRMXUP15_PU25','HARVESTUP15_PU25']]
workflows[250202.4]=['',['TTbar_13','DIGIPRMXUP15APVSimu_PU25','RECOPRMXUP15_HIPM_PU25','HARVESTUP15_PU25']]
Expand All @@ -32,8 +32,8 @@


workflows[250200.17]=['',['ZEE_13UP17','DIGIPRMXUP17_PU25','RECOPRMXUP17_PU25','HARVESTUP17_PU25']]
workflows[250202.17]=['',['TTbar_13UP17','DIGIPRMXUP17_PU25','RECOPRMXUP17_PU25','HARVESTUP17_PU25']]
workflows[250202.171]=['',['TTbar_13UP17','PREMIXUP17_PU25','DIGIPRMXLOCALUP17_PU25','RECOPRMXUP17_PU25','HARVESTUP17_PU25']]
workflows[250202.17]=['TTbar13TeVPUpmx2017',['TTbar_13UP17','DIGIPRMXUP17_PU25','RECOPRMXUP17_PU25','HARVESTUP17_PU25']]
workflows[250202.171]=['TTbar13TeVPUppmx2017',['TTbar_13UP17','PREMIXUP17_PU25','DIGIPRMXLOCALUP17_PU25','RECOPRMXUP17_PU25','HARVESTUP17_PU25']]
workflows[250202.172]=['',['TTbar_13UP17','DIGIPRMXUP17_PU25_RD','RECOPRMXUP17_PU25','HARVESTUP17_PU25']]
workflows[250203.17]=['',['H125GGgluonfusion_13UP17','DIGIPRMXUP17_PU25','RECOPRMXUP17_PU25','HARVESTUP17_PU25']]
workflows[250204.17]=['',['QQH1352T_13UP17','DIGIPRMXUP17_PU25','RECOPRMXUP17_PU25','HARVESTUP17_PU25']]
Expand All @@ -45,8 +45,8 @@

workflows[250200.18]=['',['ZEE_13UP18','DIGIPRMXUP18_PU25','RECOPRMXUP18_PU25_L1TEgDQM','HARVESTUP18_PU25_L1TEgDQM']]
workflows[250200.182]=['',['ZEE_13UP18_RD','DIGIPRMXUP18_PU25_RD','RECOPRMXUP18_PU25_L1TEgDQM_RD','HARVESTUP18_PU25_L1TEgDQM_RD']]
workflows[250202.18]=['',['TTbar_13UP18','DIGIPRMXUP18_PU25','RECOPRMXUP18_PU25','HARVESTUP18_PU25']]
workflows[250202.181]=['',['TTbar_13UP18','PREMIXUP18_PU25','DIGIPRMXLOCALUP18_PU25','RECOPRMXUP18_PU25','HARVESTUP18_PU25']]
workflows[250202.18]=['TTbar13TeVPUpmx2018',['TTbar_13UP18','DIGIPRMXUP18_PU25','RECOPRMXUP18_PU25','HARVESTUP18_PU25']]
workflows[250202.181]=['TTbar13TeVPUppmx2018',['TTbar_13UP18','PREMIXUP18_PU25','DIGIPRMXLOCALUP18_PU25','RECOPRMXUP18_PU25','HARVESTUP18_PU25']]
workflows[250202.182]=['',['TTbar_13UP18_RD','DIGIPRMXUP18_PU25_RD','RECOPRMXUP18_PU25_RD','HARVESTUP18_PU25_RD']]
workflows[250202.183]=['',['TTbar_13UP18_RD_IB','DIGIPRMXUP18_PU25_RD_IB','RECOPRMXUP18_PU25_RD','HARVESTUP18_PU25_RD']]
workflows[250202.184]=['',['TTbar_13UP18','PREMIXUP18_PU25_RDPix','DIGIPRMXLOCALUP18_PU25_RDPix','RECOPRMXUP18_PU25','HARVESTUP18_PU25']]
Expand Down Expand Up @@ -119,3 +119,4 @@
workflows[250407.18] = ['NuGun_UP18',["FS_NuGun_UP18_PRMXUP18_PU50","HARVESTUP18FS","MINIAODMCUP18FS"]]
workflows[250408.18] = ['QCD_FlatPt_15_3000HS_13',["FS_QCD_FlatPt_15_3000HS_13_PRMXUP18_PU50","HARVESTUP18FS","MINIAODMCUP18FS"]]
workflows[250409.18] = ['SMS-T1tttt_mGl-1500_mLSP-100_13',["FS_SMS-T1tttt_mGl-1500_mLSP-100_13_PRMXUP18_PU50","HARVESTUP18FS","MINIAODMCUP18FS"]]

0 comments on commit e0b82ef

Please sign in to comment.