Merge pull request #11708 from hengne/from-CMSSW_7_6_0_pre6_relval_re…

…base

Relval update after 7_6_0_pre6

Configuration/PyReleaseValidation/python/MatrixInjector.py

@@ -62,7 +62,7 @@ def __init__(self,opt,mode='init',options=''):
                 self.DbsUrl = "https://"+self.wmagent+"/dbs/int/global/DBSReader"
 
         if not self.dqmgui:
-            self.dqmgui="https://cmsweb.cern.ch/dqm/relval;https://cmsweb-testbed.cern.ch/dqm/relval"
+            self.dqmgui="https://cmsweb.cern.ch/dqm/relval"
         #couch stuff
         self.couch = 'https://'+self.wmagent+'/couchdb'
 #        self.couchDB = 'reqmgr_config_cache'
@@ -177,6 +177,10 @@ def prepare(self,mReader, directories, mode='init'):
             wmsplit['TTbar_13_ID']=1
             wmsplit['SingleMuPt10FS_ID']=1
             wmsplit['TTbarFS_ID']=1
+            wmsplit['RECODR250nsreHLT']=1
+            wmsplit['RECODR225nsreHLT']=1
+            wmsplit['HLTDR250ns']=3
+            wmsplit['HLTDR225ns']=3
 
             #import pprint
             #pprint.pprint(wmsplit)            

Configuration/PyReleaseValidation/python/relval_pileup.py

@@ -24,7 +24,7 @@
 # 50 ns at 13 TeV and POSTLS1
 workflows[50200]=['',['ZEE_13','DIGIUP15_PU50','RECOUP15_PU50','HARVESTUP15_PU50']]
 workflows[50202]=['',['TTbar_13','DIGIUP15_PU50','RECOUP15_PU50','HARVESTUP15_PU50']]
-workflows[50203]=['',['H130GGgluonfusion_13','DIGIUP15_PU50','RECOUP15_PU50','HARVESTUP15_PU50']]
+workflows[50203]=['',['H125GGgluonfusion_13','DIGIUP15_PU50','RECOUP15_PU50','HARVESTUP15_PU50']]
 workflows[50204]=['',['QQH1352T_13','DIGIUP15_PU50','RECOUP15_PU50','HARVESTUP15_PU50']]
 workflows[50205]=['',['ZTT_13','DIGIUP15_PU50','RECOUP15_PU50','HARVESTUP15_PU50']]
 workflows[50206]=['',['ZMM_13','DIGIUP15_PU50','RECOUP15_PU50','HARVESTUP15_PU50']]
@@ -34,7 +34,7 @@
 # 25 ns at 13 TeV and POSTLS1
 workflows[25200]=['',['ZEE_13','DIGIUP15_PU25','RECOUP15_PU25','HARVESTUP15_PU25']]
 workflows[25202]=['',['TTbar_13','DIGIUP15_PU25','RECOUP15_PU25','HARVESTUP15_PU25']]
-workflows[25203]=['',['H130GGgluonfusion_13','DIGIUP15_PU25','RECOUP15_PU25','HARVESTUP15_PU25']]
+workflows[25203]=['',['H125GGgluonfusion_13','DIGIUP15_PU25','RECOUP15_PU25','HARVESTUP15_PU25']]
 workflows[25204]=['',['QQH1352T_13','DIGIUP15_PU25','RECOUP15_PU25','HARVESTUP15_PU25']]
 workflows[25205]=['',['ZTT_13','DIGIUP15_PU25','RECOUP15_PU25','HARVESTUP15_PU25']]
 workflows[25206]=['',['ZMM_13','DIGIUP15_PU25','RECOUP15_PU25','HARVESTUP15_PU25']]
@@ -45,7 +45,7 @@
 #fastsim
 workflows[25400] = ['ZEE_13',["FS_ZEE_13_UP15_PU25","HARVESTUP15FS","MINIAODMCUP15FS"]]
 workflows[25402] = ['TTbar_13',["FS_TTbar_13_UP15_PU25","HARVESTUP15FS","MINIAODMCUP15FS"]]
-workflows[25403] = ['H130GGgluonfusion_13',["FS_H130GGgluonfusion_13_UP15_PU25","HARVESTUP15FS","MINIAODMCUP15FS"]]
+workflows[25403] = ['H125GGgluonfusion_13',["FS_H125GGgluonfusion_13_UP15_PU25","HARVESTUP15FS","MINIAODMCUP15FS"]]
 #workflow[25404]
 workflows[25405] = ['ZTT_13',["FS_ZTT_13_UP15_PU25","HARVESTUP15FS","MINIAODMCUP15FS"]]
 workflows[25406] = ['ZMM_13',["FS_ZMM_13_UP15_PU25","HARVESTUP15FS","MINIAODMCUP15FS"]]

