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

Fix prodlike workflows #36050

Closed
wants to merge 8 commits into from
Closed

Fix prodlike workflows #36050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
06672d1
Merge pull request #11 from cms-sw/master
kskovpen Oct 14, 2021
6263c5a
Merge pull request #12 from cms-sw/master
kskovpen Nov 9, 2021
da36f62
fix prodlike pu wfs
kskovpen Nov 9, 2021
13d052a
update
kskovpen Nov 12, 2021
7019071
update
kskovpen Nov 12, 2021
2dfd1a9
fix
kskovpen Nov 18, 2021
3adf540
update
kskovpen Nov 18, 2021
63ac30d
update
kskovpen Nov 18, 2021
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
20 changes: 3 additions & 17 deletions Configuration/PyReleaseValidation/python/relval_steps.py
View file
Open in desktop
Expand Up @@ -100,7 +100,7 @@
steps['HighMet2011B']={'INPUT':InputInfo(dataSet='/Jet/Run2011B-HighMET-19Nov2011-v1/RAW-RECO',label='2011B',run=Run2011BSk)}

steps['RunHI2010']={'INPUT':InputInfo(dataSet='/HIAllPhysics/HIRun2010-v1/RAW',label='hi2010',run=[152698],events=10000,location='STD')}
steps['RunHI2011']={'INPUT':InputInfo(dataSet='/HIMinBiasUPC/HIRun2011-v1/RAW',label='hi2011',ls={182124: [40]},events=10000,location='STD')}
steps['RunHI2011']={'INPUT':InputInfo(dataSet='/HIMinBiasUPC/HIRun2011-v1/RAW',label='hi2011',run=[182124],events=10000,location='STD')}
steps['RunPA2013']={'INPUT':InputInfo(dataSet='/PAMinBiasUPC/HIRun2013-v1/RAW',label='pa2013',run=[211313],events=10000,location='STD')}

Run2015HI={263400: [[65,904]]}
Expand Down Expand Up @@ -2103,17 +2103,6 @@ def lhegensim2018ml(fragment,howMuch):
'--eventcontent':'ALCARECO',
}

steps['TIER0EXPPPSCALALIG']={'-s':'RAW2DIGI,L1Reco,ALCAPRODUCER:PPSCalTrackBasedSel,ENDJOB',
'-n':1000,
'--process':'ALCARECO',
'--scenario': 'pp',
'--era':'Run2_2017',
'--conditions':'auto:run2_data',
'--data': '',
'--datatier':'ALCARECO',
'--eventcontent':'ALCARECO',
}

steps['ALCASPLITHPBS']={'-s':'ALCAOUTPUT:TkAlMinBias,ALCA:PromptCalibProdBeamSpotHP+PromptCalibProdBeamSpotHPLowPU',
'--scenario':'pp',
'--data':'',
Expand Down Expand Up @@ -2146,7 +2135,6 @@ def lhegensim2018ml(fragment,howMuch):
}

steps['ALCASPLITPPSALIG']={'-s':'ALCAOUTPUT:PPSCalTrackBasedSel,ALCA:PPSAlignment',
'-n':1000,
'--scenario':'pp',
'--data':'',
'--era':'Run2_2017',
Expand Down Expand Up @@ -3137,7 +3125,6 @@ def gen2021HiMix(fragment,howMuch):
'--conditions':'auto:run1_mc',
'--output':'\'[{"t":"RAW","e":"ALL"}]\'',
'--customise_commands':'"process.ALLRAWoutput.fastCloning=cms.untracked.bool(False)"'}
steps['COPYPASTER3'] = merge([{'--era' : 'Run3'}, steps['COPYPASTE']])

