diff --git a/CMGTools/TTHAnalysis/python/analyzers/treeProducerSusyMultilepton.py b/CMGTools/TTHAnalysis/python/analyzers/treeProducerSusyMultilepton.py index 6870dabf517e9..b8d9221e63364 100644 --- a/CMGTools/TTHAnalysis/python/analyzers/treeProducerSusyMultilepton.py +++ b/CMGTools/TTHAnalysis/python/analyzers/treeProducerSusyMultilepton.py @@ -19,9 +19,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 or not sv.jet.btagWP("CSVM"))) 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 or not sv.jet.btagWP("CSVM"))) 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 or not sv.jet.btagWP("CSVM"))) 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("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("mZ1", lambda ev : ev.bestZ1[0], help="Best m(ll) SF/OS"), NTupleVariable("mZ1SFSS", lambda ev : ev.bestZ1sfss[0], help="Best m(ll) SF/SS"), @@ -114,16 +114,16 @@ def __init__(self, cfg_ana, cfg_comp, looperName): self.collections.update({ # put more here - "gentopquarks" : NTupleCollection("GenTop", genParticleType, 2, help="Generated top quarks from hard scattering"), - "genbquarks" : NTupleCollection("GenBQuark", genParticleType, 2, help="Generated bottom quarks from top quark decays"), + "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"), ##-------------------------------------------------- "selectedTaus" : NTupleCollection("TauGood", tauTypeSusy, 3, help="Taus after the preselection"), "otherLeptons" : NTupleCollection("LepOther", leptonTypeSusyExtra, 8, help="Leptons after the preselection"), "selectedLeptons" : NTupleCollection("LepGood", leptonTypeSusyExtra, 8, help="Leptons after the preselection"), ##------------------------------------------------ - "cleanJets" : NTupleCollection("Jet", jetTypeSusy, 8, help="Cental jets after full selection and cleaning, sorted by pt"), - "cleanJetsFwd" : NTupleCollection("JetFwd", jetTypeSusy, 4, help="Forward jets after full selection and cleaning, sorted by pt"), + "cleanJets" : NTupleCollection("Jet", jetTypeSusy, 15, help="Cental jets after full selection and cleaning, sorted by pt"), + "cleanJetsFwd" : NTupleCollection("JetFwd", jetTypeSusy, 6, help="Forward jets after full selection and cleaning, sorted by pt"), ##------------------------------------------------ "ivf" : NTupleCollection("SV", svType, 20, help="SVs from IVF"), "genBHadrons" : NTupleCollection("GenBHad", heavyFlavourHadronType, 20, mcOnly=True, help="Gen-level B hadrons"),