Merge pull request cms-sw#74 from dgulhan/CsTune

Cs tune
mverwe · Apr 1, 2016 · a004544 · a004544
2 parents fb9e2ff + 6cc1e19
commit a004544
Show file tree

Hide file tree

Showing 15 changed files with 927 additions and 38 deletions.
diff --git a/HeavyIonsAnalysis/JetAnalysis/python/FullJetSequence_JECPbPb.py b/HeavyIonsAnalysis/JetAnalysis/python/FullJetSequence_JECPbPb.py
@@ -5,10 +5,13 @@
 
 from RecoJets.JetProducers.kt4PFJets_cfi import kt4PFJets
 from RecoHI.HiJetAlgos.hiFJRhoProducer import hiFJRhoProducer
+from RecoHI.HiJetAlgos.hiFJGridEmptyAreaCalculator_cff import hiFJGridEmptyAreaCalculator
 kt4PFJets.src = cms.InputTag('particleFlowTmp')
 kt4PFJets.doAreaFastjet = True
 kt4PFJets.jetPtMin      = cms.double(0.0)
 kt4PFJets.GhostArea     = cms.double(0.005)
+kt2PFJets = kt4PFJets.clone(rParam       = cms.double(0.2))
+
 
 from HeavyIonsAnalysis.JetAnalysis.jets.akPu1CaloJetSequence_PbPb_jec_cff import *
 from HeavyIonsAnalysis.JetAnalysis.jets.akVs1CaloJetSequence_PbPb_jec_cff import *
@@ -140,8 +143,10 @@
 jetSequences = cms.Sequence(
     voronoiBackgroundPF+
     voronoiBackgroundCalo+
+    kt2PFJets +
     kt4PFJets +
     hiFJRhoProducer +
+    hiFJGridEmptyAreaCalculator +
 
     hiReRecoCaloJets +
     hiReRecoPFJets +

diff --git a/HeavyIonsAnalysis/JetAnalysis/python/FullJetSequence_cleanedPbPb.py b/HeavyIonsAnalysis/JetAnalysis/python/FullJetSequence_cleanedPbPb.py
@@ -4,10 +4,13 @@
 from Configuration.StandardSequences.ReconstructionHeavyIons_cff import voronoiBackgroundPF, voronoiBackgroundCalo
 from RecoJets.JetProducers.kt4PFJets_cfi import kt4PFJets
 from RecoHI.HiJetAlgos.hiFJRhoProducer import hiFJRhoProducer
+from RecoHI.HiJetAlgos.hiFJGridEmptyAreaCalculator_cff import hiFJGridEmptyAreaCalculator
 kt4PFJets.src = cms.InputTag('particleFlowTmp')
 kt4PFJets.doAreaFastjet = True
 kt4PFJets.jetPtMin      = cms.double(0.0)
 kt4PFJets.GhostArea     = cms.double(0.005)
+kt2PFJets = kt4PFJets.clone(rParam       = cms.double(0.2))
+
 
 from HeavyIonsAnalysis.JetAnalysis.jets.akPu2CaloJetSequence_PbPb_mb_cff import *
 from HeavyIonsAnalysis.JetAnalysis.jets.akVs2CaloJetSequence_PbPb_mb_cff import *
@@ -47,8 +50,10 @@
 jetSequences = cms.Sequence(
     voronoiBackgroundPF+
     voronoiBackgroundCalo+
+    kt2PFJets +
     kt4PFJets +
     hiFJRhoProducer +
+    hiFJGridEmptyAreaCalculator +
 
     akPu2CaloJets +
     akPu2PFJets +

diff --git a/HeavyIonsAnalysis/JetAnalysis/python/FullJetSequence_nominalPbPb.py b/HeavyIonsAnalysis/JetAnalysis/python/FullJetSequence_nominalPbPb.py
@@ -4,10 +4,12 @@
 from Configuration.StandardSequences.ReconstructionHeavyIons_cff import voronoiBackgroundPF, voronoiBackgroundCalo
 from RecoJets.JetProducers.kt4PFJets_cfi import kt4PFJets
 from RecoHI.HiJetAlgos.hiFJRhoProducer import hiFJRhoProducer
+from RecoHI.HiJetAlgos.hiFJGridEmptyAreaCalculator_cff import hiFJGridEmptyAreaCalculator
 kt4PFJets.src = cms.InputTag('particleFlowTmp')
 kt4PFJets.doAreaFastjet = True
 kt4PFJets.jetPtMin      = cms.double(0.0)
 kt4PFJets.GhostArea     = cms.double(0.005)
+kt2PFJets = kt4PFJets.clone(rParam       = cms.double(0.2))
 
 from HeavyIonsAnalysis.JetAnalysis.jets.akPu2CaloJetSequence_PbPb_mc_cff import *
 from HeavyIonsAnalysis.JetAnalysis.jets.akVs2CaloJetSequence_PbPb_mc_cff import *
@@ -45,8 +47,10 @@
 jetSequences = cms.Sequence(
     voronoiBackgroundPF+
     voronoiBackgroundCalo+
+    kt2PFJets +
     kt4PFJets +
     hiFJRhoProducer +
+    hiFJGridEmptyAreaCalculator +
 
     akPu2CaloJets +
     akPu2PFJets +

diff --git a/HeavyIonsAnalysis/JetAnalysis/python/hiFJRhoAnalyzer_cff.py b/HeavyIonsAnalysis/JetAnalysis/python/hiFJRhoAnalyzer_cff.py
@@ -1,8 +1,19 @@
 import FWCore.ParameterSet.Config as cms
 
 hiFJRhoAnalyzer = cms.EDAnalyzer('HiFJRhoAnalyzer',
-                                 etaMap    = cms.InputTag('hiFJRhoProducer','mapEtaEdges','HiForest'),
-                                 rho       = cms.InputTag('hiFJRhoProducer','mapToRho'),
-                                 rhom      = cms.InputTag('hiFJRhoProducer','mapToRhoM'),
+                                 etaMap             = cms.InputTag('hiFJRhoProducer','mapEtaEdges','HiForest'),
+                                 rho                = cms.InputTag('hiFJRhoProducer','mapToRho'),
+                                 rhom               = cms.InputTag('hiFJRhoProducer','mapToRhoM'),
+                                 rhoCorr            = cms.InputTag('hiFJGridEmptyAreaCalculator','mapToRhoCorr'),
+                                 rhomCorr           = cms.InputTag('hiFJGridEmptyAreaCalculator','mapToRhoMCorr'),
+                                 rhoCorr1Bin            = cms.InputTag('hiFJGridEmptyAreaCalculator','mapToRhoCorr1Bin'),
+                                 rhomCorr1Bin           = cms.InputTag('hiFJGridEmptyAreaCalculator','mapToRhoMCorr1Bin'),
+                                 rhoGrid            = cms.InputTag('hiFJGridEmptyAreaCalculator','mapRhoVsEtaGrid'),
+                                 meanRhoGrid            = cms.InputTag('hiFJGridEmptyAreaCalculator','mapMeanRhoVsEtaGrid'),
+                                 etaMaxRhoGrid            = cms.InputTag('hiFJGridEmptyAreaCalculator','mapEtaMaxGrid'),
+                                 etaMinRhoGrid            = cms.InputTag('hiFJGridEmptyAreaCalculator','mapEtaMinGrid'),
+                                 ptJets            = cms.InputTag('hiFJRhoProducer','ptJets'),
+                                 etaJets            = cms.InputTag('hiFJRhoProducer','etaJets'),
+                                 areaJets            = cms.InputTag('hiFJRhoProducer','areaJets'),
 )
 
diff --git a/HeavyIonsAnalysis/JetAnalysis/python/jets/HiReRecoJets_HI_cff.py b/HeavyIonsAnalysis/JetAnalysis/python/jets/HiReRecoJets_HI_cff.py
@@ -1,25 +1,30 @@
 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.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('hiFJRhoProducer','mapToRho'),
-    rhom      = cms.InputTag('hiFJRhoProducer','mapToRhoM'),
-    csAlpha   = cms.double(1.),
-    writeJetsWithConst = cms.bool(True),
-    verbosity = cms.int32(0),
-    jetCollInstanceName = cms.string("pfParticlesCs")
-    #writeCompound = cms.bool(True)
-    )
+# 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.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))

diff --git a/HeavyIonsAnalysis/JetAnalysis/test/runForestAOD_PbPb_DATA_75X.py b/HeavyIonsAnalysis/JetAnalysis/test/runForestAOD_PbPb_DATA_75X.py
@@ -82,6 +82,8 @@
 process.kt4PFJets.doAreaFastjet = True
 process.kt4PFJets.jetPtMin      = cms.double(0.0)
 process.kt4PFJets.GhostArea     = cms.double(0.005)
+from RecoHI.HiJetAlgos.hiFJGridEmptyAreaCalculator_cff import hiFJGridEmptyAreaCalculator
+process.hiFJGridEmptyAreaCalculator = hiFJGridEmptyAreaCalculator
 
 process.load('HeavyIonsAnalysis.JetAnalysis.hiFJRhoAnalyzer_cff')
 
@@ -130,6 +132,7 @@
     voronoiBackgroundCalo+
     process.kt4PFJets +
     process.hiFJRhoProducer +
+	process.hiFJGridEmptyAreaCalculator +
     process.hiFJRhoAnalyzer +
     process.akPu2CaloJets +
     process.akPu2PFJets +