Configuration/PyReleaseValidation/python/relval_premix.py

@@ -17,7 +17,7 @@
 # 25ns pile up overlay using premix
 workflows[250200]=['',['ZEE_13','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVESTUP15_PU25']]
 workflows[250202]=['',['TTbar_13','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVESTUP15_PU25']]
-workflows[250203]=['',['H130GGgluonfusion_13','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVESTUP15_PU25']]
+workflows[250203]=['',['H125GGgluonfusion_13','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVESTUP15_PU25']]
 workflows[250204]=['',['QQH1352T_13','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVESTUP15_PU25']]
 workflows[250205]=['',['ZTT_13','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVESTUP15_PU25']]
 workflows[250206]=['',['ZMM_13','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVESTUP15_PU25']]
@@ -27,7 +27,7 @@
 # 50ns pile up overlay using premix
 workflows[500200]=['',['ZEE_13','DIGIPRMXUP15_PU50','RECOPRMXUP15_PU50','HARVESTUP15_PU50']]
 workflows[500202]=['',['TTbar_13','DIGIPRMXUP15_PU50','RECOPRMXUP15_PU50','HARVESTUP15_PU50']]
-workflows[500203]=['',['H130GGgluonfusion_13','DIGIPRMXUP15_PU50','RECOPRMXUP15_PU50','HARVESTUP15_PU50']]
+workflows[500203]=['',['H125GGgluonfusion_13','DIGIPRMXUP15_PU50','RECOPRMXUP15_PU50','HARVESTUP15_PU50']]
 workflows[500204]=['',['QQH1352T_13','DIGIPRMXUP15_PU50','RECOPRMXUP15_PU50','HARVESTUP15_PU50']]
 workflows[500205]=['',['ZTT_13','DIGIPRMXUP15_PU50','RECOPRMXUP15_PU50','HARVESTUP15_PU50']]
 workflows[500206]=['',['ZMM_13','DIGIPRMXUP15_PU50','RECOPRMXUP15_PU50','HARVESTUP15_PU50']]
@@ -44,7 +44,7 @@
 ## signal + PU
 workflows[250400] = ['ZEE_13',["FS_ZEE_13_PRMXUP15_PU25","HARVESTUP15FS","MINIAODMCUP15FS"]]
 workflows[250402] = ['TTbar_13',["FS_TTbar_13_PRMXUP15_PU25","HARVESTUP15FS","MINIAODMCUP15FS"]]
-workflows[250403] = ['H130GGgluonfusion_13',["FS_H130GGgluonfusion_13_PRMXUP15_PU25","HARVESTUP15FS","MINIAODMCUP15FS"]]
+workflows[250403] = ['H125GGgluonfusion_13',["FS_H125GGgluonfusion_13_PRMXUP15_PU25","HARVESTUP15FS","MINIAODMCUP15FS"]]
 workflows[250405] = ['ZTT_13',["FS_ZTT_13_PRMXUP15_PU25","HARVESTUP15FS","MINIAODMCUP15FS"]]
 workflows[250406] = ['ZMM_13',["FS_ZMM_13_PRMXUP15_PU25","HARVESTUP15FS","MINIAODMCUP15FS"]]
 workflows[250407] = ['NUGUN_UP15',["FS_NuGun_UP15_PRMXUP15_PU25","HARVESTUP15FS","MINIAODMCUP15FS"]]

Configuration/PyReleaseValidation/python/relval_standard.py

@@ -107,24 +107,45 @@
 workflows[140.53] = ['',['RunHI2011','RECOHID11','HARVESTDHI']]
 
 ### run2 2015B 50ns ###
