Skip to content

Commit

Permalink
Merge pull request #11889 from deguio/addHLTback
Browse files Browse the repository at this point in the history 
re-enable HLTMon sequence everywhere
  • Loading branch information
@davidlange6
davidlange6 committed Dec 11, 2015
2 parents 460922a + cbed35b commit 7943496
Show file tree
Hide file tree
Showing 8 changed files with 121 additions and 98 deletions.
24 changes: 12 additions & 12 deletions Configuration/PyReleaseValidation/python/relval_highstats.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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']]
Expand Down Expand Up @@ -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']]
Expand Down
2 changes: 1 addition & 1 deletion Configuration/PyReleaseValidation/python/relval_production.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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']]

Expand Down
150 changes: 75 additions & 75 deletions Configuration/PyReleaseValidation/python/relval_standard.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,83 +24,83 @@

### data ###
workflows[4.5] = ['', ['RunCosmicsA','RECOCOSD','ALCACOSD','HARVESTDC']]
#workflows[4.6] = ['', ['MinimumBias2010A','RECOD','HARVESTD']]
workflows[4.6] = ['', ['MinimumBias2010A','RECOSKIMALCA','HARVESTD']]
#workflows[4.7] = ['', ['MinimumBias2010B','RECODALCA','HARVESTD']]
#workflows[4.8] = ['', ['WZMuSkim2010A','RECOD','HARVESTD']]
#workflows[4.9] = ['', ['WZEGSkim2010A','RECOD','HARVESTD']]
#workflows[4.10] = ['', ['WZMuSkim2010B','RECOD','HARVESTD']]
#workflows[4.11] = ['', ['WZEGSkim2010B','RECOD','HARVESTD']]

workflows[4.12] = ['', ['RunMinBias2010B','RECOD','HARVESTD']]
#workflows[4.13] = ['', ['RunMu2010B','RECOD','HARVESTD']]
#workflows[4.14] = ['', ['RunElectron2010B','RECOD','HARVESTD']]
#workflows[4.15] = ['', ['RunPhoton2010B','RECOD','HARVESTD']]
#workflows[4.16] = ['', ['RunJet2010B','RECOD','HARVESTD']]


workflows[4.17] = ['', ['RunMinBias2011A','HLTD','RECODreHLT','HARVESTDreHLT','SKIMDreHLT']]
workflows[4.18] = ['', ['RunMu2011A','RECOD','HARVESTD']]
workflows[4.19] = ['', ['RunElectron2011A','RECOD','HARVESTD']]
workflows[4.20] = ['', ['RunPhoton2011A','RECOD','HARVESTD']]
workflows[4.21] = ['', ['RunJet2011A','RECOD','HARVESTD']]
#workflows[4.6] = ['', ['MinimumBias2010A','RECODR1','HARVESTDR1']]
workflows[4.6] = ['', ['MinimumBias2010A','RECOSKIMALCA','HARVESTDR1']]
#workflows[4.7] = ['', ['MinimumBias2010B','RECODR1ALCA','HARVESTDR1']]
#workflows[4.8] = ['', ['WZMuSkim2010A','RECODR1','HARVESTDR1']]
#workflows[4.9] = ['', ['WZEGSkim2010A','RECODR1','HARVESTDR1']]
#workflows[4.10] = ['', ['WZMuSkim2010B','RECODR1','HARVESTDR1']]
#workflows[4.11] = ['', ['WZEGSkim2010B','RECODR1','HARVESTDR1']]

workflows[4.12] = ['', ['RunMinBias2010B','RECODR1','HARVESTDR1']]
#workflows[4.13] = ['', ['RunMu2010B','RECODR1','HARVESTDR1']]
#workflows[4.14] = ['', ['RunElectron2010B','RECODR1','HARVESTDR1']]
#workflows[4.15] = ['', ['RunPhoton2010B','RECODR1','HARVESTDR1']]
#workflows[4.16] = ['', ['RunJet2010B','RECODR1','HARVESTDR1']]


