Merge CMSSW_7_6_X into CMSSW_8_0_X.

cms-sw · Oct 28, 2015 · e347383 · e347383
2 parents 5fe369f + 8dbaa61
commit e347383
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 25 deletions.
diff --git a/Configuration/StandardSequences/python/VtxSmeared.py b/Configuration/StandardSequences/python/VtxSmeared.py
@@ -42,6 +42,7 @@
     'ZeroTeslaRun247324Collision'  : 'IOMC.EventVertexGenerators.VtxSmearedZeroTeslaRun247324Collision_cfi',
     'Realistic50ns13TeVCollisionZeroTesla': 'IOMC.EventVertexGenerators.VtxSmearedRealistic50ns13TeVCollisionZeroTesla_cfi',
     'Realistic50ns13TeVCollision': 'IOMC.EventVertexGenerators.VtxSmearedRealistic50ns13TeVCollision_cfi',
+    'Nominal5TeVpp2015Collision':    'IOMC.EventVertexGenerators.VtxSmearedNominal5TeVpp2015Collision_cfi',
 
 }
 VtxSmearedDefaultKey='Realistic50ns13TeVCollision'

diff --git a/IOMC/EventVertexGenerators/python/VtxSmearedNominal5TeVpp2015Collision_cfi.py b/IOMC/EventVertexGenerators/python/VtxSmearedNominal5TeVpp2015Collision_cfi.py
@@ -0,0 +1,7 @@
+import FWCore.ParameterSet.Config as cms
+
+from IOMC.EventVertexGenerators.VtxSmearedParameters_cfi import Nominal5TeVpp2015VtxSmearingParameters,VtxSmearedCommon
+VtxSmeared = cms.EDProducer("BetafuncEvtVtxGenerator",
+    Nominal5TeVpp2015VtxSmearingParameters,
+    VtxSmearedCommon
+)
diff --git a/IOMC/EventVertexGenerators/python/VtxSmearedParameters_cfi.py b/IOMC/EventVertexGenerators/python/VtxSmearedParameters_cfi.py
@@ -524,3 +524,16 @@
     Y0 = cms.double(0.16973),
     Z0 = cms.double(-1.2230)
 )
+
+# Estimate for 2015 pp collisions at 5.02 TeV, based on feedback from accelerator:  beta* ~ 400cm, normalized emittance = 2.5 um, SigmaZ similar to RunIIWinter15GS
+Nominal5TeVpp2015VtxSmearingParameters = cms.PSet(
+    Phi = cms.double(0.0),
+    BetaStar = cms.double(400.0),
+    Emittance = cms.double(1.0e-07),
+    Alpha = cms.double(0.0),
+    SigmaZ = cms.double(5.5),
+    TimeOffset = cms.double(0.0),
+    X0 = cms.double(0.1044),
+    Y0 = cms.double(0.1676),
+    Z0 = cms.double(0.6707)
+)
diff --git a/PhysicsTools/PatAlgos/python/mcMatchLayer0/jetFlavourId_cff.py b/PhysicsTools/PatAlgos/python/mcMatchLayer0/jetFlavourId_cff.py
@@ -17,7 +17,7 @@
 )
 
 patJetPartons = cms.EDProducer('HadronAndPartonSelector',
-    src = cms.InputTag("generatorSmeared"),
+    src = cms.InputTag("generator"),
     particles = cms.InputTag("genParticles"),
     partonMode = cms.string("Auto")
 )

diff --git a/PhysicsTools/PatAlgos/python/patInputFiles_cff.py b/PhysicsTools/PatAlgos/python/patInputFiles_cff.py
@@ -1,43 +1,43 @@
 import FWCore.ParameterSet.Config as cms
 from PhysicsTools.PatAlgos.tools.cmsswVersionTools import pickRelValInputFiles
 
