Remove protected methods from interface.

Jürgen Knödlseder
1 parent 28b601b2
Showing 5 changed files with 75 additions and 90 deletions
pyext/ctbin.i
pyext/ctbkgcube.i
pyext/ctexpcube.i
src/ctexpcube/ctexpcube.cpp
src/ctexpcube/ctexpcube.hpp
@@ -51,10 +51,6 @@ public:
     void                 save(void);
     const GObservations& obs(void) const;
     GCTAEventCube        cube(void) const;
-    void                 get_parameters(void);
-    void                 init_cube(void);
-    void                 fill_cube(GCTAObservation* obs);
-    void                 obs_cube(void);
 };
@@ -50,12 +50,7 @@ public:
     void                 execute(void);
     void                 run(void);
     void                 save(void);
-    const GObservations& obs(void) const;
-    void                 get_parameters(void);
-    void                 get_obs(void);
-    void                 get_ebounds(void);
-    void                 set_from_cntmap(const std::string& filename);
-    void                 fill_cube(GCTAObservation* obs);
+    const GCTAEventCube& cube(void) const;
 };
 /***********************************************************************//**
@@ -52,11 +52,6 @@ public:
     void                 save(void);
     const GObservations& obs(void) const;
     const GCTAExposure&  expcube(void) const;
-    void                 get_parameters(void);
-    void                 get_obs(void);
-    void                 set_response(void);
-    void                 get_ebounds(void);
-    void                 set_from_cntmap(const std::string& filename);
 };
@@ -296,7 +296,6 @@ void ctexpcube::run(void)
 /***********************************************************************//**
  * @brief Save exposure cube
- *
  ***************************************************************************/
 void ctexpcube::save(void)
 {
@@ -317,6 +316,72 @@ void ctexpcube::save(void)
 }
+/*==========================================================================
+ =                                                                         =
+ =                             Private methods                             =
+ =                                                                         =
+ ==========================================================================*/
+
+/***********************************************************************//**
+ * @brief Initialise class members
+ ***************************************************************************/
+void ctexpcube::init_members(void)
+{
+    // Initialise members
+    m_outfile.clear();
+    m_apply_edisp = false;
+
+    // Initialise protected members
+    m_read_ahead = false;
+    m_obs.clear();
+    m_expcube.clear();
+    m_ebounds.clear();
+
+    // Set logger properties
+    log.date(true);
+
+    // Return
+    return;
+}
+
+
+/***********************************************************************//**
+ * @brief Copy class members
+ *
+ * @param[in] app Application.
+ ***************************************************************************/
+void ctexpcube::copy_members(const ctexpcube& app)
+{
+    // Copy attributes
+    m_outfile     = app.m_outfile;
+    m_apply_edisp = app.m_apply_edisp;
+
+    // Copy protected members
+    m_read_ahead = app.m_read_ahead;
+    m_obs        = app.m_obs;
+    m_expcube    = app.m_expcube;
+    m_ebounds    = app.m_ebounds;
+
+    // Return
+    return;
+}
+
+
+/***********************************************************************//**
+ * @brief Delete class members
+ ***************************************************************************/
+void ctexpcube::free_members(void)
+{
+    // Write separator into logger
+    if (logTerse()) {
+        log << std::endl;
+    }
+
+    // Return
+    return;
+}
+
+
 /***********************************************************************//**
  * @brief Get application parameters
  *
@@ -603,69 +668,3 @@ void ctexpcube::set_from_cntmap(const std::string&amp; filename)
     // Return
     return;
 }
-
-
-/*==========================================================================
- =                                                                         =
- =                             Private methods                             =
- =                                                                         =
- ==========================================================================*/
-
-/***********************************************************************//**
- * @brief Initialise class members
- ***************************************************************************/
-void ctexpcube::init_members(void)
-{
-    // Initialise members
-    m_outfile.clear();
-    m_apply_edisp = false;
-
-    // Initialise protected members
-    m_read_ahead = false;
-    m_obs.clear();
-    m_expcube.clear();
-    m_ebounds.clear();
-
-    // Set logger properties
-    log.date(true);
-
-    // Return
-    return;
-}
-
-
-/***********************************************************************//**
- * @brief Copy class members
- *
- * @param[in] app Application.
- ***************************************************************************/
-void ctexpcube::copy_members(const ctexpcube& app)
-{
-    // Copy attributes
-    m_outfile     = app.m_outfile;
-    m_apply_edisp = app.m_apply_edisp;
-
-    // Copy protected members
-    m_read_ahead = app.m_read_ahead;
-    m_obs        = app.m_obs;
-    m_expcube    = app.m_expcube;
-    m_ebounds    = app.m_ebounds;
-
-    // Return
-    return;
-}
-
-
-/***********************************************************************//**
- * @brief Delete class members
- ***************************************************************************/
-void ctexpcube::free_members(void)
-{
-    // Write separator into logger
-    if (logTerse()) {
-        log << std::endl;
-    }
-
-    // Return
-    return;
-}
@@ -61,17 +61,17 @@ public:
     void                 save(void);
     const GObservations& obs(void) const;
     const GCTAExposure&  expcube(void) const;
-    void                 get_parameters(void);
-    void                 get_obs(void);
-    void                 set_response(void);
-    void                 get_ebounds(void);
-    void                 set_from_cntmap(const std::string& filename);
 protected:
     // Protected methods
-    void           init_members(void);
-    void           copy_members(const ctexpcube& app);
-    void           free_members(void);
+    void init_members(void);
+    void copy_members(const ctexpcube& app);
+    void free_members(void);
+    void get_parameters(void);
+    void get_obs(void);
+    void set_response(void);
+    void get_ebounds(void);
+    void set_from_cntmap(const std::string& filename);
     // User parameters
     std::string   m_outfile;     //!< Output exposure cube file