Configuration was out of sync, fixed now.

cms-sw · Jun 22, 2017 · a7f4cda · a7f4cda
1 parent 68013b6
commit a7f4cda
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 21 deletions.
diff --git a/PhysicsTools/PatAlgos/python/slimming/applySubstructure_cff.py b/PhysicsTools/PatAlgos/python/slimming/applySubstructure_cff.py
@@ -50,10 +50,22 @@ def applySubstructure( process, postfix="" ) :
 
 
 
+    #add AK8 from PUPPI                                                                                                                                 
+    from RecoJets.JetProducers.ak4PFJets_cfi import ak4PFJetsPuppi
+    from RecoJets.JetProducers.ak8PFJets_cfi import ak8PFJetsPuppi
+    addToProcessAndTask('ak4PFJetsPuppi'+postfix,ak4PFJetsPuppi.clone(), process, task)
+    addToProcessAndTask('ak8PFJetsPuppi'+postfix,ak8PFJetsPuppi.clone(), process, task)
+    from RecoJets.Configuration.RecoPFJets_cff import ak8PFJetsPuppiSoftDrop
+    addToProcessAndTask('ak8PFJetsPuppiSoftDrop'+postfix, ak8PFJetsPuppiSoftDrop.clone(), process, task)
+    getattr(process,"ak8PFJetsPuppi").doAreaFastjet = True # even for standard ak8PFJets this is overwritten in RecoJets/Configuration/python/RecoPFJets_cff
+
+
     #add AK8 from PUPPI
-    #from RecoJets.JetProducers.ak4PFJets_cfi import ak4PFJetsPuppi
-    from RecoJets.Configuration.RecoPFJets_cff import ak8PFJetsPuppi, ak8PFJetsPuppiSoftDrop, ak8PFJetsPuppiConstituents, ak8PFJetsCHSConstituents
-    #addToProcessAndTask('ak4PFJetsPuppi'+postfix,ak4PFJetsPuppi.clone(), process, task)
+    from RecoJets.JetProducers.ak4PFJets_cfi import ak4PFJetsPuppi
+    from RecoJets.JetProducers.ak8PFJets_cfi import ak8PFJetsPuppi, ak8PFJetsPuppiSoftDrop, ak8PFJetsPuppiConstituents, ak8PFJetsCHSConstituents
+
+    #from RecoJets.Configuration.RecoPFJets_cff import ak8PFJetsPuppi, ak8PFJetsPuppiSoftDrop, ak8PFJetsPuppiConstituents, ak8PFJetsCHSConstituents
+    addToProcessAndTask('ak4PFJetsPuppi'+postfix,ak4PFJetsPuppi.clone(), process, task)
     addToProcessAndTask('ak8PFJetsPuppiConstituents', ak8PFJetsPuppiConstituents.clone(), process, task )
     addToProcessAndTask('ak8PFJetsCHSConstituents', ak8PFJetsCHSConstituents.clone(), process, task )
     addToProcessAndTask('ak8PFJetsPuppi'+postfix,ak8PFJetsPuppi.clone(), process, task)

diff --git a/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py b/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py
@@ -260,20 +260,11 @@ def miniAOD_customizeCommon(process):
     #---------------------------------------------------------------------------
 
     # Adding puppi jets
-<<<<<<< HEAD
     if not hasattr(process, 'ak4PFJetsPuppi'): #MM: avoid confilct with substructure call
         process.load('RecoJets.JetProducers.ak4PFJetsPuppi_cfi')
         task.add(process.ak4PFJets)
         task.add(process.ak4PFJetsPuppi)
