Add wfs with HLT as separate step

Configuration/PyReleaseValidation/python/relval_steps.py

@@ -3585,6 +3585,14 @@ def gen2021HiMix(fragment,howMuch):
                                       '--eventcontent':'FEVTDEBUGHLT',
                                       '--geometry' : geom
                                       }
+
+    upgradeStepDict['DigiNoHLT'][k] = {'-s':'DIGI:pdigi_valid,L1,DIGI2RAW',
+                                       '--conditions':gt,
+                                       '--datatier':'GEN-SIM-DIGI-RAW',
+                                       '-n':'10',
+                                       '--eventcontent':'FEVTDEBUGHLT',
+                                       '--geometry' : geom
+                                       }
 
     # Adding Track trigger step in step2
     upgradeStepDict['DigiTrigger'][k] = {'-s':'DIGI:pdigi_valid,L1TrackTrigger,L1,DIGI2RAW,HLT:%s'%(hltversion),
@@ -3594,6 +3602,15 @@ def gen2021HiMix(fragment,howMuch):
                                       '--eventcontent':'FEVTDEBUGHLT',
                                       '--geometry' : geom
                                       }
+
+    upgradeStepDict['HLT'][k] = {'-s':'HLT:%s'%(hltversion),
+                                 '--conditions':gt,
+                                 '--datatier':'GEN-SIM-DIGI-RAW',
+                                 '-n':'10',
+                                 '--eventcontent':'FEVTDEBUGHLT',
+                                 '--geometry' : geom,
+                                 '--outputCommands' : '"drop *_*_*_GEN,drop *_*_*_DIGI2RAW"'
+                                 }
 
     upgradeStepDict['Reco'][k] = {'-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,PAT,VALIDATION:@standardValidation+@miniAODValidation,DQM:@standardDQM+@ExtraHLT+@miniAODDQM',
                                       '--conditions':gt,
@@ -3702,6 +3719,9 @@ def gen2021HiMix(fragment,howMuch):
                                       '--geometry' : geom
                                       }
 
+    upgradeStepDict['RecoNanoHLT'][k] = upgradeStepDict['RecoNano'][k]
+    upgradeStepDict['RecoNanoHLT'][k].update({'--secondfilein': 'file:step2.root', '--filein': 'file:step3.root'})
+
     # setup baseline and variations
     for specialType,specialWF in upgradeWFs.items():
         specialWF.setup(upgradeStepDict, k, upgradeProperties[year][k])

Configuration/PyReleaseValidation/python/relval_upgrade.py

@@ -46,9 +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('RecoNano','MiniAOD').replace('Reco','MiniAOD'),specialWF.suffix))
+                                stepList[specialType].append(stepMaker(key,frag[:-4],step.replace('RecoGlobal','MiniAOD').replace('RecoNanoHLT','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))
+                                    stepList[specialType].append(stepMaker(key,frag[:-4],step.replace('RecoNanoHLT','Nano').replace('RecoNano','Nano'),specialWF.suffix))
                         # similar hacks for premixing
                         if 'PMX' in specialType:
                             if 'GenSim' in step:

Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py

@@ -20,6 +20,10 @@
     '2021PU',
     '2021Design',
     '2021DesignPU',
+    '2021HLT',
+    '2021HLTPU',
+    '2021DesignHLT',
+    '2021DesignHLTPU',
     '2023',
     '2023PU',
     '2024',
@@ -171,11 +175,14 @@ def condition(self, fragment, stepList, key, hasHarvest):
         'GenSimHLBeamSpotHGCALCloseBy',
         'Digi',
         'DigiTrigger',
+        'DigiNoHLT',
+        'HLT',
         'RecoLocal',
         'Reco',
         'RecoFakeHLT',
         'RecoGlobal',
         'RecoNano',
+        'RecoNanoHLT',
         'HARVEST',
         'HARVESTFakeHLT',
         'HARVESTNano',
@@ -188,12 +195,15 @@ def condition(self, fragment, stepList, key, hasHarvest):
     ],
     PU =  [
         'DigiTrigger',
+        'DigiNoHLT',
+        'HLT',
         'RecoLocal',
         'RecoGlobal',
         'Digi',
         'Reco',
         'RecoFakeHLT',
         'RecoNano',
+        'RecoNanoHLT',
         'HARVEST',
         'HARVESTFakeHLT',
         'HARVESTNano',
@@ -1868,6 +1878,22 @@ def condition(self, fragment, stepList, key, hasHarvest):
         'BeamSpot': 'GaussSigmaZ4cm',
         'ScenToRun' : ['GenSim','Digi','RecoNano','HARVESTNano'],
     },
+    '2021HLT' : {
+        'Geom' : 'DB:Extended',
+        'GT' : 'auto:phase1_2021_realistic',
+        'HLTmenu': '@relval2021',
+        'Era' : 'Run3',
+        'BeamSpot': 'Run3RoundOptics25ns13TeVLowSigmaZ',
+        'ScenToRun' : ['GenSim','DigiNoHLT','HLT','RecoNanoHLT','HARVESTNano','ALCA'],
+    },
+    '2021DesignHLT' : {
+        'Geom' : 'DB:Extended',
+        'GT' : 'auto:phase1_2021_design',
+        'HLTmenu': '@relval2021',
+        'Era' : 'Run3',
+        'BeamSpot': 'GaussSigmaZ4cm',
+        'ScenToRun' : ['GenSim','DigiNoHLT','HLT','RecoNanoHLT','HARVESTNano'],
+    },    
     '2023' : {
         'Geom' : 'DB:Extended',
         'GT' : 'auto:phase1_2023_realistic',