From 20736d3866c70b14567eb860ccda463e2d044f3c Mon Sep 17 00:00:00 2001
From: Joosep Pata <joosep.pata@cern.ch>
Date: Thu, 4 Feb 2016 20:39:08 +0200
Subject: [PATCH] fix uninitialized MEM
---
src/MEMClassifier.cc | 16 +++++++++-------
test/mem.py | 4 ++--
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/MEMClassifier.cc b/src/MEMClassifier.cc
index b2624b6..899eb33 100644
--- a/src/MEMClassifier.cc
+++ b/src/MEMClassifier.cc
@@ -81,11 +81,13 @@ void MEMClassifier::setup_mem(
MEM::Object* lep = make_lepton(lep_p4.Pt(), lep_p4.Eta(), lep_p4.Phi(), lep_p4.M(), selectedLeptonCharge[il]);
objs.push_back(lep);
integrand->push_back_object(lep);
+ std::cout << "adding lep " << lep->p4().Pt() << " charge " << lep->getObs(MEM::Observable::CHARGE) << std::endl;
}
assert(metP4.Pt() > 0);
- MEM::Object met(metP4, MEM::ObjectType::MET );
- integrand->push_back_object(&met);
+ MEM::Object* met = new MEM::Object(metP4, MEM::ObjectType::MET );
+ std::cout << "adding met pt " << met->p4().Pt() << " phi " << met->p4().Phi() << std::endl;
+ integrand->push_back_object(met);
}
MEMResult MEMClassifier::GetOutput(
@@ -116,7 +118,6 @@ MEMResult MEMClassifier::GetOutput(
MEM::PSVar::cos_q1, MEM::PSVar::phi_q1, MEM::PSVar::cos_qbar1, MEM::PSVar::phi_qbar1
}
);
-
std::cout << "MEM running background" << std::endl;
MEM::MEMOutput res_bkg = integrand->run(
MEM::FinalState::LH, MEM::Hypothesis::TTBB, {}, {
@@ -127,6 +128,7 @@ MEMResult MEMClassifier::GetOutput(
delete o;
}
objs.clear();
+ integrand->next_event();
res.p_sig = res_sig.p;
res.p_bkg = res_bkg.p;
@@ -216,10 +218,10 @@ MEMClassifier::MEMClassifier() : cfg(MEM::MEMConfig()) {
integrand = new MEM::Integrand(
0
- // MEM::DebugVerbosity::output
- // |MEM::DebugVerbosity::init
- // |MEM::DebugVerbosity::input
- // |MEM::DebugVerbosity::init_more
+ //MEM::DebugVerbosity::output
+ //|MEM::DebugVerbosity::init
+ //|MEM::DebugVerbosity::input
+ //|MEM::DebugVerbosity::init_more
// |MEM::DebugVerbosity::integration
,cfg
);
diff --git a/test/mem.py b/test/mem.py
index 4c637b2..ea3577a 100644
--- a/test/mem.py
+++ b/test/mem.py
@@ -39,7 +39,7 @@ for ev in events:
c_loosejets_p4 = CvectorLorentz()
c_loosejets_csv = Cvectordouble()
if jsev["event"]["cat"].startswith("sl"):
- print "tthbb13 blr=", jsev["event"]["blr"], "mem=", jsev["output"]["p_tth"], jsev["output"]["p_ttbb"], jsev["output"]["p"]
+ print "tthbb13 code blr=", jsev["event"]["blr"], "mem=", jsev["output"]["p_tth"], jsev["output"]["p_ttbb"], jsev["output"]["p"]
ret = f.GetOutput(c_leps_p4, c_leps_charge, c_jets_p4, c_jets_csv, c_loosejets_p4, c_loosejets_csv, met_p4)
- print "mem.py mem=", ret.p_sig, ret.p_bkg, ret.p
+ print "mem.py blr=", ret.blr_4b/(ret.blr_4b + ret.blr_2b), "mem=", ret.p_sig, ret.p_bkg, ret.p
--
GitLab