Merge pull request #11541 from hengne/from-CMSSW_7_5_3_patch1_relval_…

…newcond_rebase

relval scripts update, 2015c data workflows, a couple of fixes.

Configuration/AlCa/python/autoCond.py

@@ -2,31 +2,31 @@
 
     ### NEW KEYS ###
     # GlobalTag for MC production with perfectly aligned and calibrated detector for Run1
-    'run1_design'       :   '75X_mcRun1_design_v4',
+    'run1_design'       :   '75X_mcRun1_design_v5',
     # GlobalTag for MC production (pp collisions) with realistic alignment and calibrations for Run1
-    'run1_mc'           :   '75X_mcRun1_realistic_v4',
+    'run1_mc'           :   '75X_mcRun1_realistic_v5',
     # GlobalTag for MC production (Heavy Ions collisions) with realistic alignment and calibrations for Run1
-    'run1_mc_hi'        :   '75X_mcRun1_HeavyIon_v4',
+    'run1_mc_hi'        :   '75X_mcRun1_HeavyIon_v5',
     # GlobalTag for MC production (p-Pb collisions) with realistic alignment and calibrations for Run1
-    'run1_mc_pa'        :   '75X_mcRun1_pA_v4',
+    'run1_mc_pa'        :   '75X_mcRun1_pA_v5',
     # GlobalTag for MC production with perfectly aligned and calibrated detector for Run2
-    'run2_design'       :   '75X_mcRun2_design_v5',
+    'run2_design'       :   '75X_mcRun2_design_v7',
     # GlobalTag for MC production with pessimistic alignment and calibrations for Run2
-    'run2_mc_50ns'      :   '75X_mcRun2_startup_v4',
+    'run2_mc_50ns'      :   '75X_mcRun2_startup_v6',
     #GlobalTag for MC production with optimistic alignment and calibrations for Run2
-    'run2_mc'           :   '75X_mcRun2_asymptotic_v5',
+    'run2_mc'           :   '75X_mcRun2_asymptotic_v7',
     # GlobalTag for MC production (Heavy Ions collisions) with optimistic alignment and calibrations for Run2
-    'run2_mc_hi'        :   '75X_mcRun2_HeavyIon_v4',
+    'run2_mc_hi'        :   '75X_mcRun2_HeavyIon_v5',
     # GlobalTag for Run1 data reprocessing
-    'run1_data'         :   '75X_dataRun1_v5',
+    'run1_data'         :   '75X_dataRun1_v6',
     # GlobalTag for Run2 data reprocessing
-    'run2_data'         :   '75X_dataRun2_v5',
+    'run2_data'         :   '75X_dataRun2_v6',
     # GlobalTag for Run1 HLT: it points to the online GT
-    'run1_hlt'          :   '75X_dataRun1_HLT_frozen_v2',
+    'run1_hlt'          :   '75X_dataRun1_HLT_frozen_v3',
     # GlobalTag for Run2 HLT: it points to the online GT
-    'run2_hlt'          :   '75X_dataRun2_HLT_frozen_v2',
+    'run2_hlt'          :   '75X_dataRun2_HLT_frozen_v3',
     # GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2017
-    'phase1_2017_design' :  '75X_upgrade2017_design_v1',
+    'phase1_2017_design' :  '75X_upgrade2017_design_v2',
     # GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2019
     'phase1_2019_design' :  'DES19_70_V2', # placeholder (GT not meant for standard RelVal) 
     # GlobalTag for MC production with perfectly aligned and calibrated detector for Phase2

Configuration/HLT/python/autoHLT.py

