more Run1 workflows to be changed

cms-sw · Dec 9, 2015 · cbed35b · cbed35b
1 parent e044075
commit cbed35b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/Configuration/PyReleaseValidation/python/relval_highstats.py b/Configuration/PyReleaseValidation/python/relval_highstats.py
@@ -11,17 +11,17 @@
 ### data ### as it was forgoten in the past 140 + standard wf
 workflows[144.5]  = ['', ['RunCosmicsA','RECOCOSD','ALCACOSD']]
 workflows[144.45] = ['', ['RunCosmicsA','RECOD']]
-workflows[144.6]  = ['', ['MinimumBias2010A','RECOSKIMALCA']]
-workflows[144.7]  = ['', ['MinimumBias2010B','RECOSKIMALCA']]
-workflows[144.8]  = ['', ['WZMuSkim2010A','RECOSKIMALCA']]
-workflows[144.9]  = ['', ['WZEGSkim2010A','RECOSKIMALCA']]
-workflows[144.10] = ['', ['WZMuSkim2010B','RECOSKIMALCA']]
-workflows[144.11] = ['', ['WZEGSkim2010B','RECOSKIMALCA']]
-workflows[144.12] = ['', ['RunMinBias2010B','RECOD']]
-workflows[144.13] = ['', ['RunMu2010B','RECOD']]
-workflows[144.14] = ['', ['RunElectron2010B','RECOD']]
-workflows[144.15] = ['', ['RunPhoton2010B','RECOD']]
-workflows[144.16] = ['', ['RunJet2010B','RECOD']]
+workflows[144.6]  = ['', ['MinimumBias2010A','RECOSKIMALCAR1']]
+workflows[144.7]  = ['', ['MinimumBias2010B','RECOSKIMALCAR1']]
+workflows[144.8]  = ['', ['WZMuSkim2010A','RECOSKIMALCAR1']]
+workflows[144.9]  = ['', ['WZEGSkim2010A','RECOSKIMALCAR1']]
+workflows[144.10] = ['', ['WZMuSkim2010B','RECOSKIMALCAR1']]
+workflows[144.11] = ['', ['WZEGSkim2010B','RECOSKIMALCAR1']]
+workflows[144.12] = ['', ['RunMinBias2010B','RECODR1']]
+workflows[144.13] = ['', ['RunMu2010B','RECODR1']]
+workflows[144.14] = ['', ['RunElectron2010B','RECODR1']]
+workflows[144.15] = ['', ['RunPhoton2010B','RECODR1']]
+workflows[144.16] = ['', ['RunJet2010B','RECODR1']]
 
 workflows[101] = [ '', ['SingleElectronE120EHCAL']]
 workflows[102] = [ '', ['SinglePiE50HCAL']]
@@ -68,7 +68,7 @@
 workflows[132]=['',['LM9p','DIGI','RECO']]
 workflows[133]=['',['RSGrav','DIGI','RECO']]
 
-workflows[134]=['MinimumBiasBS',['RunMinBias2011B','RECOD','ALCAPROMPT','ALCAHARVD']]
+workflows[134]=['MinimumBiasBS',['RunMinBias2011B','RECODR1','ALCAPROMPT','ALCAHARVD']]
 
 ### HighStats HLT Physics 2015D ###
 workflows[134.99901] = ['',['RunHLTPhy2015DHS','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2_25nsreHLT']]

diff --git a/Configuration/PyReleaseValidation/python/relval_production.py b/Configuration/PyReleaseValidation/python/relval_production.py
@@ -12,7 +12,7 @@
 ## data production test
 workflows[1000] = [ '',['RunMinBias2011A','TIER0','SKIMD','HARVESTDfst2','ALCASPLIT']]
 workflows[1001] = [ '',['RunMinBias2011A','TIER0EXP','ALCAEXP','ALCAHARVD1','ALCAHARVD2','ALCAHARVD3','ALCAHARVD4']]
-workflows[1002]=['RRD',['RunMinBias2011A','RECOD','COPYPASTE']]#,'RECODFROMRAWRECO']]
+workflows[1002]=['RRD',['RunMinBias2011A','RECODR1','COPYPASTE']]#,'RECODFROMRAWRECO']]
 workflows[1003]=['', ['RunMinBias2012A','RECODDQM','HARVESTDDQM']]
 workflows[1004] = [ '',['RunHI2011','TIER0EXPHI','ALCAEXPHI','ALCAHARVD1HI','ALCAHARVD2HI','ALCAHARVD3HI']]
 

diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py
@@ -943,6 +943,8 @@ def identityFS(wf):
 steps['RECODSplit']=steps['RECOD'] # finer job splitting  
 steps['RECOSKIMALCA']=merge([{'--inputCommands':'"keep *","drop *_*_*_RECO"'
                               },steps['RECOD']])
+steps['RECOSKIMALCAR1']=merge([{'--inputCommands':'"keep *","drop *_*_*_RECO"'
+                                },steps['RECODR1']])
 steps['REPACKHID']=merge([{'--scenario':'HeavyIons',
                          '-s':'RAW2DIGI,REPACK',
                          '--datatier':'RAW',
@@ -1243,7 +1245,7 @@ def identityFS(wf):
 
 steps['HARVESTDDQM']=merge([{'-s':'HARVESTING:@common+@muon+@hcal+@jetmet+@ecal'},steps['HARVESTD']])
 
-steps['HARVESTDfst2']=merge([{'--filein':'file:step2_inDQM.root'},steps['HARVESTD']])
+steps['HARVESTDfst2']=merge([{'--filein':'file:step2_inDQM.root'},steps['HARVESTDR1']])
 
 steps['HARVESTDC']={'-s':'HARVESTING:dqmHarvesting',
                    '--conditions':'auto:run1_data',