Merge pull request #25524 from mmusich/AddStuckTBMWftoMatrix

[RFC] Add Pixel "Stuck TBM" simulation workflows to RelVal matrix
cms-sw · Jan 16, 2019 · 958b32c · 958b32c
2 parents 0707cb9 + 9de9934
commit 958b32c
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 0 deletions.
diff --git a/Configuration/PyReleaseValidation/python/relval_2017.py b/Configuration/PyReleaseValidation/python/relval_2017.py
@@ -21,6 +21,7 @@
 #   2018 (ZMM, TTbar, ZEE, MinBias, TTbar PU, ZEE PU, TTbar design)
 #        (TTbar trackingOnly, pixelTrackingOnly)
 #         he collapse: TTbar, TTbar PU, TTbar design
+#         killStuckTBM: TTbar, ZMM
 #   2019 (ZMM, TTbar, ZEE, MinBias, TTbar PU, ZEE PU, TTbar design)
 numWFIB = [10001.0,10002.0,10003.0,10004.0,10005.0,10006.0,10007.0,10008.0,10009.0,10059.0,10071.0,
            10042.0,10024.0,10025.0,10026.0,10023.0,10224.0,10225.0,10424.0,
@@ -29,6 +30,7 @@
            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,
            11642.0,11624.0,11625.0,11626.0,11623.0,11824.0,11825.0,12024.0]
 for numWF in numWFIB:
     if not numWF in _upgrade_workflows: continue

diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py
@@ -3031,6 +3031,10 @@ 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]])
+
     # setup PU
     if k2 in PUDataSets:
         # Setup premixing stage1

diff --git a/Configuration/PyReleaseValidation/python/relval_upgrade.py b/Configuration/PyReleaseValidation/python/relval_upgrade.py
@@ -18,6 +18,8 @@ def makeStepName(key,frag,step,suffix):
 neutronKeys = ['2023D17','2023D19','2023D21','2023D22','2023D23','2023D24','2023D25','2023D28','2023D29','2023D30','2023D31','2023D33','2023D34','2023D35','2023D36','2023D37','2023D38']
 neutronFrags = ['ZMM_14','MinBias_14TeV']
 
+tbmFrags = ['TTbar_13','ZMM_13']
+
 #just define all of them
 
 for year in upgradeKeys:
@@ -88,6 +90,10 @@ 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']]
+
             # premixing stage1, only for NuGun
             if upgradeDatasetFromFragment[frag]=="NuGun" and 'PU' in key and '2023' in key:
                 workflows[numWF+upgradeSteps['Premix']['offset']] = [upgradeDatasetFromFragment[frag], stepList['Premix']]

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

diff --git a/SimTracker/SiPixelDigitizer/python/customiseStuckTBMSimulation.py b/SimTracker/SiPixelDigitizer/python/customiseStuckTBMSimulation.py
@@ -0,0 +1,25 @@
+import FWCore.ParameterSet.Config as cms
+
+#
+# activate the stuck-TBM simulation and loads from DB the corresponding conditions
+#
+def activateStuckTBMSimulation2018NoPU(process):
+
+    if hasattr(process,'mix') and hasattr(process.mix,'digitizers') and hasattr(process.mix.digitizers,'pixel'):
+        print("activating Pixel Stuck TBM Simulation")
+        process.mix.digitizers.pixel.KillBadFEDChannels = cms.bool(True)
+
+    if not hasattr(process.GlobalTag,'toGet'):
+        process.GlobalTag.toGet=cms.VPSet()
+
+    process.GlobalTag.toGet.extend(cms.VPSet(cms.PSet(record = cms.string('SiPixelStatusScenarioProbabilityRcd'),
+                                                      tag = cms.string('SiPixelQualityProbabilities_2018_noPU_v0_mc'),
+                                                      connect = cms.string('frontier://FrontierPrep/CMS_CONDITIONS')),
+                                             cms.PSet(record = cms.string('SiPixelStatusScenariosRcd'),
+                                                      tag = cms.string('SiPixelFEDChannelContainer_StuckTBM_2018_v0_mc'),
+                                                      connect = cms.string('frontier://FrontierPrep/CMS_CONDITIONS')
+                                                      )
+                                             )
+                                   )            
+    return process
+