ctlike now derives from ctool base class.

Jürgen Knödlseder
1 parent fc6ccd39
Showing 4 changed files with 32 additions and 77 deletions
pyext/ctlike.i
src/ctlike/Makefile.am
src/ctlike/ctlike.cpp
src/ctlike/ctlike.hpp
 /***************************************************************************
- *                   ctlike - CTA maximum likelihood tool                  *
+ *                ctlike - Maximum likelihood fitting tool                 *
  * ----------------------------------------------------------------------- *
  *  copyright (C) 2010-2014 by Jurgen Knodlseder                           *
  * ----------------------------------------------------------------------- *
@@ -20,13 +20,12 @@
  ***************************************************************************/
 /**
  * @file ctlike.i
- * @brief CTA maximum likelihood tool Python interface definition
- * @author J. Knodlseder
+ * @brief Maximum likelihood fitting tool definition
+ * @author Juergen Knoedlseder
  */
 %{
 /* Put headers and other declarations here that are needed for compilation */
 #include "ctlike.hpp"
-#include "GTools.hpp"
 %}
@@ -35,8 +34,7 @@
  *
  * @brief CTA maximum likelihood tool Python interface
  ***************************************************************************/
-class ctlike : public GApplication  {
-
+class ctlike : public ctool {
 public:
     // Constructors and destructors
     ctlike(void);
@@ -56,7 +54,7 @@ public:
 /***********************************************************************//**
- * @brief CTA maximum likelihood tool Python extension
+ * @brief Maximum likelihood fitting tool Python extension
  ***************************************************************************/
 %extend ctlike {
     ctlike copy() {
 ## Process this file with automake to produce Makefile.in
+# Set include directories
+INCLUDES = -I$(top_srcdir)/src/support
+
 # Program name
 bin_PROGRAMS = ctlike
@@ -14,7 +17,7 @@ libctlike_la_SOURCES = $(sources)
 ctlike_SOURCES = main.cpp
 ctlike_LDFLAGS = $(LIB_LINK_OPTION) @LDFLAGS@
 ctlike_CPPFLAGS = @CPPFLAGS@
-ctlike_LDADD = libctlike.la
+ctlike_LDADD = libctlike.la $(top_srcdir)/src/support/libsupport.la
 # Parameter files
 pfilesdir = $(prefix)/syspfiles
 /***************************************************************************
- *                   ctlike - CTA maximum likelihood tool                  *
+ *                ctlike - Maximum likelihood fitting tool                 *
  * ----------------------------------------------------------------------- *
  *  copyright (C) 2010-2014 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
@@ -20,7 +20,7 @@
  ***************************************************************************/
 /**
  * @file ctlike.cpp
- * @brief CTA maximum likelihood tool implementation
+ * @brief Maximum likelihood fitting tool implementation
  * @author Juergen Knoedlseder
  */
@@ -49,14 +49,11 @@
 /***********************************************************************//**
  * @brief Void constructor
  ***************************************************************************/
-ctlike::ctlike(void) : GApplication(CTLIKE_NAME, CTLIKE_VERSION)
+ctlike::ctlike(void) : ctool(CTLIKE_NAME, CTLIKE_VERSION)
 {
     // Initialise members
     init_members();
-    // Write header into logger
-    log_header();
-
     // Return
     return;
 }
@@ -70,8 +67,7 @@ ctlike::ctlike(void) : GApplication(CTLIKE_NAME, CTLIKE_VERSION)
  * This method creates an instance of the class by copying an existing
  * observations container.
  ***************************************************************************/
-ctlike::ctlike(const GObservations& obs) :
-        GApplication(CTLIKE_NAME, CTLIKE_VERSION)
+ctlike::ctlike(const GObservations& obs) : ctool(CTLIKE_NAME, CTLIKE_VERSION)
 {
     // Initialise members
     init_members();
@@ -79,9 +75,6 @@ ctlike::ctlike(const GObservations&amp; obs) :
     // Set observations
     m_obs = obs;
-    // Write header into logger
-    log_header();
-
     // Return
     return;
 }
@@ -94,14 +87,11 @@ ctlike::ctlike(const GObservations&amp; obs) :
  * @param[in] argv Array of command line arguments.
  ***************************************************************************/
 ctlike::ctlike(int argc, char *argv[]) : 
-                        GApplication(CTLIKE_NAME, CTLIKE_VERSION, argc, argv)
+        ctool(CTLIKE_NAME, CTLIKE_VERSION, argc, argv)
 {
     // Initialise members
     init_members();
-    // Write header into logger
-    log_header();
-
     // Return
     return;
 }
@@ -112,7 +102,7 @@ ctlike::ctlike(int argc, char *argv[]) :
  *
  * @param[in] app Application.
  ***************************************************************************/
-ctlike::ctlike(const ctlike& app) : GApplication(app)
+ctlike::ctlike(const ctlike& app) : ctool(app)
 {
     // Initialise members
     init_members();
@@ -149,13 +139,13 @@ ctlike::~ctlike(void)
  *
  * @param[in] app Application.
  ***************************************************************************/
-ctlike& ctlike::operator= (const ctlike& app)
+ctlike& ctlike::operator=(const ctlike& app)
 {
     // Execute only if object is not identical
     if (this != &app) {
         // Copy base class members
-        this->GApplication::operator=(app);
+        this->ctool::operator=(app);
         // Free members
         free_members();
@@ -186,10 +176,12 @@ void ctlike::clear(void)
 {
     // Free members
     free_members();
+    this->ctool::free_members();
     this->GApplication::free_members();
     // Initialise members
     this->GApplication::init_members();
+    this->ctool::init_members();
     init_members();
     // Return
@@ -404,27 +396,13 @@ void ctlike::get_parameters(void)
             obs.load(filename);
             // Get other task parameters
-            m_stat  = gammalib::toupper((*this)["stat"].string());
-            m_caldb = (*this)["caldb"].string();
-            m_irf   = (*this)["irf"].string();
+            std::string statistics = gammalib::toupper((*this)["stat"].string());
             // Set statistics
-            obs.statistics(m_stat);
-
-            // Set calibration database. If specified parameter is a
-            // directory then use this as the pathname to the calibration
-            // database. Otherwise interpret this as the instrument name,
-            // the mission being "cta"
-            GCaldb caldb;
-            if (gammalib::dir_exists(m_caldb)) {
-                caldb.rootdir(m_caldb);
-            }
-            else {
-                caldb.open("cta", m_caldb);
-            }
+            obs.statistics(statistics);
-            // Set reponse
-            obs.response(m_irf, caldb);
+            // Set response
+            set_obs_response(&obs);
             // Append observation to container
             m_obs.append(obs);
@@ -440,7 +418,6 @@ void ctlike::get_parameters(void)
             // Check if all observations have response information. If
             // not, get the calibration database parameters and set
             // the response properly
-            bool asked_for_response = false;
             for (int i = 0; i < m_obs.size(); ++i) {
                 // Get CTA observation
@@ -452,25 +429,9 @@ void ctlike::get_parameters(void)
                     // If response is not valid then set response from
                     // task parameters
                     if (!obs->has_response()) {
+                        set_obs_response(obs);
+                    }
-                        // Get calibration parameters
-                        if (!asked_for_response) {
-                            m_caldb = (*this)["caldb"].string();
-                            m_irf   = (*this)["irf"].string();
-                            asked_for_response = true;
-                        }
-
-                        // Set response
-                        GCaldb caldb;
-                        if (gammalib::dir_exists(m_caldb)) {
-                            caldb.rootdir(m_caldb);
-                        }
-                        else {
-                            caldb.open("cta", m_caldb);
-                        }
-                        obs->response(m_irf, caldb);
-
-                    } // endif: there was no response
                 } // endif: observation was a CTA observation
             } // endfor: looped over observations
@@ -620,9 +581,6 @@ double ctlike::reoptimize_lm(void)
 void ctlike::init_members(void)
 {
     // Initialise members
-    m_stat.clear();
-    m_caldb.clear();
-    m_irf.clear();
     m_outmdl.clear();
     m_obs.clear();
     m_refit       = false;
@@ -650,11 +608,8 @@ void ctlike::init_members(void)
 void ctlike::copy_members(const ctlike& app)
 {
     // Copy attributes
-    m_stat        = app.m_stat;
     m_refit       = app.m_refit;
     m_tscalc      = app.m_tscalc;
-    m_caldb       = app.m_caldb;
-    m_irf         = app.m_irf;
     m_outmdl      = app.m_outmdl;
     m_obs         = app.m_obs;
     m_max_iter    = app.m_max_iter;
 /***************************************************************************
- *                   ctlike - CTA maximum likelihood tool                  *
+ *                ctlike - Maximum likelihood fitting tool                 *
  * ----------------------------------------------------------------------- *
  *  copyright (C) 2010-2014 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
@@ -20,7 +20,7 @@
  ***************************************************************************/
 /**
  * @file ctlike.hpp
- * @brief CTA maximum likelihood tool interface definition
+ * @brief Maximum likelihood fitting tool definition
  * @author Juergen Knoedlseder
  */
@@ -31,6 +31,7 @@
 #include <string>
 #include "GammaLib.hpp"
 #include "GCTALib.hpp"
+#include "ctool.hpp"
 /* __Definitions _________________________________________________________ */
 #define CTLIKE_NAME    "ctlike"
@@ -40,9 +41,10 @@
 /***********************************************************************//**
  * @class ctlike
  *
- * @brief CTA maximum likelihood tool interface defintion.
+ * @brief Maximum likelihood fitting tool
  ***************************************************************************/
-class ctlike : public GApplication  {
+class ctlike : public ctool {
+
 public:
     // Constructors and destructors
     ctlike(void);
@@ -52,7 +54,7 @@ public:
     virtual ~ctlike(void);
     // Operators
-    ctlike& operator= (const ctlike& app);
+    ctlike& operator=(const ctlike& app);
     // Methods
     void                 clear(void);
@@ -72,11 +74,8 @@ protected:
     double reoptimize_lm(void);
     // User parameters
-    std::string   m_stat;        //!< Optimisation statistics (poisson/gaussian)
     bool          m_refit;       //!< Refitting
     bool          m_tscalc;      //!< TS computation
-    std::string   m_caldb;       //!< Calibration database
-    std::string   m_irf;         //!< Instrument response functions
     std::string   m_outmdl;      //!< Source model output XML file
     bool          m_apply_edisp; //!< Apply energy dispersion?