-workflows[134.701] = ['',['RunHLTPhy2015B','HLTDR250ns','RECODR250nsreHLT','HARVESTDR2reHLT']]
-workflows[134.702] = ['',['RunDoubleEG2015B','HLTDR250ns','RECODR250nsreHLT','HARVESTDR2reHLT']]
-workflows[134.703] = ['',['RunDoubleMuon2015B','HLTDR250ns','RECODR250nsreHLT','HARVESTDR2reHLT']]
-workflows[134.704] = ['',['RunJetHT2015B','HLTDR250ns','RECODR250nsreHLT','HARVESTDR2reHLT']]
-workflows[134.705] = ['',['RunMET2015B','HLTDR250ns','RECODR250nsreHLT','HARVESTDR2reHLT']]
-workflows[134.706] = ['',['RunMuonEG2015B','HLTDR250ns','RECODR250nsreHLT','HARVESTDR2reHLT']]
+workflows[134.701] = ['',['RunHLTPhy2015B','HLTDR250ns','RECODR250nsreHLT','HARVESTDR250nsreHLT']]
+workflows[134.702] = ['',['RunDoubleEG2015B','HLTDR250ns','RECODR250nsreHLT','HARVESTDR250nsreHLT']]
+workflows[134.703] = ['',['RunDoubleMuon2015B','HLTDR250ns','RECODR250nsreHLT','HARVESTDR250nsreHLT']]
+workflows[134.704] = ['',['RunJetHT2015B','HLTDR250ns','RECODR250nsreHLT','HARVESTDR250nsreHLT']]
+workflows[134.705] = ['',['RunMET2015B','HLTDR250ns','RECODR250nsreHLT','HARVESTDR250nsreHLT']]
+workflows[134.706] = ['',['RunMuonEG2015B','HLTDR250ns','RECODR250nsreHLT','HARVESTDR250nsreHLT']]
+workflows[134.707] = ['',['RunSingleEl2015B','HLTDR250ns','RECODR250nsreHLT','HARVESTDR250nsreHLT']]
+workflows[134.708] = ['',['RunSingleMu2015B','HLTDR250ns','RECODR250nsreHLT','HARVESTDR250nsreHLT']]
+workflows[134.709] = ['',['RunSinglePh2015B','HLTDR250ns','RECODR250nsreHLT','HARVESTDR250nsreHLT']]
+workflows[134.710] = ['',['RunZeroBias2015B','HLTDR250ns','RECODR250nsreHLT','HARVESTDR250nsreHLT']]
 
 ### run 2015C 25ns ###
-workflows[134.801] = ['',['RunHLTPhy2015C','HLTDR225ns','RECODR225nsreHLT','HARVESTDR2reHLT']]
-workflows[134.802] = ['',['RunDoubleEG2015C','HLTDR225ns','RECODR225nsreHLT','HARVESTDR2reHLT']]
-workflows[134.803] = ['',['RunDoubleMuon2015C','HLTDR225ns','RECODR225nsreHLT','HARVESTDR2reHLT']]
-workflows[134.804] = ['',['RunJetHT2015C','HLTDR225ns','RECODR225nsreHLT','HARVESTDR2reHLT']]
-workflows[134.805] = ['',['RunMET2015C','HLTDR225ns','RECODR225nsreHLT','HARVESTDR2reHLT']]
-workflows[134.806] = ['',['RunMuonEG2015C','HLTDR225ns','RECODR225nsreHLT','HARVESTDR2reHLT']]
-workflows[134.807] = ['',['RunDoubleEGPrpt2015C','HLTDR225ns','RECODR225nsreHLT','HARVESTDR2reHLT']]
-workflows[134.808] = ['',['RunSingleMuPrpt2015C','HLTDR225ns','RECODR225nsreHLT','HARVESTDR2reHLT']]
-
-
+workflows[134.801] = ['',['RunHLTPhy2015C','HLTDR225ns','RECODR225nsreHLT','HARVESTDR225nsreHLT']]
+workflows[134.802] = ['',['RunDoubleEG2015C','HLTDR225ns','RECODR225nsreHLT','HARVESTDR225nsreHLT']]
+workflows[134.803] = ['',['RunDoubleMuon2015C','HLTDR225ns','RECODR225nsreHLT','HARVESTDR225nsreHLT']]
+workflows[134.804] = ['',['RunJetHT2015C','HLTDR225ns','RECODR225nsreHLT','HARVESTDR225nsreHLT']]
+workflows[134.805] = ['',['RunMET2015C','HLTDR225ns','RECODR225nsreHLT','HARVESTDR225nsreHLT']]
+workflows[134.806] = ['',['RunMuonEG2015C','HLTDR225ns','RECODR225nsreHLT','HARVESTDR225nsreHLT']]
+workflows[134.807] = ['',['RunDoubleEGPrpt2015C','HLTDR225ns','RECODR225nsreHLT','HARVESTDR225nsreHLT']]
+workflows[134.808] = ['',['RunSingleMuPrpt2015C','HLTDR225ns','RECODR225nsreHLT','HARVESTDR225nsreHLT']]
+workflows[134.809] = ['',['RunSingleEl2015C','HLTDR225ns','RECODR225nsreHLT','HARVESTDR225nsreHLT']]
+workflows[134.810] = ['',['RunSingleMu2015C','HLTDR225ns','RECODR225nsreHLT','HARVESTDR225nsreHLT']]
+workflows[134.811] = ['',['RunSinglePh2015C','HLTDR225ns','RECODR225nsreHLT','HARVESTDR225nsreHLT']]
+workflows[134.812] = ['',['RunZeroBias2015C','HLTDR225ns','RECODR225nsreHLT','HARVESTDR225nsreHLT']]
+
+
+### run 2015D 25ns ###
+workflows[134.901] = ['',['RunHLTPhy2015D','HLTDR225ns','RECODR225nsreHLT','HARVESTDR225nsreHLT']]
+workflows[134.902] = ['',['RunDoubleEG2015D','HLTDR225ns','RECODR225nsreHLT','HARVESTDR225nsreHLT']]
+workflows[134.903] = ['',['RunDoubleMuon2015D','HLTDR225ns','RECODR225nsreHLT','HARVESTDR225nsreHLT']]
+workflows[134.904] = ['',['RunJetHT2015D','HLTDR225ns','RECODR225nsreHLT','HARVESTDR225nsreHLT']]
+workflows[134.905] = ['',['RunMET2015D','HLTDR225ns','RECODR225nsreHLT','HARVESTDR225nsreHLT']]
+workflows[134.906] = ['',['RunMuonEG2015D','HLTDR225ns','RECODR225nsreHLT','HARVESTDR225nsreHLT']]
+workflows[134.907] = ['',['RunDoubleEGPrpt2015D','HLTDR225ns','RECODR225nsreHLT','HARVESTDR225nsreHLT']]
+workflows[134.908] = ['',['RunSingleMuPrpt2015D','HLTDR225ns','RECODR225nsreHLT','HARVESTDR225nsreHLT']]
+workflows[134.909] = ['',['RunSingleEl2015D','HLTDR225ns','RECODR225nsreHLT','HARVESTDR225nsreHLT']]
+workflows[134.910] = ['',['RunSingleMu2015D','HLTDR225ns','RECODR225nsreHLT','HARVESTDR225nsreHLT']]
+workflows[134.911] = ['',['RunSinglePh2015D','HLTDR225ns','RECODR225nsreHLT','HARVESTDR225nsreHLT']]
+workflows[134.912] = ['',['RunZeroBias2015D','HLTDR225ns','RECODR225nsreHLT','HARVESTDR225nsreHLT']]
 
 ### fastsim ###
 workflows[5.1] = ['TTbar', ['TTbarFS','HARVESTFS']]
