diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index f4e71afd8fc11..5586e1657abfd 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -2864,7 +2864,6 @@ def gen2021HiMix(fragment,howMuch): '--filetype':'DQM', '--scenario':'pp'} - steps['HARVESTCOS']={'-s':'HARVESTING:dqmHarvestingFakeHLT', '--conditions':'auto:run1_mc', '--mc':'', @@ -3280,7 +3279,7 @@ def gen2021HiMix(fragment,howMuch): '--datatier':'NANOAODSIM', '--eventcontent':'NANOEDMAODSIM', '--filein':'file:step3_inMINIAODSIM.root'} - + ################################################################################# ####From this line till the end of the file : ####UPGRADE WORKFLOWS IN PREPARATION - Gaelle's sandbox - @@ -3461,6 +3460,14 @@ def gen2021HiMix(fragment,howMuch): '--filetype':'DQM', } + upgradeStepDict['HARVESTRecNan'][k]={'-s':'HARVESTING:@standardValidation+@standardDQM+@ExtraHLT+@miniAODValidation+@miniAODDQM+@nanoAODDQM', + '--conditions':gt, + '--mc':'', + '--geometry' : geom, + '--scenario' : 'pp', + '--filetype':'DQM', + } + upgradeStepDict['HARVESTFakeHLT'][k]={'-s':'HARVESTING:@standardValidationNoHLT+@standardDQMFakeHLT+@miniAODValidation+@miniAODDQM', '--conditions':gt, '--mc':'', @@ -3495,15 +3502,23 @@ def gen2021HiMix(fragment,howMuch): '--scenario' : 'pp' } - upgradeStepDict['Nano'][k] = {'-s':'NANO', + upgradeStepDict['Nano'][k] = {'-s':'NANO,DQM:@nanoAODDQM', '--conditions':gt, - '--datatier':'NANOAODSIM', + '--datatier':'NANOAODSIM,DQMIO', '-n':'10', - '--eventcontent':'NANOEDMAODSIM', + '--eventcontent':'NANOEDMAODSIM,DQM', '--filein':'file:step3_inMINIAODSIM.root', '--geometry' : geom } - + + upgradeStepDict['RecNan'][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', + '--eventcontent':'RECOSIM,MINIAODSIM,NANOEDMAODSIM,DQM', + '--geometry' : geom + } + # setup baseline and variations for specialType,specialWF in upgradeWFs.items(): specialWF.setup(upgradeStepDict, k, upgradeProperties[year][k]) diff --git a/Configuration/PyReleaseValidation/python/relval_upgrade.py b/Configuration/PyReleaseValidation/python/relval_upgrade.py index 574bb2cff83a9..341102308fc28 100644 --- a/Configuration/PyReleaseValidation/python/relval_upgrade.py +++ b/Configuration/PyReleaseValidation/python/relval_upgrade.py @@ -28,7 +28,7 @@ def makeStepName(key,frag,step,suffix): for specialType in upgradeWFs.keys(): stepList[specialType] = [] hasHarvest = False - for step in upgradeProperties[year][key]['ScenToRun']: + for step in upgradeProperties[year][key]['ScenToRun']: stepMaker = makeStepName if 'Sim' in step: if 'HLBeamSpot' in step: @@ -47,6 +47,7 @@ def makeStepName(key,frag,step,suffix): 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)) # similar hacks for premixing if 'PMX' in specialType: if 'GenSim' in step: @@ -59,6 +60,11 @@ 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 diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index f5ff92debab2c..2ef67714ca7ff 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -150,7 +150,9 @@ def setup_(self, step, stepName, stepDict, k, properties): era=properties.get('Era', None) modifier=properties.get('ProcessModifier',None) if cust is not None: stepDict[stepName][k]['--customise']=cust - if era is not None: stepDict[stepName][k]['--era']=era + if era is not None: + stepDict[stepName][k]['--era']=era + if 'RecNan' in stepName: stepDict[stepName][k]['--era'] += ',run3_nanoAOD_devel' if modifier is not None: stepDict[stepName][k]['--procModifier']=modifier def condition(self, fragment, stepList, key, hasHarvest): return True @@ -168,12 +170,14 @@ def condition(self, fragment, stepList, key, hasHarvest): 'RecoGlobal', 'HARVEST', 'HARVESTFakeHLT', + 'HARVESTRecNan', 'FastSim', 'HARVESTFast', 'HARVESTGlobal', 'ALCA', 'Nano', 'MiniAOD', + 'RecNan', ], PU = [ 'DigiTrigger', @@ -184,9 +188,11 @@ def condition(self, fragment, stepList, key, hasHarvest): 'RecoFakeHLT', 'HARVEST', 'HARVESTFakeHLT', + 'HARVESTRecNan', 'HARVESTGlobal', 'MiniAOD', 'Nano', + 'RecNan', ], suffix = '', offset = 0.0, @@ -660,7 +666,7 @@ def setup_(self, step, stepName, stepDict, k, properties): # remove step stepDict[stepName][k] = None if 'Nano' in step: - stepDict[stepName][k] = merge([{'--filein':'file:step4.root'}, stepDict[step][k]]) + stepDict[stepName][k] = merge([{'--filein':'file:step4.root','-s':'NANO','--datatier':'NANOAODSIM','--eventcontent':'NANOEDMAODSIM'}, stepDict[step][k]]) def condition(self, fragment, stepList, key, hasHarvest): return fragment=="TTbar_14TeV" and ('2026' in key or '2021' in key) upgradeWFs['ProdLike'] = UpgradeWorkflow_ProdLike(