ctselect now derives from ctool base class.

Jürgen Knödlseder
1 parent 3b9e0e5f
Showing 4 changed files with 25 additions and 28 deletions
pyext/ctselect.i
src/ctselect/Makefile.am
src/ctselect/ctselect.cpp
src/ctselect/ctselect.hpp
 /***************************************************************************
- *                    ctselect - CTA data selection tool                   *
+ *                      ctselect - Data selection tool                     *
  * ----------------------------------------------------------------------- *
  *  copyright (C) 2010-2014 by Jurgen Knodlseder                           *
  * ----------------------------------------------------------------------- *
@@ -20,22 +20,21 @@
  ***************************************************************************/
 /**
  * @file ctselect.i
- * @brief CTA data selection tool Python interface definition
+ * @brief Data selection tool definition
  * @author Juergen Knoedlseder
  */
 %{
 /* Put headers and other declarations here that are needed for compilation */
 #include "ctselect.hpp"
-#include "GTools.hpp"
 %}
 /***********************************************************************//**
  * @class ctselect
  *
- * @brief CTA data selection tool Python interface
+ * @brief Data selection tool
  ***************************************************************************/
-class ctselect : public GApplication  {
+class ctselect : public ctool {
 public:
     // Constructors and destructors
     ctselect(void);
@@ -55,7 +54,7 @@ public:
 /***********************************************************************//**
- * @brief CTA data selection tool Python extension
+ * @brief Data selection tool Python extension
  ***************************************************************************/
 %extend ctselect {
     ctselect copy() {
 ## Process this file with automake to produce Makefile.in
+# Set include directories
+INCLUDES = -I$(top_srcdir)/src/support
+
 # Program name
 bin_PROGRAMS = ctselect
@@ -14,7 +17,7 @@ libctselect_la_SOURCES = $(sources)
 ctselect_SOURCES = main.cpp
 ctselect_LDFLAGS = $(LIB_LINK_OPTION) @LDFLAGS@
 ctselect_CPPFLAGS = @CPPFLAGS@
-ctselect_LDADD = libctselect.la
+ctselect_LDADD = libctselect.la $(top_srcdir)/src/support/libsupport.la
 # Parameter files
 pfilesdir = $(prefix)/syspfiles
 /***************************************************************************
- *                    ctselect - CTA data selection tool                   *
+ *                      ctselect - Data selection tool                     *
  * ----------------------------------------------------------------------- *
  *  copyright (C) 2010-2014 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
@@ -20,7 +20,7 @@
  ***************************************************************************/
 /**
  * @file ctselect.cpp
- * @brief CTA data selection tool implementation
+ * @brief Data selection tool definition
  * @author Juergen Knoedlseder
  */
@@ -52,14 +52,11 @@
 /***********************************************************************//**
  * @brief Void constructor
  ***************************************************************************/
-ctselect::ctselect(void) : GApplication(CTSELECT_NAME, CTSELECT_VERSION)
+ctselect::ctselect(void) : ctool(CTSELECT_NAME, CTSELECT_VERSION)
 {
     // Initialise members
     init_members();
-    // Write header into logger
-    log_header();
-
     // Return
     return;
 }
@@ -74,7 +71,7 @@ ctselect::ctselect(void) : GApplication(CTSELECT_NAME, CTSELECT_VERSION)
  * an observation container.
  ***************************************************************************/
 ctselect::ctselect(const GObservations& obs) :
-          GApplication(CTSELECT_NAME, CTSELECT_VERSION)
+          ctool(CTSELECT_NAME, CTSELECT_VERSION)
 {
     // Initialise members
     init_members();
@@ -82,9 +79,6 @@ ctselect::ctselect(const GObservations&amp; obs) :
     // Set observations
     m_obs = obs;
-    // Write header into logger
-    log_header();
-
     // Return
     return;
 }
@@ -99,14 +93,11 @@ ctselect::ctselect(const GObservations&amp; obs) :
  * @param[in] argv Array of command line arguments.
  ***************************************************************************/
 ctselect::ctselect(int argc, char *argv[]) : 
-                   GApplication(CTSELECT_NAME, CTSELECT_VERSION, argc, argv)
+          ctool(CTSELECT_NAME, CTSELECT_VERSION, argc, argv)
 {
     // Initialise members
     init_members();
-    // Write header into logger
-    log_header();
-
     // Return
     return;
 }
@@ -117,7 +108,7 @@ ctselect::ctselect(int argc, char *argv[]) :
  *
  * @param[in] app Application.
  ***************************************************************************/
-ctselect::ctselect(const ctselect& app) : GApplication(app)
+ctselect::ctselect(const ctselect& app) : ctool(app)
 {
     // Initialise members
     init_members();
@@ -154,13 +145,13 @@ ctselect::~ctselect(void)
  *
  * @param[in] app Application.
  ***************************************************************************/
-ctselect& ctselect::operator= (const ctselect& app)
+ctselect& ctselect::operator=(const ctselect& 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();
@@ -191,10 +182,12 @@ void ctselect::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
 /***************************************************************************
- *                    ctselect - CTA data selection tool                   *
+ *                      ctselect - Data selection tool                     *
  * ----------------------------------------------------------------------- *
  *  copyright (C) 2010-2014 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
@@ -20,7 +20,7 @@
  ***************************************************************************/
 /**
  * @file ctselect.hpp
- * @brief CTA data selection tool definition
+ * @brief Data selection tool definition
  * @author Juergen Knoedlseder
  */
@@ -32,6 +32,7 @@
 #include <string>
 #include "GammaLib.hpp"
 #include "GCTALib.hpp"
+#include "ctool.hpp"
 /* __Definitions _________________________________________________________ */
 #define CTSELECT_NAME    "ctselect"
@@ -41,9 +42,10 @@
 /***********************************************************************//**
  * @class ctselect
  *
- * @brief CTA data selection tool interface defintion.
+ * @brief Data selection tool
  ***************************************************************************/
-class ctselect : public GApplication  {
+class ctselect : public ctool {
+
 public:
     // Constructors and destructors
     ctselect(void);