Skip to content

Commit

Permalink
Merge pull request cms-sw#88 from kurtejung/FixCfgsFor80XMC
Browse files Browse the repository at this point in the history
fixing rho analyzer and mu tree for 80X
  • Loading branch information
kurtejung committed Nov 4, 2016
2 parents 9d23c84 + 697520d commit 72695ae
Show file tree
Hide file tree
Showing 9 changed files with 463 additions and 20 deletions.
11 changes: 11 additions & 0 deletions HeavyIonsAnalysis/Configuration/python/CommonFunctions_cff.py
Expand Up @@ -764,6 +764,17 @@ def overrideJEC_pPb8TeV(process):
connect = cms.string("frontier://FrontierProd/CMS_CONDITIONS"),
label = cms.untracked.string("AK4PF")
),
##adding PU = nonPU TEMPORARILY
cms.PSet(record = cms.string("JetCorrectionsRecord"),
tag = cms.string("JetCorrectorParametersCollection_Spring16_25nsV6_MC_AK4Calo"),
connect = cms.string("frontier://FrontierProd/CMS_CONDITIONS"),
label = cms.untracked.string("AKPu4Calo_offline")
),
cms.PSet(record = cms.string("JetCorrectionsRecord"),
tag = cms.string("JetCorrectorParametersCollection_Spring16_25nsV6_MC_AK4PF"),
connect = cms.string("frontier://FrontierProd/CMS_CONDITIONS"),
label = cms.untracked.string("AKPu4PF_offline")
)
])
return process

Expand Down
30 changes: 27 additions & 3 deletions HeavyIonsAnalysis/JetAnalysis/python/FullJetSequence_JECPPb.py
@@ -1,9 +1,21 @@
import FWCore.ParameterSet.Config as cms

from HeavyIonsAnalysis.JetAnalysis.jets.HiReRecoJets_pp_cff import *
from HeavyIonsAnalysis.JetAnalysis.jets.HiReRecoJets_pPb_cff import *

from HeavyIonsAnalysis.JetAnalysis.jets.ak4PFJetSequence_pPb_jec_cff import *
from HeavyIonsAnalysis.JetAnalysis.jets.akPu4PFJetSequence_pp_jec_cff import *
from HeavyIonsAnalysis.JetAnalysis.jets.ak4CaloJetSequence_pPb_jec_cff import *
from HeavyIonsAnalysis.JetAnalysis.jets.akPu4CaloJetSequence_pp_jec_cff import *
from HeavyIonsAnalysis.JetAnalysis.jets.akCs4PFJetSequence_pPb_jec_cff import *

from RecoJets.JetProducers.kt4PFJets_cfi import kt4PFJets
from RecoHI.HiJetAlgos.hiFJRhoProducer import hiFJRhoProducer
from RecoHI.HiJetAlgos.hiFJGridEmptyAreaCalculator_cff import hiFJGridEmptyAreaCalculator
kt4PFJets.src = cms.InputTag('particleFlow')
kt4PFJets.doAreaFastjet = True
kt4PFJets.jetPtMin = cms.double(0.0)
kt4PFJets.GhostArea = cms.double(0.005)
kt2PFJets = kt4PFJets.clone(rParam = cms.double(0.2))

ak4PFJetAnalyzer.doSubEvent = True
ak4CaloJetAnalyzer.doSubEvent = True
Expand All @@ -24,13 +36,25 @@
cut = cms.string('quality("highPurity")')
)

#custom for 80X
PFTowers.src = cms.InputTag("particleFlow")

jetSequences = cms.Sequence(
akGenJets +
# ppReRecoPFJets +
# ppReRecoCaloJets +
#kt2PFJets +
#kt4PFJets +
hiReRecoCaloJets +
PFTowers +
hiReRecoPFJets +
#hiFJRhoProducer +
#hiFJGridEmptyAreaCalculator +
makePartons +
highPurityTracks +
ak4CaloJets +
ak4PFJetSequence +
ak4CaloJetSequence
akPu4PFJetSequence +
ak4CaloJetSequence +
akPu4CaloJetSequence
#akCs4PFJetSequence
)
@@ -1,7 +1,7 @@
import FWCore.ParameterSet.Config as cms

