Fix CMSSW_7_0_X to CMSSW_7_1_X forward port

[ktf]

This will forward port to CMSSW_7_1_X the following PR:

• pat::Muon best track embedding fix (7.0.X) Copied from #4359 #4446
• New trees v1 cmssw 7 0 x #4392
• fixed getters to be able to read from miniAOD #4431

while it will ignore (mostly due to large amount of conflicts):

• miniaod integration to runTheMatrix for 70X #4255
• Gf update premix input from cmssw 7 0 6 #4351

[cmsbuild]

A new Pull Request was created by @ktf (Giulio Eulisse) for CMSSW_7_1_X.

Fix CMSSW_7_0_X to CMSSW_7_1_X forward port

It involves the following packages:

DataFormats/PatCandidates
MuonAnalysis/MomentumScaleCalibration

@nclopezo, @vadler, @cmsbuild, @Degano, @monttj can you please review it and eventually sign? Thanks.
@mmusich, @frmeier, @argiro this is something you requested to watch as well.
You can sign-off by replying to this message having '+1' in the first line of your reply.
You can reject by replying to this message having '-1' in the first line of your reply.
@nclopezo, @ktf you are the release manager for this.
You can merge this pull request by typing 'merge' in the first line of your comment.

[ktf]

Notice I had to ignore #4255 because of large conflicts (see below) if you think I should systematically take one side of the conflict, I can do that automatically, otherwise it needs to be done by hand.

@arizzi @gpetruc @franzoni

diff --cc Configuration/PyReleaseValidation/python/MatrixReader.py
index cc5e147,a09656a..0000000
--- a/Configuration/PyReleaseValidation/python/MatrixReader.py
+++ b/Configuration/PyReleaseValidation/python/MatrixReader.py
@@@ -47,7 -47,8 +47,12 @@@ class MatrixReader(object)
                               'relval_ged': 'ged-',
                               'relval_upgrade':'upg-',
                               'relval_identity':'id-',
++<<<<<<< HEAD
 +                             'relval_machine': 'mach-'
++=======
+                              'relval_premix' : 'pmx-' ,
+                              'relval_miniaod' : 'miniaod-' ,
++>>>>>>> 572426ed7c58b995822774b9b2779e34b3f422f8
                               }

          self.files = ['relval_standard' ,
@@@ -58,7 -59,8 +63,12 @@@
                        'relval_ged',
                        'relval_upgrade',
                        'relval_identity',
++<<<<<<< HEAD
 +                      'relval_machine'
++=======
+                       'relval_premix',
+                       'relval_miniaod'
++>>>>>>> 572426ed7c58b995822774b9b2779e34b3f422f8
                        ]

          self.relvalModule = None
