add specific post-LS1 customisations for 25ns, 50ns and heavy ions wi…

…th premixing
cms-sw · Feb 18, 2015 · 055c600 · 055c600
1 parent 8c995bf
commit 055c600
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py
@@ -861,7 +861,7 @@ def genvalid(fragment,d,suffix='all',fi='',dataSet=''):
     }
 digiPremixUp2015Defaults50ns=merge([{'--conditions':'auto:run2_mc_50ns'},
                                     {'--pileup_input' : 'das:/RelValPREMIXUP15_PU50/%s/GEN-SIM-DIGI-RAW'%baseDataSetRelease[6]},
-                                    # {'--customise':'SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1_50ns'}, # FIX FIX here we miss an equivalent versin of postLS1CustomsPreMixing for 50ns; keep the same custom here as in digiPremixUp2015Defaults25ns
+                                    {'--customise': 'SLHCUpgradeSimulations/Configuration/postLS1CustomsPreMixing.customisePostLS1_50ns'},
                                     digiPremixUp2015Defaults25ns])
 steps['DIGIPRMXUP15_PU25']=merge([digiPremixUp2015Defaults25ns])
 steps['DIGIPRMXUP15_PU50']=merge([digiPremixUp2015Defaults50ns])

diff --git a/SLHCUpgradeSimulations/Configuration/python/postLS1CustomsPreMixing.py b/SLHCUpgradeSimulations/Configuration/python/postLS1CustomsPreMixing.py
@@ -7,8 +7,29 @@
 
 def customisePostLS1(process):
 
+    # apply the general 25 ns post-LS1 customisation
     process = postLS1Customs.customisePostLS1(process)
-    # deal with CSC separately:
+    # deal with premixing-specific CSC changes separately
+    process = customise_csc_PostLS1(process)
+
+    return process
+
+
+def customisePostLS1_50ns(process):
+
+    # apply the general 25 ns post-LS1 customisation
+    process = postLS1Customs.customisePostLS1_50ns(process)
+    # deal with premixing-specific CSC changes separately
+    process = customise_csc_PostLS1(process)
+
+    return process
+
+
+def customisePostLS1_HI(process):
+
+    # apply the general 25 ns post-LS1 customisation
+    process = postLS1Customs.customisePostLS1_HI(process)
+    # deal with premixing-specific CSC changes separately
     process = customise_csc_PostLS1(process)
 
     return process