workflows[4.17] = ['', ['RunMinBias2011A','HLTD','RECODR1reHLT','HARVESTDR1reHLT','SKIMDreHLT']]
workflows[4.18] = ['', ['RunMu2011A','RECODR1','HARVESTDR1']]
workflows[4.19] = ['', ['RunElectron2011A','RECODR1','HARVESTDR1']]
workflows[4.20] = ['', ['RunPhoton2011A','RECODR1','HARVESTDR1']]
workflows[4.21] = ['', ['RunJet2011A','RECODR1','HARVESTDR1']]

workflows[4.22] = ['', ['RunCosmics2011A','RECOCOSD','ALCACOSD','SKIMCOSD','HARVESTDC']]
workflows[4.23] = ['',['ValSkim2011A','HLTDSKIM','RECODreHLT','HARVESTDreHLT']]
workflows[4.24] = ['',['WMuSkim2011A','HLTDSKIM','RECODreHLT','HARVESTDreHLT']]
workflows[4.25] = ['',['WElSkim2011A','HLTDSKIM','RECODreHLT','HARVESTDreHLT']]
workflows[4.26] = ['',['ZMuSkim2011A','HLTDSKIM','RECODreHLT','HARVESTDreHLT']]
workflows[4.27] = ['',['ZElSkim2011A','HLTDSKIM','RECODreHLT','HARVESTDreHLT']]
workflows[4.28] = ['',['HighMet2011A','HLTDSKIM','RECODreHLT','HARVESTDreHLT']]

workflows[4.29] = ['', ['RunMinBias2011B','HLTD','RECODreHLT','HARVESTDreHLT','SKIMDreHLT']]
#workflows[4.291] = ['', ['RunMinBias2011B','HLTD','RECODreHLT','HARVESTDreHLT']]
workflows[4.30] = ['', ['RunMu2011B','HLTD','RECODreHLT','HARVESTDreHLT']]
workflows[4.31] = ['', ['RunElectron2011B','HLTD','RECODreHLT','HARVESTDreHLT']]
workflows[4.32] = ['', ['RunPhoton2011B','HLTD','RECODreHLT','HARVESTDreHLT']]
workflows[4.33] = ['', ['RunJet2011B','HLTD','RECODreHLT','HARVESTDreHLT']]

workflows[4.34] = ['',['ValSkim2011B','HLTDSKIM','RECODreHLT','HARVESTDreHLT']]
#workflows[4.35] = ['',['WMuSkim2011B','HLTDSKIM','RECODreHLT','HARVESTDreHLT']]
workflows[4.36] = ['',['WElSkim2011B','HLTDSKIM','RECODreHLT','HARVESTDreHLT']]
workflows[4.37] = ['',['ZMuSkim2011B','HLTDSKIM','RECODreHLT','HARVESTDreHLT']]
workflows[4.38] = ['',['ZElSkim2011B','HLTDSKIM','RECODreHLT','HARVESTDreHLT']]
workflows[4.39] = ['',['HighMet2011B','HLTDSKIM','RECODreHLT','HARVESTDreHLT']]

workflows[4.40] = ['',['RunMinBias2012A','HLTD','RECODreHLT','HARVESTDreHLT']]
workflows[4.41] = ['',['RunTau2012A','HLTD','RECODreHLT','HARVESTDreHLT']]
workflows[4.42] = ['',['RunMET2012A','HLTD','RECODreHLT','HARVESTDreHLT']]
workflows[4.43] = ['',['RunMu2012A','HLTD','RECODreHLT','HARVESTDreHLT']]
workflows[4.44] = ['',['RunElectron2012A','HLTD','RECODreHLT','HARVESTDreHLT']]
workflows[4.45] = ['',['RunJet2012A','HLTD','RECODreHLT','HARVESTDreHLT']]

workflows[4.51] = ['',['RunMinBias2012B','HLTD','RECODreHLT','HARVESTDreHLT']]
workflows[4.52] = ['',['RunMu2012B','HLTD','RECODreHLT','HARVESTDreHLT']]
workflows[4.53] = ['',['RunPhoton2012B','HLTD','RECODreHLT','HARVESTDreHLT']]
workflows[4.54] = ['',['RunEl2012B','HLTD','RECODreHLT','HARVESTDreHLT']]
workflows[4.55] = ['',['RunJet2012B','HLTD','RECODreHLT','HARVESTDreHLT']]
workflows[4.56] = ['',['ZMuSkim2012B','HLTDSKIM','RECODreHLT','HARVESTDreHLT']]
workflows[4.57] = ['',['ZElSkim2012B','HLTDSKIM','RECODreHLT','HARVESTDreHLT']]
workflows[4.58] = ['',['WElSkim2012B','HLTDSKIM','RECODreHLT','HARVESTDreHLT']]

