Improve ctlike output

ctlike now computes the observed number of events and dumps the information just before the predicted number of events into the log file. The difference between the observed and predicted number of events is also given so that one knows immediately if the fit behaved as it should. This commit closes actions #87 and #88 and the feature #54.

Improve ctlike output
ctlike now computes the observed number of events and dumps the information just before the predicted number of events into the log file. The difference between the observed and predicted number of events is also given so that one knows immediately if the fit behaved as it should. This commit closes actions #87 and #88 and the feature #54.
Jürgen Knödlseder
1 parent 4e47b21b
Showing 4 changed files with 24 additions and 9 deletions
ChangeLog
NEWS
src/ctlike/ctlike.cpp
src/ctlike/ctlike.hpp
@@ -4,18 +4,20 @@
         ========================
 	Add observation definition XML files support to ctobssim
+        Improve logging information for ctlike
 2012-03-08  Juergen Knoedlseder  <jurgen.knodlseder@irap.omp.eu>
         * Version 0.4.0 released
         ========================
-        Add handling of observation definition XML files to ctselect, ctbin
-          and ctlike
+        Add handling of observation definition XML files to ctselect
+        Add handling of observation definition XML files to ctbin
+        Add handling of observation definition XML files to ctlike
         Add deadtime correction factor to ctobssim
         No longer query output parameters first
-        Remove method parameter from ctlike and replace evfile and cntmap
-          parameters by infile parameter 
+        Remove method parameter from ctlike
+        Replace evfile and cntmap parameters by infile parameter in ctlike
         Add configure options for Mac OSX universal builds
         Remove automake dependency tracking
         Improve building of Python bindings
@@ -41,7 +41,11 @@ None
 7. ctlike - CTA maximum likelihood fitting
 ------------------------------------------
-None
+ctlike computes now the total number of observed events and dumps
+them in the log file just before it dumps the number of predicted
+events. It also computes the difference between observed and
+predicted events so that the difference is immediately visible.
+
 8. ctskymap - CTA sky mapping
 -----------------------------
@@ -256,10 +256,19 @@ void ctlike::run(void)
     // Optimize model parameters using LM optimizer
     optimize_lm();
+    // Compute number of observed events in all observations
+    double num_events = 0.0;
+    for (int i = 0; i < m_obs.size(); ++i) {
+        num_events += m_obs[i].events()->number();
+    }
+
     // Write results into logger
     if (logTerse()) {
-        log << " Maximum log likelihood ....: " << m_logL << std::endl;
-        log << " Npred .....................: " << m_obs.npred() << std::endl;
+        log << parformat("Maximum log likelihood") << m_logL << std::endl;
+        log << parformat("Observed events  (Nobs)") << num_events << std::endl;
+        log << parformat("Predicted events (Npred)") << m_obs.npred();
+        log << " (Nobs - Npred = " << num_events-m_obs.npred();
+        log << ")" << std::endl;
         log << m_obs.models() << std::endl;
     }
@@ -282,7 +291,7 @@ void ctlike::save(void)
     }
     // Get output filename
-    m_outmdl = (*this)["outmdl"].value();
+    m_outmdl = (*this)["outmdl"].filename();
     // Write results out as XML model
     if (toupper(m_outmdl) != "NONE") {
@@ -34,7 +34,7 @@
 /* __Definitions _________________________________________________________ */
 #define CTLIKE_NAME    "ctlike"
-#define CTLIKE_VERSION "00-03-00"
+#define CTLIKE_VERSION "00-04-00"
 /***********************************************************************//**