Integrate code

Jürgen Knödlseder
1 parent 63c302a9
Showing 19 changed files with 51 additions and 52 deletions
pyext/ctbutterfly.i
pyext/ctcubemask.i
pyext/ctobssim.i
pyext/ctselect.i
src/ctbin/ctbin.cpp
src/ctbutterfly/ctbutterfly.cpp
src/ctbutterfly/ctbutterfly.hpp
src/ctcubemask/ctcubemask.cpp
src/ctcubemask/ctcubemask.hpp
src/ctedispcube/ctedispcube.cpp
src/ctexpcube/ctexpcube.cpp
src/ctmodel/ctmodel.cpp
src/ctmodel/ctmodel.hpp
src/ctobssim/ctobssim.cpp
src/ctobssim/ctobssim.hpp
src/ctpsfcube/ctpsfcube.cpp
src/ctselect/ctselect.cpp
src/ctselect/ctselect.hpp
test/test_ctbin.py
@@ -42,12 +42,11 @@ public:
     ctbutterfly(int argc, char *argv[]);
     ctbutterfly(const ctbutterfly& app);
     virtual ~ctbutterfly(void);
-    
-    // Methods
-    void                 clear(void);
-    void                 run(void);
-    void                 save(void);
+    // Methods
+    void clear(void);
+    void run(void);
+    void save(void);
 };
@@ -44,10 +44,10 @@ public:
     virtual ~ctcubemask(void);
     // Methods
-    void                 clear(void);
-    void                 run(void);
-    void                 save(void);
-    void                 publish(const std::string& name = "");
+    void clear(void);
+    void run(void);
+    void save(void);
+    void publish(const std::string& name = "");
 };
@@ -44,11 +44,11 @@ public:
     virtual ~ctobssim(void);
     // Methods
-    void                 clear(void);
-    void                 run(void);
-    void                 save(void);
-    const double&        max_rate(void) const;
-    void                 max_rate(const double& max_rate);
+    void          clear(void);
+    void          run(void);
+    void          save(void);
+    const double& max_rate(void) const;
+    void          max_rate(const double& max_rate);
 };
@@ -44,9 +44,9 @@ public:
     virtual ~ctselect(void);
     // Methods
-    void                 clear(void);
-    void                 run(void);
-    void                 save(void);
+    void clear(void);
+    void run(void);
+    void save(void);
 };
@@ -524,8 +524,8 @@ void ctbin::fill_cube(GCTAObservation* obs)
         // fully contained in the event list energy range. This avoids
         // having partially filled bins.
         if (iebin == -1 || !usage[iebin]) {
-        	num_outside_ebds++;
-        	continue;
+            num_outside_ebds++;
+            continue;
         }
         // Fill event in skymap
