ctskymap now derives from ctool base class.

Jürgen Knödlseder
1 parent 5a6fea13
Showing 5 changed files with 25 additions and 37 deletions
pyext/ctskymap.i
src/ctselect/ctselect.cpp
src/ctskymap/Makefile.am
src/ctskymap/ctskymap.cpp
src/ctskymap/ctskymap.hpp
 /***************************************************************************
- *                     ctskymap - CTA sky mapping tool                     *
+ *                       ctskymap - Sky mapping tool                       *
  * ----------------------------------------------------------------------- *
  *  copyright (C) 2012-2014 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
@@ -20,22 +20,21 @@
  ***************************************************************************/
 /**
  * @file ctskymap.i
- * @brief CTA sky mapping tool definition
+ * @brief Sky mapping tool definition
  * @author Juergen Knoedlseder
  */
 %{
 /* Put headers and other declarations here that are needed for compilation */
 #include "ctskymap.hpp"
-#include "GTools.hpp"
 %}
 /***********************************************************************//**
  * @class ctskymap
  *
- * @brief CTA sky mapping tool interface defintion
+ * @brief Sky mapping tool
  ***************************************************************************/
-class ctskymap : public GApplication  {
+class ctskymap : public ctool {
 public:
     // Constructors and destructors
     ctskymap(void);
@@ -54,7 +53,7 @@ public:
 /***********************************************************************//**
- * @brief CTA sky mapping tool Python extension
+ * @brief Sky mapping tool Python extension
  ***************************************************************************/
 %extend ctskymap {
     ctskymap copy() {
@@ -761,11 +761,6 @@ void ctselect::copy_members(const ctselect&amp; app)
  ***************************************************************************/
 void ctselect::free_members(void)
 {
-    // Write separator into logger
-    if (logTerse()) {
-        log << std::endl;
-    }
-
     // Return
     return;
 }
 ## Process this file with automake to produce Makefile.in
+# Set include directories
+INCLUDES = -I$(top_srcdir)/src/support
+
 # Program name
 bin_PROGRAMS = ctskymap
@@ -14,7 +17,7 @@ libctskymap_la_SOURCES = $(sources)
 ctskymap_SOURCES = main.cpp
 ctskymap_LDFLAGS = $(LIB_LINK_OPTION) @LDFLAGS@
 ctskymap_CPPFLAGS = @CPPFLAGS@
-ctskymap_LDADD = libctskymap.la
+ctskymap_LDADD = libctskymap.la $(top_srcdir)/src/support/libsupport.la
 # Parameter files
 pfilesdir = $(prefix)/syspfiles
 /***************************************************************************
- *                     ctskymap - CTA sky mapping tool                     *
+ *                       ctskymap - Sky mapping tool                       *
  * ----------------------------------------------------------------------- *
  *  copyright (C) 2011-2014 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
@@ -20,7 +20,7 @@
  ***************************************************************************/
 /**
  * @file ctskymap.cpp
- * @brief CTA sky mapping tool implementation
+ * @brief Sky mapping tool implementation
  * @author Juergen Knoedlseder
  */
@@ -50,14 +50,11 @@
 /***********************************************************************//**
  * @brief Void constructor
  ***************************************************************************/
-ctskymap::ctskymap(void) : GApplication(CTSKYMAP_NAME, CTSKYMAP_VERSION)
+ctskymap::ctskymap(void) : ctool(CTSKYMAP_NAME, CTSKYMAP_VERSION)
 {
     // Initialise members
     init_members();
-    // Write header into logger
-    log_header();
-
     // Return
     return;
 }
@@ -72,7 +69,7 @@ ctskymap::ctskymap(void) : GApplication(CTSKYMAP_NAME, CTSKYMAP_VERSION)
  * observations container.
  ***************************************************************************/
 ctskymap::ctskymap(const GObservations& obs) :
-          GApplication(CTSKYMAP_NAME, CTSKYMAP_VERSION)
+          ctool(CTSKYMAP_NAME, CTSKYMAP_VERSION)
 {
     // Initialise members
     init_members();
@@ -80,9 +77,6 @@ ctskymap::ctskymap(const GObservations&amp; obs) :
     // Set observations
     m_obs = obs;
-    // Write header into logger
-    log_header();
-
     // Return
     return;
 }
@@ -96,14 +90,11 @@ ctskymap::ctskymap(const GObservations&amp; obs) :
  * @param[in] argv Array of command line arguments.
  ***************************************************************************/
 ctskymap::ctskymap(int argc, char *argv[]) : 
-                    GApplication(CTSKYMAP_NAME, CTSKYMAP_VERSION, argc, argv)
+          ctool(CTSKYMAP_NAME, CTSKYMAP_VERSION, argc, argv)
 {
     // Initialise members
     init_members();
-    // Write header into logger
-    log_header();
-
     // Return
     return;
 }
@@ -114,7 +105,7 @@ ctskymap::ctskymap(int argc, char *argv[]) :
  *
  * @param[in] app Application.
  ***************************************************************************/
-ctskymap::ctskymap(const ctskymap& app) : GApplication(app)
+ctskymap::ctskymap(const ctskymap& app) : ctool(app)
 {
     // Initialise members
     init_members();
@@ -151,13 +142,13 @@ ctskymap::~ctskymap(void)
  *
  * @param[in] app Application.
  ***************************************************************************/
-ctskymap& ctskymap::operator= (const ctskymap& app)
+ctskymap& ctskymap::operator=(const ctskymap& 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();
@@ -188,10 +179,12 @@ void ctskymap::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
@@ -602,10 +595,6 @@ void ctskymap::copy_members(const ctskymap&amp; app)
  ***************************************************************************/
 void ctskymap::free_members(void)
 {
-    // Write separator into logger
-    if (logTerse())
-        log << std::endl;
-
     // Return
     return;
 }
 /***************************************************************************
- *                     ctskymap - CTA sky mapping tool                     *
+ *                       ctskymap - Sky mapping tool                       *
  * ----------------------------------------------------------------------- *
  *  copyright (C) 2010-2014 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
@@ -20,7 +20,7 @@
  ***************************************************************************/
 /**
  * @file ctskymap.hpp
- * @brief CTA sky mapping tool definition
+ * @brief Sky mapping tool definition
  * @author Juergen Knoedlseder
  */
@@ -30,6 +30,7 @@
 /* __ Includes ___________________________________________________________ */
 #include "GammaLib.hpp"
 #include "GCTALib.hpp"
+#include "ctool.hpp"
 /* __Definitions _________________________________________________________ */
 #define CTSKYMAP_NAME    "ctskymap"
@@ -39,11 +40,12 @@
 /***********************************************************************//**
  * @class ctskymap
  *
- * @brief CTA sky mapping tool interface defintion
+ * @brief Sky mapping tool
  *
  * This class creates a sky map from a CTA event list.
  ***************************************************************************/
-class ctskymap : public GApplication  {
+class ctskymap : public ctool {
+
 public:
     // Constructors and destructors
     ctskymap(void);