@@ -143,7 +164,7 @@
 workflows[135.4] = ['ZEE_13', ['ZEEFS_13','HARVESTUP15FS','MINIAODMCUP15FS']]
 workflows[135.5] = ['ZTT_13',['ZTTFS_13','HARVESTUP15FS','MINIAODMCUP15FS']]
 workflows[135.6] = ['QCD_FlatPt_15_3000_13', ['QCDFlatPt153000FS_13','HARVESTUP15FS','MINIAODMCUP15FS']]
-workflows[135.7] = ['H130GGgluonfusion_13', ['H130GGgluonfusionFS_13','HARVESTUP15FS','MINIAODMCUP15FS']]
+workflows[135.7] = ['H125GGgluonfusion_13', ['H125GGgluonfusionFS_13','HARVESTUP15FS','MINIAODMCUP15FS']]
 workflows[135.9] = ['ZMM_13',['ZMMFS_13','HARVESTUP15FS','MINIAODMCUP15FS']]
 workflows[135.11] = ['SMS-T1tttt_mGl-1500_mLSP-100_13', ['SMS-T1tttt_mGl-1500_mLSP-100FS_13','HARVESTUP15FS','MINIAODMCUP15FS']]
 workflows[135.12] = ['QCD_Pt_80_120_13', ['QCD_Pt_80_120FS_13','HARVESTUP15FS','MINIAODMCUP15FS']]
@@ -234,7 +255,7 @@
 workflows[1326] = ['', ['WE_13','DIGIUP15','RECOUP15','HARVESTUP15']]
 workflows[1329] = ['', ['ZEE_13','DIGIUP15','RECOUP15','HARVESTUP15']]
 workflows[1331] = ['', ['ZTT_13','DIGIUP15','RECOUP15','HARVESTUP15']]
-workflows[1332] = ['', ['H130GGgluonfusion_13','DIGIUP15','RECOUP15','HARVESTUP15']]
+workflows[1332] = ['', ['H125GGgluonfusion_13','DIGIUP15','RECOUP15','HARVESTUP15']]
 workflows[1333] = ['', ['PhotonJets_Pt_10_13','DIGIUP15','RECOUP15','HARVESTUP15']]
 workflows[1334] = ['', ['QQH1352T_13','DIGIUP15','RECOUP15','HARVESTUP15']]