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

XeXe collision era and relval workflow #20749

Merged
merged 18 commits into from
Oct 9, 2017
Merged

XeXe collision era and relval workflow #20749

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
bf580de
Era to run customized pp reco for XeXe and a XeXe relval wf
mandrenguyen Oct 5, 2017
3c3fe57
remove tau validation and other dqm/validation fixes
mandrenguyen Oct 5, 2017
1e22923
Remove some spaces just to clean diff
mandrenguyen Oct 5, 2017
ac25b93
Improved style thanks to Matti's review
mandrenguyen Oct 5, 2017
e8245cc
fix undefined variable
mandrenguyen Oct 5, 2017
262bce0
Fix missing parameter and minor typo
mandrenguyen Oct 5, 2017
8643795
Fix accidental swap of originHalfLenght in MixedTriplets
mandrenguyen Oct 5, 2017
a5ba2a5
allow pp Reco to be repacked as well
mandrenguyen Oct 6, 2017
a726035
add ppEra_Run2_2017_pp_on_XeXe
mandrenguyen Oct 6, 2017
66dc0a7
instead of dropping taus, increase the thresholds
mandrenguyen Oct 6, 2017
d50ab0c
make sure relevant sequences and tasks are named and are imported
mandrenguyen Oct 6, 2017
8eddae5
disable boosted tau reco by bumping the thresholds for pp_on_XeXe_2017
mandrenguyen Oct 6, 2017
6853293
Added PAT step and mini-AOD validation to wf 148
mandrenguyen Oct 6, 2017
97cf091
More style changes for Matti
mandrenguyen Oct 6, 2017
d573a63
remove explicit type on originHalfLegnth in MixedTripletStep
mandrenguyen Oct 6, 2017
3bd804e
Switch to fake2 HLT menu
mandrenguyen Oct 6, 2017
a28df62
Fix typo
mandrenguyen Oct 6, 2017
7a6cb63
effectively disable corr function computations for subjets
mandrenguyen Oct 7, 2017
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
6 changes: 6 additions & 0 deletions Configuration/Eras/python/Era_Run2_2017_pp_on_XeXe_cff.py
View file
Open in desktop
@@ -0,0 +1,6 @@
import FWCore.ParameterSet.Config as cms

from Configuration.Eras.Era_Run2_2017_cff import Run2_2017
from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017

Run2_2017_pp_on_XeXe = cms.ModifierChain(Run2_2017, pp_on_XeXe_2017)
4 changes: 4 additions & 0 deletions Configuration/Eras/python/Modifier_pp_on_XeXe_2017_cff.py
View file
Open in desktop
@@ -0,0 +1,4 @@
import FWCore.ParameterSet.Config as cms

pp_on_XeXe_2017 = cms.Modifier()

139 changes: 139 additions & 0 deletions Configuration/Generator/python/Hydjet_Quenched_MinBias_XeXe_5442GeV_cfi.py
View file
Open in desktop
@@ -0,0 +1,139 @@
import FWCore.ParameterSet.Config as cms

from Configuration.Generator.Pyquen2015Settings_cff import *
from Configuration.Generator.PythiaUESettings_cfi import *