diff --cc Configuration/PyReleaseValidation/python/relval_pileup.py
index dfdd1d8,c6d64b5..0000000
--- a/Configuration/PyReleaseValidation/python/relval_pileup.py
+++ b/Configuration/PyReleaseValidation/python/relval_pileup.py
@@@ -9,9 -8,9 +8,9 @@@ workflows = Matrix(
  # if no explicit name/label given for the workflow (first arg),
  # the name of step1 will be used

- # 50 ns at 8 TeV
+ # FullSim, 8TeV, 50ns
  workflows[200]=['',['ZEE','DIGIPU1','RECOPU1','HARVEST']]
 -workflows[201]=['',['ZmumuJets_Pt_20_300','DIGIPU1','RECOPU1','HARVEST']]
 +workflows[201]=['',['ZmumuJets_Pt_20_300','DIGIPU2','RECOPU2','HARVEST']]
  workflows[202]=['',['TTbar','DIGIPU1','RECOPU1','HARVEST']]
  workflows[203]=['',['H130GGgluonfusion','DIGIPU1','RECOPU1','HARVEST']]
  workflows[204]=['',['QQH1352T_Tauola','DIGIPU1','RECOPU1','HARVEST']]
@@@ -26,26 -26,20 +26,45 @@@ workflows[302]=['Pyquen_ZeemumuJets_pt1
  workflows[400]=['TTbar',['TTbarFSPU','HARVESTFS']]
  workflows[401]=['TTbarNewMix',['TTbarFSPU2','HARVESTFS']]

++<<<<<<< HEAD
 +
 +# 50 ns at 13 TeV and POSTLS1
 +workflows[50200]=['',['ZEE_13','DIGIUP15_PU50','RECOUP15_PU50','HARVEST','MINIAODMC50']]
 +workflows[50201]=['',['ZmumuJets_Pt_20_300_13','DIGIUP15_PU50','RECOUP15_PU50','HARVEST','MINIAODMC50']]
 +workflows[50202]=['',['TTbar_13','DIGIUP15_PU50','RECOUP15_PU50','HARVEST','MINIAODMC50']]
 +workflows[50203]=['',['H130GGgluonfusion_13','DIGIUP15_PU50','RECOUP15_PU50','HARVEST','MINIAODMC50']]
 +workflows[50204]=['',['QQH1352T_Tauola_13','DIGIUP15_PU50','RECOUP15_PU50','HARVEST','MINIAODMC50']]
 +workflows[50205]=['',['ZTT_13','DIGIUP15_PU50','RECOUP15_PU50','HARVEST','MINIAODMC50']]
 +
 +
 +# 25 ns at 13 TeV and POSTLS1
 +workflows[25200]=['',['ZEE_13','DIGIUP15_PU25','RECOUP15_PU25','HARVEST','MINIAODMC']]
 +#
 +workflows[25201]=['',['ZmumuJets_Pt_20_300_13','DIGIUP15_PU25','RECOUP15_PU25','HARVEST','MINIAODMC']]
 +# cannot be recycled => GEN SIM NEEDED!
++=======
+ # FullSim, 13TeV, 50ns, POSTLS1
+ workflows[50200]=['',['ZEE_13','DIGIUP15_PU50','RECOUP15_PU50','HARVEST','MINIAODMC50']]
+ workflows[50201]=['',['ZmumuJets_Pt_20_300_13','DIGIUP15_PU50','RECOUP15_PU50','HARVEST','MINIAODMC50']]
+ workflows[50202]=['',['TTbar_13','DIGIUP15_PU50','RECOUP15_PU50','HARVEST','MINIAODMC','MINIAODMC50']]
+ workflows[50203]=['',['H130GGgluonfusion_13','DIGIUP15_PU50','RECOUP15_PU50','HARVEST','MINIAODMC50']]
+ workflows[50204]=['',['QQH1352T_Tauola_13','DIGIUP15_PU50','RECOUP15_PU50','HARVEST','MINIAODMC50']]
+ workflows[50205]=['',['ZTT_13','DIGIUP15_PU50','RECOUP15_PU50','HARVEST','MINIAODMC50']]
+ workflows[50206]=['',['ZMM_13','DIGIUP15_PU50','RECOUP15_PU50','HARVEST','MINIAODMC50']]
+ 
+ # FullSim, 13TeV, 25ns, POSTLS1
+ workflows[25200]=['',['ZEE_13','DIGIUP15_PU25','RECOUP15_PU25','HARVEST','MINIAODMC']]
+ workflows[25201]=['',['ZmumuJets_Pt_20_300_13','DIGIUP15_PU25','RECOUP15_PU25','HARVEST','MINIAODMC']]
++>>>>>>> 572426ed7c58b995822774b9b2779e34b3f422f8
  workflows[25202]=['',['TTbar_13','DIGIUP15_PU25','RECOUP15_PU25','HARVEST','MINIAODMC']]
  workflows[25203]=['',['H130GGgluonfusion_13','DIGIUP15_PU25','RECOUP15_PU25','HARVEST','MINIAODMC']]
  workflows[25204]=['',['QQH1352T_Tauola_13','DIGIUP15_PU25','RECOUP15_PU25','HARVEST','MINIAODMC']]
  workflows[25205]=['',['ZTT_13','DIGIUP15_PU25','RECOUP15_PU25','HARVEST','MINIAODMC']]
++<<<<<<< HEAD
 +
 +#fastsim
 +workflows[25400]=['TTbar_13_AVE10',['TTbarFSPU13AVE10','HARVESTFS','MINIAODMCFS']]
 +workflows[25401]=['TTbar_13_AVE20',['TTbarFSPU13AVE20','HARVESTFS','MINIAODMCFS']]
++=======
+ workflows[25206]=['',['ZMM_13','DIGIUP15_PU25','RECOUP15_PU25','HARVEST','MINIAODMC']]
++>>>>>>> 572426ed7c58b995822774b9b2779e34b3f422f8
diff --cc Configuration/PyReleaseValidation/python/relval_standard.py
index f9b9372,ac714a8..0000000
--- a/Configuration/PyReleaseValidation/python/relval_standard.py
+++ b/Configuration/PyReleaseValidation/python/relval_standard.py
@@@ -40,61 -39,61 +39,73 @@@ workflows[4.21] = ['', ['RunJet2011A','

  workflows[4.22] = ['', ['RunCosmics2011A','RECOCOSD','ALCACOSD','SKIMCOSD','HARVESTDC']]

- workflows[4.23] = ['',['ValSkim2011A','RECOSKIM','HARVESTD']]
- workflows[4.24] = ['',['WMuSkim2011A','RECOSKIM','HARVESTD']]
- workflows[4.25] = ['',['WElSkim2011A','RECOSKIM','HARVESTD']]
- workflows[4.26] = ['',['ZMuSkim2011A','RECOSKIM','HARVESTD']]
- workflows[4.27] = ['',['ZElSkim2011A','RECOSKIM','HARVESTD']]
- workflows[4.28] = ['',['HighMet2011A','RECOSKIM','HARVESTD']]
- 
- 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','RECOSKIM','HARVESTD']]
- workflows[4.35] = ['',['WMuSkim2011B','RECOSKIM','HARVESTD']]
- workflows[4.36] = ['',['WElSkim2011B','RECOSKIM','HARVESTD']]
- workflows[4.37] = ['',['ZMuSkim2011B','RECOSKIM','HARVESTD']]
- workflows[4.38] = ['',['ZElSkim2011B','RECOSKIM','HARVESTD']]
- workflows[4.39] = ['',['HighMet2011B','RECOSKIM','HARVESTD']]
- 
- 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','RECOSKIM','HARVESTD']]
- workflows[4.57] = ['',['ZElSkim2012B','RECOSKIM','HARVESTD']]
- workflows[4.58] = ['',['WElSkim2012B','RECOSKIM','HARVESTD']]
- 
- 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.23] = ['',['ValSkim2011A','RECOSKIM','HARVESTD','MINIAODDATAStep2']]
+ workflows[4.24] = ['',['WMuSkim2011A','RECOSKIM','HARVESTD','MINIAODDATAStep2']]
+ workflows[4.25] = ['',['WElSkim2011A','RECOSKIM','HARVESTD','MINIAODDATAStep2']]
+ workflows[4.26] = ['',['ZMuSkim2011A','RECOSKIM','HARVESTD','MINIAODDATAStep2']]
+ workflows[4.27] = ['',['ZElSkim2011A','RECOSKIM','HARVESTD','MINIAODDATAStep2']]
+ workflows[4.28] = ['',['HighMet2011A','RECOSKIM','HARVESTD','MINIAODDATAStep2']]
+ 
+ workflows[4.29] = ['', ['RunMinBias2011B','HLTD','RECODreHLT','HARVESTDreHLT','SKIMDreHLT','MINIAODDATA']]
+ #workflows[4.291] = ['', ['RunMinBias2011B','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDATA']]
+ workflows[4.30] = ['', ['RunMu2011B','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDATA']]
+ workflows[4.31] = ['', ['RunElectron2011B','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDATA']]
+ workflows[4.32] = ['', ['RunPhoton2011B','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDATA']]
+ workflows[4.33] = ['', ['RunJet2011B','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDATA']]
+ 
+ workflows[4.34] = ['',['ValSkim2011B','RECOSKIM','HARVESTD','MINIAODDATAStep2']]
+ workflows[4.35] = ['',['WMuSkim2011B','RECOSKIM','HARVESTD','MINIAODDATAStep2']]
+ workflows[4.36] = ['',['WElSkim2011B','RECOSKIM','HARVESTD','MINIAODDATAStep2']]
+ workflows[4.37] = ['',['ZMuSkim2011B','RECOSKIM','HARVESTD','MINIAODDATAStep2']]
+ workflows[4.38] = ['',['ZElSkim2011B','RECOSKIM','HARVESTD','MINIAODDATAStep2']]
+ workflows[4.39] = ['',['HighMet2011B','RECOSKIM','HARVESTD','MINIAODDATAStep2']]
+ 
+ workflows[4.40] = ['',['RunMinBias2012A','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDATA']]
+ workflows[4.41] = ['',['RunTau2012A','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDATA']]
+ workflows[4.42] = ['',['RunMET2012A','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDATA']]
+ workflows[4.43] = ['',['RunMu2012A','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDATA']]
+ workflows[4.44] = ['',['RunElectron2012A','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDATA']]
+ workflows[4.45] = ['',['RunJet2012A','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDATA']]
+ 
+ workflows[4.51] = ['',['RunMinBias2012B','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDATA']]
+ workflows[4.52] = ['',['RunMu2012B','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDATA']]
+ workflows[4.53] = ['',['RunPhoton2012B','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDATA']]
+ workflows[4.54] = ['',['RunEl2012B','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDATA']]
+ workflows[4.55] = ['',['RunJet2012B','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDATA']]
+ workflows[4.56] = ['',['ZMuSkim2012B','RECOSKIM','HARVESTD','MINIAODDATAStep2']]
+ workflows[4.57] = ['',['ZElSkim2012B','RECOSKIM','HARVESTD','MINIAODDATAStep2']]
+ workflows[4.58] = ['',['WElSkim2012B','RECOSKIM','HARVESTD','MINIAODDATAStep2']]
+ 
+ workflows[4.61] = ['',['RunMinBias2012C','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDATA']]
+ workflows[4.62] = ['',['RunMu2012C','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDATA']]
+ workflows[4.63] = ['',['RunPhoton2012C','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDATA']]
+ workflows[4.64] = ['',['RunEl2012C','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDATA']]
+ workflows[4.65] = ['',['RunJet2012C','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDATA']]
  # workflows[4.69] = ['',['RunZBias2012C','RECODSplit','HARVESTD']] # needed but can't be tested because of DBS => das hanging forever
++<<<<<<< HEAD
 +workflows[4.66] = ['',['ZMuSkim2012C','RECOSKIM','HARVESTD']]
 +workflows[4.67] = ['',['ZElSkim2012C','RECOSKIM','HARVESTD']]
 +workflows[4.68] = ['',['WElSkim2012C','RECOSKIM','HARVESTD']]
++=======
+ workflows[4.66] = ['',['ZMuSkim2012C','RECOSKIM','HARVESTD','MINIAODDATAStep2']]
+ workflows[4.67] = ['',['ZElSkim2012C','RECOSKIM','HARVESTD','MINIAODDATAStep2']]
+ workflows[4.68] = ['',['WElSkim2012C','RECOSKIM','HARVESTD','MINIAODDATAStep2']]
++>>>>>>> 572426ed7c58b995822774b9b2779e34b3f422f8

  workflows[4.71] = ['',['RunMinBias2012D','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDATA']]
  workflows[4.72] = ['',['RunMu2012D','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDATA']]
  workflows[4.73] = ['',['RunPhoton2012D','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDATA']]
  workflows[4.74] = ['',['RunEl2012D','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDATA']]
  workflows[4.75] = ['',['RunJet2012D','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDATA']]
++<<<<<<< HEAD
 +workflows[4.76] = ['',['ZMuSkim2012D','RECOSKIM','HARVESTD']]
 +workflows[4.77] = ['',['ZElSkim2012D','RECOSKIM','HARVESTD']]
 +workflows[4.78] = ['',['WElSkim2012D','RECOSKIM','HARVESTD']]
++=======
+ workflows[4.76] = ['',['ZMuSkim2012D','RECOSKIM','HARVESTD','MINIAODDATAStep2']]
+ workflows[4.77] = ['',['ZElSkim2012D','RECOSKIM','HARVESTD','MINIAODDATAStep2']]
+ workflows[4.78] = ['',['WElSkim2012D','RECOSKIM','HARVESTD','MINIAODDATAStep2']]
++>>>>>>> 572426ed7c58b995822774b9b2779e34b3f422f8

  workflows[140.51] = ['',['RunHI2010','REPACKHID','RECOHID11St3','HARVESTDHI']]
  workflows[140.52] = ['',['RunHI2010','RECOHID10','RECOHIR10D11','HARVESTDHI']]
@@@ -117,11 -114,9 +128,11 @@@ workflows[135.3] = ['SingleMuPt100', ['
  workflows[135.4] = ['ZEE_13', ['ZEEFS_13','HARVESTUP15FS']]
  workflows[135.5] = ['ZTT_13',['ZTTFS_13','HARVESTUP15FS']]

- workflows[135.6]  = ['QCD_FlatPt_15_3000_13', ['QCDFlatPt153000FS_13','HARVESTUP15FS']]
+ workflows[135.6] = ['QCD_FlatPt_15_3000_13', ['QCDFlatPt153000FS_13','HARVESTUP15FS']]
  workflows[135.7] = ['H130GGgluonfusion_13', ['H130GGgluonfusionFS_13','HARVESTUP15FS']]

 +### MinBias fastsim_13 TeV for mixing ###
 +workflows[135.8] = ['',['MinBiasFS_13_ForMixing']]

  ### standard set ###
  ## particle guns
@@@ -184,42 -179,41 +196,55 @@@ workflows[44] = ['', ['ZpEE_2250_8TeV_T
  workflows[45] = ['', ['ZpTT_1500_8TeV_Tauola','DIGI','RECO','HARVEST']]

  ## 13 TeV and postLS1 geometry
- 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[1338] = ['', ['QCD_FlatPt_15_3000HS_13','DIGIUP15','RECOUP15','HARVESTUP15']]
- 
- workflows[1309]  = ['', ['Higgs200ChargedTaus_13','DIGIUP15','RECOUP15','HARVESTUP15']]
- workflows[1313] = ['', ['QCD_Pt_3000_3500_13','DIGIUP15','RECOUP15','HARVESTUP15']]
- workflows[1339] = ['', ['QCD_Pt_600_800_13','DIGIUP15','RECOUP15','HARVESTUP15']]
- workflows[1323] = ['', ['JpsiMM_13','DIGIUP15','RECOUP15','HARVESTUP15']]
- workflows[1325] = ['', ['TTbar_13','DIGIUP15','RECOUP15','HARVESTUP15','ALCATT']]
- workflows[1326] = ['', ['WE_13','DIGIUP15','RECOUP15','HARVESTUP15']]
- workflows[1329] = ['', ['ZEE_13','DIGIUP15','RECOUP15','HARVESTUP15','ALCAELE']]
- workflows[1331] = ['', ['ZTT_13','DIGIUP15','RECOUP15','HARVESTUP15']]
- workflows[1332] = ['', ['H130GGgluonfusion_13','DIGIUP15','RECOUP15','HARVESTUP15']]
- workflows[1333] = ['', ['PhotonJets_Pt_10_13','DIGIUP15','RECOUP15','HARVESTUP15']]
- workflows[1334] = ['', ['QQH1352T_Tauola_13','DIGIUP15','RECOUP15','HARVESTUP15']]
+ workflows[1324] = ['', ['TTbarLepton_13','DIGIUP15','RECOUP15','HARVESTUP15','MINIAODMC50']]
+ workflows[1335] = ['', ['Wjet_Pt_80_120_13','DIGIUP15','RECOUP15','HARVESTUP15','MINIAODMC50']]
+ workflows[1336] = ['', ['Wjet_Pt_3000_3500_13','DIGIUP15','RECOUP15','HARVESTUP15','MINIAODMC50']]
+ workflows[1337] = ['', ['LM1_sfts_13','DIGIUP15','RECOUP15','HARVESTUP15','MINIAODMC50']]
+ workflows[1338] = ['', ['QCD_FlatPt_15_3000HS_13','DIGIUP15','RECOUP15','HARVESTUP15','MINIAODMC50']]
+ 
+ workflows[1309] = ['', ['Higgs200ChargedTaus_13','DIGIUP15','RECOUP15','HARVESTUP15','MINIAODMC50']]
+ workflows[1313] = ['', ['QCD_Pt_3000_3500_13','DIGIUP15','RECOUP15','HARVESTUP15','MINIAODMC50']]
+ workflows[1339] = ['', ['QCD_Pt_600_800_13','DIGIUP15','RECOUP15','HARVESTUP15','MINIAODMC50']]
+ workflows[1323] = ['', ['JpsiMM_13','DIGIUP15','RECOUP15','HARVESTUP15','MINIAODMC50']]
+ workflows[1325] = ['', ['TTbar_13','DIGIUP15','RECOUP15','HARVESTUP15','ALCATT','MINIAODMC50']]
+ workflows[1326] = ['', ['WE_13','DIGIUP15','RECOUP15','HARVESTUP15','MINIAODMC50']]
+ workflows[1329] = ['', ['ZEE_13','DIGIUP15','RECOUP15','HARVESTUP15','ALCAELE','MINIAODMC50']]
+ workflows[1330] = ['', ['ZMM_13','DIGIUP15','RECOUP15','HARVESTUP15','MINIAODMC50']]
+ workflows[1331] = ['', ['ZTT_13','DIGIUP15','RECOUP15','HARVESTUP15','MINIAODMC50']]
+ workflows[1332] = ['', ['H130GGgluonfusion_13','DIGIUP15','RECOUP15','HARVESTUP15','MINIAODMC50']]
+ workflows[1333] = ['', ['PhotonJets_Pt_10_13','DIGIUP15','RECOUP15','HARVESTUP15','MINIAODMC50']]
+ workflows[1334] = ['', ['QQH1352T_Tauola_13','DIGIUP15','RECOUP15','HARVESTUP15','MINIAODMC50']]
  workflows[1346] = ['', ['ZmumuJets_Pt_20_300_13']]

++<<<<<<< HEAD
 +workflows[1307]  = ['', ['Cosmics_UP15','DIGIHAL','RECOHAL','ALCAHAL','HARVESTHAL']]
 +workflows[1308]  = ['', ['BeamHalo_13','DIGIHAL','RECOHAL','ALCAHAL','HARVESTHAL']]
 +workflows[1311] = ['', ['MinBias_13','DIGIUP15','RECOMINUP15','HARVESTUP15','ALCAMIN']]
 +workflows[1328] = ['', ['QCD_Pt_80_120_13','DIGIUP15','RECOUP15','HARVESTUP15']]
 +workflows[1327] = ['', ['WM_13','DIGIUP15','RECOUP15','HARVESTUP15']]
 +workflows[1330] = ['', ['ZMM_13','DIGIUP15','RECOUP15','HARVESTUP15']]
- 
- workflows[1310] = ['', ['ADDMonoJet_d3MD3_13','DIGIUP15','RECOUP15','HARVESTUP15']]
- workflows[1312] = ['', ['ZpMM_13','DIGIUP15','RECOUP15','HARVESTUP15']]
- workflows[1314] = ['', ['WpM_13','DIGIUP15','RECOUP15','HARVESTUP15']]
- 
++=======
+ workflows[1308] = ['', ['BeamHalo_13','DIGIHAL','RECOHAL','ALCAHAL','HARVESTHAL']]
+ workflows[1311] = ['', ['MinBias_13','DIGIUP15','RECOMINUP15','HARVESTUP15','ALCAMIN','MINIAODMC50']]
+ workflows[1328] = ['', ['QCD_Pt_80_120_13','DIGIUP15','RECOUP15','HARVESTUP15','MINIAODMC50']]
+ workflows[1327] = ['', ['WM_13','DIGIUP15','RECOUP15','HARVESTUP15','MINIAODMC50']]
++>>>>>>> 572426ed7c58b995822774b9b2779e34b3f422f8
+ 
+ workflows[1310] = ['', ['ADDMonoJet_d3MD3_13','DIGIUP15','RECOUP15','HARVESTUP15','MINIAODMC50']]
+ workflows[1312] = ['', ['ZpMM_13','DIGIUP15','RECOUP15','HARVESTUP15','MINIAODMC50']]
+ workflows[1314] = ['', ['WpM_13','DIGIUP15','RECOUP15','HARVESTUP15','MINIAODMC50']]
+ 
++<<<<<<< HEAD
 +workflows[1340] = ['', ['Pythia6_BuJpsiK_TuneZ2star_13','DIGIUP15','RECOUP15','HARVESTUP15']]
 +workflows[1341] = ['', ['RSKKGluon_m3000GeV_13','DIGIUP15','RECOUP15','HARVESTUP15']]
- 
- workflows[1343] = ['', ['ZpMM_2250_13TeV_Tauola','DIGIUP15','RECOUP15','HARVESTUP15']]
- workflows[1344] = ['', ['ZpEE_2250_13TeV_Tauola','DIGIUP15','RECOUP15','HARVESTUP15']]
- workflows[1345] = ['', ['ZpTT_1500_13TeV_Tauola','DIGIUP15','RECOUP15','HARVESTUP15']]
++=======
+ workflows[1340] = ['', ['RelValPythia6_BuJpsiK_TuneZ2star_13','DIGIUP15','RECOUP15','HARVESTUP15','MINIAODMC50']]
+ workflows[1341] = ['', ['RelValRSKKGluon_m3000GeV_13','DIGIUP15','RECOUP15','HARVESTUP15','MINIAODMC50']]
++>>>>>>> 572426ed7c58b995822774b9b2779e34b3f422f8
+ 
+ workflows[1343] = ['', ['ZpMM_2250_13TeV_Tauola','DIGIUP15','RECOUP15','HARVESTUP15','MINIAODMC50']]
+ workflows[1344] = ['', ['ZpEE_2250_13TeV_Tauola','DIGIUP15','RECOUP15','HARVESTUP15','MINIAODMC50']]
+ workflows[1345] = ['', ['ZpTT_1500_13TeV_Tauola','DIGIUP15','RECOUP15','HARVESTUP15','MINIAODMC50']]

  ### HI test ###
  workflows[140] = ['',['HydjetQ_MinBias_2760GeV','DIGIHI','RECOHI','HARVESTHI']]
diff --cc Configuration/PyReleaseValidation/python/relval_steps.py
index b557309,377515a..0000000
--- a/Configuration/PyReleaseValidation/python/relval_steps.py
+++ b/Configuration/PyReleaseValidation/python/relval_steps.py
@@@ -101,8 -100,7 +100,12 @@@ def merge(dictlist,TELL=False)
          reducedlist.append(d)
          return merge(reducedlist,TELL)

++<<<<<<< HEAD
 +
 +# step1 gensim: for run1
++=======
+ # step1 gensim
++>>>>>>> 572426ed7c58b995822774b9b2779e34b3f422f8
  step1Defaults = {'--relval'      : None, # need to be explicitly set
                   '-s'            : 'GEN,SIM',
                   '-n'            : 10,
@@@ -110,15 -108,19 +113,25 @@@
                   '--datatier'    : 'GEN-SIM',
                   '--eventcontent': 'RAWSIM',
                   }
++<<<<<<< HEAD
 +# step1 gensim: for postLS1
++=======
+ 
+ # 2015 step1 gensim
++>>>>>>> 572426ed7c58b995822774b9b2779e34b3f422f8
  step1Up2015Defaults = {'-s' : 'GEN,SIM',
                               '-n'            : 10,
 -                             '--conditions'  : 'auto:upgradePLS1', # 25ns GT
 +                             '--conditions'  : 'auto:run2_mc',
                               '--datatier'    : 'GEN-SIM',
                               '--eventcontent': 'FEVTDEBUG',
 -                             '--geometry'    : 'Extended2015',
                               '--magField'    : '38T_PostLS1',
                               '--customise'   : 'SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1'
                               }
++<<<<<<< HEAD
++=======
+ # differences between upgradePLS150ns and upgradePLS1 ought to be irrelevant for GEN-SIM
+ #step1Up2015Defaults50ns = merge([{'--conditions':'auto:upgradePLS150ns'},step1Up2015Defaults])
++>>>>>>> 572426ed7c58b995822774b9b2779e34b3f422f8

  steps = Steps()
  #wmsplit = {}
@@@ -181,9 -180,8 +191,8 @@@ steps['ZElSkim2011B']={'INPUT':InputInf
  steps['HighMet2011B']={'INPUT':InputInfo(dataSet='/Jet/Run2011B-HighMET-19Nov2011-v1/RAW-RECO',label='hMet2011B',run=Run2011BSk)}

  steps['RunHI2010']={'INPUT':InputInfo(dataSet='/HIAllPhysics/HIRun2010-v1/RAW',label='hi2010',run=[152698],events=10000,location='STD')}
 -steps['RunHI2011']={'INPUT':InputInfo(dataSet='/HIMinBiasUPC/HIRun2011-v1/RAW',label='hi2011',run=[182124],events=10000,location='STD')}
 +steps['RunHI2011']={'INPUT':InputInfo(dataSet='/HIMinBiasUPC/HIRun2011-v1/RAW',label='hi2011',run=[181913],events=10000,location='STD')}

- 
  Run2012A=[191226]
  Run2012ASk=Run2012A+[]
  steps['RunMinBias2012A']={'INPUT':InputInfo(dataSet='/MinimumBias/Run2012A-v1/RAW',label='mb2012A',run=Run2012A, events=100000,location='STD')}
@@@ -237,9 -233,10 +244,16 @@@ steps['ZMuSkim2012D']={'INPUT':InputInf
  steps['WElSkim2012D']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2012D-WElectron-PromptSkim-v1/USER',label='wEl2012D',location='STD',run=Run2012Dsk)}
  steps['ZElSkim2012D']={'INPUT':InputInfo(dataSet='/DoubleElectron/Run2012D-ZElectron-PromptSkim-v1/RAW-RECO',label='zEl2012D',location='STD',run=Run2012Dsk)}

++<<<<<<< HEAD
 +#### Standard release validation samples ####
 +
 +stCond={'--conditions':'auto:run1_mc'}
++=======
+ ################################################
+ #### Standard release validation MC samples ####
+ ################################################
+ stCond={'--conditions':'auto:startup'}
++>>>>>>> 572426ed7c58b995822774b9b2779e34b3f422f8
  def Kby(N,s):
      return {'--relval':'%s000,%s'%(N,s)}
  def Mby(N,s):
@@@ -322,23 -327,22 +344,24 @@@ steps['SingleMuPt10_ID']=identitySim(st
  steps['TTbar_ID']=identitySim(steps['TTbar'])

  baseDataSetRelease=[
 -    'CMSSW_6_2_0_pre8-PRE_ST62_V8-v1',
 -    'CMSSW_6_2_0_pre8-PRE_SH62_V15-v1',
 -    'CMSSW_6_2_0_pre8-PRE_ST62_V8_FastSim-v1',
 -    'CMSSW_6_2_0_pre8-PRE_SH62_V15-v2',
 -    'CMSSW_6_1_0_pre6-STARTHI61_V6-v1',
 -    'CMSSW_6_2_0_pre8-PRE_ST62_V8-v3',
 -    'CMSSW_6_2_0_patch1-POSTLS162_V1_30Aug2013-v2',  # for _13  TeV samples with postLs1 geometry and updated mag field
 -    'CMSSW_6_2_0_patch1-POSTLS162_V1_30Aug2013HS-v3',# only for MB, to go away once GEN-SIM will be remade
 -    'CMSSW_6_2_0_patch1-POSTLS162_V1_30Aug2013-v3',  # for _13  RelValZmumuJets_Pt_20_300_GEN_13 and two others
 -    'CMSSW_7_0_5_patch1-PU25ns_POSTLS170_V7-v1',     # 25ns premixed dataset
 -    'CMSSW_7_0_5_patch1-PU50ns_POSTLS170_V6-v1'      # 50ns premixed dataset
 +    'CMSSW_7_1_0_pre7-PRE_STA71_V3-v1', # run1 samples; keep GEN-SIM fixed to 710_pre7, for samples not routinely produced
 +    'CMSSW_7_1_0_pre6-PRE_SHI71_V3-v1', # Run1 HI GEN-SIM (only MB = wf 140)
 +    'CMSSW_6_2_0_pre8-PRE_ST62_V8_FastSim-v1', # for fastsim id test
 +    'CMSSW_6_2_0_pre8-PRE_SH62_V15-v2', # Run1 HI GEN-SIM (only HydjetQ_B3_2760)
 +    'CMSSW_6_1_0_pre6-STARTHI61_V6-v1', # Run1 HI GEN-SIM (only HydjetQ_B0_2760)
 +    'CMSSW_6_2_0_pre8-PRE_ST62_V8-v3',  # pPb 
 +    'CMSSW_7_1_0_pre5-POSTLS171_V1-v1', # 13 TeV samples with postLs1 geometry and updated mag field
 +    'CMSSW_6_2_0_pre8-PRE_SH62_V15-v1', # Run1 HI GEN-SIM (only HydjetQ_B8_2760)
 +    'CMSSW_7_1_0_pre5-START71_V1-v1',   # 8 TeV , for the one sample which is part of the routine relval production (MinBias)
 +    'CMSSW_7_1_0_pre5-START71_V1-v2',   # 8 TeV , for the one sample which is part of the routine relval production (RelValZmumuJets_Pt_20_300, because of -v2)
 +                                        # this an previous should be unified, when -v2 will be gone
 +    'CMSSW_7_1_0_pre8-PRE_LS171_V9-v1', # 13 TeV samples with GEN-SIM from 710pre8;
 +    'CMSSW_7_1_0_pre8-PRE_LS171_V9_finesplit-v2', #SingleMu GEN-SIM from 710pre8
      ]
+ #baseDataSetReleaseForMiniAOD is defined at the end of this file, for miniAOD validation

  # note: INPUT commands to be added once GEN-SIM w/ 13TeV+PostLS1Geo will be available 
 -steps['MinBiasINPUT']={'INPUT':InputInfo(dataSet='/RelValMinBias/%s/GEN-SIM'%(baseDataSetRelease[0],),location='STD')}
 +steps['MinBiasINPUT']={'INPUT':InputInfo(dataSet='/RelValMinBias/%s/GEN-SIM'%(baseDataSetRelease[0],),location='STD')} #was [0] 
  steps['QCD_Pt_3000_3500INPUT']={'INPUT':InputInfo(dataSet='/RelValQCD_Pt_3000_3500/%s/GEN-SIM'%(baseDataSetRelease[0],),location='STD')}
  steps['QCD_Pt_600_800INPUT']={'INPUT':InputInfo(dataSet='/RelValQCD_Pt_600_800/%s/GEN-SIM'%(baseDataSetRelease[0],),location='STD')}
  steps['QCD_Pt_80_120INPUT']={'INPUT':InputInfo(dataSet='/RelValQCD_Pt_80_120/%s/GEN-SIM'%(baseDataSetRelease[0],),location='STD')}
@@@ -1418,7 -1392,87 +1441,91 @@@ steps['SKIMCOSD']={'-s':'SKIM:all'
                     '--scenario':'cosmics',
                     '--filein':'file:step2.root',
                     '--secondfilein':'filelist:step1_dasquery.log'}
++<<<<<<< HEAD
 +                 
++=======
+ 
+ # miniAOD
+ baseDataSetReleaseForMiniAOD=[
+     'CMSSW_7_0_0-PU25ns_POSTLS170_V3-v2',            # 25ns normal mixing (for miniAOD)
+     'CMSSW_7_0_0-PU50ns_POSTLS170_V4-v2',            # 50ns normal mixing (for miniAOD)
+     'CMSSW_7_0_0-GR_R_70_V1_RelVal_'                 # For real data
+     ]
+ 
+ stepMiniAODDefaults = { '-s'              : 'PAT',
+                         '--runUnscheduled': '',
+                         '-n'              : '100'
+                         }
+ stepMiniAODData = merge([{'--conditions'   : 'auto:com10',
+                           '--data'         : '',
+                           '--datatier'     : 'MINIAOD',
+                           '--eventcontent' : 'MINIAOD'
+                           },stepMiniAODDefaults])
+ stepMiniAODMC = merge([{'--conditions'   : 'auto:upgradePLS1',
+                         '--mc'           : '',
+                         '--datatier'     : 'MINIAODSIM',
+                         '--eventcontent' : 'MINIAODSIM'
+                         },stepMiniAODDefaults])
+ stepMiniAODMC50ns = merge([{'--conditions'   : 'auto:upgradePLS150ns',
+                             '--mc'           : '',
+                             '--datatier'     : 'MINIAODSIM',
+                             '--eventcontent' : 'MINIAODSIM'
+                         },stepMiniAODDefaults])
+ stepMiniAODMCFS = merge([{'--conditions'   : 'auto:upgradePLS1',
+                           '--mc'           : '',
+                           '--fast'         : '',
+                           '--datatier'     : 'MINIAODSIM',
+                           '--eventcontent' : 'MINIAODSIM'
+                           },stepMiniAODDefaults])
+ stepMiniAODMCFS50ns = merge([{'--conditions'   : 'auto:upgradePLS150ns',
+                               '--mc'           : '',
+                               '--fast'         : '',
+                               '--datatier'     : 'MINIAODSIM',
+                               '--eventcontent' : 'MINIAODSIM'
+                               },stepMiniAODDefaults])
+ 
+ steps['MINIAODDATA']=merge([{'--filein':'file:step3.root'},stepMiniAODData])
+ steps['MINIAODDATAStep2']=merge([{'--filein':'file:step2.root'},stepMiniAODData])
+ steps['MINIAODMC']=merge([{'--filein':'file:step3.root'},stepMiniAODMC])
+ steps['MINIAODMC50']=merge([{'--filein':'file:step3.root'},stepMiniAODMC50ns])
+ steps['MINIAODMCFS']=merge([{'--filein':'file:step3.root'},stepMiniAODMCFS])
+ steps['MINIAODMCFS50']=merge([{'--filein':'file:step3.root'},stepMiniAODMCFS50ns])
+ 
+ steps['MINIAODDATAINPUT']=merge([stepMiniAODData])
+ steps['MINIAODMCINPUT']=merge([stepMiniAODMC])
+ steps['MINIAODMC50INPUT']=merge([stepMiniAODMC50ns])
+ steps['MINIAODMCFSINPUT']=merge([stepMiniAODMCFS])
+ steps['MINIAODMCFS50INPUT']=merge([stepMiniAODMCFS50ns])
+ 
+ # 13 TeV RECO
+ steps['ZEE_13MINIAOD']={'INPUT':InputInfo(dataSet='/RelValZEE_13/%s/GEN-SIM-RECO'%(baseDataSetReleaseForMiniAOD[0],),location='STD')}
+ steps['ZmumuJets_Pt_20_300_13MINIAOD']={'INPUT':InputInfo(dataSet='/RelValZmumuJets_Pt_20_300_GEN_13/%s/GEN-SIM-RECO'%(baseDataSetReleaseForMiniAOD[0],),location='STD')}
+ steps['TTbar_13MINIAOD']={'INPUT':InputInfo(dataSet='/RelValTTbar_13/%s/GEN-SIM-RECO'%(baseDataSetReleaseForMiniAOD[0],),location='STD')}
+ steps['H130GGgluonfusion_13MINIAOD']={'INPUT':InputInfo(dataSet='/RelValH130GGgluonfusion_13/%s/GEN-SIM-RECO'%(baseDataSetReleaseForMiniAOD[0],),location='STD')}
+ steps['QQH1352T_Tauola_13MINIAOD']={'INPUT':InputInfo(dataSet='/RelValQQH1352T_Tauola_13/%s/GEN-SIM-RECO'%(baseDataSetReleaseForMiniAOD[0],),location='STD')}
+ steps['ZTT_13MINIAOD']={'INPUT':InputInfo(dataSet='/RelValZTT_13/%s/GEN-SIM-RECO'%(baseDataSetReleaseForMiniAOD[0],),location='STD')}
+ 
+ #Data
+ steps['RunMinBias2012DMINIAOD']={'INPUT':InputInfo(dataSet='/MinimumBias/%smb2012D-v2/RECO'%(baseDataSetReleaseForMiniAOD[2],),location='STD')}
+ steps['RunMu2012DMINIAOD']={'INPUT':InputInfo(dataSet='/SingleMu/%smu2012A-v2/RECO'%(baseDataSetReleaseForMiniAOD[2],),location='STD')}
+ steps['RunPhoton2012DMINIAOD']={'INPUT':InputInfo(dataSet='/SinglePhoton/%sphoton2012D-v2/RECO'%(baseDataSetReleaseForMiniAOD[2],),location='STD')}
+ steps['RunEl2012DMINIAOD']={'INPUT':InputInfo(dataSet='/SingleElectron/%selectron2012D-v2/RECO'%(baseDataSetReleaseForMiniAOD[2],),location='STD')}
+ steps['RunJet2012DMINIAOD']={'INPUT':InputInfo(dataSet='/JetHT/%sjet2012D-v2/RECO'%(baseDataSetReleaseForMiniAOD[2],),location='STD')}
+ 
+ #### for special wfs ###
+ #steps['TTbar_REDIGI_RERECO']=merge([{'cfg':'TTbar_Tauola_8TeV_cfi',
+ #                                     '-s':'GEN,SIM,DIGI,L1,DIGI2RAW,HLT:@relval,RAW2DIGI,L1Reco,RECO,EI,ALCA:MuAlCalIsolatedMu+DtCalib,VALIDATION,DQM',
+ #                                     '--datatier':'GEN-SIM-DIGI-RAW-HLTDEBUG-RECO,DQMIO',
+ #                                     '--eventcontent':'FEVTDEBUGHLT,DQM'},
+ #                                    K9by50,stCond,step1Defaults])
+ #steps['DIGI2RECO']=merge([{'-s':'DIGI,L1,DIGI2RAW,HLT:@relval,RAW2DIGI,L1Reco,RECO,EI,VALIDATION,DQM',
+ #                           '--filtername':'DIGItoRECO',
+ #                           '--process':'RECO',
+ #                           '--eventcontent':'RECOSIM,DQM',
+ #                           '--datatier':'GEN-SIM-RECO,DQMIO',
+ #                           },
+ #                            stCond,step3Defaults])
++>>>>>>> 572426ed7c58b995822774b9b2779e34b3f422f8
  steps['RECOFROMRECO']=merge([{'-s':'RECO,EI',
                                '--filtername':'RECOfromRECO',
                                '--process':'reRECO',

[cmsbuild]

+1
Tested at: 9ba47e1
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-4518/1787/summary.html

[cmsbuild]

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-4518/1787/summary.html