From 10e1f7cc2c815185cbed72eb39677574eaf382a7 Mon Sep 17 00:00:00 2001
From: Jürgen Knödlseder <jurgen.knodlseder@irap.omp.eu>
Date: Thu, 26 Nov 2020 23:37:44 +0100
Subject: [PATCH] Add more logging information

---
 src/ctlike/ctlike.cpp | 37 ++++++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/ctlike/ctlike.cpp b/src/ctlike/ctlike.cpp
index e571446..8d88b3b 100755
--- a/src/ctlike/ctlike.cpp
+++ b/src/ctlike/ctlike.cpp
@@ -230,6 +230,15 @@ void ctlike::run(void)
     // Write input observation container into logger
     log_observations(NORMAL, m_obs, "Input observation");
 
+    // Compute number of observed events in all observations
+    m_nobs = 0.0;
+    for (int i = 0; i < m_obs.size(); ++i) {
+        double data = m_obs[i]->nobserved();
+        if (data >= 0.0) {
+            m_nobs += data;
+        }
+    }
+
     // Optimize model parameters using LM optimizer
     optimize_lm();
 
@@ -253,6 +262,16 @@ void ctlike::run(void)
     // Compute TS values if requested
     if (!ts_srcs.empty()) {
 
+        // Write general fit results in logger (will be repeated at the
+        // end)
+        log_header1(EXPLICIT, "Maximum likelihood optimisation results");
+        log_string(EXPLICIT, m_opt.print(m_chatter));
+        log_value(EXPLICIT, "Maximum log likelihood", gammalib::str(m_logL,3));
+        log_value(EXPLICIT, "Observed events  (Nobs)", gammalib::str(m_nobs,3));
+        log_value(EXPLICIT, "Predicted events (Npred)", gammalib::str(m_npred,3)+
+                  " (Nobs - Npred = "+gammalib::str(m_nobs-m_npred)+")");
+        log_string(VERBOSE, m_obs.models().print(m_chatter));
+
         // Store original maximum likelihood and models
         double  logL_src = m_logL;
         GModels models   = m_obs.models();
@@ -307,15 +326,6 @@ void ctlike::run(void)
 
     } // endif: requested TS computation
 
-    // Compute number of observed events in all observations
-    m_nobs = 0.0;
-    for (int i = 0; i < m_obs.size(); ++i) {
-        double data = m_obs[i]->nobserved();
-        if (data >= 0.0) {
-            m_nobs += data;
-        }
-    }
-
     // Write results into logger
     log_header1(NORMAL, "Maximum likelihood optimisation results");
     log_string(NORMAL, m_opt.print(m_chatter));
@@ -620,8 +630,13 @@ double ctlike::reoptimize_lm(void)
 
     // Write optimization results
     log.indent(0);
-    log_header1(NORMAL, "Maximum likelihood re-optimisation results");
-    log_string(NORMAL, opt->print(m_chatter));
+    log_header1(EXPLICIT, "Maximum likelihood re-optimisation results");
+    log_string(EXPLICIT, opt->print(m_chatter));
+    log_value(EXPLICIT, "Maximum log likelihood", gammalib::str(logL,3));
+    log_value(EXPLICIT, "Observed events  (Nobs)", gammalib::str(m_nobs,3));
+    log_value(EXPLICIT, "Predicted events (Npred)", gammalib::str(m_obs.npred(),3)+
+              " (Nobs - Npred = "+gammalib::str(m_nobs-m_obs.npred())+")");
+    log_string(VERBOSE, m_obs.models().print(m_chatter));
 
     // Return
     return (logL);
--
libgit2 0.21.4