generator = cms.EDFilter("HydjetGeneratorFilter",
aBeamTarget = cms.double(129.0), ## beam/target atomic number
comEnergy = cms.double(5442.0),
qgpInitialTemperature = cms.double(1.), ## initial temperature of QGP; allowed range [0.2,2.0]GeV;
qgpProperTimeFormation = cms.double(0.1), ## proper time of QGP formation; allowed range [0.01,10.0]fm/c;
hadronFreezoutTemperature = cms.double(0.125),
doRadiativeEnLoss = cms.bool(True), ## if true, perform partonic radiative en loss
doCollisionalEnLoss = cms.bool(True),
qgpNumQuarkFlavor = cms.int32(0), ## number of active quark flavors in qgp; allowed values: 0,1,2,3
numQuarkFlavor = cms.int32(0), ## to be removed
sigmaInelNN = cms.double(70),
shadowingSwitch = cms.int32(1),
nMultiplicity = cms.int32(9000),
fracSoftMultiplicity = cms.double(1.),
maxLongitudinalRapidity = cms.double(2.3),
maxTransverseRapidity = cms.double(1.15),
angularSpectrumSelector = cms.int32(1),
rotateEventPlane = cms.bool(True),
allowEmptyEvents = cms.bool(False),
embeddingMode = cms.bool(False),
hydjetMode = cms.string('kHydroQJets'),

PythiaParameters = cms.PSet(
pythiaUESettingsBlock,
hydjetPythiaDefault = cms.vstring('MSEL=0 ! user processes',
'CKIN(3)=8.15',# ! ptMin
'MSTP(81)=1'
),
myParameters = cms.vstring('MDCY(310,1)=0'),
pythiaJets = cms.vstring('MSUB(11)=1', # q+q->q+q
'MSUB(12)=1', # q+qbar->q+qbar
'MSUB(13)=1', # q+qbar->g+g
'MSUB(28)=1', # q+g->q+g
'MSUB(53)=1', # g+g->q+qbar
'MSUB(68)=1' # g+g->g+g
),
pythiaPromptPhotons = cms.vstring('MSUB(14)=1', # q+qbar->g+gamma
'MSUB(18)=1', # q+qbar->gamma+gamma
'MSUB(29)=1', # q+g->q+gamma
'MSUB(114)=1', # g+g->gamma+gamma
'MSUB(115)=1' # g+g->g+gamma
),
pythiaZjets = cms.vstring('MSUB(15)=1',
'MSUB(30)=1'),
pythiaCharmoniumNRQCD = cms.vstring('MSUB(421) = 1',
'MSUB(422) = 1',
'MSUB(423) = 1',
'MSUB(424) = 1',
'MSUB(425) = 1',
'MSUB(426) = 1',
'MSUB(427) = 1',
'MSUB(428) = 1',
'MSUB(429) = 1',
'MSUB(430) = 1',
'MSUB(431) = 1',
'MSUB(432) = 1',
'MSUB(433) = 1',
'MSUB(434) = 1',
'MSUB(435) = 1',
'MSUB(436) = 1',
'MSUB(437) = 1',
'MSUB(438) = 1',
'MSUB(439) = 1'
),

pythiaBottomoniumNRQCD = cms.vstring('MSUB(461) = 1',
'MSUB(462) = 1',
'MSUB(463) = 1',
'MSUB(464) = 1',
'MSUB(465) = 1',
'MSUB(466) = 1',
'MSUB(467) = 1',
'MSUB(468) = 1',
'MSUB(469) = 1',
'MSUB(470) = 1',
'MSUB(471) = 1',
'MSUB(472) = 1',
'MSUB(473) = 1',
'MSUB(474) = 1',
'MSUB(475) = 1',
'MSUB(476) = 1',
'MSUB(477) = 1',
'MSUB(478) = 1',
'MSUB(479) = 1',
),
pythiaWeakBosons = cms.vstring('MSUB(1)=1',
'MSUB(2)=1'),
pythiaQuarkoniaSettings = cms.vstring('PARP(141)=1.16', # Matrix Elements
'PARP(142)=0.0119',
'PARP(143)=0.01',
'PARP(144)=0.01',
'PARP(145)=0.05',
'PARP(146)=9.28',
'PARP(147)=0.15',
'PARP(148)=0.02',
'PARP(149)=0.02',
'PARP(150)=0.085',
# Meson spin
'PARJ(13)=0.60',
'PARJ(14)=0.162',
'PARJ(15)=0.018',
'PARJ(16)=0.054',
# Polarization
'MSTP(145)=0',
'MSTP(146)=0',
'MSTP(147)=0',
'MSTP(148)=1',
'MSTP(149)=1',
# Chi_c branching ratios
'BRAT(861)=0.202',
'BRAT(862)=0.798',
'BRAT(1501)=0.013',
'BRAT(1502)=0.987',
'BRAT(1555)=0.356',
'BRAT(1556)=0.644'
),
# Quarkonia and Weak Bosons added back upon dilepton group's request.
parameterSets = cms.vstring('pythiaUESettings',
'hydjetPythiaDefault',
'myParameters',
'pythiaJets',
'pythiaPromptPhotons',
'pythiaZjets',
'pythiaBottomoniumNRQCD',
'pythiaCharmoniumNRQCD',
'pythiaQuarkoniaSettings',
'pythiaWeakBosons'
)
),
cFlag = cms.int32(1),
bMin = cms.double(0),
bMax = cms.double(30),
bFixed = cms.double(0)
)
2 changes: 2 additions & 0 deletions Configuration/PyReleaseValidation/python/relval_standard.py
View file
Open in desktop
Expand Up @@ -423,6 +423,8 @@
workflows[140] = ['',['HydjetQ_B12_5020GeV_2011','DIGIHI2011','RECOHI2011','HARVESTHI2011']]
### Run II cond., 2015
workflows[145] = ['',['HydjetQ_B12_5020GeV_2015','DIGIHI2015','RECOHI2015','HARVESTHI2015']]
### Run II cond., 2017
workflows[148] = ['',['HydjetQ_MinBias_XeXe_5442GeV_2017','DIGIHI2017','RECOHI2017','HARVESTHI2017']]
### Run II cond., 2018
workflows[150] = ['',['HydjetQ_B12_5020GeV_2018','DIGIHI2018','RECOHI2018','HARVESTHI2018']]
workflows[150.1] = ['',['QCD_Pt_80_120_13_HI','DIGIHI2018','RECOHI2018','HARVESTHI2018']]
Expand Down
9 changes: 9 additions & 0 deletions Configuration/PyReleaseValidation/python/relval_steps.py
View file
Open in desktop
Expand Up @@ -695,16 +695,19 @@ def genS(fragment,howMuch):

