Merge pull request #6907 from fratnikov/ak4jets_v1

add ak4 gen and PF jets to corresponding sequences
cms-sw · Dec 15, 2014 · 8ec9c82 · 8ec9c82
2 parents ae8db5a + b50710f
commit 8ec9c82
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/RecoJets/Configuration/python/RecoGenJets_cff.py b/RecoJets/Configuration/python/RecoGenJets_cff.py
@@ -11,6 +11,7 @@
 
 
 sisCone8GenJets = sisCone5GenJets.clone( rParam = 0.8 )
+ak4GenJets      = ak5GenJets.clone( rParam = 0.4 )
 ak8GenJets      = ak5GenJets.clone( rParam = 0.8 )
 gk8GenJets      = gk5GenJets.clone( rParam = 0.8 )
 kt6GenJets      = kt4GenJets.clone( rParam = 0.6 )
@@ -42,10 +43,10 @@
 ca6GenJetsNoMuNoNu = ca6GenJets.clone( src = cms.InputTag("genParticlesForJetsNoMuNoNu") )
 
 recoGenJets   =cms.Sequence(kt4GenJets+kt6GenJets+iterativeCone5GenJets+
-                            ak5GenJets+ak8GenJets)
+                            ak4GenJets+ak5GenJets+ak8GenJets)
 
 recoAllGenJets=cms.Sequence(kt4GenJets+kt6GenJets+
-                            ak5GenJets+ak8GenJets)
+                             ak4GenJets+ak5GenJets+ak8GenJets)
 
 recoAllGenJetsNoNu=cms.Sequence(kt4GenJetsNoNu+kt6GenJetsNoNu+
                                 ak5GenJetsNoNu+ak8GenJetsNoNu)

diff --git a/RecoJets/Configuration/python/RecoPFJets_cff.py b/RecoJets/Configuration/python/RecoPFJets_cff.py
@@ -15,6 +15,7 @@
 from RecoJets.JetProducers.caTopTaggers_cff import *
 
 sisCone7PFJets = sisCone5PFJets.clone( rParam = 0.7 )
+ak4PFJets = ak5PFJets.clone( rParam = 0.4 )
 ak7PFJets = ak5PFJets.clone( rParam = 0.7 )
 ak8PFJets = ak5PFJets.clone( rParam = 0.8 )
 gk7PFJets = gk5PFJets.clone( rParam = 0.7 )
@@ -68,6 +69,8 @@
     src = cms.InputTag("pfNoPileUpJME")
     )
 
+ak4PFJetsCHS = ak5PFJetsCHS.clone( rParam = 0.4 )
+
 ak5PFJetsCHSPruned = ak5PFJetsPruned.clone(
     src = cms.InputTag("pfNoPileUpJME")
     )
@@ -152,7 +155,8 @@
                            cmsTopTagPFJetsCHS+
                            hepTopTagPFJetsCHS+
                            ca15PFJetsCHSMassDropFiltered+
-                           ca15PFJetsCHSFiltered
+                           ca15PFJetsCHSFiltered+
+                           ak4PFJets+ak4PFJetsCHS
     )
 
 recoAllPFJets=cms.Sequence(sisCone5PFJets+sisCone7PFJets+
@@ -183,5 +187,6 @@
                            cmsTopTagPFJetsCHS+
                            hepTopTagPFJetsCHS+
                            ca15PFJetsCHSMassDropFiltered+
-                           ca15PFJetsCHSFiltered
+                           ca15PFJetsCHSFiltered+
+                           ak4PFJets+ak4PFJetsCHS
     )