From daa5f949efa2afcefede4f899c5dfa8e8852752a Mon Sep 17 00:00:00 2001 From: Riccardo Manzoni Date: Mon, 6 Jul 2015 15:12:36 +0200 Subject: [PATCH 1/2] add vtx smearing parameters for nominal beam size but realistic (measured) luminous region centroid --- Configuration/StandardSequences/python/VtxSmeared.py | 3 ++- ...isticCentroidNominalEmittance13TeVCollision_cfi.py | 7 +++++++ .../python/VtxSmearedParameters_cfi.py | 11 +++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 IOMC/EventVertexGenerators/python/VtxSmeareRealisticCentroidNominalEmittance13TeVCollision_cfi.py diff --git a/Configuration/StandardSequences/python/VtxSmeared.py b/Configuration/StandardSequences/python/VtxSmeared.py index a033457744831..40c109b763162 100644 --- a/Configuration/StandardSequences/python/VtxSmeared.py +++ b/Configuration/StandardSequences/python/VtxSmeared.py @@ -33,7 +33,8 @@ 'Shifted5mmCollision2015' : 'IOMC.EventVertexGenerators.VtxSmearedShifted5mmCollision2015_cfi', 'Shifted15mmCollision2015' : 'IOMC.EventVertexGenerators.VtxSmearedShifted15mmCollision2015_cfi', 'NominalCollision2015' : 'IOMC.EventVertexGenerators.VtxSmearedNominalCollision2015_cfi', - 'ZeroTeslaRun247324Collision' : 'IOMC.EventVertexGenerators.VtxSmearedZeroTeslaRun247324Collision_cfi' + 'ZeroTeslaRun247324Collision' : 'IOMC.EventVertexGenerators.VtxSmearedZeroTeslaRun247324Collision_cfi', + 'RealisticCentroidNominalEmittance13TeVCollision': 'IOMC.EventVertexGenerators.RealisticCentroidNominalEmittance13TeVCollision_cfi', } VtxSmearedDefaultKey='NominalCollision2015' diff --git a/IOMC/EventVertexGenerators/python/VtxSmeareRealisticCentroidNominalEmittance13TeVCollision_cfi.py b/IOMC/EventVertexGenerators/python/VtxSmeareRealisticCentroidNominalEmittance13TeVCollision_cfi.py new file mode 100644 index 0000000000000..cf971572172c9 --- /dev/null +++ b/IOMC/EventVertexGenerators/python/VtxSmeareRealisticCentroidNominalEmittance13TeVCollision_cfi.py @@ -0,0 +1,7 @@ +import FWCore.ParameterSet.Config as cms + +from IOMC.EventVertexGenerators.VtxSmearedParameters_cfi import * +VtxSmeared = cms.EDProducer("BetafuncEvtVtxGenerator", + RealisticCentroidNominalEmittance13TeVCollisionVtxSmearingParameters, + VtxSmearedCommon +) diff --git a/IOMC/EventVertexGenerators/python/VtxSmearedParameters_cfi.py b/IOMC/EventVertexGenerators/python/VtxSmearedParameters_cfi.py index 73091165f8e1e..476909a71778e 100644 --- a/IOMC/EventVertexGenerators/python/VtxSmearedParameters_cfi.py +++ b/IOMC/EventVertexGenerators/python/VtxSmearedParameters_cfi.py @@ -417,6 +417,17 @@ Y0 = cms.double(0.1657), Z0 = cms.double(-1.688) ) +RealisticCentroidNominalEmittance13TeVCollisionVtxSmearingParameters = cms.PSet( + Phi = cms.double(0.0), + BetaStar = cms.double(65.0), + Emittance = cms.double(5.411e-08), + Alpha = cms.double(0.0), + SigmaZ = cms.double(5.3), + TimeOffset = cms.double(0.0), + X0 = cms.double(0.06006), + Y0 = cms.double(0.10007), + Z0 = cms.double(-1.708) +) # Test HF offset ShiftedCollision2015VtxSmearingParameters = cms.PSet( Phi = cms.double(0.0), From 5d47410b96c9b43ba84624ae73a16799572fb47f Mon Sep 17 00:00:00 2001 From: Riccardo Manzoni Date: Wed, 8 Jul 2015 22:54:41 +0200 Subject: [PATCH 2/2] fix naming --- Configuration/StandardSequences/python/VtxSmeared.py | 2 +- IOMC/EventVertexGenerators/python/VtxSmearedParameters_cfi.py | 2 +- ...sion_cfi.py => VtxSmearedRealistic50ns13TeVCollision_cfi.py} | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename IOMC/EventVertexGenerators/python/{VtxSmeareRealisticCentroidNominalEmittance13TeVCollision_cfi.py => VtxSmearedRealistic50ns13TeVCollision_cfi.py} (71%) diff --git a/Configuration/StandardSequences/python/VtxSmeared.py b/Configuration/StandardSequences/python/VtxSmeared.py index 40c109b763162..0f5ff275f5b61 100644 --- a/Configuration/StandardSequences/python/VtxSmeared.py +++ b/Configuration/StandardSequences/python/VtxSmeared.py @@ -34,7 +34,7 @@ 'Shifted15mmCollision2015' : 'IOMC.EventVertexGenerators.VtxSmearedShifted15mmCollision2015_cfi', 'NominalCollision2015' : 'IOMC.EventVertexGenerators.VtxSmearedNominalCollision2015_cfi', 'ZeroTeslaRun247324Collision' : 'IOMC.EventVertexGenerators.VtxSmearedZeroTeslaRun247324Collision_cfi', - 'RealisticCentroidNominalEmittance13TeVCollision': 'IOMC.EventVertexGenerators.RealisticCentroidNominalEmittance13TeVCollision_cfi', + 'Realistic50ns13TeVCollision': 'IOMC.EventVertexGenerators.VtxSmearedRealistic50ns13TeVCollision_cfi', } VtxSmearedDefaultKey='NominalCollision2015' diff --git a/IOMC/EventVertexGenerators/python/VtxSmearedParameters_cfi.py b/IOMC/EventVertexGenerators/python/VtxSmearedParameters_cfi.py index 476909a71778e..6cb085ce334fa 100644 --- a/IOMC/EventVertexGenerators/python/VtxSmearedParameters_cfi.py +++ b/IOMC/EventVertexGenerators/python/VtxSmearedParameters_cfi.py @@ -417,7 +417,7 @@ Y0 = cms.double(0.1657), Z0 = cms.double(-1.688) ) -RealisticCentroidNominalEmittance13TeVCollisionVtxSmearingParameters = cms.PSet( +Realistic50ns13TeVCollisionVtxSmearingParameters = cms.PSet( Phi = cms.double(0.0), BetaStar = cms.double(65.0), Emittance = cms.double(5.411e-08), diff --git a/IOMC/EventVertexGenerators/python/VtxSmeareRealisticCentroidNominalEmittance13TeVCollision_cfi.py b/IOMC/EventVertexGenerators/python/VtxSmearedRealistic50ns13TeVCollision_cfi.py similarity index 71% rename from IOMC/EventVertexGenerators/python/VtxSmeareRealisticCentroidNominalEmittance13TeVCollision_cfi.py rename to IOMC/EventVertexGenerators/python/VtxSmearedRealistic50ns13TeVCollision_cfi.py index cf971572172c9..154ca0ba8c4ea 100644 --- a/IOMC/EventVertexGenerators/python/VtxSmeareRealisticCentroidNominalEmittance13TeVCollision_cfi.py +++ b/IOMC/EventVertexGenerators/python/VtxSmearedRealistic50ns13TeVCollision_cfi.py @@ -2,6 +2,6 @@ from IOMC.EventVertexGenerators.VtxSmearedParameters_cfi import * VtxSmeared = cms.EDProducer("BetafuncEvtVtxGenerator", - RealisticCentroidNominalEmittance13TeVCollisionVtxSmearingParameters, + Realistic50ns13TeVCollisionVtxSmearingParameters, VtxSmearedCommon )