Merge pull request #12815 from boudoul/phase1IB

First Integration of the 2017 scenario in IB test
cms-sw · Dec 18, 2015 · 54ea90a · 54ea90a
2 parents 4918827 + c1ac60b
commit 54ea90a
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 0 deletions.
diff --git a/Configuration/PyReleaseValidation/python/MatrixReader.py b/Configuration/PyReleaseValidation/python/MatrixReader.py
@@ -47,6 +47,7 @@ def reset(self, what='all'):
                              'relval_production': 'prod-'  ,
                              'relval_ged': 'ged-',
                              'relval_upgrade':'upg-',
+                             'relval_2017':'2017-',
                              'relval_identity':'id-',
                              'relval_machine': 'mach-',
                              'relval_unsch': 'unsch-',
@@ -61,6 +62,7 @@ def reset(self, what='all'):
                       'relval_production',
                       'relval_ged',
                       'relval_upgrade',
+                      'relval_2017',
                       'relval_identity',
                       'relval_machine',
                       'relval_unsch',
@@ -74,6 +76,7 @@ def reset(self, what='all'):
                              'relval_production':True,
                              'relval_ged':True,
                              'relval_upgrade':False,
+                             'relval_2017':True,
                              'relval_identity':False,
                              'relval_machine':True,
                              'relval_unsch':True,

diff --git a/Configuration/PyReleaseValidation/python/relval_2017.py b/Configuration/PyReleaseValidation/python/relval_2017.py
@@ -0,0 +1,32 @@
+
+# import the definition of the steps and input files:
+from  Configuration.PyReleaseValidation.relval_steps import *
+
+# here only define the workflows as a combination of the steps defined above:
+workflows = Matrix()
+
+# each workflow defines a name and a list of steps to be done. 
+# if no explicit name/label given for the workflow (first arg),
+# the name of step1 will be used
+
+
+
+#just define all of them
+
+numWFStart=10000
+numWFSkip=200
+numWFIB = [10060.0,10039.0,10046.0] ##2017 WFs to run in IB (TenMuE_0_200, TTbar, MinBias)
+for i,key in enumerate(upgradeKeys):
+    numWF=numWFStart+i*numWFSkip
+    for frag in upgradeFragments:
+        k=frag[:-4]+'_'+key
+        stepList=[]
+        for step in upgradeScenToRun[key]:
+            if 'Sim' in step:
+                stepList.append(k+'_'+step)
+            else:
+                stepList.append(step+'_'+key)
+        if numWF in numWFIB:
+	    print numWF
+	    workflows[numWF] = [ upgradeDatasetFromFragment[frag], stepList]
+        numWF+=1