Merge pull request #12989 from deguio/fix50nsWFs

cms-sw · Jan 19, 2016 · 863cad9 · 863cad9
2 parents 217ef94 + d84cfcb
commit 863cad9
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py
@@ -921,7 +921,7 @@ def identityFS(wf):
 steps['HLTDSKIM']=merge([{'--inputCommands':'"keep *","drop *_*_*_RECO"'},steps['HLTD']])
 
 steps['RECOD']=merge([{'--scenario':'pp',},dataReco])
-steps['RECODR1']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias,DQM:@standardDQMRun1+@miniAODDQM'},dataReco])
+steps['RECODR1']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias,DQM:@standardDQMFakeHLT+@miniAODDQM'},dataReco])
 steps['RECODAlCaCalo']=merge([{'--scenario':'pp',},dataRecoAlCaCalo])
 
 hltKey50ns='relval50ns'
@@ -1025,7 +1025,7 @@ def identityFS(wf):
     '--era' : 'Run2_25ns'
     }
 
-step3Up2015Defaults50ns = merge([{'--conditions':'auto:run2_mc_'+autoHLT['relval50ns'],'--era':'Run2_50ns'},step3Up2015Defaults])
+step3Up2015Defaults50ns = merge([{'-s':'RAW2DIGI,L1Reco,RECO,EI,PAT,VALIDATION:@standardValidation+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM','--conditions':'auto:run2_mc_'+autoHLT['relval50ns'],'--era':'Run2_50ns'},step3Up2015Defaults])
 
 step3Up2015DefaultsAlCaCalo = merge([{'-s':'RAW2DIGI,L1Reco,RECO,EI,ALCA:EcalCalZElectron+EcalCalWElectron+EcalUncalZElectron+EcalUncalWElectron+HcalCalIsoTrk,VALIDATION,DQM'},step3Up2015Defaults])
 step3Up2015DefaultsAlCaCalo50ns = merge([{'--conditions':'auto:run2_mc_'+autoHLT['relval50ns'],'--era':'Run2_50ns'},step3Up2015DefaultsAlCaCalo])
@@ -1232,7 +1232,7 @@ def identityFS(wf):
                    '--filetype':'DQM',
                    '--scenario':'pp'}
 
-steps['HARVESTDR1']={'-s':'HARVESTING:@standardDQMRun1+@miniAODDQM',
+steps['HARVESTDR1']={'-s':'HARVESTING:@standardDQMFakeHLT+@miniAODDQM',
                    '--conditions':'auto:run1_data',
                    '--data':'',
                    '--filetype':'DQM',
@@ -1305,7 +1305,7 @@ def identityFS(wf):
 
 steps['HARVESTUP15_PU25']=steps['HARVESTUP15']
 
-steps['HARVESTUP15_PU50']=merge([{'--era' : 'Run2_50ns'},steps['HARVESTUP15']])
+steps['HARVESTUP15_PU50']=merge([{'-s':'HARVESTING:@standardValidation+@standardDQMFakeHLT+@miniAODValidation+@miniAODDQM','--era' : 'Run2_50ns'},steps['HARVESTUP15']])
 
 # unSchHarvestOverrides={'-s':'HARVESTING:@standardValidation+@standardDQM+@miniAODValidation+@miniAODDQM'}
 # steps['HARVESTmAODUP15']=merge([unSchHarvestOverrides,steps['HARVESTUP15']])

diff --git a/Configuration/StandardSequences/python/Harvesting_cff.py b/Configuration/StandardSequences/python/Harvesting_cff.py
@@ -12,7 +12,7 @@
 
 
 dqmHarvesting = cms.Path(DQMOffline_SecondStep*DQMOffline_Certification)
-dqmHarvestingRun1 = cms.Path(DQMOffline_SecondStep_Run1*DQMOffline_Certification)
+dqmHarvestingFakeHLT = cms.Path(DQMOffline_SecondStep_FakeHLT*DQMOffline_Certification)
 
 dqmHarvestingPOG = cms.Path(DQMOffline_SecondStep_PrePOG)
 

diff --git a/DQMOffline/Configuration/python/DQMOffline_SecondStep_cff.py b/DQMOffline/Configuration/python/DQMOffline_SecondStep_cff.py
@@ -67,8 +67,8 @@
                                       DQMMessageLoggerClientSeq *
                                       dqmFastTimerServiceClient)
 
-DQMOffline_SecondStep_Run1 = cms.Sequence( DQMOffline_SecondStep )
-DQMOffline_SecondStep_Run1.remove( HLTMonitoringClient )
+DQMOffline_SecondStep_FakeHLT = cms.Sequence( DQMOffline_SecondStep )
+DQMOffline_SecondStep_FakeHLT.remove( HLTMonitoringClient )
 
 DQMOffline_SecondStep_PrePOGMC = cms.Sequence( bTagCollectorSequenceDATA )
 

diff --git a/DQMOffline/Configuration/python/DQMOffline_cff.py b/DQMOffline/Configuration/python/DQMOffline_cff.py
@@ -71,8 +71,8 @@
                            dqmFastTimerServiceLuminosity *
                            DQMMessageLogger )
 
-DQMOfflineRun1 = cms.Sequence( DQMOffline )
-DQMOfflineRun1.remove( HLTMonitoring )
+DQMOfflineFakeHLT = cms.Sequence( DQMOffline )
+DQMOfflineFakeHLT.remove( HLTMonitoring )
 
 DQMOfflinePrePOGMC = cms.Sequence( pvMonitor *
                                    bTagPlotsDATA *

diff --git a/DQMOffline/Configuration/python/autoDQM.py b/DQMOffline/Configuration/python/autoDQM.py
@@ -26,7 +26,7 @@
                            'DQMHarvestMiniAOD'],
             'standardDQM': ['DQMOffline',
                             'dqmHarvesting'],
-            'standardDQMRun1': ['DQMOfflineRun1',
-                                'dqmHarvestingRun1']
+            'standardDQMFakeHLT': ['DQMOfflineFakeHLT',
+                                   'dqmHarvestingFakeHLT']
             }