Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Beamspot nominal collision2015 #5463

Merged
merged 3 commits into from Sep 28, 2014
Merged

Beamspot nominal collision2015 #5463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b9acf7
introduce NominalCollision2015 beamspot scenario, according to: https…
Sep 21, 2014
4a605e1
beamspot of postLs1 relvals set to NominalCollision2015; run1 relvals…
Sep 22, 2014
03f3b15
UNDO: beamspot of postLs1 relvals set to NominalCollision2015
Sep 25, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions Configuration/PyReleaseValidation/python/relval_steps.py
View file
Open in desktop
Expand Up @@ -531,7 +531,7 @@ def genS(fragment,howMuch):


## upgrade dedicated wf
## extendedPhase1
## extendedPhase1 ## do we need these (unused)? ==>
step1UpepiDefaults = {'-s' : 'GEN,SIM',
'-n' : 10,
'--conditions' : 'DESIGN61_V10::All', #should be updated with autocond
Expand Down Expand Up @@ -582,12 +582,12 @@ def genepi(fragment,howMuch):
steps['ADDMonoJet_d3MD3_UPGPhase1_8']=genepi('ADDMonoJet_8TeV_d3MD3_cfi',Kby(9,100))
steps['ZpMM_UPGPhase1_8']=genepi('ZpMM_8TeV_cfi',Kby(9,200))
steps['WpM_UPGPhase1_8']=genepi('WpM_8TeV_cfi',Kby(9,200))
## <== do we need these (unused)?





#14TeV
#14TeV ## do we need these (unused)? ==>
#steps['TTbarLepton_UPGPhase1_14']=genepi('TTbarLepton_Tauola_14TeV_cfi',Kby(9,100))
steps['Wjet_Pt_80_120_UPGPhase1_14']=genepi('Wjet_Pt_80_120_14TeV_cfi',Kby(9,100))
steps['Wjet_Pt_3000_3500_UPGPhase1_14']=genepi('Wjet_Pt_3000_3500_14TeV_cfi',Kby(9,50))
Expand All @@ -614,7 +614,7 @@ def genepi(fragment,howMuch):
#steps['ADDMonoJet_d3MD3_UPGPhase1_14']=genepi('ADDMonoJet_14TeV_d3MD3_cfi',Kby(9,100))
#steps['ZpMM_UPGPhase1_14']=genepi('ZpMM_14TeV_cfi',Kby(9,200))
#steps['WpM_UPGPhase1_14']=genepi('WpM_14TeV_cfi',Kby(9,200))

## <== do we need these (unused)?

## 2015
steps['FourMuPt1_200_UPG2015']=gen2015('FourMuPt_1_200_cfi',Kby(10,100))
Expand Down Expand Up @@ -686,7 +686,7 @@ def genepi(fragment,howMuch):
#steps['WpM_UPG2015_14']=gen2015('WpM_14TeV_cfi',Kby(9,200))



## do we need these (unused)? ==>
step1Up2017Defaults = {'-s' : 'GEN,SIM',
'-n' : 10,
'--conditions' : 'auto:run2_mc',
Expand Down Expand Up @@ -763,7 +763,7 @@ def gen2017(fragment,howMuch):
steps['MinBias_TuneZ2star_UPG2017_14']=gen2017('MinBias_TuneZ2star_14TeV_pythia6_cff',Kby(9,300))
steps['WM_UPG2017_14']=gen2017('WM_14TeV_cfi',Kby(9,200))
steps['ZMM_UPG2017_14']=gen2017('ZMM_14TeV_cfi',Kby(18,300))

## <== do we need these (unused)?

## pPb tests
step1PPbDefaults={'--beamspot':'Realistic8TeVCollisionPPbBoost'}
Expand Down
5 changes: 3 additions & 2 deletions Configuration/StandardSequences/python/VtxSmeared.py
View file
Open in desktop
Expand Up @@ -20,15 +20,16 @@
'Realistic7TeVCollision2010B': 'IOMC.EventVertexGenerators.VtxSmearedRealistic7TeVCollision2010B_cfi',
'Realistic7TeVCollisionComm10': 'IOMC.EventVertexGenerators.VtxSmearedRealistic7TeVCollisionComm10_cfi',
'Realistic900GeVCollision': 'IOMC.EventVertexGenerators.VtxSmearedRealistic900GeVCollision_cfi',
'Realistic8TeVCollision': 'IOMC.EventVertexGenerators.VtxSmearedRealistic8TeVCollision_cfi',
'Realistic8TeVCollision': 'IOMC.EventVertexGenerators.VtxSmearedRealistic8TeVCollision_cfi',
'Realistic8TeV2012Collision': 'IOMC.EventVertexGenerators.VtxSmearedRealistic8TeV2012Collision_cfi',
'Realistic7TeV2011Collision': 'IOMC.EventVertexGenerators.VtxSmearedRealistic7TeV2011Collision_cfi',
'Realistic2p76TeV2011Collision': 'IOMC.EventVertexGenerators.VtxSmearedRealistic2p76TeV2011Collision_cfi',
'Realistic2p76TeV2013Collision': 'IOMC.EventVertexGenerators.VtxSmearedRealistic2p76TeV2013Collision_cfi',
'Centered7TeV2011Collision': 'IOMC.EventVertexGenerators.VtxSmearedCentered7TeV2011Collision_cfi',
'RealisticHI2011Collision': 'IOMC.EventVertexGenerators.VtxSmearedRealisticHI2011Collision_cfi',
'Realistic8TeVCollisionPPbBoost': 'GeneratorInterface.HiGenCommon.VtxSmearedRealisticPPbBoost8TeVCollision_cff',
'HLLHC' : 'IOMC.EventVertexGenerators.VtxSmearedHLLHC_cfi'
'HLLHC' : 'IOMC.EventVertexGenerators.VtxSmearedHLLHC_cfi',
'NominalCollision2015' : 'IOMC.EventVertexGenerators.VtxSmearedNominalCollision2015_cfi'

}
VtxSmearedDefaultKey='Realistic8TeVCollision'
Expand Down
7 changes: 7 additions & 0 deletions IOMC/EventVertexGenerators/python/VtxSmearedNominalCollision2015_cfi.py
View file
Open in desktop
@@ -0,0 +1,7 @@
import FWCore.ParameterSet.Config as cms

from IOMC.EventVertexGenerators.VtxSmearedParameters_cfi import *
VtxSmeared = cms.EDProducer("BetafuncEvtVtxGenerator",
NominalCollision2015VtxSmearingParameters,
VtxSmearedCommon
)
13 changes: 11 additions & 2 deletions IOMC/EventVertexGenerators/python/VtxSmearedParameters_cfi.py
View file
Open in desktop
Expand Up @@ -395,5 +395,14 @@
X0 = cms.double(0.2),
Z0 = cms.double(0.0)
)


NominalCollision2015VtxSmearingParameters = 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.0322),
Y0 = cms.double(0.0),
Z0 = cms.double(0.0)
)