workflows[4.61] = ['',['RunMinBias2012C','HLTD','RECODreHLT','HARVESTDreHLT']]
workflows[4.62] = ['',['RunMu2012C','HLTD','RECODreHLT','HARVESTDreHLT']]
workflows[4.63] = ['',['RunPhoton2012C','HLTD','RECODreHLT','HARVESTDreHLT']]
workflows[4.64] = ['',['RunEl2012C','HLTD','RECODreHLT','HARVESTDreHLT']]
workflows[4.65] = ['',['RunJet2012C','HLTD','RECODreHLT','HARVESTDreHLT']]

workflows[4.66] = ['',['ZMuSkim2012C','HLTDSKIM','RECODreHLT','HARVESTDreHLT']]
workflows[4.67] = ['',['ZElSkim2012C','HLTDSKIM','RECODreHLT','HARVESTDreHLT']]
workflows[4.68] = ['',['WElSkim2012C','HLTDSKIM','RECODreHLT','HARVESTDreHLT']]

workflows[4.71] = ['',['RunMinBias2012D','HLTD','RECODreHLT','HARVESTDreHLT']]
workflows[4.72] = ['',['RunMu2012D','HLTD','RECODreHLT','HARVESTDreHLT']]
workflows[4.73] = ['',['RunPhoton2012D','HLTD','RECODreHLT','HARVESTDreHLT']]
workflows[4.74] = ['',['RunEl2012D','HLTD','RECODreHLT','HARVESTDreHLT']]
workflows[4.75] = ['',['RunJet2012D','HLTD','RECODreHLT','HARVESTDreHLT']]
workflows[4.76] = ['',['ZMuSkim2012D','HLTDSKIM','RECODreHLT','HARVESTDreHLT']]
workflows[4.77] = ['',['ZElSkim2012D','HLTDSKIM','RECODreHLT','HARVESTDreHLT']]
workflows[4.78] = ['',['WElSkim2012D','HLTDSKIM','RECODreHLT','HARVESTDreHLT']]
workflows[4.23] = ['',['ValSkim2011A','HLTDSKIM','RECODR1reHLT','HARVESTDR1reHLT']]
workflows[4.24] = ['',['WMuSkim2011A','HLTDSKIM','RECODR1reHLT','HARVESTDR1reHLT']]
workflows[4.25] = ['',['WElSkim2011A','HLTDSKIM','RECODR1reHLT','HARVESTDR1reHLT']]
workflows[4.26] = ['',['ZMuSkim2011A','HLTDSKIM','RECODR1reHLT','HARVESTDR1reHLT']]
workflows[4.27] = ['',['ZElSkim2011A','HLTDSKIM','RECODR1reHLT','HARVESTDR1reHLT']]
workflows[4.28] = ['',['HighMet2011A','HLTDSKIM','RECODR1reHLT','HARVESTDR1reHLT']]

workflows[4.29] = ['', ['RunMinBias2011B','HLTD','RECODR1reHLT','HARVESTDR1reHLT','SKIMDreHLT']]
#workflows[4.291] = ['', ['RunMinBias2011B','HLTD','RECODR1reHLT','HARVESTDR1reHLT']]
workflows[4.30] = ['', ['RunMu2011B','HLTD','RECODR1reHLT','HARVESTDR1reHLT']]
workflows[4.31] = ['', ['RunElectron2011B','HLTD','RECODR1reHLT','HARVESTDR1reHLT']]
workflows[4.32] = ['', ['RunPhoton2011B','HLTD','RECODR1reHLT','HARVESTDR1reHLT']]
workflows[4.33] = ['', ['RunJet2011B','HLTD','RECODR1reHLT','HARVESTDR1reHLT']]