@@ -71,7 +71,7 @@ ctbutterfly::ctbutterfly(void) : ctlikelihood(CTBUTTERFLY_NAME, CTBUTTERFLY_VERS
  * observations container.
  ***************************************************************************/
 ctbutterfly::ctbutterfly(const GObservations& obs) :
-		ctlikelihood(CTBUTTERFLY_NAME, CTBUTTERFLY_VERSION, obs)
+             ctlikelihood(CTBUTTERFLY_NAME, CTBUTTERFLY_VERSION, obs)
 {
     // Initialise members
     init_members();
@@ -89,7 +89,7 @@ ctbutterfly::ctbutterfly(const GObservations&amp; obs) :
  * @param[in] argv Array of command line arguments.
  ***************************************************************************/
 ctbutterfly::ctbutterfly(int argc, char *argv[]) :
-		ctlikelihood(CTBUTTERFLY_NAME, CTBUTTERFLY_VERSION, argc, argv)
+             ctlikelihood(CTBUTTERFLY_NAME, CTBUTTERFLY_VERSION, argc, argv)
 {
     // Initialise members
     init_members();
@@ -67,9 +67,9 @@ public:
     ctbutterfly& operator=(const ctbutterfly& app);
     // Methods
-    void                 clear(void);
-    void                 run(void);
-    void                 save(void);
+    void clear(void);
+    void run(void);
+    void save(void);
 protected:
     // Protected methods
@@ -70,7 +70,7 @@ ctcubemask::ctcubemask(void) : ctobservation(CTCUBEMASK_NAME, CTCUBEMASK_VERSION
  * an observation container.
  ***************************************************************************/
 ctcubemask::ctcubemask(const GObservations& obs) :
-		ctobservation(CTCUBEMASK_NAME, CTCUBEMASK_VERSION, obs)
+            ctobservation(CTCUBEMASK_NAME, CTCUBEMASK_VERSION, obs)
 {
     // Initialise members
     init_members();
@@ -89,7 +89,7 @@ ctcubemask::ctcubemask(const GObservations&amp; obs) :
  * @param[in] argv Array of command line arguments.
  ***************************************************************************/
 ctcubemask::ctcubemask(int argc, char *argv[]) : 
-		ctobservation(CTCUBEMASK_NAME, CTCUBEMASK_VERSION, argc, argv)
+            ctobservation(CTCUBEMASK_NAME, CTCUBEMASK_VERSION, argc, argv)
 {
     // Initialise members
     init_members();
@@ -58,10 +58,10 @@ public:
     ctcubemask& operator=(const ctcubemask& app);
     // Methods
-    void                 clear(void);
-    void                 run(void);
-    void                 save(void);
-    void                 publish(const std::string& name = "");
+    void clear(void);
+    void run(void);
+    void save(void);
+    void publish(const std::string& name = "");
 protected:
     // Protected methods
@@ -71,7 +71,7 @@ ctedispcube::ctedispcube(void) : ctobservation(CTEDISPCUBE_NAME, CTEDISPCUBE_VER
  * in an observation container @p obs.
  ***************************************************************************/
 ctedispcube::ctedispcube(const GObservations& obs) :
-		ctobservation(CTEDISPCUBE_NAME, CTEDISPCUBE_VERSION, obs)
+             ctobservation(CTEDISPCUBE_NAME, CTEDISPCUBE_VERSION, obs)
 {
     // Initialise members
     init_members();
@@ -92,7 +92,7 @@ ctedispcube::ctedispcube(const GObservations&amp; obs) :
  * on the command line.
  ***************************************************************************/
 ctedispcube::ctedispcube(int argc, char *argv[]) :
-		ctobservation(CTEDISPCUBE_NAME, CTEDISPCUBE_VERSION, argc, argv)
+             ctobservation(CTEDISPCUBE_NAME, CTEDISPCUBE_VERSION, argc, argv)
 {
     // Initialise members
     init_members();
@@ -69,7 +69,7 @@ ctexpcube::ctexpcube(void) : ctobservation(CTEXPCUBE_NAME, CTEXPCUBE_VERSION)
  * observations container.
  ***************************************************************************/
 ctexpcube::ctexpcube(const GObservations& obs) :
-		ctobservation(CTEXPCUBE_NAME, CTEXPCUBE_VERSION, obs)
+           ctobservation(CTEXPCUBE_NAME, CTEXPCUBE_VERSION, obs)
 {
     // Initialise members
     init_members();
@@ -87,7 +87,7 @@ ctexpcube::ctexpcube(const GObservations&amp; obs) :
  * @param[in] argv Array of command line arguments.
  ***************************************************************************/
 ctexpcube::ctexpcube(int argc, char *argv[]) :
-		ctobservation(CTEXPCUBE_NAME, CTEXPCUBE_VERSION, argc, argv)
+           ctobservation(CTEXPCUBE_NAME, CTEXPCUBE_VERSION, argc, argv)
 {
     // Initialise members
     init_members();
@@ -72,7 +72,7 @@ ctmodel::ctmodel(void) : ctobservation(CTMODEL_NAME, CTMODEL_VERSION)
  * observations container.
  ***************************************************************************/
 ctmodel::ctmodel(const GObservations& obs) :
-		ctobservation(CTMODEL_NAME, CTMODEL_VERSION, obs)
+         ctobservation(CTMODEL_NAME, CTMODEL_VERSION, obs)
 {
     // Initialise members
     init_members();
@@ -90,7 +90,7 @@ ctmodel::ctmodel(const GObservations&amp; obs) :
  * @param[in] argv Array of command line arguments.
  ***************************************************************************/
 ctmodel::ctmodel(int argc, char *argv[]) :
-		ctobservation(CTMODEL_NAME, CTMODEL_VERSION, argc, argv)
+         ctobservation(CTMODEL_NAME, CTMODEL_VERSION, argc, argv)
 {
     // Initialise members
     init_members();
@@ -82,7 +82,7 @@ protected:
     void get_obs(void);
     void fill_cube(const GCTAObservation* obs);
     bool has_cube(void) const;
-    
+
     // User parameters
     GFilename m_outcube;      //!< Output model cube
     bool      m_apply_edisp;  //!< Apply energy dispersion?
@@ -101,7 +101,7 @@ ctobssim::ctobssim(const GObservations&amp; obs) :
  * setting.
  ***************************************************************************/
 ctobssim::ctobssim(int argc, char *argv[]) :
-		ctobservation(CTOBSSIM_NAME, CTOBSSIM_VERSION, argc, argv)
+          ctobservation(CTOBSSIM_NAME, CTOBSSIM_VERSION, argc, argv)
 {
     // Initialise members
     init_members();
@@ -62,11 +62,11 @@ public:
     ctobssim& operator=(const ctobssim& app);
     // Methods
-    void                 clear(void);
-    void                 run(void);
-    void                 save(void);
-    const double&        max_rate(void) const;
-    void                 max_rate(const double& max_rate);
+    void          clear(void);
+    void          run(void);
+    void          save(void);
+    const double& max_rate(void) const;
+    void          max_rate(const double& max_rate);
 protected:
     // Protected methods
@@ -68,7 +68,7 @@ ctpsfcube::ctpsfcube(void) : ctobservation(CTPSFCUBE_NAME, CTPSFCUBE_VERSION)
  * observations container.
  ***************************************************************************/
 ctpsfcube::ctpsfcube(const GObservations& obs) :
-		ctobservation(CTPSFCUBE_NAME, CTPSFCUBE_VERSION, obs)
+           ctobservation(CTPSFCUBE_NAME, CTPSFCUBE_VERSION, obs)
 {
     // Initialise members
     init_members();
@@ -86,7 +86,7 @@ ctpsfcube::ctpsfcube(const GObservations&amp; obs) :
  * @param[in] argv Array of command line arguments.
  ***************************************************************************/
 ctpsfcube::ctpsfcube(int argc, char *argv[]) :
-		ctobservation(CTPSFCUBE_NAME, CTPSFCUBE_VERSION, argc, argv)
+           ctobservation(CTPSFCUBE_NAME, CTPSFCUBE_VERSION, argc, argv)
 {
     // Initialise members
     init_members();
@@ -72,7 +72,7 @@ ctselect::ctselect(void) : ctobservation(CTSELECT_NAME, CTSELECT_VERSION)
  * provided in an observation container.
  ***************************************************************************/
 ctselect::ctselect(const GObservations& obs) :
-		ctobservation(CTSELECT_NAME, CTSELECT_VERSION, obs)
+          ctobservation(CTSELECT_NAME, CTSELECT_VERSION, obs)
 {
     // Initialise members
     init_members();
@@ -91,7 +91,7 @@ ctselect::ctselect(const GObservations&amp; obs) :
  * @param[in] argv Array of command line arguments.
  ***************************************************************************/
 ctselect::ctselect(int argc, char *argv[]) : 
-		ctobservation(CTSELECT_NAME, CTSELECT_VERSION, argc, argv)
+          ctobservation(CTSELECT_NAME, CTSELECT_VERSION, argc, argv)
 {
     // Initialise members
     init_members();
@@ -460,7 +460,7 @@ void ctselect::copy_members(const ctselect&amp; app)
     m_select_energy = app.m_select_energy;
     m_select_roi    = app.m_select_roi;
     m_select_time   = app.m_select_time;
-    
+
     // Return
     return;
 }
@@ -58,9 +58,9 @@ public:
     ctselect& operator=(const ctselect& app);
     // Methods
-    void                  clear(void);
-    void                  run(void);
-    void                  save(void);
+    void clear(void);
+    void run(void);
+    void save(void);
 protected:
     // Protected methods
@@ -100,7 +100,7 @@ class Test(test):
         # Check if execution failed
         self.test_assert(self._execute(cmd) != 0,
              'Check invalid input file when executed from command line')
-        
+
         # Setup ctbin command with different ebounds than input
         cmd = ctbin+' inobs="'+self._events+'"'+ \
                     ' outcube="cntmap_cmd3.fits"'+\