Add a matrix workflow testing MkFit in initialStep

cms-sw · Aug 28, 2019 · bfb35ed · bfb35ed
1 parent 14992c8
commit bfb35ed
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 1 deletion.
diff --git a/Configuration/PyReleaseValidation/python/relval_2017.py b/Configuration/PyReleaseValidation/python/relval_2017.py
@@ -23,6 +23,7 @@
 #         he collapse: TTbar, TTbar PU, TTbar design
 #         ParkingBPH: TTbar
 #   2021 (ZMM, TTbar, ZEE, MinBias, TTbar PU, TTbar PU premix, ZEE PU, TTbar design)
+#        (TTbar trackingMkFit)
 #   2023 (TTbar, TTbar PU, TTbar PU premix)
 #   2024 (TTbar, TTbar PU, TTbar PU premix)
 numWFIB = [10001.0,10002.0,10003.0,10004.0,10005.0,10006.0,10007.0,10008.0,10009.0,10059.0,10071.0,
@@ -34,6 +35,7 @@
            10824.6,11024.6,11224.6,
            10824.8,
            11650.0,11634.0,11646.0,11640.0,11834.0,11834.99,11846.0,12024.0,
+           11634.7,
            12434.0,12634.0,12634.99,
            12834.0,13034.0,13034.99]
 for numWF in numWFIB:

diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py
@@ -2090,6 +2090,9 @@ def gen2018HiMix(fragment,howMuch):
 step3_trackingLowPU = {
     '--era': 'Run2_2016_trackingLowPU'
 }
+step3_trackingMkFit = {
+    '--customise': 'RecoTracker/MkFit/customizeInitialStepToMkFit.customizeInitialStepToMkFit'
+}
 step3_HIPM = {
     '--era': 'Run2_2016_HIPM'
 }
@@ -3240,6 +3243,10 @@ def gen2018HiMix(fragment,howMuch):
         if 'Reco' in step and upgradeStepDict[step][k]['--era']=='Run2_2017':
             upgradeStepDict[stepName][k] = merge([{'--era': 'Run2_2017_trackingLowPU'}, upgradeStepDict[step][k]])
 
+    for step in upgradeSteps['trackingMkFit']['steps']:
+        stepName = step + upgradeSteps['trackingMkFit']['suffix']
+        if 'Reco' in step: upgradeStepDict[stepName][k] = merge([step3_trackingMkFit, upgradeStepDict[step][k]])
+
     for step in upgradeSteps['Neutron']['steps']:
         if 'GenSim' in step:
             custNew = "SimG4Core/Application/NeutronBGforMuonsXS_cff.customise"

diff --git a/Configuration/PyReleaseValidation/python/relval_upgrade.py b/Configuration/PyReleaseValidation/python/relval_upgrade.py
@@ -73,7 +73,7 @@ def makeStepName(key,frag,step,suffix):
             # special workflows for tracker
             if (upgradeDatasetFromFragment[frag]=="TTbar_13" or upgradeDatasetFromFragment[frag]=="TTbar_14TeV") and not 'PU' in key and hasHarvest:
                 # skip ALCA and Nano
-                trackingVariations = ['trackingOnly','trackingRun2','trackingOnlyRun2','trackingLowPU','pixelTrackingOnly']
+                trackingVariations = ['trackingOnly','trackingRun2','trackingOnlyRun2','trackingLowPU','pixelTrackingOnly','trackingMkFit']
                 for tv in trackingVariations:
                     stepList[tv] = [s for s in stepList[tv] if (("ALCA" not in s) and ("Nano" not in s))]
                 workflows[numWF+upgradeSteps['trackingOnly']['offset']] = [ upgradeDatasetFromFragment[frag], stepList['trackingOnly']]
@@ -82,6 +82,8 @@ def makeStepName(key,frag,step,suffix):
                         workflows[numWF+upgradeSteps[tv]['offset']] = [ upgradeDatasetFromFragment[frag], stepList[tv]]
                 elif '2018' in key:
                     workflows[numWF+upgradeSteps['pixelTrackingOnly']['offset']] = [ upgradeDatasetFromFragment[frag], stepList['pixelTrackingOnly']]
+                elif '2021' in key:
+                    workflows[numWF+upgradeSteps['trackingMkFit']['offset']] = [ upgradeDatasetFromFragment[frag], stepList['trackingMkFit']]
 
             # special workflows for HGCAL/TICL
             if (upgradeDatasetFromFragment[frag]=="CloseByParticleGun") and ('2026' in key):

diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
@@ -188,6 +188,15 @@
     'suffix' : '_heCollapse',
     'offset' : 0.6,
 }
+upgradeSteps['trackingMkFit'] = {
+    'steps' : [
+        'RecoFull',
+        'RecoFullGlobal',
+    ],
+    'PU' : [],
+    'suffix' : '_trackingMkFit',
+    'offset' : 0.7,
+}
 upgradeSteps['ParkingBPH'] = {
     'steps' : [
         'RecoFull',