Merge pull request cms-sw#159 from safarzad/CMG_MiniAOD_Lite_V6_0_fro…

…m-CMSSW_7_0_6 Update Singlelepton tree
parbol · Dec 4, 2014 · c1a36be · c1a36be
2 parents 1e63df8 + 85b85bf
commit c1a36be
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/CMGTools/TTHAnalysis/cfg/run_susySingleSoftlepton_cfg.py b/CMGTools/TTHAnalysis/cfg/run_susySingleSoftlepton_cfg.py
@@ -12,7 +12,7 @@
 
 ttHLepAna.loose_muon_pt  = 5
 ttHLepAna.loose_muon_relIso = 0.4
-ttHLepAna.ele_isoCorr = "deltaBeta" 
+ttHLepAna.mu_isoCorr = "deltaBeta" 
 #ttHLepAna.loose_muon_absIso5= 10
 ttHLepAna.loose_electron_pt  = 7
 ttHLepAna.loose_electron_relIso = 0.4

diff --git a/CMGTools/TTHAnalysis/cfg/run_susySinglelepton_cfg.py b/CMGTools/TTHAnalysis/cfg/run_susySinglelepton_cfg.py
@@ -11,10 +11,11 @@
 from CMGTools.TTHAnalysis.analyzers.susyCore_modules_cff import * 
 
 ttHLepAna.loose_muon_pt  = 10
-ttHLepAna.loose_muon_relIso = 0.2
+ttHLepAna.loose_muon_relIso = 0.4
+ttHLepAna.mu_isoCorr = "deltaBeta" 
 ttHLepAna.loose_electron_pt  = 10
-ttHLepAna.loose_electron_relIso = 0.2
-ttHLepAna.ele_isoCorr = "deltaBeta" 
+ttHLepAna.loose_electron_relIso = 0.4
+ttHLepAna.ele_isoCorr = "rhoArea" 
 
 
 # Redefine what I need
@@ -56,6 +57,13 @@
             doSecondVeto = False
             )
 
+susyCoreSequence.insert(susyCoreSequence.index(ttHCoreEventAna), 
+                        ttHSVAnalyzer)
+susyCoreSequence.insert(susyCoreSequence.index(ttHCoreEventAna), 
+                        ttHHeavyFlavourHadronAnalyzer)
+
+
+
 from CMGTools.TTHAnalysis.samples.samples_8TeV_v517 import triggers_1mu, triggers_1muHT, triggers_1eleHT
 
 # Tree Producer

diff --git a/CMGTools/TTHAnalysis/python/analyzers/treeProducerSusySingleLepton.py b/CMGTools/TTHAnalysis/python/analyzers/treeProducerSusySingleLepton.py
@@ -20,6 +20,9 @@ def __init__(self, cfg_ana, cfg_comp, looperName):
             NTupleVariable("htJet40a", lambda ev : ev.htJet40a, help="H_{T} computed from leptons and jets (with |eta|<4.7, pt > 40 GeV)"),
             NTupleVariable("mhtJet40", lambda ev : ev.mhtJet40, help="H_{T}^{miss} computed from leptons and jets (with |eta|<2.4, pt > 40 GeV)"),
             NTupleVariable("mhtJet40a", lambda ev : ev.mhtJet40a, help="H_{T}^{miss} computed from leptons and jets (with |eta|<4.7, pt > 40 GeV)"),
+            NTupleVariable("nSoftBJetLoose25",  lambda ev: sum([(sv.mva>0.3 and (sv.jet == None or sv.jet.pt() < 25)) for sv in ev.ivf]) + len(ev.bjetsMedium), int, help="Exclusive sum of jets with pt > 25 passing CSV medium and SV from ivf with loose sv mva"),
+            NTupleVariable("nSoftBJetMedium25", lambda ev: sum([(sv.mva>0.7 and (sv.jet == None or sv.jet.pt() < 25)) for sv in ev.ivf]) + len(ev.bjetsMedium), int, help="Exclusive sum of jets with pt > 25 passing CSV medium and SV from ivf with medium sv mva"),
+            NTupleVariable("nSoftBJetTight25",  lambda ev: sum([(sv.mva>0.9 and (sv.jet == None or sv.jet.pt() < 25)) for sv in ev.ivf]) + len(ev.bjetsMedium), int, help="Exclusive sum of jets with pt > 25 passing CSV medium and SV from ivf with tight sv mva"),
             ##--------------------------------------------------
             NTupleVariable("minMWjj", lambda ev: ev.minMWjj, int, help="minMWjj"),
             NTupleVariable("minMWjjPt", lambda ev: ev.minMWjjPt, int, help="minMWjjPt"),
@@ -36,13 +39,22 @@ def __init__(self, cfg_ana, cfg_comp, looperName):
         })
         self.collections.update({
             # put more here
+            "gentopquarks"    : NTupleCollection("GenTop",     genParticleType, 6, help="Generated top quarks from hard scattering"),
+            "genbquarks"      : NTupleCollection("GenBQuark",  genParticleType, 6, help="Generated bottom quarks from top quark decays"),
+            "genwzquarks"     : NTupleCollection("GenQuark",   genParticleWithSourceType, 6, help="Generated quarks from W/Z decays"),
+            "genParticles"     : NTupleCollection("genPart",  genParticleWithMotherId, 200, help="all pruned genparticles"), # need to decide which gen collection ?
+           ##------------------------------------------------
             "selectedLeptons" : NTupleCollection("LepGood", leptonTypeSusy, 8, help="Leptons after the preselection"),
             "otherLeptons"    : NTupleCollection("LepOther", leptonTypeSusy, 8, help="Leptons after the preselection"),
             "selectedTaus"    : NTupleCollection("TauGood", tauTypeSusy, 3, help="Taus after the preselection"),
             "selectedIsoTrack"    : NTupleCollection("isoTrack", isoTrackType, 50, help="isoTrack, sorted by pt"),
             ##------------------------------------------------
             "cleanJetsAll"       : NTupleCollection("Jet",     jetTypeSusy, 25, help="Cental jets after full selection and cleaning, sorted by pt"),
             "reclusteredFatJets" : NTupleCollection("FatJet",     fourVectorType,20, help="FatJets reclusterd from ak4 cleanJetsAll"),
+               ##----------------------------------------------
+            "ivf"       : NTupleCollection("SV",     svType, 20, help="SVs from IVF"),
+            "genBHadrons"  : NTupleCollection("GenBHad", heavyFlavourHadronType, 20, mcOnly=True, help="Gen-level B hadrons"),
+            "genDHadrons"  : NTupleCollection("GenDHad", heavyFlavourHadronType, 20, mcOnly=True, help="Gen-level D hadrons"),
         })
 
         ## Book the variables, but only if we're called explicitly and not through a base class