Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Configuration/AlCa/python/autoCond.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@
'phase1_2017_design' : '106X_mc2017_design_IdealBS_v6',
# GlobalTag for MC production with realistic conditions for Phase1 2017 detector
'phase1_2017_realistic' : '106X_mc2017_realistic_v9',
# GlobalTag for MC production with realistic conditions for Phase1 2017 detector, for PP reference run
'phase1_2017_realistic_ppref' : '106X_mc2017_realistic_forppRef5TeV_v3',
# GlobalTag for MC production (cosmics) with realistic alignment and calibrations for Phase1 2017 detector, Strip tracker in DECO mode
'phase1_2017_cosmics' : '106X_mc2017cosmics_realistic_deco_v4',
# GlobalTag for MC production (cosmics) with realistic alignment and calibrations for Phase1 2017 detector, Strip tracker in PEAK mode
Expand Down
2 changes: 1 addition & 1 deletion Configuration/PyReleaseValidation/python/relval_steps.py
Original file line number Diff line number Diff line change
Expand Up @@ -957,7 +957,7 @@ def genS(fragment,howMuch):

## pp reference tests

ppRefAlca2017 = {'--conditions':'auto:phase1_2017_realistic', '--era':'Run2_2017_ppRef'}
ppRefAlca2017 = {'--conditions':'auto:phase1_2017_realistic_ppref', '--era':'Run2_2017_ppRef', '--beamspot':'Fixed_EmitRealistic5TeVppCollision2017'}
ppRefDefaults2017=merge([ppRefAlca2017,{'-n':2}])

steps['QCD_Pt_80_120_13_PPREF']=merge([ppRefDefaults2017,gen2017('QCD_Pt_80_120_13TeV_TuneCUETP8M1_cfi',Kby(9,150))])
Expand Down
1 change: 1 addition & 0 deletions Configuration/StandardSequences/python/VtxSmeared.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
'Realistic50ns13TeVCollision': 'IOMC.EventVertexGenerators.VtxSmearedRealistic50ns13TeVCollision_cfi',
'Nominal5TeVpp2015Collision': 'IOMC.EventVertexGenerators.VtxSmearedNominal5TeVpp2015Collision_cfi',
'Realistic5TeVppCollision2017': 'IOMC.EventVertexGenerators.VtxSmearedRealistic5TeVppCollision2017_cfi',
'Fixed_EmitRealistic5TeVppCollision2017': 'IOMC.EventVertexGenerators.VtxSmearedFixed_EmitRealistic5TeVppCollision2017_cfi',
'Realistic25ns13TeV2016Collision': 'IOMC.EventVertexGenerators.VtxSmearedRealistic25ns13TeV2016Collision_cfi',
'Realistic100ns13TeVCollisionBetaStar90m' : 'IOMC.EventVertexGenerators.VtxSmearedRealistic100ns13TeVCollisionBetaStar90m_cfi',
'Realistic100ns13TeVCollisionBetaStar90mLowBunches' : 'IOMC.EventVertexGenerators.VtxSmearedRealistic100ns13TeVCollisionBetaStar90mLowBunches_cfi',
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import FWCore.ParameterSet.Config as cms

from IOMC.EventVertexGenerators.VtxSmearedParameters_cfi import Fixed_EmitRealistic5TeVppCollision2017VtxSmearingParameters,VtxSmearedCommon
VtxSmeared = cms.EDProducer("BetafuncEvtVtxGenerator",
Fixed_EmitRealistic5TeVppCollision2017VtxSmearingParameters,
VtxSmearedCommon
)
13 changes: 13 additions & 0 deletions IOMC/EventVertexGenerators/python/VtxSmearedParameters_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,19 @@
Z0 = cms.double(0.619)
)

# Fixed Emittance (X2) in Beam spot extracted from data for 2017 pp run @ 5 TeV
Fixed_EmitRealistic5TeVppCollision2017VtxSmearingParameters = cms.PSet(
Phi = cms.double(0.0),
BetaStar = cms.double(311),
Emittance = cms.double(7.6e-8),
Alpha = cms.double(0.0),
SigmaZ = cms.double(5.82),
TimeOffset = cms.double(0.0),
X0 = cms.double(-0.0228),
Y0 = cms.double(0.0795),
Z0 = cms.double(0.619)
)

# From 2018B 3.8T data
# BS parameters extracted from run 316199, fill 6675 (from StreamExpressAlignment, HP BS):
# X0 = 0.09676 [cm]
Expand Down