Olga Sergijenko / ctools

Commit d201f08af4705173d04d7d7ddc0763bf50bd3f29

Authored by Jürgen Knödlseder
1 parent e0d30823

Put back ctool base class methods

Inline Side-by-side
Showing 3 changed files with 9 additions and 15 deletions
pyext/ctool.i
  View file @d201f08
... ... @@ -91,7 +91,7 @@ public:
91 91 %rename(_create_map) create_map;
92 92 %rename(_create_cube) create_cube;
93 93 %rename(_create_cta_obs) create_cta_obs;
94   - //%rename(_require_inobs) require_inobs;
  94 + %rename(_require_inobs) require_inobs;
95 95 %rename(_require_inobs_nocube) require_inobs_nocube;
96 96 %rename(_get_roi) get_roi;
97 97 %rename(_get_ebounds) get_ebounds;
... ... @@ -99,14 +99,14 @@ public:
99 99 %rename(_get_pointing) get_pointing;
100 100 %rename(_get_skydir) get_skydir;
101 101 %rename(_set_outfile_name) set_outfile_name;
102   - //%rename(_is_stacked) is_stacked;
  102 + %rename(_is_stacked) is_stacked;
103 103 %rename(_set_response) set_response;
104 104 %rename(_set_edisp) set_edisp;
105 105 %rename(_restore_edisp) restore_edisp;
106 106 %rename(_set_obs_response) set_obs_response;
107 107 %rename(_set_obs_bounds) set_obs_bounds;
108 108 %rename(_get_mean_pointing) get_mean_pointing;
109   - //%rename(_get_current_rss) get_current_rss;
  109 + %rename(_get_current_rss) get_current_rss;
110 110 %rename(_get_obs_header) get_obs_header;
111 111 %rename(_insert_energy_boundaries) insert_energy_boundaries;
112 112 %rename(_cube_layer_usage) cube_layer_usage;
... ... @@ -133,7 +133,7 @@ public:
133 133 GCTAObservation create_cta_obs(void);
134 134  
135 135 // Protected methods that check user parameters
136   - //void require_inobs(const std::string& method);
  136 + void require_inobs(const std::string& method);
137 137 void require_inobs_nocube(const std::string& method);
138 138  
139 139 // Protected methods that extract user parameters
... ... @@ -145,7 +145,7 @@ public:
145 145 std::string set_outfile_name(const std::string& filename);
146 146  
147 147 // Protected methods that query user parameters
148   - //bool is_stacked(void);
  148 + bool is_stacked(void);
149 149  
150 150 // Protected support methods
151 151 void set_response(GObservations& obs);
... ... @@ -156,7 +156,7 @@ public:
156 156 void set_obs_bounds(GObservations& obs);
157 157 GObservations get_observations(const bool& get_response = true);
158 158 GSkyDir get_mean_pointing(const GObservations& obs);
159   - //size_t get_current_rss(void);
  159 + size_t get_current_rss(void);
160 160 std::string get_obs_header(const GObservation* obs) const;
161 161 GEnergies insert_energy_boundaries(const GEnergies& energies,
162 162 const GCTAObservation& obs);
... ...
src/support/ctool.cpp
  View file @d201f08
... ... @@ -810,7 +810,6 @@ GCTAObservation ctool::create_cta_obs(void)
810 810 * @todo This method is only used by csobsinfo, csresmap and csspec. We
811 811 * should try to get rid of it
812 812 ***************************************************************************/
813   -/*
814 813 void ctool::require_inobs(const std::string& method)
815 814 {
816 815 // Get inobs filename
... ... @@ -829,7 +828,6 @@ void ctool::require_inobs(const std::string& method)
829 828 // Return
830 829 return;
831 830 }
832   -*/
833 831  
834 832  
835 833 /***********************************************************************//**
... ... @@ -1170,7 +1168,6 @@ std::string ctool::set_outfile_name(const std::string& filename)
1170 1168 * Using this method assures that the parameters are always queried in the
1171 1169 * same order.
1172 1170 ***************************************************************************/
1173   -/*
1174 1171 bool ctool::is_stacked(void)
1175 1172 {
1176 1173 // First query the minimum and maximum energies
... ... @@ -1195,7 +1192,6 @@ bool ctool::is_stacked(void)
1195 1192 // Return stacked flag
1196 1193 return stacked;
1197 1194 }
1198   -*/
1199 1195  
1200 1196  
1201 1197 /***********************************************************************//**
... ... @@ -1706,7 +1702,6 @@ GSkyDir ctool::get_mean_pointing(const GObservations& obs)
1706 1702 * @todo This method is currently not used and can be removed if we do not
1707 1703 * use it
1708 1704 ***************************************************************************/
1709   -/*
1710 1705 size_t ctool::get_current_rss(void)
1711 1706 {
1712 1707 // Initialize resident set size
... ... @@ -1747,7 +1742,6 @@ size_t ctool::get_current_rss(void)
1747 1742 // Return resident set size
1748 1743 return rss;
1749 1744 }
1750   -*/
1751 1745  
1752 1746  
1753 1747 /***********************************************************************//**
... ...
src/support/ctool.hpp
  View file @d201f08
... ... @@ -90,7 +90,7 @@ protected:
90 90 GCTAObservation create_cta_obs(void);
91 91  
92 92 // Protected methods that check user parameters
93   - //void require_inobs(const std::string& method);
  93 + void require_inobs(const std::string& method);
94 94 void require_inobs_nolist(const std::string& method);
95 95 void require_inobs_nocube(const std::string& method);
96 96  
... ... @@ -103,7 +103,7 @@ protected:
103 103 std::string set_outfile_name(const std::string& filename);
104 104  
105 105 // Protected methods that query user parameters
106   - //bool is_stacked(void);
  106 + bool is_stacked(void);
107 107  
108 108 // Protected methods for logging
109 109 void log_observations(const GChatter& chatter,
... ... @@ -122,7 +122,7 @@ protected:
122 122 void set_obs_bounds(GObservations& obs);
123 123 GObservations get_observations(const bool& get_response = true);
124 124 GSkyDir get_mean_pointing(const GObservations& obs);
125   - //size_t get_current_rss(void);
  125 + size_t get_current_rss(void);
126 126 std::string get_obs_header(const GObservation* obs) const;
127 127 GEnergies insert_energy_boundaries(const GEnergies& energies,
128 128 const GCTAObservation& obs);
... ...