Put back ctool base class methods

Jürgen Knödlseder
1 parent e0d30823
Showing 3 changed files with 9 additions and 15 deletions
pyext/ctool.i
src/support/ctool.cpp
src/support/ctool.hpp
@@ -91,7 +91,7 @@ public:
     %rename(_create_map)               create_map;
     %rename(_create_cube)              create_cube;
     %rename(_create_cta_obs)           create_cta_obs;
-    //%rename(_require_inobs)            require_inobs;
+    %rename(_require_inobs)            require_inobs;
     %rename(_require_inobs_nocube)     require_inobs_nocube;
     %rename(_get_roi)                  get_roi;
     %rename(_get_ebounds)              get_ebounds;
@@ -99,14 +99,14 @@ public:
     %rename(_get_pointing)             get_pointing;
     %rename(_get_skydir)               get_skydir;
     %rename(_set_outfile_name)         set_outfile_name;
-    //%rename(_is_stacked)               is_stacked;
+    %rename(_is_stacked)               is_stacked;
     %rename(_set_response)             set_response;
     %rename(_set_edisp)                set_edisp;
     %rename(_restore_edisp)            restore_edisp;
     %rename(_set_obs_response)         set_obs_response;
     %rename(_set_obs_bounds)           set_obs_bounds;
     %rename(_get_mean_pointing)        get_mean_pointing;
-    //%rename(_get_current_rss)          get_current_rss;
+    %rename(_get_current_rss)          get_current_rss;
     %rename(_get_obs_header)           get_obs_header;
     %rename(_insert_energy_boundaries) insert_energy_boundaries;
     %rename(_cube_layer_usage)         cube_layer_usage;
@@ -133,7 +133,7 @@ public:
     GCTAObservation   create_cta_obs(void);
     // Protected methods that check user parameters
-    //void              require_inobs(const std::string& method);
+    void              require_inobs(const std::string& method);
     void              require_inobs_nocube(const std::string& method);
     // Protected methods that extract user parameters
@@ -145,7 +145,7 @@ public:
     std::string       set_outfile_name(const std::string& filename);
     // Protected methods that query user parameters
-    //bool              is_stacked(void);
+    bool              is_stacked(void);
     // Protected support methods
     void              set_response(GObservations& obs);
@@ -156,7 +156,7 @@ public:
     void              set_obs_bounds(GObservations& obs);
     GObservations     get_observations(const bool& get_response = true);
     GSkyDir           get_mean_pointing(const GObservations& obs);
-    //size_t            get_current_rss(void);
+    size_t            get_current_rss(void);
     std::string       get_obs_header(const GObservation* obs) const;
     GEnergies         insert_energy_boundaries(const GEnergies&       energies,
                                                const GCTAObservation& obs);
@@ -810,7 +810,6 @@ GCTAObservation ctool::create_cta_obs(void)
  * @todo This method is only used by csobsinfo, csresmap and csspec. We
  * should try to get rid of it
  ***************************************************************************/
-/*
 void ctool::require_inobs(const std::string& method)
 {
     // Get inobs filename
@@ -829,7 +828,6 @@ void ctool::require_inobs(const std::string&amp; method)
     // Return
     return;
 }
-*/
 /***********************************************************************//**
@@ -1170,7 +1168,6 @@ std::string ctool::set_outfile_name(const std::string&amp; filename)
  * Using this method assures that the parameters are always queried in the
  * same order.
  ***************************************************************************/
-/*
 bool ctool::is_stacked(void)
 {
     // First query the minimum and maximum energies
@@ -1195,7 +1192,6 @@ bool ctool::is_stacked(void)
     // Return stacked flag
     return stacked;
 }
-*/
 /***********************************************************************//**
@@ -1706,7 +1702,6 @@ GSkyDir ctool::get_mean_pointing(const GObservations&amp; obs)
  * @todo This method is currently not used and can be removed if we do not
  *       use it
  ***************************************************************************/
-/*
 size_t ctool::get_current_rss(void)
 {
     // Initialize resident set size
@@ -1747,7 +1742,6 @@ size_t ctool::get_current_rss(void)
     // Return resident set size
     return rss;
 }
-*/
 /***********************************************************************//**
@@ -90,7 +90,7 @@ protected:
     GCTAObservation   create_cta_obs(void);
     // Protected methods that check user parameters
-    //void              require_inobs(const std::string& method);
+    void              require_inobs(const std::string& method);
     void              require_inobs_nolist(const std::string& method);
     void              require_inobs_nocube(const std::string& method);
@@ -103,7 +103,7 @@ protected:
     std::string       set_outfile_name(const std::string& filename);
     // Protected methods that query user parameters
-    //bool              is_stacked(void);
+    bool              is_stacked(void);
     // Protected methods for logging
     void              log_observations(const GChatter&      chatter,
@@ -122,7 +122,7 @@ protected:
     void              set_obs_bounds(GObservations& obs);
     GObservations     get_observations(const bool& get_response = true);
     GSkyDir           get_mean_pointing(const GObservations& obs);
-    //size_t            get_current_rss(void);
+    size_t            get_current_rss(void);
     std::string       get_obs_header(const GObservation* obs) const;
     GEnergies         insert_energy_boundaries(const GEnergies&       energies,
                                                const GCTAObservation& obs);