Merge pull request #7329 from ahinzmann/RemoveJetCollections

Update jet AOD/RECO event content

DQM/Physics/python/B2GDQM_cfi.py

@@ -14,7 +14,6 @@
         'ak4PFJets',
         'ak4PFJetsCHS',
         'ak8PFJetsCHS',
-        'ak8PFJetsCHSPruned',
         'ak8PFJetsCHSSoftDrop',
         'cmsTopTagPFJetsCHS'
         ),

DQM/Physics/python/singleTopDQM_cfi.py

@@ -62,11 +62,11 @@
     jetExtras = cms.PSet(
       ## when omitted monitor plots for pt will be filled from uncorrected
       ## jets                                            
-      jetCorrector = cms.string("ak5CaloL2L3"),
+      jetCorrector = cms.string("ak4CaloL2L3"),
       ## when omitted monitor plots will be filled w/o additional cut on
       ## jetID                                                   
 #      jetID  = cms.PSet(
-#        label  = cms.InputTag("ak5JetID"),
+#        label  = cms.InputTag("ak4JetID"),
 #        select = cms.string("fHPD < 0.98 & n90Hits>1 & restrictedEMF<1")
 #      ),
       ## when omitted no extra selection will be applied on jets before
@@ -121,10 +121,10 @@
   selection = cms.VPSet(
     cms.PSet(
       label  = cms.string("jets/calo:step0"),
-      src    = cms.InputTag("ak5CaloJets"),
+      src    = cms.InputTag("ak4CaloJets"),
       select = cms.string("pt>20 & abs(eta)<2.1 & 0.05<emEnergyFraction"),
       jetID  = cms.PSet(
-        label  = cms.InputTag("ak5JetID"),
+        label  = cms.InputTag("ak4JetID"),
         select = cms.string("fHPD < 0.98 & n90Hits>1 & restrictedEMF<1")
       ),
       min = cms.int32(2),
@@ -186,7 +186,7 @@
       ## when omitted monitor plots will be filled w/o additional cut on
       ## jetID                                                                                                   
 #      jetID  = cms.PSet(
-#        label  = cms.InputTag("ak5JetID"),
+#        label  = cms.InputTag("ak4JetID"),
 #        select = cms.string(""), ##fHPD < 0.98 & n90Hits>1 & restrictedEMF<1")
 #     ),
       ## when omitted no extra selection will be applied on jets before
@@ -347,7 +347,7 @@
       ## when omitted monitor plots will be filled w/o additional cut on
       ## jetID
 #      jetID  = cms.PSet(
-#        label  = cms.InputTag("ak5JetID"),
+#        label  = cms.InputTag("ak4JetID"),
 #        select = cms.string(" ")
 #      ),
       ## when omitted no extra selection will be applied on jets before

HLTriggerOffline/SUSYBSM/python/SUSYBSM_caloHT_cff.py

@@ -3,8 +3,8 @@
 SUSY_HLT_CaloHT200 = cms.EDAnalyzer("SUSY_HLT_InclusiveHT",
   trigSummary = cms.InputTag("hltTriggerSummaryAOD"),
   pfMETCollection = cms.InputTag("pfMet"),
-  pfJetCollection = cms.InputTag("ak5PFJetsCHS"),
-  caloJetCollection = cms.InputTag("ak5CaloJets"),
+  pfJetCollection = cms.InputTag("ak4PFJetsCHS"),
+  caloJetCollection = cms.InputTag("ak4CaloJets"),
   TriggerResults = cms.InputTag('TriggerResults','','HLT'),
   TriggerPath = cms.string('HLT_HT200_v'),
   TriggerPathAuxiliaryForHadronic = cms.string('HLT_IsoMu24_eta2p1_IterTrk02_v'),
@@ -16,8 +16,8 @@
 SUSY_HLT_CaloHT250 = cms.EDAnalyzer("SUSY_HLT_InclusiveHT",
   trigSummary = cms.InputTag("hltTriggerSummaryAOD"),
   pfMETCollection = cms.InputTag("pfMet"),
-  pfJetCollection = cms.InputTag("ak5PFJetsCHS"),
-  caloJetCollection = cms.InputTag("ak5CaloJets"),
+  pfJetCollection = cms.InputTag("ak4PFJetsCHS"),
+  caloJetCollection = cms.InputTag("ak4CaloJets"),
   TriggerResults = cms.InputTag('TriggerResults','','HLT'),
   TriggerPath = cms.string('HLT_HT250_v'),
   TriggerPathAuxiliaryForHadronic = cms.string('HLT_IsoMu24_eta2p1_IterTrk02_v'),
@@ -29,8 +29,8 @@
 SUSY_HLT_CaloHT300 = cms.EDAnalyzer("SUSY_HLT_InclusiveHT",
   trigSummary = cms.InputTag("hltTriggerSummaryAOD"),
   pfMETCollection = cms.InputTag("pfMet"),
-  pfJetCollection = cms.InputTag("ak5PFJetsCHS"),
-  caloJetCollection = cms.InputTag("ak5CaloJets"),
+  pfJetCollection = cms.InputTag("ak4PFJetsCHS"),
+  caloJetCollection = cms.InputTag("ak4CaloJets"),
   TriggerResults = cms.InputTag('TriggerResults','','HLT'),
   TriggerPath = cms.string('HLT_HT300_v'),
   TriggerPathAuxiliaryForHadronic = cms.string('HLT_IsoMu24_eta2p1_IterTrk02_v'),
@@ -42,8 +42,8 @@
 SUSY_HLT_CaloHT350 = cms.EDAnalyzer("SUSY_HLT_InclusiveHT",
   trigSummary = cms.InputTag("hltTriggerSummaryAOD"),
   pfMETCollection = cms.InputTag("pfMet"),
-  pfJetCollection = cms.InputTag("ak5PFJetsCHS"),
-  caloJetCollection = cms.InputTag("ak5CaloJets"),
+  pfJetCollection = cms.InputTag("ak4PFJetsCHS"),
+  caloJetCollection = cms.InputTag("ak4CaloJets"),
   TriggerResults = cms.InputTag('TriggerResults','','HLT'),
   TriggerPath = cms.string('HLT_HT350_v'),
   TriggerPathAuxiliaryForHadronic = cms.string('HLT_IsoMu24_eta2p1_IterTrk02_v'),
@@ -55,8 +55,8 @@
 SUSY_HLT_CaloHT400 = cms.EDAnalyzer("SUSY_HLT_InclusiveHT",
   trigSummary = cms.InputTag("hltTriggerSummaryAOD"),
   pfMETCollection = cms.InputTag("pfMet"),
-  pfJetCollection = cms.InputTag("ak5PFJetsCHS"),
-  caloJetCollection = cms.InputTag("ak5CaloJets"),
+  pfJetCollection = cms.InputTag("ak4PFJetsCHS"),
+  caloJetCollection = cms.InputTag("ak4CaloJets"),
   TriggerResults = cms.InputTag('TriggerResults','','HLT'),
   TriggerPath = cms.string('HLT_HT400_v'),
   TriggerPathAuxiliaryForHadronic = cms.string('HLT_IsoMu24_eta2p1_IterTrk02_v'),
@@ -68,8 +68,8 @@
 SUSY_HLT_CaloHT200_FASTSIM = cms.EDAnalyzer("SUSY_HLT_InclusiveHT",
   trigSummary = cms.InputTag("hltTriggerSummaryAOD"),
   pfMETCollection = cms.InputTag("pfMet"),
-  pfJetCollection = cms.InputTag("ak5PFJetsCHS"),
-  caloJetCollection = cms.InputTag("ak5CaloJets"),
+  pfJetCollection = cms.InputTag("ak4PFJetsCHS"),
+  caloJetCollection = cms.InputTag("ak4CaloJets"),
   TriggerResults = cms.InputTag('TriggerResults','','HLT'),
   TriggerPath = cms.string('HLT_HT200_v'),
   TriggerPathAuxiliaryForHadronic = cms.string('HLT_IsoMu24_eta2p1_IterTrk02_v'),
@@ -81,8 +81,8 @@
 SUSY_HLT_CaloHT250_FASTSIM = cms.EDAnalyzer("SUSY_HLT_InclusiveHT",
   trigSummary = cms.InputTag("hltTriggerSummaryAOD"),
   pfMETCollection = cms.InputTag("pfMet"),
-  pfJetCollection = cms.InputTag("ak5PFJetsCHS"),
-  caloJetCollection = cms.InputTag("ak5CaloJets"),
+  pfJetCollection = cms.InputTag("ak4PFJetsCHS"),
+  caloJetCollection = cms.InputTag("ak4CaloJets"),
   TriggerResults = cms.InputTag('TriggerResults','','HLT'),
   TriggerPath = cms.string('HLT_HT250_v'),
   TriggerPathAuxiliaryForHadronic = cms.string('HLT_IsoMu24_eta2p1_IterTrk02_v'),
@@ -94,8 +94,8 @@
 SUSY_HLT_CaloHT300_FASTSIM = cms.EDAnalyzer("SUSY_HLT_InclusiveHT",
   trigSummary = cms.InputTag("hltTriggerSummaryAOD"),
   pfMETCollection = cms.InputTag("pfMet"),
-  pfJetCollection = cms.InputTag("ak5PFJetsCHS"),
-  caloJetCollection = cms.InputTag("ak5CaloJets"),
+  pfJetCollection = cms.InputTag("ak4PFJetsCHS"),
+  caloJetCollection = cms.InputTag("ak4CaloJets"),
   TriggerResults = cms.InputTag('TriggerResults','','HLT'),
   TriggerPath = cms.string('HLT_HT300_v'),
   TriggerPathAuxiliaryForHadronic = cms.string('HLT_IsoMu24_eta2p1_IterTrk02_v'),
@@ -107,8 +107,8 @@
 SUSY_HLT_CaloHT350_FASTSIM = cms.EDAnalyzer("SUSY_HLT_InclusiveHT",
   trigSummary = cms.InputTag("hltTriggerSummaryAOD"),
   pfMETCollection = cms.InputTag("pfMet"),
-  pfJetCollection = cms.InputTag("ak5PFJetsCHS"),
-  caloJetCollection = cms.InputTag("ak5CaloJets"),
+  pfJetCollection = cms.InputTag("ak4PFJetsCHS"),
+  caloJetCollection = cms.InputTag("ak4CaloJets"),
   TriggerResults = cms.InputTag('TriggerResults','','HLT'),
   TriggerPath = cms.string('HLT_HT350_v'),
   TriggerPathAuxiliaryForHadronic = cms.string('HLT_IsoMu24_eta2p1_IterTrk02_v'),
@@ -120,8 +120,8 @@
 SUSY_HLT_CaloHT400_FASTSIM = cms.EDAnalyzer("SUSY_HLT_InclusiveHT",
   trigSummary = cms.InputTag("hltTriggerSummaryAOD"),
   pfMETCollection = cms.InputTag("pfMet"),
-  pfJetCollection = cms.InputTag("ak5PFJetsCHS"),
-  caloJetCollection = cms.InputTag("ak5CaloJets"),
+  pfJetCollection = cms.InputTag("ak4PFJetsCHS"),
+  caloJetCollection = cms.InputTag("ak4CaloJets"),
   TriggerResults = cms.InputTag('TriggerResults','','HLT'),
   TriggerPath = cms.string('HLT_HT400_v'),
   TriggerPathAuxiliaryForHadronic = cms.string('HLT_IsoMu24_eta2p1_IterTrk02_v'),

PhysicsTools/JetCharge/python/JetChargeProducer_cfi.py

@@ -2,7 +2,7 @@
 
 jetChargeProducer = cms.EDProducer("JetChargeProducer",
     var = cms.string('Pt'),
-    src = cms.InputTag("ic5JetTracksAssociatorAtVertex"),
+    src = cms.InputTag("ak4JTA"),
     exp = cms.double(1.0)
 )
 

PhysicsTools/PatAlgos/plugins/PATJetProducer.cc

@@ -450,7 +450,7 @@ void PATJetProducer::fillDescriptions(edm::ConfigurationDescriptions & descripti
 
   // track association
   iDesc.add<bool>("addAssociatedTracks", true);
-  iDesc.add<edm::InputTag>("trackAssociationSource", edm::InputTag("ic5JetTracksAssociatorAtVertex"));
+  iDesc.add<edm::InputTag>("trackAssociationSource", edm::InputTag("ak4JTA"));
 
   // tag info
   iDesc.add<bool>("addTagInfos", true);

RecoJets/Configuration/python/JetIDProducers_cff.py

@@ -17,4 +17,5 @@
                               kt4JetID + #kt6JetID +
                               ca4JetID + ca6JetID + gk5JetID + gk7JetID )
 
-recoJetIds = cms.Sequence( ak4JetID + ak7JetID + ic5JetID )
+recoJetIds = cms.Sequence( ak4JetID
+			  )

RecoJets/Configuration/python/RecoGenJets_cff.py

@@ -12,7 +12,7 @@
 
 
 sisCone8GenJets = sisCone5GenJets.clone( rParam = 0.8 )
-ak8GenJets      = ak5GenJets.clone( rParam = 0.8 )
+ak8GenJets      = ak5GenJets.clone( rParam = 0.8, jetPtMin = 15.0 )
 gk8GenJets      = gk5GenJets.clone( rParam = 0.8 )
 kt6GenJets      = kt4GenJets.clone( rParam = 0.6 )
 ca8GenJets      = ca4GenJets.clone( rParam = 0.8 )
@@ -44,10 +44,9 @@
 ca4GenJetsNoMuNoNu = ca4GenJets.clone( src = cms.InputTag("genParticlesForJetsNoMuNoNu") )
 ca8GenJetsNoMuNoNu = ca8GenJets.clone( src = cms.InputTag("genParticlesForJetsNoMuNoNu") )
 
-recoGenJets  = cms.Sequence(kt4GenJets+kt6GenJets+
-                            ak4GenJets+
-                            ak5GenJets+ak8GenJets+
-                            ak4GenJetsNoNu+ak8GenJetsNoNu)
+recoGenJets  = cms.Sequence(ak4GenJets+
+                            ak8GenJets
+			    )
 
 recoAllGenJets=cms.Sequence(kt4GenJets+kt6GenJets+
                             ak4GenJets+

RecoJets/Configuration/python/RecoJetAssociations_cff.py

@@ -11,5 +11,5 @@
 from RecoJets.JetAssociationProducers.kt4JTA_cff import *
 from RecoJets.JetAssociationProducers.ak4JTA_cff import *
 from RecoJets.JetAssociationProducers.ak7JTA_cff import *
-recoJetAssociations = cms.Sequence(ic5JetTracksAssociatorAtVertex+iterativeCone5JTA+ak4JTA)
+recoJetAssociations = cms.Sequence(ak4JTA)
 recoJetAssociationsExplicit = cms.Sequence(ak4JTAExplicit)