-# /RelValTTbar_13/CMSSW_7_6_0_pre4-PU25ns_76X_mcRun2_asymptotic_v1-v1/MINIAODSIM
+# /RelValTTbar_13/CMSSW_7_6_0_pre7-PU25ns_76X_mcRun2_asymptotic_v5-v1/MINIAODSIM
 filesRelValTTbarPileUpMINIAODSIM = cms.untracked.vstring(
-    #pickRelValInputFiles( cmsswVersion  = 'CMSSW_7_6_0_pre4'
+    #pickRelValInputFiles( cmsswVersion  = 'CMSSW_7_6_0_pre7'
                         #, relVal        = 'RelValTTbar_13'
-                        #, globalTag     = 'PU25ns_76X_mcRun2_asymptotic_v1'
+                        #, globalTag     = 'PU25ns_76X_mcRun2_asymptotic_v5'
                         #, dataTier      = 'MINIAODSIM'
                         #, maxVersions   = 1
                         #, numberOfFiles = 1
                         #, useDAS        = True
                         #)
-        '/store/relval/CMSSW_7_6_0_pre4/RelValTTbar_13/MINIAODSIM/PU25ns_76X_mcRun2_asymptotic_v1-v1/00000/C63FAB0C-ED4F-E511-A453-0025905A7786.root'
+        '/store/relval/CMSSW_7_6_0_pre7/RelValTTbar_13/MINIAODSIM/PU25ns_76X_mcRun2_asymptotic_v5-v1/00000/36527390-E371-E511-ABF5-00259059642E.root'
     )
 
-# /RelValProdTTbar_13/CMSSW_7_6_0_pre4-76X_mcRun2_asymptotic_v1-v1/AODSIM
+# /RelValProdTTbar_13/CMSSW_7_6_0_pre7-76X_mcRun2_asymptotic_v5-v1/AODSIM
 filesRelValProdTTbarAODSIM = cms.untracked.vstring(
-    #pickRelValInputFiles( cmsswVersion  = 'CMSSW_7_6_0_pre4'
+    #pickRelValInputFiles( cmsswVersion  = 'CMSSW_7_6_0_pre7'
                         #, relVal        = 'RelValProdTTbar_13'
-                        #, globalTag     = '76X_mcRun2_asymptotic_v1'
+                        #, globalTag     = '76X_mcRun2_asymptotic_v5'
                         #, dataTier      = 'AODSIM'
                         #, maxVersions   = 1
                         #, numberOfFiles = 1
                         #, useDAS        = True
                         #)
-        '/store/relval/CMSSW_7_6_0_pre4/RelValProdTTbar_13/AODSIM/76X_mcRun2_asymptotic_v1-v1/00000/90C5FA7A-7B4F-E511-BC27-002618943916.root'
+        '/store/relval/CMSSW_7_6_0_pre7/RelValProdTTbar_13/AODSIM/76X_mcRun2_asymptotic_v5-v1/00000/0E9A5DE8-1D71-E511-A205-00261894380D.root'
     )
 
-# /RelValTTbar_13/CMSSW_7_6_0_pre4-76X_mcRun2_asymptotic_v1-v1/GEN-SIM-RECO
+# /RelValTTbar_13/CMSSW_7_6_0_pre7-76X_mcRun2_asymptotic_v5-v1/GEN-SIM-RECO
 filesRelValTTbarGENSIMRECO = cms.untracked.vstring(
-    #pickRelValInputFiles( cmsswVersion  = 'CMSSW_7_6_0_pre4'
+    #pickRelValInputFiles( cmsswVersion  = 'CMSSW_7_6_0_pre7'
                         #, relVal        = 'RelValTTbar_13'
-                        #, globalTag     = '76X_mcRun2_asymptotic_v1'
+                        #, globalTag     = '76X_mcRun2_asymptotic_v5'
                         #, dataTier      = 'GEN-SIM-RECO'
                         #, maxVersions   = 1
                         #, numberOfFiles = 1
                         #, useDAS        = True
                         #)
-        '/store/relval/CMSSW_7_6_0_pre4/RelValTTbar_13/GEN-SIM-RECO/76X_mcRun2_asymptotic_v1-v1/00000/24C33B07-5E4F-E511-B11F-0025905A6094.root'
+        '/store/relval/CMSSW_7_6_0_pre7/RelValTTbar_13/GEN-SIM-RECO/76X_mcRun2_asymptotic_v5-v1/00000/7678A3E9-FE70-E511-8177-0025905B85B2.root'
     )
 
 # /RelValTTbar_13/CMSSW_7_6_0_pre4-PU25ns_76X_mcRun2_asymptotic_v1_FastSim-v1/GEN-SIM-DIGI-RECO
@@ -56,41 +56,41 @@
     "file:ttbarForFastSimTest.root"
     )
 