workflows[4.34] = ['',['ValSkim2011B','HLTDSKIM','RECODR1reHLT','HARVESTDR1reHLT']]
#workflows[4.35] = ['',['WMuSkim2011B','HLTDSKIM','RECODR1reHLT','HARVESTDR1reHLT']]
workflows[4.36] = ['',['WElSkim2011B','HLTDSKIM','RECODR1reHLT','HARVESTDR1reHLT']]
workflows[4.37] = ['',['ZMuSkim2011B','HLTDSKIM','RECODR1reHLT','HARVESTDR1reHLT']]
workflows[4.38] = ['',['ZElSkim2011B','HLTDSKIM','RECODR1reHLT','HARVESTDR1reHLT']]
workflows[4.39] = ['',['HighMet2011B','HLTDSKIM','RECODR1reHLT','HARVESTDR1reHLT']]

workflows[4.40] = ['',['RunMinBias2012A','HLTD','RECODR1reHLT','HARVESTDR1reHLT']]
workflows[4.41] = ['',['RunTau2012A','HLTD','RECODR1reHLT','HARVESTDR1reHLT']]
workflows[4.42] = ['',['RunMET2012A','HLTD','RECODR1reHLT','HARVESTDR1reHLT']]
workflows[4.43] = ['',['RunMu2012A','HLTD','RECODR1reHLT','HARVESTDR1reHLT']]
workflows[4.44] = ['',['RunElectron2012A','HLTD','RECODR1reHLT','HARVESTDR1reHLT']]
workflows[4.45] = ['',['RunJet2012A','HLTD','RECODR1reHLT','HARVESTDR1reHLT']]

workflows[4.51] = ['',['RunMinBias2012B','HLTD','RECODR1reHLT','HARVESTDR1reHLT']]
workflows[4.52] = ['',['RunMu2012B','HLTD','RECODR1reHLT','HARVESTDR1reHLT']]
workflows[4.53] = ['',['RunPhoton2012B','HLTD','RECODR1reHLT','HARVESTDR1reHLT']]
workflows[4.54] = ['',['RunEl2012B','HLTD','RECODR1reHLT','HARVESTDR1reHLT']]
workflows[4.55] = ['',['RunJet2012B','HLTD','RECODR1reHLT','HARVESTDR1reHLT']]
workflows[4.56] = ['',['ZMuSkim2012B','HLTDSKIM','RECODR1reHLT','HARVESTDR1reHLT']]
workflows[4.57] = ['',['ZElSkim2012B','HLTDSKIM','RECODR1reHLT','HARVESTDR1reHLT']]
workflows[4.58] = ['',['WElSkim2012B','HLTDSKIM','RECODR1reHLT','HARVESTDR1reHLT']]

workflows[4.61] = ['',['RunMinBias2012C','HLTD','RECODR1reHLT','HARVESTDR1reHLT']]
workflows[4.62] = ['',['RunMu2012C','HLTD','RECODR1reHLT','HARVESTDR1reHLT']]
workflows[4.63] = ['',['RunPhoton2012C','HLTD','RECODR1reHLT','HARVESTDR1reHLT']]
workflows[4.64] = ['',['RunEl2012C','HLTD','RECODR1reHLT','HARVESTDR1reHLT']]
workflows[4.65] = ['',['RunJet2012C','HLTD','RECODR1reHLT','HARVESTDR1reHLT']]

workflows[4.66] = ['',['ZMuSkim2012C','HLTDSKIM','RECODR1reHLT','HARVESTDR1reHLT']]
workflows[4.67] = ['',['ZElSkim2012C','HLTDSKIM','RECODR1reHLT','HARVESTDR1reHLT']]
workflows[4.68] = ['',['WElSkim2012C','HLTDSKIM','RECODR1reHLT','HARVESTDR1reHLT']]

