Merge pull request #2180 from franzoni/from-CMSSW_7_0_X_2014-01-27-02…

…00-fix-wf134 Configuration fixes. -- HARVESTING input for some postLS1 wfs + remove whitelisting
cms-sw · Jan 29, 2014 · 98661b5 · 98661b5
2 parents b053478 + a86263e
commit 98661b5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Configuration/PyReleaseValidation/python/MatrixInjector.py b/Configuration/PyReleaseValidation/python/MatrixInjector.py
@@ -92,7 +92,7 @@ def __init__(self,opt,mode='init',options=''):
             "DbsUrl": "http://cmsdbsprod.cern.ch/cms_dbs_prod_global/servlet/DBSServlet",
             #"CouchDBName": self.couchDB,                      #Name of Couch Database containing config cache
             #- Will contain all configs for all Tasks
-            "SiteWhitelist" : ["T2_CH_CERN", "T1_US_FNAL"],   #Site whitelist
+            #"SiteWhitelist" : ["T2_CH_CERN", "T1_US_FNAL"],   #Site whitelist
             "TaskChain" : None,                                  #Define number of tasks in chain.
             "nowmTasklist" : [],  #a list of tasks as we put them in
             "unmergedLFNBase" : "/store/unmerged",

diff --git a/Configuration/PyReleaseValidation/python/WorkFlowRunner.py b/Configuration/PyReleaseValidation/python/WorkFlowRunner.py
@@ -117,7 +117,8 @@ def closeCmd(i,ID):
                 if lumiRangeFile: #DAS query can also restrict lumi range
                     cmd += ' --lumiToProcess '+lumiRangeFile
                     lumiRangeFile=None
-                if 'HARVESTING' in cmd and not '134' in str(self.wf.numId) and not '--filein' in cmd:
+                # 134 is an existing workflow where harvesting has to operate on AlcaReco and NOT on DQM; hard-coded..    
+                if 'HARVESTING' in cmd and not 134==self.wf.numId and not '--filein' in cmd:
                     cmd+=' --filein file:step%d_inDQM.root --fileout file:step%d.root '%(istep-1,istep)
                 else:
                     if istep!=1 and not '--filein' in cmd: