Merge pull request #21021 from gsfs/NewBeamSpots

New beam spots
cms-sw · Nov 17, 2017 · dfcd296 · dfcd296
2 parents b4980ca + 4258c4e
commit dfcd296
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 3 deletions.
diff --git a/Configuration/StandardSequences/python/VtxSmeared.py b/Configuration/StandardSequences/python/VtxSmeared.py
@@ -46,11 +46,13 @@
     'Shifted15mmCollision2015'  :    'IOMC.EventVertexGenerators.VtxSmearedShifted15mmCollision2015_cfi',
     'NominalCollision2015'  :        'IOMC.EventVertexGenerators.VtxSmearedNominalCollision2015_cfi',
     'NominalHICollision2015':      'IOMC.EventVertexGenerators.VtxSmearedNominalHICollision2015_cfi',
-    'RealisticHICollision2015':      'IOMC.EventVertexGenerators.VtxSmearedRealisticHICollision2015_cfi',
+    'RealisticHICollisionFixZ2015':      'IOMC.EventVertexGenerators.VtxSmearedRealisticHICollisionFixZ2015_cfi',
+    'RealisticXeXeCollision2017':      'IOMC.EventVertexGenerators.VtxSmearedRealisticXeXeCollision2017_cfi',
     'ZeroTeslaRun247324Collision'  : 'IOMC.EventVertexGenerators.VtxSmearedZeroTeslaRun247324Collision_cfi',
     'Realistic50ns13TeVCollisionZeroTesla': 'IOMC.EventVertexGenerators.VtxSmearedRealistic50ns13TeVCollisionZeroTesla_cfi',
     'Realistic50ns13TeVCollision': 'IOMC.EventVertexGenerators.VtxSmearedRealistic50ns13TeVCollision_cfi',
     'Nominal5TeVpp2015Collision':    'IOMC.EventVertexGenerators.VtxSmearedNominal5TeVpp2015Collision_cfi',
+    'Realistic5TeVppCollision2017':    'IOMC.EventVertexGenerators.VtxSmearedRealistic5TeVppCollision2017_cfi',
     'Realistic25ns13TeV2016Collision':    'IOMC.EventVertexGenerators.VtxSmearedRealistic25ns13TeV2016Collision_cfi',
     'Realistic100ns13TeVCollisionBetaStar90m' : 'IOMC.EventVertexGenerators.VtxSmearedRealistic100ns13TeVCollisionBetaStar90m_cfi',
     'Realistic100ns13TeVCollisionBetaStar90mLowBunches' : 'IOMC.EventVertexGenerators.VtxSmearedRealistic100ns13TeVCollisionBetaStar90mLowBunches_cfi',

diff --git a/IOMC/EventVertexGenerators/python/VtxSmearedParameters_cfi.py b/IOMC/EventVertexGenerators/python/VtxSmearedParameters_cfi.py
@@ -581,6 +581,20 @@
     Z0 = cms.double(0.82054  )
 )
 
+# Placeholder for beam spot extracted from data for 2017 pp run @ 5 TeV
+# For now using the same parameters as Realistic25ns13TeVEarly2017Collision
+Realistic5TeVppCollision2017VtxSmearingParameters = cms.PSet(
+    Phi = cms.double(0.0),
+    BetaStar = cms.double(40.0),
+    Emittance = cms.double(3.319e-8),
+    Alpha = cms.double(0.0),
+    SigmaZ = cms.double(3.5),
+    TimeOffset = cms.double(0.0),
+    X0 = cms.double(-0.024755),
+    Y0 = cms.double(0.069233 ),
+    Z0 = cms.double(0.82054  )
+)
+
 # Test HF offset
 ShiftedCollision2015VtxSmearingParameters = cms.PSet(
     Phi = cms.double(0.0),
@@ -631,7 +645,23 @@
 )
 
 # updated numbers based on beamspot fits to 2015 PbPb data