@@ -2,8 +2,8 @@
 #   cmsDiver.py hlt -s HLT:@relval
 
 autoHLT = {
-  'frozen25ns' : '25ns14e33_v3',
-  'relval25ns' : '25ns14e33_v3',
+  'frozen25ns' : '25ns14e33_v4',
+  'relval25ns' : '25ns14e33_v4',
   'frozen50ns' : '50ns_5e33_v3',
   'relval50ns' : '50ns_5e33_v3',
   'fake'       : 'Fake',

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'
@@ -250,7 +250,7 @@ def prepare(self,mReader, directories, mode='init'):
                                 if len(nextHasDSInput.run):
                                     chainDict['nowmTasklist'][-1]['RunWhitelist']=nextHasDSInput.run
                                 if len(nextHasDSInput.ls):
-                                    chainDict['nowmTasklist'][-1]['lumis']=nextHasDSInput.ls
+                                    chainDict['nowmTasklist'][-1]['LumiList']=nextHasDSInput.ls
                                 #print "what is s",s[2][index]
                                 if '--data' in s[2][index] and nextHasDSInput.label:
                                     thisLabel+='_RelVal_%s'%nextHasDSInput.label

Configuration/PyReleaseValidation/python/MatrixUtil.py

@@ -51,11 +51,11 @@ def expandLsInterval(lumis):
 
 import json
 with open(jsonFile2015) as data_file:
-    data_json = json.load(data_file)
+    data_json2015 = json.load(data_file)
 
 # return a portion of the 2015 golden json
 # LS for a full run by default; otherwise a subset of which you determined the size
-def selectedLS(list_runs=[],maxNum=-1,l_json=data_json):
+def selectedLS(list_runs=[],maxNum=-1,l_json=data_json2015):
     # print "maxNum is %s"%(maxNum)
     if type(list_runs[0]) !=int:
         print "ERROR: list_runs must be a list of intergers"
@@ -67,8 +67,9 @@ def selectedLS(list_runs=[],maxNum=-1,l_json=data_json):
         if str(run) in l_json.keys():
             # print "run %s is there"%(run)
             runNumber = run
+            # print "Doing lumi-section selection for run %s: "%(run)
             for LSsegment in l_json[str(run)] :
-                print LSsegment
+                # print LSsegment
                 ls_count += (LSsegment[-1] - LSsegment[0] + 1)
                 if (ls_count > maxNum) & (maxNum != -1):
                     break
@@ -80,7 +81,7 @@ def selectedLS(list_runs=[],maxNum=-1,l_json=data_json):
                 # print "total LS so far  %s    -   grow %s"%(ls_count,local_dict)
             #local_dict[runNumber] = [1,2,3]
         else:
-            print "run %s is NOT there\n\n"%(run)
+            print "run %s NOT present in json %s\n\n"%(run,l_json)
         # print "++    %s"%(local_dict)
 
     if ( len(local_dict.keys()) > 0 ) :

Configuration/PyReleaseValidation/python/relval_standard.py

@@ -105,14 +105,24 @@
 workflows[140.52] = ['',['RunHI2010','RECOHID10','RECOHIR10D11','HARVESTDHI']]
 workflows[140.53] = ['',['RunHI2011','RECOHID11','HARVESTDHI']]
 
-### run2 ###
-workflows[134.71] = ['',['RunHLTPhy2015B','HLTDR2','RECODR2reHLT','HARVESTDR2reHLT']]
-workflows[134.72] = ['',['RunDoubleEG2015B','HLTDR2','RECODR2reHLT','HARVESTDR2reHLT']]
-workflows[134.73] = ['',['RunDoubleMuon2015B','HLTDR2','RECODR2reHLT','HARVESTDR2reHLT']]
-workflows[134.74] = ['',['RunJetHT2015B','HLTDR2','RECODR2reHLT','HARVESTDR2reHLT']]
-workflows[134.75] = ['',['RunMET2015B','HLTDR2','RECODR2reHLT','HARVESTDR2reHLT']]
-workflows[134.76] = ['',['RunMuonEG2015B','HLTDR2','RECODR2reHLT','HARVESTDR2reHLT']]
-
+### run2 2015B 50ns ###
+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']]
+
+### run 2015C 25ns ###
+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']]
+##
 
 ### fastsim ###
 workflows[5.1] = ['TTbar', ['TTbarFS','HARVESTFS']]
@@ -203,7 +213,7 @@
 workflows[1324] = ['', ['TTbarLepton_13','DIGIUP15','RECOUP15','HARVESTUP15']]
 workflows[1335] = ['', ['Wjet_Pt_80_120_13','DIGIUP15','RECOUP15','HARVESTUP15']]
 workflows[1336] = ['', ['Wjet_Pt_3000_3500_13','DIGIUP15','RECOUP15','HARVESTUP15']]
-#workflows[1337] = ['', ['LM1_sfts_13','DIGIUP15','RECOUP15','HARVESTUP15']]
+workflows[1337] = ['', ['SMS-T1tttt_mGl-1500_mLSP-100_13','DIGIUP15','RECOUP15','HARVESTUP15']]
 workflows[1338] = ['', ['QCD_FlatPt_15_3000HS_13','DIGIUP15','RECOUP15','HARVESTUP15']]
 
 workflows[1309]  = ['', ['Higgs200ChargedTaus_13','DIGIUP15','RECOUP15','HARVESTUP15']]
@@ -218,7 +228,7 @@
 workflows[1350] = ['', ['JpsiMuMu_Pt-15','DIGIUP15','RECOUP15','HARVESTUP15']]
 workflows[1351] = ['', ['BuToKstarPsi2S_13','DIGIUP15','RECOUP15','HARVESTUP15']]
 
-workflows[1325] = ['', ['TTbar_13','DIGIUP15','RECOUP15','HARVESTUP15','ALCATT']]
+workflows[1325] = ['', ['TTbar_13','DIGIUP15','RECOUP15','HARVESTUP15','ALCATTUP15']]
 workflows[1326] = ['', ['WE_13','DIGIUP15','RECOUP15','HARVESTUP15']]
 workflows[1329] = ['', ['ZEE_13','DIGIUP15','RECOUP15','HARVESTUP15']]
 workflows[1331] = ['', ['ZTT_13','DIGIUP15','RECOUP15','HARVESTUP15']]
@@ -228,7 +238,7 @@
 
 workflows[1307]= ['', ['CosmicsSPLoose_UP15','DIGIHAL','RECOHAL','ALCAHAL','HARVESTHAL']]
 workflows[1308]  = ['', ['BeamHalo_13','DIGIHAL','RECOHAL','ALCAHAL','HARVESTHAL']]
-workflows[1311] = ['', ['MinBias_13','DIGIUP15','RECOMINUP15','HARVESTUP15','ALCAMIN']]
+workflows[1311] = ['', ['MinBias_13','DIGIUP15','RECOMINUP15','HARVESTUP15','ALCAMINUP15']]
 workflows[1328] = ['', ['QCD_Pt_80_120_13','DIGIUP15','RECOUP15','HARVESTUP15']]
 workflows[1327] = ['', ['WM_13','DIGIUP15','RECOUP15','HARVESTUP15']]
 workflows[1330] = ['', ['ZMM_13','DIGIUP15','RECOUP15','HARVESTUP15']]