Merge pull request #9284 from shervin86/RelValMatrix_fix

Relval for Ecal{Cal,Uncal}{Z,W}Electron alcarecoes running on SingleEle (data)
cms-sw · May 27, 2015 · d22966f · d22966f
2 parents c7ec728 + 5d393b8
commit d22966f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/Configuration/PyReleaseValidation/python/relval_standard.py b/Configuration/PyReleaseValidation/python/relval_standard.py
@@ -39,7 +39,7 @@
 
 workflows[4.17] = ['', ['RunMinBias2011A','HLTD','RECODreHLT','HARVESTDreHLT','SKIMDreHLT','MINIAODDreHLT']]
 workflows[4.18] = ['', ['RunMu2011A','RECOD','HARVESTD','MINIAODDATAs2']]
-workflows[4.19] = ['', ['RunElectron2011A','RECOD','HARVESTD','MINIAODDATAs2']]
+workflows[4.19] = ['', ['RunElectron2011A','RECODAlCaEle','HARVESTD','MINIAODDATAs2']]
 workflows[4.20] = ['', ['RunPhoton2011A','RECOD','HARVESTD','MINIAODDATAs2']]
 workflows[4.21] = ['', ['RunJet2011A','RECOD','HARVESTD','MINIAODDATAs2']]
 
@@ -54,7 +54,7 @@
 workflows[4.29] = ['', ['RunMinBias2011B','HLTD','RECODreHLT','HARVESTDreHLT','SKIMDreHLT','MINIAODDreHLT']]
 #workflows[4.291] = ['', ['RunMinBias2011B','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
 workflows[4.30] = ['', ['RunMu2011B','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
-workflows[4.31] = ['', ['RunElectron2011B','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
+workflows[4.31] = ['', ['RunElectron2011B','HLTD','RECODreHLTAlCaEle','HARVESTDreHLT','MINIAODDreHLT']]
 workflows[4.32] = ['', ['RunPhoton2011B','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
 workflows[4.33] = ['', ['RunJet2011B','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
 
@@ -69,13 +69,13 @@
 workflows[4.41] = ['',['RunTau2012A','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
 workflows[4.42] = ['',['RunMET2012A','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
 workflows[4.43] = ['',['RunMu2012A','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
-workflows[4.44] = ['',['RunElectron2012A','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
+workflows[4.44] = ['',['RunElectron2012A','HLTD','RECODreHLTAlCaEle','HARVESTDreHLT','MINIAODDreHLT']]
 workflows[4.45] = ['',['RunJet2012A','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
 
 workflows[4.51] = ['',['RunMinBias2012B','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
 workflows[4.52] = ['',['RunMu2012B','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
 workflows[4.53] = ['',['RunPhoton2012B','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
-workflows[4.54] = ['',['RunEl2012B','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
+workflows[4.54] = ['',['RunEl2012B','HLTD','RECODreHLTAlCaEle','HARVESTDreHLT','MINIAODDreHLT']]
 workflows[4.55] = ['',['RunJet2012B','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
 workflows[4.56] = ['',['ZMuSkim2012B','HLTDSKIM','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
 workflows[4.57] = ['',['ZElSkim2012B','HLTDSKIM','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
@@ -84,7 +84,7 @@
 workflows[4.61] = ['',['RunMinBias2012C','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
 workflows[4.62] = ['',['RunMu2012C','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
 workflows[4.63] = ['',['RunPhoton2012C','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
-workflows[4.64] = ['',['RunEl2012C','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
+workflows[4.64] = ['',['RunEl2012C','HLTD','RECODreHLTAlCaEle','HARVESTDreHLT','MINIAODDreHLT']]
 workflows[4.65] = ['',['RunJet2012C','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
 
 workflows[4.66] = ['',['ZMuSkim2012C','HLTDSKIM','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
@@ -94,7 +94,7 @@
 workflows[4.71] = ['',['RunMinBias2012D','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
 workflows[4.72] = ['',['RunMu2012D','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
 workflows[4.73] = ['',['RunPhoton2012D','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
-workflows[4.74] = ['',['RunEl2012D','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
+workflows[4.74] = ['',['RunEl2012D','HLTD','RECODreHLTAlCaEle','HARVESTDreHLT','MINIAODDreHLT']]
 workflows[4.75] = ['',['RunJet2012D','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
 workflows[4.76] = ['',['ZMuSkim2012D','HLTDSKIM','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
 workflows[4.77] = ['',['ZElSkim2012D','HLTDSKIM','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]

diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py
@@ -906,6 +906,9 @@ def genvalid(fragment,d,suffix='all',fi='',dataSet=''):
           '--scenario':'pp',
           }
 
+dataRecoAlCaEle=merge([{'-s':'RAW2DIGI,L1Reco,RECO,EI,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalCalZElectron+EcalCalWElectron+EcalUncalZElectron+EcalUncalWElectron,DQM'}, dataReco])
+
+
 hltKey='fake'
 from Configuration.HLT.autoHLT import autoHLT
 menu = autoHLT[hltKey]
@@ -918,6 +921,8 @@ def genvalid(fragment,d,suffix='all',fi='',dataSet=''):
 steps['HLTDSKIM']=merge([{'--inputCommands':'"keep *","drop *_*_*_RECO"'},steps['HLTD']])
 
 steps['RECOD']=merge([{'--scenario':'pp',},dataReco])
+steps['RECODAlCaEle']=merge([{'--scenario':'pp',},dataRecoAlCaEle])
+
 steps['RECODSplit']=steps['RECOD'] # finer job splitting  
 steps['RECOSKIMALCA']=merge([{'--inputCommands':'"keep *","drop *_*_*_RECO"'
                               },steps['RECOD']])
@@ -1004,6 +1009,7 @@ def genvalid(fragment,d,suffix='all',fi='',dataSet=''):
 #steps['RECOUP15PROD1']=merge([{ '-s' : 'RAW2DIGI,L1Reco,RECO,EI,DQM:DQMOfflinePOGMC', '--datatier' : 'AODSIM,DQMIO', '--eventcontent' : 'AODSIM,DQM'},step3Up2015Defaults])
 
 steps['RECODreHLT']=merge([{'--hltProcess':'reHLT','--conditions':'auto:run1_data_%s'%menu},steps['RECOD']])
+steps['RECODreHLTAlCaEle']=merge([{'--hltProcess':'reHLT','--conditions':'auto:run1_data_%s'%menu},steps['RECODAlCaEle']])
 
 steps['RECO']=merge([step3Defaults])
 steps['RECODBG']=merge([{'--eventcontent':'RECODEBUG,DQM'},steps['RECO']])