workflows[4.71] = ['',['RunMinBias2012D','HLTD','RECODR1reHLT','HARVESTDR1reHLT']]
workflows[4.72] = ['',['RunMu2012D','HLTD','RECODR1reHLT','HARVESTDR1reHLT']]
workflows[4.73] = ['',['RunPhoton2012D','HLTD','RECODR1reHLT','HARVESTDR1reHLT']]
workflows[4.74] = ['',['RunEl2012D','HLTD','RECODR1reHLT','HARVESTDR1reHLT']]
workflows[4.75] = ['',['RunJet2012D','HLTD','RECODR1reHLT','HARVESTDR1reHLT']]
workflows[4.76] = ['',['ZMuSkim2012D','HLTDSKIM','RECODR1reHLT','HARVESTDR1reHLT']]
workflows[4.77] = ['',['ZElSkim2012D','HLTDSKIM','RECODR1reHLT','HARVESTDR1reHLT']]
workflows[4.78] = ['',['WElSkim2012D','HLTDSKIM','RECODR1reHLT','HARVESTDR1reHLT']]

workflows[140.51] = ['',['RunHI2010','REPACKHID','RECOHID11St3','HARVESTDHI']]
workflows[140.52] = ['',['RunHI2010','RECOHID10','RECOHIR10D11','HARVESTDHI']]
Expand Down
19 changes: 15 additions & 4 deletions Configuration/PyReleaseValidation/python/relval_steps.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -921,6 +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['RECODAlCaCalo']=merge([{'--scenario':'pp',},dataRecoAlCaCalo])

hltKey50ns='relval50ns'
Expand All @@ -942,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',
Expand All @@ -959,19 +962,19 @@ def identityFS(wf):
steps['RECOHID10']['--eventcontent']+=',REPACKRAW'

steps['TIER0']=merge([{'--customise':'Configuration/DataProcessing/RecoTLR.customisePrompt',
'-s':'RAW2DIGI,L1Reco,RECO,EI,ALCAPRODUCER:@allForPrompt,DQM,ENDJOB',
'-s':'RAW2DIGI,L1Reco,RECO,EI,ALCAPRODUCER:@allForPrompt,DQM:@allForPrompt,ENDJOB',
'--datatier':'RECO,AOD,ALCARECO,DQMIO',
'--eventcontent':'RECO,AOD,ALCARECO,DQM',
'--process':'RECO'
},dataReco])
steps['TIER0EXP']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,EI,ALCAPRODUCER:@allForExpress,DQM,ENDJOB',
steps['TIER0EXP']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,EI,ALCAPRODUCER:@allForExpress,DQM:@express,ENDJOB',
'--datatier':'ALCARECO,DQMIO',
'--eventcontent':'ALCARECO,DQM',
'--customise':'Configuration/DataProcessing/RecoTLR.customiseExpress',
},steps['TIER0']])

steps['TIER0EXPHI']={ '--conditions':'auto:run1_data',
'-s':'RAW2DIGI,L1Reco,RECO,ALCAPRODUCER:@allForExpressHI,DQM,ENDJOB',
'-s':'RAW2DIGI,L1Reco,RECO,ALCAPRODUCER:@allForExpressHI,DQM:@express,ENDJOB',
'--datatier':'ALCARECO,DQMIO',
'--eventcontent':'ALCARECO,DQM',
'--data':'',
Expand Down Expand Up @@ -1046,6 +1049,7 @@ def identityFS(wf):
#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['RECODR1reHLT']=merge([{'--hltProcess':'reHLT','--conditions':'auto:run1_data_%s'%menu},steps['RECODR1']])
steps['RECODreHLTAlCaCalo']=merge([{'--hltProcess':'reHLT','--conditions':'auto:run1_data_%s'%menu},steps['RECODAlCaCalo']])

steps['RECODR2_25nsreHLT']=merge([{'--hltProcess':'reHLT'},steps['RECODR2_25ns']])
Expand Down Expand Up @@ -1228,13 +1232,20 @@ def identityFS(wf):
'--filetype':'DQM',
'--scenario':'pp'}

steps['HARVESTDR1']={'-s':'HARVESTING:@standardDQMRun1+@miniAODDQM',
'--conditions':'auto:run1_data',
'--data':'',
'--filetype':'DQM',
'--scenario':'pp'}

