Domenico Tiziani / ctools

Commit 4f90c87f952365f118f93d9f083abc1e6752bb68

Authored by Jürgen Knödlseder
1 parent 28b601b2

Remove protected methods from interface.

Inline Side-by-side
Showing 5 changed files with 75 additions and 90 deletions
pyext/ctbin.i
  View file @4f90c87
... ... @@ -51,10 +51,6 @@ public:
51 51 void save(void);
52 52 const GObservations& obs(void) const;
53 53 GCTAEventCube cube(void) const;
54   - void get_parameters(void);
55   - void init_cube(void);
56   - void fill_cube(GCTAObservation* obs);
57   - void obs_cube(void);
58 54 };
59 55  
60 56  
... ...
pyext/ctbkgcube.i
  View file @4f90c87
... ... @@ -50,12 +50,7 @@ public:
50 50 void execute(void);
51 51 void run(void);
52 52 void save(void);
53   - const GObservations& obs(void) const;
54   - void get_parameters(void);
55   - void get_obs(void);
56   - void get_ebounds(void);
57   - void set_from_cntmap(const std::string& filename);
58   - void fill_cube(GCTAObservation* obs);
  53 + const GCTAEventCube& cube(void) const;
59 54 };
60 55  
61 56 /***********************************************************************//**
... ...
pyext/ctexpcube.i
  View file @4f90c87
... ... @@ -52,11 +52,6 @@ public:
52 52 void save(void);
53 53 const GObservations& obs(void) const;
54 54 const GCTAExposure& expcube(void) const;
55   - void get_parameters(void);
56   - void get_obs(void);
57   - void set_response(void);
58   - void get_ebounds(void);
59   - void set_from_cntmap(const std::string& filename);
60 55 };
61 56  
62 57  
... ...
src/ctexpcube/ctexpcube.cpp
  View file @4f90c87
... ... @@ -296,7 +296,6 @@ void ctexpcube::run(void)
296 296  
297 297 /***********************************************************************//**
298 298 * @brief Save exposure cube
299   - *
300 299 ***************************************************************************/
301 300 void ctexpcube::save(void)
302 301 {
... ... @@ -317,6 +316,72 @@ void ctexpcube::save(void)
317 316 }
318 317  
319 318  
  319 +/*==========================================================================
  320 + = =
  321 + = Private methods =
  322 + = =
  323 + ==========================================================================*/
  324 +
  325 +/***********************************************************************//**
  326 + * @brief Initialise class members
  327 + ***************************************************************************/
  328 +void ctexpcube::init_members(void)
  329 +{
  330 + // Initialise members
  331 + m_outfile.clear();
  332 + m_apply_edisp = false;
  333 +
  334 + // Initialise protected members
  335 + m_read_ahead = false;
  336 + m_obs.clear();
  337 + m_expcube.clear();
  338 + m_ebounds.clear();
  339 +
  340 + // Set logger properties
  341 + log.date(true);
  342 +
  343 + // Return
  344 + return;
  345 +}
  346 +
  347 +
  348 +/***********************************************************************//**
  349 + * @brief Copy class members
  350 + *
  351 + * @param[in] app Application.
  352 + ***************************************************************************/
  353 +void ctexpcube::copy_members(const ctexpcube& app)
  354 +{
  355 + // Copy attributes
  356 + m_outfile = app.m_outfile;
  357 + m_apply_edisp = app.m_apply_edisp;
  358 +
  359 + // Copy protected members
  360 + m_read_ahead = app.m_read_ahead;
  361 + m_obs = app.m_obs;
  362 + m_expcube = app.m_expcube;
  363 + m_ebounds = app.m_ebounds;
  364 +
  365 + // Return
  366 + return;
  367 +}
  368 +
  369 +
  370 +/***********************************************************************//**
  371 + * @brief Delete class members
  372 + ***************************************************************************/
  373 +void ctexpcube::free_members(void)
  374 +{
  375 + // Write separator into logger
  376 + if (logTerse()) {
  377 + log << std::endl;
  378 + }
  379 +
  380 + // Return
  381 + return;
  382 +}
  383 +
  384 +
320 385 /***********************************************************************//**
321 386 * @brief Get application parameters
322 387 *
... ... @@ -603,69 +668,3 @@ void ctexpcube::set_from_cntmap(const std::string&amp; filename)
603 668 // Return
604 669 return;
605 670 }
606   -
607   -
608   -/*==========================================================================
609   - = =
610   - = Private methods =
611   - = =
612   - ==========================================================================*/
613   -
614   -/***********************************************************************//**
615   - * @brief Initialise class members
616   - ***************************************************************************/
617   -void ctexpcube::init_members(void)
618   -{
619   - // Initialise members
620   - m_outfile.clear();
621   - m_apply_edisp = false;
622   -
623   - // Initialise protected members
624   - m_read_ahead = false;
625   - m_obs.clear();
626   - m_expcube.clear();
627   - m_ebounds.clear();
628   -
629   - // Set logger properties
630   - log.date(true);
631   -
632   - // Return
633   - return;
634   -}
635   -
636   -
637   -/***********************************************************************//**
638   - * @brief Copy class members
639   - *
640   - * @param[in] app Application.
641   - ***************************************************************************/
642   -void ctexpcube::copy_members(const ctexpcube& app)
643   -{
644   - // Copy attributes
645   - m_outfile = app.m_outfile;
646   - m_apply_edisp = app.m_apply_edisp;
647   -
648   - // Copy protected members
649   - m_read_ahead = app.m_read_ahead;
650   - m_obs = app.m_obs;
651   - m_expcube = app.m_expcube;
652   - m_ebounds = app.m_ebounds;
653   -
654   - // Return
655   - return;
656   -}
657   -
658   -
659   -/***********************************************************************//**
660   - * @brief Delete class members
661   - ***************************************************************************/
662   -void ctexpcube::free_members(void)
663   -{
664   - // Write separator into logger
665   - if (logTerse()) {
666   - log << std::endl;
667   - }
668   -
669   - // Return
670   - return;
671   -}
... ...
src/ctexpcube/ctexpcube.hpp
  View file @4f90c87
... ... @@ -61,17 +61,17 @@ public:
61 61 void save(void);
62 62 const GObservations& obs(void) const;
63 63 const GCTAExposure& expcube(void) const;
64   - void get_parameters(void);
65   - void get_obs(void);
66   - void set_response(void);
67   - void get_ebounds(void);
68   - void set_from_cntmap(const std::string& filename);
69 64  
70 65 protected:
71 66 // Protected methods
72   - void init_members(void);
73   - void copy_members(const ctexpcube& app);
74   - void free_members(void);
  67 + void init_members(void);
  68 + void copy_members(const ctexpcube& app);
  69 + void free_members(void);
  70 + void get_parameters(void);
  71 + void get_obs(void);
  72 + void set_response(void);
  73 + void get_ebounds(void);
  74 + void set_from_cntmap(const std::string& filename);
75 75  
76 76 // User parameters
77 77 std::string m_outfile; //!< Output exposure cube file
... ...