Merge pull request #15543 from mmusich/71X_FSQ_vtxSmearingFixes

71X: Miscellaneous fixes to new FSQ vtx smearing parameters
cms-sw · Aug 30, 2016 · 50f7a36 · 50f7a36
2 parents 45a752d + 06544c8
commit 50f7a36
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/Configuration/StandardSequences/python/VtxSmeared.py b/Configuration/StandardSequences/python/VtxSmeared.py
@@ -39,8 +39,8 @@
     'Realistic50ns13TeVCollision': 'IOMC.EventVertexGenerators.VtxSmearedRealistic50ns13TeVCollision_cfi',
     'Nominal5TeVpp2015Collision':    'IOMC.EventVertexGenerators.VtxSmearedNominal5TeVpp2015Collision_cfi',
     'Realistic25ns13TeV2016Collision':  'IOMC.EventVertexGenerators.VtxSmearedRealistic25ns13TeV2016Collision_cfi',
-    'Realistic25ns13TeVCollisionBetaStar90m' : 'IOMC.EventVertexGenerators.VtxSmearedRealistic25ns13TeVCollisionBetaStar90m',
-    'Realistic25ns13TeVCollisionBetaStar90mLowBunches' : 'IOMC.EventVertexGenerators.VtxSmearedRealistic25ns13TeVCollisionBetaStar90mLowBunches'
+    'Realistic100ns13TeVCollisionBetaStar90m' : 'IOMC.EventVertexGenerators.VtxSmearedRealistic100ns13TeVCollisionBetaStar90m_cfi',
+    'Realistic100ns13TeVCollisionBetaStar90mLowBunches' : 'IOMC.EventVertexGenerators.VtxSmearedRealistic100ns13TeVCollisionBetaStar90mLowBunches_cfi'
 }
 VtxSmearedDefaultKey='NominalCollision2015'
 VtxSmearedHIDefaultKey='NominalHICollision2015'
diff --git a/IOMC/EventVertexGenerators/python/VtxSmearedParameters_cfi.py b/IOMC/EventVertexGenerators/python/VtxSmearedParameters_cfi.py
@@ -475,7 +475,7 @@
 #
 # Emittance has been calculated to match a BeamWidht of O(10um) with: https://lpc.web.cern.ch/lumi2.html
 #
-Realistic25ns13TeVCollisionBetaStar90mVtxSmearingParameters = cms.PSet(
+Realistic100ns13TeVCollisionBetaStar90mVtxSmearingParameters = cms.PSet(
     Phi = cms.double(0.0),
     BetaStar = cms.double(9121.0),
     Emittance = cms.double(0.12e-7),
@@ -500,7 +500,7 @@
 #
 # Emittance has been calculated to match a BeamWidht of O(10um) with: https://lpc.web.cern.ch/lumi2.html
 #
-Realistic25ns13TeVCollisionBetaStar90mLowBunchesVtxSmearingParameters = cms.PSet(
+Realistic100ns13TeVCollisionBetaStar90mLowBunchesVtxSmearingParameters = cms.PSet(
     Phi = cms.double(0.0),
     BetaStar = cms.double(9121.0),
     Emittance = cms.double(0.12e-7),

diff --git a/...3TeVCollisionBetaStar90mLowBunches_cfi.py → ...3TeVCollisionBetaStar90mLowBunches_cfi.py b/...3TeVCollisionBetaStar90mLowBunches_cfi.py → ...3TeVCollisionBetaStar90mLowBunches_cfi.py
@@ -2,6 +2,6 @@
 
 from IOMC.EventVertexGenerators.VtxSmearedParameters_cfi import *
 VtxSmeared = cms.EDProducer("BetafuncEvtVtxGenerator",
-    Realistic25ns13TeVCollisionBetaStar90mLowBunchesVtxSmearingParameters,
+    Realistic100ns13TeVCollisionBetaStar90mLowBunchesVtxSmearingParameters,
     VtxSmearedCommon
 )
diff --git a/...istic25ns13TeVCollisionBetaStar90m_cfi.py → ...stic100ns13TeVCollisionBetaStar90m_cfi.py b/...istic25ns13TeVCollisionBetaStar90m_cfi.py → ...stic100ns13TeVCollisionBetaStar90m_cfi.py
@@ -2,6 +2,6 @@
 
 from IOMC.EventVertexGenerators.VtxSmearedParameters_cfi import *
 VtxSmeared = cms.EDProducer("BetafuncEvtVtxGenerator",
-    Realistic25ns13TeVCollisionBetaStar90mVtxSmearingParameters,
+    Realistic100ns13TeVCollisionBetaStar90mVtxSmearingParameters,
     VtxSmearedCommon
 )