neutron workflow has different customs for sim and digi

cms-sw · Apr 28, 2017 · f42f2b4 · f42f2b4
1 parent 64e9b0f
commit f42f2b4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py
@@ -1905,7 +1905,10 @@ def lhegensim(fragment,howMuch):
             upgradeStepDict[stepName][k]['--era'] += "_timing"
 
     for step in upgradeSteps['Neutron']['steps']:
-        custNew = "SLHCUpgradeSimulations/Configuration/customise_mixing.customise_Mix_LongLived_Neutrons"
+        if 'GenSim' in step:
+            custNew = "SimG4Core/Application/NeutronBGforMuonsXS_cff.customise"
+        else:
+            custNew = "SLHCUpgradeSimulations/Configuration/customise_mixing.customise_Mix_LongLived_Neutrons"
         stepName = step + upgradeSteps['Neutron']['suffix']
         upgradeStepDict[stepName][k] = deepcopy(upgradeStepDict[step][k])
         if '--customise' in upgradeStepDict[stepName][k].keys():

diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
@@ -107,8 +107,17 @@
     'offset' : 0.2,
 }
 upgradeSteps['Neutron'] = {
-    'steps' : upgradeSteps['baseline']['steps'],
-    'PU' : upgradeSteps['baseline']['PU'],
+    'steps' : [
+        'GenSimFull',
+        'GenSimHLBeamSpotFull',
+        'GenSimHLBeamSpotFull14',
+        'DigiFull',
+        'DigiFullTrigger',
+    ],
+    'PU' : [
+        'DigiFull',
+        'DigiFullTrigger',
+    ],
     'suffix' : '_Neutron',
     'offset' : 0.3,
 }