hiAlca2011 = {'--conditions':'auto:run1_mc_hi'}
hiAlca2015 = {'--conditions':'auto:run2_mc_hi', '--era':'Run2_HI'}
hiAlca2017 = {'--conditions':'auto:phase1_2017_realistic', '--era':'Run2_2017_pp_on_XeXe'}
hiAlca2018 = {'--conditions':'auto:phase1_2017_realistic', '--era':'Run2_2017'}


hiDefaults2011=merge([hiAlca2011,{'--scenario':'HeavyIons','-n':2}])
hiDefaults2015=merge([hiAlca2015,{'--scenario':'HeavyIons','-n':2}])
hiDefaults2017=merge([hiAlca2017,{'-n':2}])
hiDefaults2018=merge([hiAlca2018,{'--scenario':'HeavyIons','-n':2}])


steps['HydjetQ_B12_5020GeV_2011']=merge([{'-n':1,'--beamspot':'RealisticHI2011Collision'},hiDefaults2011,genS('Hydjet_Quenched_B12_5020GeV_cfi',U2000by1)])
steps['HydjetQ_B12_5020GeV_2015']=merge([{'-n':1,'--beamspot':'RealisticHICollision2015'},hiDefaults2015,genS('Hydjet_Quenched_B12_5020GeV_cfi',U2000by1)])
steps['HydjetQ_MinBias_XeXe_5442GeV_2017']=merge([{'-n':1},hiDefaults2017,gen2017('Hydjet_Quenched_MinBias_XeXe_5442GeV_cfi',U2000by1)])
steps['HydjetQ_B12_5020GeV_2018']=merge([{'-n':1},hiDefaults2018,gen2017('Hydjet_Quenched_B12_5020GeV_cfi',U2000by1)])

steps['QCD_Pt_80_120_13_HI']=merge([hiDefaults2018,gen2017('QCD_Pt_80_120_13TeV_TuneCUETP8M1_cfi',Kby(9,150))])
Expand Down Expand Up @@ -1102,6 +1105,7 @@ def lhegensim2017(fragment,howMuch):


steps['DIGIHI2018']=merge([{'-s':'DIGI:pdigi_hi,L1,DIGI2RAW,HLT:@fake'}, hiDefaults2018, {'--pileup':'HiMixNoPU'}, step2Upg2015Defaults])
steps['DIGIHI2017']=merge([{'-s':'DIGI:pdigi_hi,L1,DIGI2RAW,HLT:@fake'}, hiDefaults2017, step2Upg2015Defaults])
steps['DIGIHI2015']=merge([{'-s':'DIGI:pdigi_hi,L1,DIGI2RAW,HLT:HIon'}, hiDefaults2015, {'--pileup':'HiMixNoPU'}, step2Upg2015Defaults])
steps['DIGIHI2011']=merge([{'-s':'DIGI:pdigi_hi,L1,DIGI2RAW,HLT:@fake'}, hiDefaults2011, {'--pileup':'HiMixNoPU'}, step2Defaults])
steps['DIGIHIMIX']=merge([{'-s':'DIGI:pdigi_hi,L1,DIGI2RAW,HLT:HIon', '-n':2}, hiDefaults2018, {'--pileup':'HiMix'}, PUHI, step2Upg2015Defaults])
Expand Down Expand Up @@ -1556,6 +1560,7 @@ def gen2018HiMix(fragment,howMuch):
steps['RECOUP15_ID']=merge([{'--hltProcess':'HLT2'},steps['RECOUP15']])

