Merge pull request #27692 from mmusich/cleanUpStuckTBMRelVals

remove stuck-TBM specific workflows
cms-sw · Aug 8, 2019 · aaf13dc · aaf13dc
2 parents f29a2e0 + 9ab93c4
commit aaf13dc
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 47 deletions.
diff --git a/Configuration/PyReleaseValidation/python/relval_2017.py b/Configuration/PyReleaseValidation/python/relval_2017.py
@@ -21,7 +21,6 @@
 #   2018 (ZMM, TTbar, ZEE, MinBias, TTbar PU, ZEE PU, TTbar design)
 #        (TTbar trackingOnly, pixelTrackingOnly)
 #         he collapse: TTbar, TTbar PU, TTbar design
-#         killStuckTBM: TTbar, ZMM
 #         ParkingBPH: TTbar
 #   2021 (ZMM, TTbar, ZEE, MinBias, TTbar PU, ZEE PU, TTbar design)
 #   2023 (TTbar, TTbar PU)
@@ -33,7 +32,6 @@
            10842.0,10824.0,10825.0,10826.0,10823.0,11024.0,11025.0,11224.0,
            10824.1,10824.5,
            10824.6,11024.6,11224.6,
-           10824.7,10842.7,
            10824.8,
            11650.0,11634.0,11646.0,11640.0,11834.0,11846.0,12024.0,
            12434.0,12634.0,

diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py
@@ -3255,10 +3255,6 @@ def gen2018HiMix(fragment,howMuch):
         stepName = step + upgradeSteps['heCollapse']['suffix']
         upgradeStepDict[stepName][k] = merge([{'--procModifiers': 'run2_HECollapse_2018'}, upgradeStepDict[step][k]])
 
-    for step in upgradeSteps['killStuckTBM']['steps']:
-        stepName = step + upgradeSteps['killStuckTBM']['suffix']
-        upgradeStepDict[stepName][k] = merge([{'--customise': 'SimTracker/SiPixelDigitizer/customiseStuckTBMSimulation.activateStuckTBMSimulation2018NoPU'}, upgradeStepDict[step][k]])
-
     for step in upgradeSteps['ProdLike']['steps']:
         stepName = step + upgradeSteps['ProdLike']['suffix']
         if 'Reco' in step:

diff --git a/Configuration/PyReleaseValidation/python/relval_upgrade.py b/Configuration/PyReleaseValidation/python/relval_upgrade.py
@@ -18,8 +18,6 @@ def makeStepName(key,frag,step,suffix):
 neutronKeys = [x for x in upgradeKeys[2026] if 'PU' not in x]
 neutronFrags = ['ZMM_14','MinBias_14TeV']
 
-tbmFrags = ['TTbar_13','ZMM_13']
-
 #just define all of them
 
 for year in upgradeKeys:
@@ -99,10 +97,6 @@ def makeStepName(key,frag,step,suffix):
             if upgradeDatasetFromFragment[frag]=="TTbar_13" and '2018' in key:
                 workflows[numWF+upgradeSteps['heCollapse']['offset']] = [ upgradeDatasetFromFragment[frag], stepList['heCollapse']]
 
-            # special workflows for stuck TBM
-            if any(upgradeDatasetFromFragment[frag]==nfrag for nfrag in tbmFrags) and '2018' in key:
-                workflows[numWF+upgradeSteps['killStuckTBM']['offset']] = [ upgradeDatasetFromFragment[frag], stepList['killStuckTBM']]
-
             # workflow for profiling
             if upgradeDatasetFromFragment[frag]=="TTbar_14TeV" and '2026' in key:
                 workflows[numWF+upgradeSteps['ProdLike']['offset']] = [ upgradeDatasetFromFragment[frag]+"_ProdLike", stepList['ProdLike']]

diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
@@ -185,16 +185,6 @@
     'suffix' : '_heCollapse',
     'offset' : 0.6,
 }
-upgradeSteps['killStuckTBM'] = {
-    'steps' : [
-        'DigiFull',
-    ],
-    'PU' : [
-        'DigiFull',
-    ],
-    'suffix' : '_killStuckTBM',
-    'offset' : 0.7,
-}
 upgradeSteps['ParkingBPH'] = {
     'steps' : [
         'RecoFull',

diff --git a/SimTracker/SiPixelDigitizer/python/customiseStuckTBMSimulation.py b/SimTracker/SiPixelDigitizer/python/customiseStuckTBMSimulation.py