Merge pull request #8242 from franzoni/miniAodValidation-CMSSW_7_4_X_…

…2015-03-12-1400 MiniAod validation and DQM
cms-sw · Mar 14, 2015 · 1340a67 · 1340a67
2 parents d9de358 + 02883cc
commit 1340a67
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py
@@ -973,7 +973,7 @@ def genvalid(fragment,d,suffix='all',fi='',dataSet=''):
                  '--customise'    :'SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1'
                  }
 
-unSchOverrides={'--runUnscheduled':'','-s':'RAW2DIGI,L1Reco,RECO,EI,PAT,VALIDATION,DQM','--eventcontent':'RECOSIM,MINIAODSIM,DQM','--datatier':'GEN-SIM-RECO,MINIAODSIM,DQMIO'}
+unSchOverrides={'--runUnscheduled':'','-s':'RAW2DIGI,L1Reco,RECO,EI,PAT,VALIDATION:@standardValidation+@miniAODValidation,DQM:@standardDQM+@miniAODDQM','--eventcontent':'RECOSIM,MINIAODSIM,DQM','--datatier':'GEN-SIM-RECO,MINIAODSIM,DQMIO'}
 step3Up2015DefaultsUnsch = merge([unSchOverrides,step3Up2015Defaults])
 step3DefaultsUnsch = merge([unSchOverrides,step3Defaults])
 
@@ -999,8 +999,8 @@ def genvalid(fragment,d,suffix='all',fi='',dataSet=''):
 steps['RECOUP15_PU25']=merge([PU25,step3Up2015Defaults])
 steps['RECOUP15_PU50']=merge([PU50,step3Up2015Defaults50ns])
 
-steps['RECOUNSCH']=merge([step3DefaultsUnsch])
-steps['RECOUP15UNSCH']=merge([step3Up2015DefaultsUnsch])
+#steps['RECOmAOD']=merge([step3DefaultsUnsch])
+steps['RECOmAODUP15']=merge([step3Up2015DefaultsUnsch])
 
 
 # for premixing: no --pileup_input for replay; GEN-SIM only available for in-time event, from FEVTDEBUGHLT previous step
@@ -1184,6 +1184,9 @@ def genvalid(fragment,d,suffix='all',fi='',dataSet=''):
                    '--filetype':'DQM',
                    }
 
+unSchHarvestOverrides={'-s':'HARVESTING:@standardValidation+@standardDQM+@miniAODValidation+@miniAODDQM'}
+steps['HARVESTmAODUP15']=merge([unSchHarvestOverrides,steps['HARVESTUP15']])
+
 steps['HARVESTUP15FS']={'-s':'HARVESTING:validationHarvestingFS',
                         '--conditions':'auto:run2_mc',
                         '--mc':'',

diff --git a/Configuration/PyReleaseValidation/python/relval_unsch.py b/Configuration/PyReleaseValidation/python/relval_unsch.py
@@ -11,5 +11,5 @@
 
 # 50 ns at 8 TeV
 #needs a new GT to work
-#workflows[10025] = ['', ['TTbar','DIGI','RECOUNSCH','HARVEST','ALCATT']]
-workflows[11325] = ['', ['TTbar_13','DIGIUP15','RECOUP15UNSCH','HARVESTUP15','ALCATT']]
+#workflows[10025] = ['', ['TTbar','DIGI','RECOmAOD','HARVEST','ALCATT']]
+workflows[11325] = ['TTbar_13_unsch', ['TTbar_13','DIGIUP15','RECOmAODUP15','HARVESTmAODUP15','ALCATT']]