-RealisticHICollision2015VtxSmearingParameters = cms.PSet(
+# Later found to be incorrect, see following entry
+# RealisticHICollision2015VtxSmearingParameters = cms.PSet(
+#    Phi = cms.double(0.0),
+#    BetaStar = cms.double(60.0),
+#    Emittance = cms.double(1.70e-07),
+#    Alpha = cms.double(0.0),
+#    SigmaZ = cms.double(5.2278),
+#    TimeOffset = cms.double(0.0),
+#    X0 = cms.double(0.1025),
+#    Y0 = cms.double(0.1654),
+#    Z0 = cms.double(3.2528)
+#)
+# updated numbers for 2015 PbPb data with Z centroid from fixed beamspot fits
+# See discussion here https://hypernews.cern.ch/HyperNews/CMS/get/hi-general/3968.html
+# See plot of difference here: https://www.dropbox.com/s/tsnkgvvpkdqjtyq/vzDataMCOverlay_c_20170420.pdf?dl=0
+#
+RealisticHICollisionFixZ2015VtxSmearingParameters = cms.PSet(
     Phi = cms.double(0.0),
     BetaStar = cms.double(60.0),
     Emittance = cms.double(1.70e-07),
@@ -640,7 +670,20 @@
     TimeOffset = cms.double(0.0),
     X0 = cms.double(0.1025),
     Y0 = cms.double(0.1654),
-    Z0 = cms.double(3.2528)
+    Z0 = cms.double(0.771)
+)
+# Numbers based on beamspot fits to 2017 XeXe data
+# Documentation here: https://docs.google.com/spreadsheets/d/1mla_04k-NgSpmzg5KpUd_BlQYsOHKemxA4j45PIPeq4/edit#gid=717868856
+RealisticXeXeCollision2017VtxSmearingParameters = cms.PSet(
+    Phi = cms.double(0.0),
+    BetaStar = cms.double(30.0),
+    Emittance = cms.double(3.61e-08),
+    Alpha = cms.double(0.0),
+    SigmaZ = cms.double(4.73),
+    TimeOffset = cms.double(0.0),
+    X0 = cms.double(-0.0260),
+    Y0 = cms.double(0.0796),
+    Z0 = cms.double(0.693)
 )
 
 # 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

diff --git a/IOMC/EventVertexGenerators/python/VtxSmearedRealistic5TeVppCollision2017_cfi.py b/IOMC/EventVertexGenerators/python/VtxSmearedRealistic5TeVppCollision2017_cfi.py
@@ -0,0 +1,7 @@
+import FWCore.ParameterSet.Config as cms
+
+from IOMC.EventVertexGenerators.VtxSmearedParameters_cfi import Realistic5TeVppCollision2017VtxSmearingParameters,VtxSmearedCommon
+VtxSmeared = cms.EDProducer("BetafuncEvtVtxGenerator",
+    Realistic5TeVppCollision2017VtxSmearingParameters,
+    VtxSmearedCommon
+)
diff --git a/IOMC/EventVertexGenerators/python/VtxSmearedRealisticHICollisionFixZ2015_cfi.py b/IOMC/EventVertexGenerators/python/VtxSmearedRealisticHICollisionFixZ2015_cfi.py
@@ -0,0 +1,10 @@
+import FWCore.ParameterSet.Config as cms
+
+from IOMC.EventVertexGenerators.VtxSmearedParameters_cfi import RealisticHICollisionFixZ2015VtxSmearingParameters,VtxSmearedCommon
+VtxSmeared = cms.EDProducer("BetafuncEvtVtxGenerator",
+    RealisticHICollisionFixZ2015VtxSmearingParameters,
+    VtxSmearedCommon
+)
+
+
+
diff --git a/IOMC/EventVertexGenerators/python/VtxSmearedRealisticXeXeCollision2017_cfi.py b/IOMC/EventVertexGenerators/python/VtxSmearedRealisticXeXeCollision2017_cfi.py
@@ -0,0 +1,10 @@
+import FWCore.ParameterSet.Config as cms
+
+from IOMC.EventVertexGenerators.VtxSmearedParameters_cfi import RealisticXeXeCollision2017VtxSmearingParameters,VtxSmearedCommon
+VtxSmeared = cms.EDProducer("BetafuncEvtVtxGenerator",
+    RealisticXeXeCollision2017VtxSmearingParameters,
+    VtxSmearedCommon
+)
+
+
+