Merged rappoccio_B2G_CSA14 from repository ferencek

cbernet · Jul 28, 2014 · 3712c5d · 3712c5d
2 parents 4a7a912 + fd4d24a
commit 3712c5d
Showing 1 changed file with 42 additions and 9 deletions.
diff --git a/TopQuarkAnalysis/TopPairBSM/test/anaTrain_cfg.py b/TopQuarkAnalysis/TopPairBSM/test/anaTrain_cfg.py
@@ -162,6 +162,7 @@
 ############################ Run extra jet reconstruction ######################################
 ################################################################################################
 from RecoJets.Configuration.RecoPFJets_cff import *
+process.ca15PFJetsCHS = ca8PFJetsCHS.clone(rParam=1.5,src='pfNoPileUpJME',doAreaFastjet=False)
 process.hepTopTagPFJetsCHS = hepTopTagPFJetsCHS.clone(src='pfNoPileUpJME')
 
 from RecoJets.JetProducers.caTopTaggers_cff import CATopTagInfos, HEPTopTagInfos
@@ -184,7 +185,8 @@
    process,
    labelName = 'AK5PFCHS',
    jetSource = cms.InputTag('ak5PFJetsCHS'),
-   algo='ak5',
+   algo='ak',
+   rParam=0.5,
    jetCorrections = ('AK5PFchs', cms.vstring(['L1FastJet', 'L2Relative', 'L3Absolute']), 'Type-1'),
    btagDiscriminators = [
        'jetBProbabilityBJetTags'
@@ -204,15 +206,16 @@
    process,
    labelName = 'CA8PFCHS',
    jetSource = cms.InputTag('ca8PFJetsCHS'),
-   algo='ca8',
+   algo='ca',
+   rParam=0.8,
    jetCorrections = ('AK7PFchs', cms.vstring(['L1FastJet', 'L2Relative', 'L3Absolute']), 'None')
    )
 
 addJetCollection(
    process,
    labelName = 'CA8CMSTopTag',
    jetSource = cms.InputTag('cmsTopTagPFJetsCHS',''),
-   algo='ca8',
+   getJetMCFlavour=False,
    jetCorrections = ('AK7PFchs', cms.vstring(['L1FastJet', 'L2Relative', 'L3Absolute']), 'None'),
     btagInfos = [
         'CATopTagInfos'
@@ -223,7 +226,8 @@
    process,
    labelName = 'CA8CMSTopTagSubjets',
    jetSource = cms.InputTag('cmsTopTagPFJetsCHS','caTopSubJets'),
-   algo='ca8',
+   algo='ca',
+   rParam=0.8,
    jetCorrections = ('AK5PFchs', cms.vstring(['L1FastJet', 'L2Relative', 'L3Absolute']), 'None'),
    btagDiscriminators = [
        'jetBProbabilityBJetTags'
@@ -243,15 +247,16 @@
    process,
    labelName = 'CA8Pruned',
    jetSource = cms.InputTag('ca8PFJetsCHSPruned',''),
-   algo='ca8',
+   getJetMCFlavour=False,
    jetCorrections = ('AK7PFchs', cms.vstring(['L1FastJet', 'L2Relative', 'L3Absolute']), 'None')
    )
 
 addJetCollection(
    process,
    labelName = 'CA8PrunedSubjets',
    jetSource = cms.InputTag('ca8PFJetsCHSPruned','SubJets'),
-   algo='ca8',
+   algo='ca',
+   rParam=0.8,
    jetCorrections = ('AK5PFchs', cms.vstring(['L1FastJet', 'L2Relative', 'L3Absolute']), 'None'),
    btagDiscriminators = [
        'jetBProbabilityBJetTags'
@@ -272,15 +277,16 @@
    process,
    labelName = 'CA15HEPTopTag',
    jetSource = cms.InputTag('hepTopTagPFJetsCHS',''),
-   algo='ca8',
+   getJetMCFlavour=False,
    jetCorrections = ('AK7PFchs', cms.vstring(['L1FastJet', 'L2Relative', 'L3Absolute']), 'None')
    )
 
 addJetCollection(
    process,
    labelName = 'CA15HEPTopTagSubjets',
    jetSource = cms.InputTag('hepTopTagPFJetsCHS','caTopSubJets'),
-   algo='ca8',
+   algo='ca',
+   rParam=1.5,
    jetCorrections = ('AK5PFchs', cms.vstring(['L1FastJet', 'L2Relative', 'L3Absolute']), 'None'),
    btagDiscriminators = [
        'jetBProbabilityBJetTags'
@@ -300,7 +306,8 @@
    process,
    labelName = 'EI',
    jetSource = cms.InputTag('pfJetsEI'),
-   algo='ak5',
+   algo='ak',
+   rParam=0.5,
    jetCorrections = ('AK5PFchs', cms.vstring(['L1FastJet', 'L2Relative', 'L3Absolute']), 'Type-1'),
    btagDiscriminators = [
        'jetBProbabilityBJetTags'
@@ -319,6 +326,8 @@
 switchJetCollection(
     process,
     jetSource = cms.InputTag('ak5PFJets'),
+    algo='ak',
+    rParam=0.5,
     jetCorrections = ('AK5PF', cms.vstring(['L1FastJet', 'L2Relative', 'L3Absolute']), 'Type-1'),
     btagDiscriminators = [
        'jetBProbabilityBJetTags'
@@ -335,6 +344,30 @@
    )
 
 
+# Subjet flavor still requires some manual tweaking until it is better integrated into PAT
+# Adjust the flavor of subjets of pruned CA8 jets
+process.patJetFlavourAssociationCA8PrunedSubjets = process.patJetFlavourAssociationCA8PrunedSubjets.clone(
+    jets = cms.InputTag('ca8PFJetsCHS'),
+    groomedJets = cms.InputTag('ca8PFJetsCHSPruned'),
+    subjets = cms.InputTag('ca8PFJetsCHSPruned','SubJets')
+)
+process.patJetsCA8PrunedSubjets.JetFlavourInfoSource = cms.InputTag('patJetFlavourAssociationCA8PrunedSubjets','SubJets')
+# Adjust the flavor of subjets of CMSTopTag jets
+process.patJetFlavourAssociationCA8CMSTopTagSubjets = process.patJetFlavourAssociationCA8CMSTopTagSubjets.clone(
+    jets = cms.InputTag('ca8PFJetsCHS'),
+    groomedJets = cms.InputTag('cmsTopTagPFJetsCHS'),
+    subjets = cms.InputTag('cmsTopTagPFJetsCHS','caTopSubJets')
+)
+process.patJetsCA8CMSTopTagSubjets.JetFlavourInfoSource = cms.InputTag('patJetFlavourAssociationCA8CMSTopTagSubjets','SubJets')
+# Adjust the flavor of subjets of HEPTopTag jets
+process.patJetFlavourAssociationCA15HEPTopTagSubjets = process.patJetFlavourAssociationCA15HEPTopTagSubjets.clone(
+    jets = cms.InputTag('ca15PFJetsCHS'),
+    groomedJets = cms.InputTag('hepTopTagPFJetsCHS'),
+    subjets = cms.InputTag('hepTopTagPFJetsCHS','caTopSubJets')
+)
+process.patJetsCA15HEPTopTagSubjets.JetFlavourInfoSource = cms.InputTag('patJetFlavourAssociationCA15HEPTopTagSubjets','SubJets')
+
+
 # Add some user functions for the secondary vertex mass. 
 for mod in [process.patJets,
             process.patJetsAK5PFCHS,