-=======
-    #if not hasattr(process, 'ak4PFJetsPuppi'): #MM: avoid confilct with substructure call
-    from RecoJets.JetProducers.ak4PFJets_cfi import ak4PFJets, ak4PFJetsPuppi
-    addToProcessAndTask('ak4PFJetsPuppi',ak4PFJetsPuppi.clone(), process, task)
-    addToProcessAndTask('ak4PFJets',ak4PFJets.clone(), process, task)
-    task.add(process.ak4PFJets)
-    task.add(process.ak4PFJetsPuppi)
-
->>>>>>> A few miniaod inconsistencies fixed
+    process.ak4PFJetsPuppi.doAreaFastjet = True # even for standard ak4PFJets this is overwritten in RecoJets/Configuration/python/RecoPFJets_cff
     from RecoJets.JetAssociationProducers.j2tParametersVX_cfi import j2tParametersVX
     process.ak4PFJetsPuppiTracksAssociatorAtVertex = cms.EDProducer("JetTracksAssociatorAtVertex",
         j2tParametersVX,

diff --git a/PhysicsTools/PatUtils/python/tools/runMETCorrectionsAndUncertainties.py b/PhysicsTools/PatUtils/python/tools/runMETCorrectionsAndUncertainties.py
@@ -1462,11 +1462,11 @@ def ak4JetReclustering(self,process, pfCandCollection, patMetModuleSequence, pos
 
         jetColName+=postfix
         if not hasattr(process, jetColName):
-            process.load("RecoJets.JetProducers.ak4PFJets_cfi")
-            task.add(process.ak4PFJets)
-
+            #process.load("RecoJets.JetProducers.ak4PFJets_cfi")
+            #task.add(process.ak4PFJets)
+            from RecoJets.JetProducers.ak4PFJets_cfi import ak4PFJets
             #if chs:
-            addToProcessAndTask(jetColName, getattr(process,"ak4PFJets").clone(), process, task)
+            addToProcessAndTask(jetColName, ak4PFJets.clone(), process, task)
             getattr(process, jetColName).src = pfCandColl 
             getattr(process, jetColName).doAreaFastjet = True
 

diff --git a/RecoJets/Configuration/python/RecoPFJets_cff.py b/RecoJets/Configuration/python/RecoPFJets_cff.py
@@ -5,6 +5,7 @@
 from RecoJets.JetProducers.kt4PFJets_cfi import *
 from RecoJets.JetProducers.kt6PFJets_cfi import *
 from RecoJets.JetProducers.ca15PFJets_cfi import *
+from RecoJets.JetProducers.caTopTaggers_cff import cmsTopTagPFJetsCHS
 from CommonTools.ParticleFlow.pfNoPileUpJME_cff  import *
 from CommonTools.PileupAlgos.Puppi_cff import puppi
 from CommonTools.PileupAlgos.softKiller_cfi import softKiller
@@ -38,7 +39,8 @@
                            ak8PFJetsCHS+
                            ak8PFJetsCHSConstituents+
                            ak8PFJetsCHSSoftDrop+
-                           ak8PFJetsCHSSoftDropMass
+                           ak8PFJetsCHSSoftDropMass+
+                           cmsTopTagPFJetsCHS
     )
 
 recoAllPFJets=cms.Sequence(fixedGridRhoAll+

diff --git a/RecoJets/JetProducers/python/PFJetParameters_cfi.py b/RecoJets/JetProducers/python/PFJetParameters_cfi.py
@@ -14,7 +14,7 @@
     #nSigmaPU = cms.double(1.0),
     #radiusPU = cms.double(0.5),  
     # fastjet-style pileup     
-    doAreaFastjet       = cms.bool( False),
+    doAreaFastjet       = cms.bool( True ),
     doRhoFastjet        = cms.bool( False),
     doAreaDiskApprox    = cms.bool( False),
     Active_Area_Repeats = cms.int32(    1),

diff --git a/RecoJets/JetProducers/python/ak8PFJets_cfi.py b/RecoJets/JetProducers/python/ak8PFJets_cfi.py
@@ -7,7 +7,10 @@
 ##############################################################################
 # Standard AK8 Jets####################################################
 ##########################
-ak8PFJets = ak4PFJets.clone( rParam       = cms.double(0.8) )
+ak8PFJets = ak4PFJets.clone( 
+    rParam       = cms.double(0.8),
+    jetPtMin = cms.double(50.0) 
+    )
 
 ##############################################################################
 # AK8 jets with various pileup subtraction schemes

diff --git a/RecoJets/JetProducers/python/caTopTaggers_cff.py b/RecoJets/JetProducers/python/caTopTaggers_cff.py
@@ -6,7 +6,7 @@
 # with adjacency 
 cmsTopTagPFJetsCHS = cms.EDProducer(
     "CATopJetProducer",
-    PFJetParameters.clone( src = cms.InputTag('pfNoPileUpJME'),
+    PFJetParameters.clone( src = cms.InputTag("ak8PFJetsCHSConstituents", "constituents"),
                            doAreaFastjet = cms.bool(True),
                            doRhoFastjet = cms.bool(False),
 			   jetPtMin = cms.double(100.0)