-# /RelValTTbar_13/CMSSW_7_6_0_pre4-PU25ns_76X_mcRun2_asymptotic_v1-v1/GEN-SIM-RECO
+# /RelValTTbar_13/CMSSW_7_6_0_pre7-PU25ns_76X_mcRun2_asymptotic_v5-v1/GEN-SIM-RECO
 filesRelValTTbarPileUpGENSIMRECO = cms.untracked.vstring(
-    #pickRelValInputFiles( cmsswVersion  = 'CMSSW_7_6_0_pre4'
+    #pickRelValInputFiles( cmsswVersion  = 'CMSSW_7_6_0_pre7'
                         #, relVal        = 'RelValTTbar_13'
-                        #, globalTag     = 'PU25ns_76X_mcRun2_asymptotic_v1'
+                        #, globalTag     = 'PU25ns_76X_mcRun2_asymptotic_v5'
                         #, dataTier      = 'GEN-SIM-RECO'
                         #, maxVersions   = 1
                         #, numberOfFiles = 1
                         #, useDAS        = True
                         #)
-        '/store/relval/CMSSW_7_6_0_pre4/RelValTTbar_13/GEN-SIM-RECO/PU25ns_76X_mcRun2_asymptotic_v1-v1/00000/24C18DA0-6A4F-E511-AE07-0025905A48B2.root'
+        '/store/relval/CMSSW_7_6_0_pre7/RelValTTbar_13/GEN-SIM-RECO/PU25ns_76X_mcRun2_asymptotic_v5-v1/00000/02CAB78F-E371-E511-BAC3-0025905A6084.root'
     )
 
-# /SingleMu/CMSSW_7_6_0_pre4-75X_dataRun1_HLT_frozen_v2_RelVal_mu2012D-v1/MINIAOD
+# /SingleMu/CMSSW_7_6_0_pre7-76X_dataRun1_HLT_frozen_v4_RelVal_mu2012D-v1/MINIAOD
 filesRelValSingleMuMINIAOD = cms.untracked.vstring(
-    #pickRelValInputFiles( cmsswVersion  = 'CMSSW_7_6_0_pre4'
+    #pickRelValInputFiles( cmsswVersion  = 'CMSSW_7_6_0_pre7'
                         #, relVal        = 'SingleMu'
-                        #, globalTag     = '75X_dataRun1_HLT_frozen_v2_RelVal_mu2012D'
+                        #, globalTag     = '76X_dataRun1_HLT_frozen_v4_RelVal_mu2012D'
                         #, dataTier      = 'MINIAOD'
                         #, maxVersions   = 1
                         #, numberOfFiles = 1
                         #, useDAS        = True
                         #)
-        '/store/relval/CMSSW_7_6_0_pre4/SingleMu/MINIAOD/75X_dataRun1_HLT_frozen_v2_RelVal_mu2012D-v1/00000/0A9FB3D9-A550-E511-93C5-0025905B85AE.root'
+        '/store/relval/CMSSW_7_6_0_pre7/SingleMu/MINIAOD/76X_dataRun1_HLT_frozen_v4_RelVal_mu2012D-v1/00000/04E2CB97-6172-E511-B58F-002590596486.root'
     )
 
-# /SingleMu/CMSSW_7_6_0_pre4-75X_dataRun1_HLT_frozen_v2_RelVal_mu2012D-v1/RECO
+# /SingleMu/CMSSW_7_6_0_pre7-76X_dataRun1_HLT_frozen_v4_RelVal_mu2012D-v1/RECO
 filesSingleMuRECO = cms.untracked.vstring(
-    #pickRelValInputFiles( cmsswVersion  = 'CMSSW_7_6_0_pre4'
+    #pickRelValInputFiles( cmsswVersion  = 'CMSSW_7_6_0_pre7'
                         #, relVal        = 'SingleMu'
                         #, dataTier      = 'RECO'
-                        #, globalTag     = '75X_dataRun1_HLT_frozen_v2_RelVal_mu2012D'
+                        #, globalTag     = '76X_dataRun1_HLT_frozen_v4_RelVal_mu2012D'
                         #, maxVersions   = 1
                         #, numberOfFiles = 1
                         #, useDAS        = True
                         #)
-        '/store/relval/CMSSW_7_6_0_pre4/SingleMu/RECO/75X_dataRun1_HLT_frozen_v2_RelVal_mu2012D-v1/00000/004C77E9-7050-E511-B458-0025905B8590.root'
+        '/store/relval/CMSSW_7_6_0_pre7/SingleMu/RECO/76X_dataRun1_HLT_frozen_v4_RelVal_mu2012D-v1/00000/000026F5-2172-E511-B57C-0025905B8582.root'
     )