hiFJRhoAnalyzer = cms.EDAnalyzer('HiFJRhoAnalyzer',
etaMap = cms.InputTag('hiFJRhoProducer','mapEtaEdges','HiForest'),
etaMap = cms.InputTag('hiFJRhoProducer','mapEtaEdges'),
rho = cms.InputTag('hiFJRhoProducer','mapToRho'),
rhom = cms.InputTag('hiFJRhoProducer','mapToRhoM'),
rhoCorr = cms.InputTag('hiFJGridEmptyAreaCalculator','mapToRhoCorr'),
Expand Down
155 changes: 155 additions & 0 deletions HeavyIonsAnalysis/JetAnalysis/python/jets/HiReRecoJets_pPb_cff.py
@@ -0,0 +1,155 @@
import FWCore.ParameterSet.Config as cms
from RecoHI.HiJetAlgos.HiRecoJets_cff import *
from RecoHI.HiJetAlgos.HiRecoPFJets_cff import *
# from RecoJets.JetProducers.ak8PFJetsCS_cfi import ak8PFJetsCS
from RecoJets.JetProducers.akCs4PFJets_cfi import akCs4PFJets

# akCs4PFJets = ak8PFJetsCS.clone(
# src = cms.InputTag('particleFlowTmp'),
# rParam = cms.double(0.4),
# jetPtMin = cms.double(0.0),
# doAreaFastjet = cms.bool(True),
# GhostArea = cms.double(0.005),
# useConstituentSubtraction = cms.bool(False),
# useConstituentSubtractionHi = cms.bool(True),
# etaMap = cms.InputTag('hiFJRhoProducer','mapEtaEdges'),
# rho = cms.InputTag('hiFJGridEmptyAreaCalculator','mapToRhoCorr'),
# rhom = cms.InputTag('hiFJGridEmptyAreaCalculator','mapToRhoMCorr'),
# csAlpha = cms.double(1.),
# writeJetsWithConst = cms.bool(True),
# verbosity = cms.int32(0),
# jetCollInstanceName = cms.string("pfParticlesCs")

##writeCompound = cms.bool(True)
# )

akCs4PFJets.src = cms.InputTag("particleFlow")
akCs4PFJets.rho = cms.InputTag('hiFJGridEmptyAreaCalculator','mapToRhoCorr1Bin')
akCs4PFJets.rhom = cms.InputTag('hiFJGridEmptyAreaCalculator','mapToRhoMCorr1Bin')
akCs1PFJets = akCs4PFJets.clone(rParam = cms.double(0.1))
akCs2PFJets = akCs4PFJets.clone(rParam = cms.double(0.2))
akCs3PFJets = akCs4PFJets.clone(rParam = cms.double(0.3))
akCs5PFJets = akCs4PFJets.clone(rParam = cms.double(0.5))
akCs6PFJets = akCs4PFJets.clone(rParam = cms.double(0.6))

from RecoJets.JetProducers.PFJetParameters_cfi import *
from RecoJets.JetProducers.AnomalousCellParameters_cfi import *
akCsSoftDrop4PFJets = cms.EDProducer(
"FastjetJetProducer",
PFJetParameters,
AnomalousCellParameters,
jetAlgorithm = cms.string("AntiKt"),
rParam = cms.double(0.4),
useSoftDrop = cms.bool(True),
zcut = cms.double(0.1),
beta = cms.double(0.0),
R0 = cms.double(0.4),
useExplicitGhosts = cms.bool(True),
writeCompound = cms.bool(True),
jetCollInstanceName=cms.string("SubJets")
)
akCsSoftDrop4PFJets.src = cms.InputTag("akCs4PFJets","pfParticlesCs")
akCsSoftDrop5PFJets = akCsSoftDrop4PFJets.clone(rParam = cms.double(0.5),
src = cms.InputTag("akCs5PFJets","pfParticlesCs"))
akCsSoftDrop6PFJets = akCsSoftDrop4PFJets.clone(rParam = cms.double(0.6),
src = cms.InputTag("akCs6PFJets","pfParticlesCs"))

akCsFilter4PFJets = cms.EDProducer(
"FastjetJetProducer",
PFJetParameters,
AnomalousCellParameters,
jetAlgorithm = cms.string("AntiKt"),
rParam = cms.double(0.4),
useFiltering = cms.bool(True),
nFilt = cms.int32(4),
rFilt = cms.double(0.15),
useExplicitGhosts = cms.bool(True),
writeCompound = cms.bool(True),
jetCollInstanceName=cms.string("SubJets")
)
akCsFilter4PFJets.src = cms.InputTag("akCs4PFJets","pfParticlesCs")
akCsFilter5PFJets = akCsFilter4PFJets.clone(rParam = cms.double(0.5),
src = cms.InputTag("akCs5PFJets","pfParticlesCs"))
akCsFilter6PFJets = akCsFilter4PFJets.clone(rParam = cms.double(0.6),
src = cms.InputTag("akCs6PFJets","pfParticlesCs"))

ak5PFJets.doAreaFastjet = cms.bool(True)
ak5PFJets.src = cms.InputTag('particleFlow')

ak1PFJets = ak5PFJets.clone(rParam = cms.double(0.1))
ak2PFJets = ak5PFJets.clone(rParam = cms.double(0.2))
ak3PFJets = ak5PFJets.clone(rParam = cms.double(0.3))
ak4PFJets = ak5PFJets.clone(rParam = cms.double(0.4))
ak6PFJets = ak5PFJets.clone(rParam = cms.double(0.6))

akPu1PFJets.jetPtMin = 1
akPu1CaloJets.jetPtMin = 1
akPu2PFJets.jetPtMin = 1
akPu2CaloJets.jetPtMin = 1
akPu3PFJets.jetPtMin = 1
akPu3CaloJets.jetPtMin = 1
akPu4PFJets.jetPtMin = 1
akPu4CaloJets.jetPtMin = 1
akPu5PFJets.jetPtMin = 1
akPu5CaloJets.jetPtMin = 1
akPu6PFJets.jetPtMin = 1
akPu6CaloJets.jetPtMin = 1
ak1PFJets.jetPtMin = 1
#ak1PFJets.src = cms.InputTag("particleFlowTmp")
ak1CaloJets.jetPtMin = 1
ak2PFJets.jetPtMin = 1
#ak2PFJets.src = cms.InputTag("particleFlowTmp")
ak2CaloJets.jetPtMin = 1
ak3PFJets.jetPtMin = 1
#ak3PFJets.src = cms.InputTag("particleFlowTmp")
ak3CaloJets.jetPtMin = 1
ak4PFJets.jetPtMin = 1
#ak4PFJets.src = cms.InputTag("particleFlowTmp")
ak4CaloJets.jetPtMin = 1
ak5PFJets.jetPtMin = 1
#ak5PFJets.src = cms.InputTag("particleFlowTmp")
ak5CaloJets.jetPtMin = 1
ak6PFJets.jetPtMin = 1
#ak6PFJets.src = cms.InputTag("particleFlowTmp")

hiReRecoPFJets = cms.Sequence(
akPu3PFJets
+
akPu4PFJets
+
akPu5PFJets
+
ak3PFJets
+
ak4PFJets
+
ak5PFJets
+
akCs3PFJets
+
akCs4PFJets
+
akCs5PFJets
#+
#akCsSoftDrop4PFJets
#+
#akCsSoftDrop5PFJets
#+
#akCsFilter4PFJets
#+
#akCsFilter5PFJets
)

hiReRecoCaloJets = cms.Sequence(
akPu3CaloJets
+
akPu4CaloJets
+
akPu5CaloJets
+
ak3CaloJets
+
ak4CaloJets
+
ak5CaloJets
)
1 change: 1 addition & 0 deletions HeavyIonsAnalysis/JetAnalysis/python/rechitanalyzer_cfi.py
Expand Up @@ -8,6 +8,7 @@
hcalHBHERecHitSrc = cms.untracked.InputTag("hbhereco"),
towersSrc = cms.untracked.InputTag("towerMaker"),
JetSrc = cms.untracked.InputTag("iterativeConePu5CaloJets"),
zdcRecHitSrc = cms.untracked.InputTag("zdcreco"),
useJets = cms.untracked.bool(True),
doBasicClusters = cms.untracked.bool(False),
doTowers = cms.untracked.bool(True),
Expand Down

0 comments on commit 72695ae

Please sign in to comment.