#miniaod
stepMiniAODDefaults = { '-s' : 'PAT',
Expand Down Expand Up @@ -3352,7 +3339,6 @@ def gen2021HiMix(fragment,howMuch):
defaultDataSets['2024']='CMSSW_12_0_0_pre4-120X_mcRun3_2024_realistic_v2-v'
defaultDataSets['2026D49']='CMSSW_12_0_0_pre4-113X_mcRun4_realistic_v7_2026D49noPU-v'
defaultDataSets['2026D76']='CMSSW_12_0_0_pre4-113X_mcRun4_realistic_v7_2026D76noPU-v'
defaultDataSets['2026D77']='CMSSW_12_1_0_pre2-113X_mcRun4_realistic_v7_2026D77noPU-v'

puDataSets = {}
for key, value in defaultDataSets.items(): puDataSets[key+'PU'] = value
Expand Down Expand Up @@ -3509,7 +3495,7 @@ def gen2021HiMix(fragment,howMuch):
'--filetype':'DQM',
}

upgradeStepDict['HARVESTRecNan'][k]={'-s':'HARVESTING:@standardValidation+@standardDQM+@ExtraHLT+@miniAODValidation+@miniAODDQM+@nanoAODDQM',
upgradeStepDict['HARVESTNano'][k]={'-s':'HARVESTING:@standardValidation+@standardDQM+@ExtraHLT+@miniAODValidation+@miniAODDQM+@nanoAODDQM',
'--conditions':gt,
'--mc':'',
'--geometry' : geom,
Expand Down Expand Up @@ -3560,7 +3546,7 @@ def gen2021HiMix(fragment,howMuch):
'--geometry' : geom
}

upgradeStepDict['RecNan'][k] = {'-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,EI,PAT,NANO,VALIDATION:@standardValidation+@miniAODValidation,DQM:@standardDQM+@ExtraHLT+@miniAODDQM+@nanoAODDQM',
upgradeStepDict['RecoNano'][k] = {'-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,EI,PAT,NANO,VALIDATION:@standardValidation+@miniAODValidation,DQM:@standardDQM+@ExtraHLT+@miniAODDQM+@nanoAODDQM',
'--conditions':gt,
'--datatier':'GEN-SIM-RECO,MINIAODSIM,NANOAODSIM,DQMIO',
'-n':'10',
Expand Down
10 changes: 3 additions & 7 deletions Configuration/PyReleaseValidation/python/relval_upgrade.py
View file
Open in desktop
Expand Up @@ -46,8 +46,9 @@ def makeStepName(key,frag,step,suffix):
# hack to add an extra step
if 'ProdLike' in specialType:
if 'Reco' in step: # handles both Reco and RecoGlobal
stepList[specialType].append(stepMaker(key,frag[:-4],step.replace('RecoGlobal','MiniAOD').replace('Reco','MiniAOD'),specialWF.suffix))
stepList[specialType].append(stepMaker(key,frag[:-4],step.replace('RecoGlobal','Nano').replace('Reco','Nano'),specialWF.suffix))
stepList[specialType].append(stepMaker(key,frag[:-4],step.replace('RecoGlobal','MiniAOD').replace('RecoNano','MiniAOD').replace('Reco','MiniAOD'),specialWF.suffix))
if 'RecoNano' in step:
stepList[specialType].append(stepMaker(key,frag[:-4],step.replace('RecoNano','Nano'),specialWF.suffix))
# similar hacks for premixing
if 'PMX' in specialType:
if 'GenSim' in step:
Expand All @@ -60,11 +61,6 @@ def makeStepName(key,frag,step,suffix):
else: stepList[specialType][-1] = stepMade
else:
stepList[specialType].append(stepMaker(key,frag[:-4],step,''))

if specialType in ['baseline']:
for ist, st in enumerate(stepList[specialType]):
if st.split('_')[0] == 'Reco': stepList[specialType][ist] = st.replace('Reco', 'RecNan')
elif st.split('_')[0] == 'HARVEST': stepList[specialType][ist] = st.replace('HARVEST', 'HARVESTRecNan')

for specialType,specialWF in upgradeWFs.items():
# remove other steps for premixS1
Expand Down