steps['RECOHI2018']=merge([hiDefaults2018,{'-s':'RAW2DIGI,L1Reco,RECO,VALIDATION,DQM'},step3Up2015Defaults])
steps['RECOHI2017']=merge([hiDefaults2017,{'-s':'RAW2DIGI,L1Reco,RECO,EI,VALIDATION,DQM'},step3Up2015Defaults])
steps['RECOHI2015']=merge([hiDefaults2015,{'-s':'RAW2DIGI,L1Reco,RECO,VALIDATION,DQM'},step3Up2015Defaults])
steps['RECOHI2011']=merge([hiDefaults2011,{'-s':'RAW2DIGI,L1Reco,RECO,VALIDATION,DQM'},step3Defaults])

Expand Down Expand Up @@ -1801,6 +1806,10 @@ def gen2018HiMix(fragment,howMuch):
'--era' : 'Run2_2017',
'--filetype':'DQM',
'--scenario':'HeavyIons'}])
steps['HARVESTHI2017']=merge([hiDefaults2017,{'-s':'HARVESTING:validationHarvesting+dqmHarvesting',
'--mc':'',
'--era' : 'Run2_2017_pp_on_XeXe',
'--filetype':'DQM'}])
steps['HARVESTHI2015']=merge([hiDefaults2015,{'-s':'HARVESTING:validationHarvesting+dqmHarvesting',
'--mc':'',
'--era' : 'Run2_2016,Run2_HI',
Expand Down
1 change: 1 addition & 0 deletions Configuration/StandardSequences/python/Eras.py
View file
Open in desktop
Expand Up @@ -23,6 +23,7 @@ def __init__(self):
'Run2_2017_trackingRun2',
'Run2_2017_trackingPhase1QuadProp',
'Run2_2017_trackingLowPU',
'Run2_2017_pp_on_XeXe',
'Run2_2018',
'Run3',
'Phase2',
Expand Down
2 changes: 2 additions & 0 deletions DQMOffline/Configuration/python/DQMOffline_cff.py
View file
Open in desktop
Expand Up @@ -177,3 +177,5 @@
pfMetDQMAnalyzerMiniAOD, pfPuppiMetDQMAnalyzerMiniAOD # No hcalnoise yet
]))

from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017
pp_on_XeXe_2017.toReplaceWith(DQMOffline, DQMOffline.copyAndExclude([pfTauRunDQMValidation]))
3 changes: 3 additions & 0 deletions HLTriggerOffline/Common/python/HLTValidation_cff.py
View file
Open in desktop
Expand Up @@ -67,6 +67,9 @@
hltassociation.remove(hltMultiTrackValidationGsfTracks)
hltassociation.remove(hltMultiTrackValidationMuonTracks)

from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017
pp_on_XeXe_2017.toReplaceWith(hltvalidation, hltvalidation.copyAndExclude([HiggsValidationSequence]))

