Merge pull request #7254 from davidlange6/cleanup_limited_add_defaults

Limited matrix cleanup and make it easy to develop workflows that don't yet work
cms-sw · Jan 19, 2015 · d09a2df · d09a2df
2 parents 5a36863 + a075864
commit d09a2df
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 10 deletions.
diff --git a/Configuration/PyReleaseValidation/python/MatrixReader.py b/Configuration/PyReleaseValidation/python/MatrixReader.py
@@ -49,8 +49,8 @@ def reset(self, what='all'):
                              'relval_upgrade':'upg-',
                              'relval_identity':'id-',
                              'relval_machine': 'mach-',
-                             'relval_unsch': 'unsch-'
-                             #, 'relval_premix': 'premix-'
+                             'relval_unsch': 'unsch-',
+                             'relval_premix': 'premix-'
                              }
 
         self.files = ['relval_standard' ,
@@ -63,9 +63,22 @@ def reset(self, what='all'):
                       'relval_upgrade',
                       'relval_identity',
                       'relval_machine',
-                      'relval_unsch'
-                      #, 'relval_premix'
+                      'relval_unsch',
+                      'relval_premix'
                       ]
+        self.filesDefault = {'relval_standard':True ,
+                             'relval_highstats':True ,
+                             'relval_pileup':True,
+                             'relval_generator':True,
+                             'relval_extendedgen':True,
+                             'relval_production':True,
+                             'relval_ged':True,
+                             'relval_upgrade':False,
+                             'relval_identity':False,
+                             'relval_machine':True,
+                             'relval_unsch':True,
+                             'relval_premix':False
+                             }
 
         self.relvalModule = None
 
@@ -103,7 +116,7 @@ def readMatrix(self, fileNameIn, useInput=None, refRel=None, fromScratch=None):
 
         prefix = self.filesPrefMap[fileNameIn]
 
-        print "processing ", fileNameIn
+        print "processing", fileNameIn
 
         try:
             _tmpMod = __import__( 'Configuration.PyReleaseValidation.'+fileNameIn )
@@ -112,7 +125,8 @@ def readMatrix(self, fileNameIn, useInput=None, refRel=None, fromScratch=None):
             print "ERROR importing file ", fileNameIn, str(e)
             return
 
-        print "request for INPUT for ", useInput
+        if useInput is not None:
+            print "request for INPUT for ", useInput
 
 
         fromInput={}
@@ -286,6 +300,10 @@ def showRaw(self, useInput, refRel=None, fromScratch=None, what='all',step1Only=
                 print "ignoring non-requested file",matrixFile
                 continue
 
+            if self.what == 'all' and not self.filesDefault[matrixFile]:
+                print "ignoring file not used by default (enable with -w)",matrixFile
+                continue
+
             try:
                 self.readMatrix(matrixFile, useInput, refRel, fromScratch)
             except Exception, e:
@@ -444,7 +462,7 @@ def prepare(self, useInput=None, refRel='', fromScratch=None):
             if self.what != 'all' and self.what not in matrixFile:
                 print "ignoring non-requested file",matrixFile
                 continue
-            if self.what == 'all' and ('upgrade' in matrixFile):
+            if self.what == 'all' and not self.filesDefault[matrixFile]:
                 print "ignoring",matrixFile,"from default matrix"
                 continue
 

diff --git a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py
@@ -52,11 +52,12 @@ def runSelected(opt):
                      8, #BH/Cosmic MC
                      25, #MC ttbar
                      4.22, #cosmic data
-                     4.291, #hlt data
                      1000, #data+prompt
                      1001, #data+express
-                     4.53, #HI data
-                     40, #HI MC
+                     4.53, #2012B Photon data
+                     140.53, #2011 HI data
+                     1330, #Run2 MC Zmm
+                     135.4 #Run 2 Zee ttbar
                      ],
         'jetmc': [5.1, 13, 15, 25, 38, 39], #MC
         'metmc' : [5.1, 15, 25, 37, 38, 39], #MC