From f6f8d305cda6d7cd04e297e8d4d2f5f5b4211d24 Mon Sep 17 00:00:00 2001 From: Jürgen Knödlseder Date: Wed, 23 Jul 2014 00:05:11 +0200 Subject: [PATCH] Adjust TS computation code to avoid re-optimization after TS computation. --- src/ctlike/ctlike.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/ctlike/ctlike.cpp b/src/ctlike/ctlike.cpp index caed269..ec12970 100644 --- a/src/ctlike/ctlike.cpp +++ b/src/ctlike/ctlike.cpp @@ -271,6 +271,9 @@ void ctlike::run(void) // Optimize model parameters using LM optimizer optimize_lm(); + // Store Npred + double npred = m_obs.npred(); + // Optionally perform TS computation if (m_tscalc) { @@ -315,14 +318,17 @@ void ctlike::run(void) // Write results into logger if (logTerse()) { + log << std::endl; + log.header1("Maximum likelihood optimization results"); + log << *m_opt << std::endl; log << gammalib::parformat("Maximum log likelihood"); log << gammalib::str(m_logL,3) << std::endl; log << gammalib::parformat("Observed events (Nobs)"); log << gammalib::str(num_events, 3) << std::endl; log << gammalib::parformat("Predicted events (Npred)"); - log << gammalib::str(m_obs.npred(), 3); + log << gammalib::str(npred, 3); log << " (Nobs - Npred = "; - log << gammalib::str(num_events-m_obs.npred()); + log << gammalib::str(num_events-npred); log << ")" << std::endl; log << m_obs.models() << std::endl; } -- libgit2 0.21.4