hltvalidation_preprod = cms.Sequence(
HLTTauVal
+heavyFlavorValidationSequence
Expand Down
3 changes: 2 additions & 1 deletion RecoEcal/Configuration/python/RecoEcal_EventContent_cff.py
View file
Open in desktop
Expand Up @@ -100,8 +100,9 @@

from Configuration.Eras.Modifier_pA_2016_cff import pA_2016
from Configuration.Eras.Modifier_peripheralPbPb_cff import peripheralPbPb
from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017
#HI-specific products needed in pp scenario special configurations
for e in [pA_2016, peripheralPbPb]:
for e in [pA_2016, peripheralPbPb, pp_on_XeXe_2017]:
for ec in [RecoEcalRECO.outputCommands, RecoEcalFEVT.outputCommands]:
e.toModify( ec, func=lambda outputCommands: outputCommands.extend(['keep recoCaloClusters_islandBasicClusters_*_*'])
)
11 changes: 11 additions & 0 deletions RecoEcal/Configuration/python/RecoEcal_cff.py
View file
Open in desktop
Expand Up @@ -20,3 +20,14 @@

ecalClustersNoPFBox = cms.Sequence(hybridClusteringSequence*multi5x5ClusteringSequence*multi5x5PreshowerClusteringSequence)
ecalClusters = cms.Sequence(ecalClustersNoPFBox*particleFlowSuperClusteringSequence)

from Configuration.Eras.Modifier_pA_2016_cff import pA_2016
from Configuration.Eras.Modifier_peripheralPbPb_cff import peripheralPbPb
from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017

from RecoEcal.EgammaClusterProducers.islandBasicClusters_cfi import islandBasicClusters

_ecalClustersHI = ecalClusters.copy()
_ecalClustersHI += islandBasicClusters
for e in [pA_2016, peripheralPbPb, pp_on_XeXe_2017]:
e.toReplaceWith(ecalClusters, _ecalClustersHI)
3 changes: 2 additions & 1 deletion RecoEgamma/Configuration/python/RecoEgamma_EventContent_cff.py
View file
Open in desktop
Expand Up @@ -178,8 +178,9 @@

from Configuration.Eras.Modifier_pA_2016_cff import pA_2016
from Configuration.Eras.Modifier_peripheralPbPb_cff import peripheralPbPb
from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017
#HI-specific products needed in pp scenario special configurations
for e in [pA_2016, peripheralPbPb]:
for e in [pA_2016, peripheralPbPb, pp_on_XeXe_2017]:
for ec in [RecoEgammaAOD.outputCommands, RecoEgammaRECO.outputCommands, RecoEgammaFEVT.outputCommands]:
e.toModify( ec, func=lambda outputCommands: outputCommands.extend(['keep recoHIPhotonIsolationedmValueMap_photonIsolationHIProducerppGED_*_*',
'keep recoHIPhotonIsolationedmValueMap_photonIsolationHIProducerpp_*_*'
Expand Down
4 changes: 2 additions & 2 deletions RecoEgamma/Configuration/python/RecoEgamma_cff.py
View file
Open in desktop
Expand Up @@ -42,14 +42,14 @@

from Configuration.Eras.Modifier_pA_2016_cff import pA_2016
from Configuration.Eras.Modifier_peripheralPbPb_cff import peripheralPbPb
from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017
#HI-specific algorithms needed in pp scenario special configurations
from RecoEcal.EgammaClusterProducers.islandBasicClusters_cfi import islandBasicClusters
from RecoHI.HiEgammaAlgos.photonIsolationHIProducer_cfi import photonIsolationHIProducerpp
from RecoHI.HiEgammaAlgos.photonIsolationHIProducer_cfi import photonIsolationHIProducerppGED

_egammaHighLevelRecoPostPF_HI = egammaHighLevelRecoPostPF.copy()
_egammaHighLevelRecoPostPF_HI += islandBasicClusters
_egammaHighLevelRecoPostPF_HI += photonIsolationHIProducerpp
_egammaHighLevelRecoPostPF_HI += photonIsolationHIProducerppGED
for e in [pA_2016, peripheralPbPb]:
for e in [pA_2016, peripheralPbPb, pp_on_XeXe_2017]:
e.toReplaceWith(egammaHighLevelRecoPostPF, _egammaHighLevelRecoPostPF_HI)
6 changes: 6 additions & 0 deletions RecoEgamma/EgammaPhotonProducers/python/photonCore_cfi.py
View file
Open in desktop
Expand Up @@ -20,3 +20,9 @@
scIslandEndcapProducer = 'particleFlowSuperClusterHGCalFromMultiCl',
pixelSeedProducer = 'electronMergedSeedsFromMultiCl'
)

photonCoreIsland = photonCore.clone(
scHybridBarrelProducer = "correctedIslandBarrelSuperClusters",
scIslandEndcapProducer = "correctedIslandEndcapSuperClusters",
minSCEt = 8.0
)
9 changes: 9 additions & 0 deletions RecoEgamma/EgammaPhotonProducers/python/photonSequence_cff.py
View file
Open in desktop
Expand Up @@ -10,8 +10,17 @@
photonSequence = cms.Sequence( photonCore + photons )
_photonSequenceFromMultiCl = photonSequence.copy()
_photonSequenceFromMultiCl += cms.Sequence ( photonCoreFromMultiCl + photonsFromMultiCl)
_photonSequenceWithIsland = photonSequence.copy()
_photonSequenceWithIsland += cms.Sequence ( photonCoreIsland + photonsIsland)


from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal
phase2_hgcal.toReplaceWith(
photonSequence, _photonSequenceFromMultiCl
)

from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017
pp_on_XeXe_2017.toReplaceWith(
photonSequence, _photonSequenceWithIsland
)

9 changes: 9 additions & 0 deletions RecoEgamma/EgammaPhotonProducers/python/photons_cfi.py
View file
Open in desktop
Expand Up @@ -84,3 +84,12 @@
photonProducer = 'photonCoreFromMultiCl'
)

photonsIsland = photons.clone(
photonProducer = "islandPhotonCore",
minSCEtBarrel = 5.0,
minSCEtEndcap = 15.0,
minR9Barrel = 10.,
minR9Endcap = 10.,
maxHoverEEndcap = 0.5,
maxHoverEBarrel = 0.99
)