steps['HARVESTDreHLT'] = merge([ {'--conditions':'auto:run1_data_%s'%menu}, steps['HARVESTD'] ])
steps['HARVESTDR1reHLT'] = merge([ {'--conditions':'auto:run1_data_%s'%menu}, steps['HARVESTDR1'] ])
steps['HARVESTDR2_50nsreHLT'] = merge([ {'--conditions':'auto:run2_data_'+menuR2_50ns,}, steps['HARVESTD'] ])
steps['HARVESTDR2_25nsreHLT'] = merge([ {'--conditions':'auto:run2_data_'+menuR2_25ns,}, steps['HARVESTD'] ])

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',
Expand Down
2 changes: 2 additions & 0 deletions Configuration/StandardSequences/python/Harvesting_cff.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@


dqmHarvesting = cms.Path(DQMOffline_SecondStep*DQMOffline_Certification)
dqmHarvestingRun1 = cms.Path(DQMOffline_SecondStep_Run1*DQMOffline_Certification)

dqmHarvestingPOG = cms.Path(DQMOffline_SecondStep_PrePOG)

dqmHarvestingPOGMC = cms.Path( DQMOffline_SecondStep_PrePOGMC )
Expand Down
8 changes: 6 additions & 2 deletions DQMOffline/Configuration/python/DQMOffline_SecondStep_cff.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,18 @@
DQMOffline_SecondStep_PrePOG *
DQMMessageLoggerClientSeq )

HLTMonitoringClient = cms.Sequence()

DQMOffline_SecondStep = cms.Sequence( dqmRefHistoRootFileGetter *
DQMOffline_SecondStep_PreDPG *
DQMOffline_SecondStep_PrePOG *
HLTMonitoringClient *
DQMMessageLoggerClientSeq *
dqmFastTimerServiceClient)

DQMOffline_SecondStep_Run1 = cms.Sequence( DQMOffline_SecondStep )
DQMOffline_SecondStep_Run1.remove( HLTMonitoringClient )

DQMOffline_SecondStep_PrePOGMC = cms.Sequence( bTagCollectorSequenceDATA )

DQMOffline_SecondStepPOGMC = cms.Sequence( dqmRefHistoRootFileGetter *
Expand Down Expand Up @@ -116,6 +122,4 @@

DQMHarvestBTag = cms.Sequence( bTagCollectorSequenceDATA )

HLTMonitoringClient = cms.Sequence()

DQMHarvestMiniAOD = cms.Sequence( dataCertificationJetMETSequence )
8 changes: 6 additions & 2 deletions DQMOffline/Configuration/python/DQMOffline_cff.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,17 @@
DQMOfflinePOG = cms.Sequence( DQMOfflinePrePOG *
DQMMessageLogger )

HLTMonitoring = cms.Sequence( OfflineHLTMonitoring )

DQMOffline = cms.Sequence( DQMOfflinePreDPG *
DQMOfflinePrePOG *
HLTMonitoring *
dqmFastTimerServiceLuminosity *
DQMMessageLogger )

DQMOfflineRun1 = cms.Sequence( DQMOffline )
DQMOfflineRun1.remove( HLTMonitoring )

DQMOfflinePrePOGMC = cms.Sequence( pvMonitor *
bTagPlotsDATA *
dqmPhysics )
Expand Down Expand Up @@ -124,7 +130,5 @@
DQMOfflineEGamma = cms.Sequence( egammaDQMOffline )

DQMOfflineBTag = cms.Sequence( bTagPlotsDATA )

HLTMonitoring = cms.Sequence( OfflineHLTMonitoring )

DQMOfflineMiniAOD = cms.Sequence( miniAODDQMSequence*jetMETDQMOfflineSourceMiniAOD*tracksDQMMiniAOD )
6 changes: 4 additions & 2 deletions DQMOffline/Configuration/python/autoDQM.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@
'allForPrompt': ['@common+@muon+@hcal+@jetmet+@ecal',
'@common+@muon+@hcal+@jetmet+@ecal'],
'miniAODDQM': ['DQMOfflineMiniAOD',
'DQMHarvestMiniAOD'],
'DQMHarvestMiniAOD'],
'standardDQM': ['DQMOffline',
'dqmHarvesting']
'dqmHarvesting'],
'standardDQMRun1': ['DQMOfflineRun1',
'dqmHarvestingRun1']
}

0 comments on commit 7943496

Please sign in to comment.