Alexander Ziegler / ctools

Commit eaa752428c8553ef74f796c492fffb74ba202d87

Authored by Jürgen Knödlseder
1 parent 63c302a9

Integrate code

Inline Side-by-side
Showing 19 changed files with 51 additions and 52 deletions
pyext/ctbutterfly.i
  View file @eaa7524
... ... @@ -42,12 +42,11 @@ public:
42 42 ctbutterfly(int argc, char *argv[]);
43 43 ctbutterfly(const ctbutterfly& app);
44 44 virtual ~ctbutterfly(void);
45   -
46   - // Methods
47   - void clear(void);
48   - void run(void);
49   - void save(void);
50 45  
  46 + // Methods
  47 + void clear(void);
  48 + void run(void);
  49 + void save(void);
51 50 };
52 51  
53 52  
... ...
pyext/ctcubemask.i
  View file @eaa7524
... ... @@ -44,10 +44,10 @@ public:
44 44 virtual ~ctcubemask(void);
45 45  
46 46 // Methods
47   - void clear(void);
48   - void run(void);
49   - void save(void);
50   - void publish(const std::string& name = "");
  47 + void clear(void);
  48 + void run(void);
  49 + void save(void);
  50 + void publish(const std::string& name = "");
51 51 };
52 52  
53 53  
... ...
pyext/ctobssim.i
  View file @eaa7524
... ... @@ -44,11 +44,11 @@ public:
44 44 virtual ~ctobssim(void);
45 45  
46 46 // Methods
47   - void clear(void);
48   - void run(void);
49   - void save(void);
50   - const double& max_rate(void) const;
51   - void max_rate(const double& max_rate);
  47 + void clear(void);
  48 + void run(void);
  49 + void save(void);
  50 + const double& max_rate(void) const;
  51 + void max_rate(const double& max_rate);
52 52 };
53 53  
54 54  
... ...
pyext/ctselect.i
  View file @eaa7524
... ... @@ -44,9 +44,9 @@ public:
44 44 virtual ~ctselect(void);
45 45  
46 46 // Methods
47   - void clear(void);
48   - void run(void);
49   - void save(void);
  47 + void clear(void);
  48 + void run(void);
  49 + void save(void);
50 50 };
51 51  
52 52  
... ...
src/ctbin/ctbin.cpp
  View file @eaa7524
... ... @@ -524,8 +524,8 @@ void ctbin::fill_cube(GCTAObservation* obs)
524 524 // fully contained in the event list energy range. This avoids
525 525 // having partially filled bins.
526 526 if (iebin == -1 || !usage[iebin]) {
527   - num_outside_ebds++;
528   - continue;
  527 + num_outside_ebds++;
  528 + continue;
529 529 }
530 530  
531 531 // Fill event in skymap
... ...
src/ctbutterfly/ctbutterfly.cpp
  View file @eaa7524
... ... @@ -71,7 +71,7 @@ ctbutterfly::ctbutterfly(void) : ctlikelihood(CTBUTTERFLY_NAME, CTBUTTERFLY_VERS
71 71 * observations container.
72 72 ***************************************************************************/
73 73 ctbutterfly::ctbutterfly(const GObservations& obs) :
74   - ctlikelihood(CTBUTTERFLY_NAME, CTBUTTERFLY_VERSION, obs)
  74 + ctlikelihood(CTBUTTERFLY_NAME, CTBUTTERFLY_VERSION, obs)
75 75 {
76 76 // Initialise members
77 77 init_members();
... ... @@ -89,7 +89,7 @@ ctbutterfly::ctbutterfly(const GObservations& obs) :
89 89 * @param[in] argv Array of command line arguments.
90 90 ***************************************************************************/
91 91 ctbutterfly::ctbutterfly(int argc, char *argv[]) :
92   - ctlikelihood(CTBUTTERFLY_NAME, CTBUTTERFLY_VERSION, argc, argv)
  92 + ctlikelihood(CTBUTTERFLY_NAME, CTBUTTERFLY_VERSION, argc, argv)
93 93 {
94 94 // Initialise members
95 95 init_members();
... ...
src/ctbutterfly/ctbutterfly.hpp
  View file @eaa7524
... ... @@ -67,9 +67,9 @@ public:
67 67 ctbutterfly& operator=(const ctbutterfly& app);
68 68  
69 69 // Methods
70   - void clear(void);
71   - void run(void);
72   - void save(void);
  70 + void clear(void);
  71 + void run(void);
  72 + void save(void);
73 73  
74 74 protected:
75 75 // Protected methods
... ...
src/ctcubemask/ctcubemask.cpp
  View file @eaa7524
... ... @@ -70,7 +70,7 @@ ctcubemask::ctcubemask(void) : ctobservation(CTCUBEMASK_NAME, CTCUBEMASK_VERSION
70 70 * an observation container.
71 71 ***************************************************************************/
72 72 ctcubemask::ctcubemask(const GObservations& obs) :
73   - ctobservation(CTCUBEMASK_NAME, CTCUBEMASK_VERSION, obs)
  73 + ctobservation(CTCUBEMASK_NAME, CTCUBEMASK_VERSION, obs)
74 74 {
75 75 // Initialise members
76 76 init_members();
... ... @@ -89,7 +89,7 @@ ctcubemask::ctcubemask(const GObservations& obs) :
89 89 * @param[in] argv Array of command line arguments.
90 90 ***************************************************************************/
91 91 ctcubemask::ctcubemask(int argc, char *argv[]) :
92   - ctobservation(CTCUBEMASK_NAME, CTCUBEMASK_VERSION, argc, argv)
  92 + ctobservation(CTCUBEMASK_NAME, CTCUBEMASK_VERSION, argc, argv)
93 93 {
94 94 // Initialise members
95 95 init_members();
... ...
src/ctcubemask/ctcubemask.hpp
  View file @eaa7524
... ... @@ -58,10 +58,10 @@ public:
58 58 ctcubemask& operator=(const ctcubemask& app);
59 59  
60 60 // Methods
61   - void clear(void);
62   - void run(void);
63   - void save(void);
64   - void publish(const std::string& name = "");
  61 + void clear(void);
  62 + void run(void);
  63 + void save(void);
  64 + void publish(const std::string& name = "");
65 65  
66 66 protected:
67 67 // Protected methods
... ...
src/ctedispcube/ctedispcube.cpp
  View file @eaa7524
... ... @@ -71,7 +71,7 @@ ctedispcube::ctedispcube(void) : ctobservation(CTEDISPCUBE_NAME, CTEDISPCUBE_VER
71 71 * in an observation container @p obs.
72 72 ***************************************************************************/
73 73 ctedispcube::ctedispcube(const GObservations& obs) :
74   - ctobservation(CTEDISPCUBE_NAME, CTEDISPCUBE_VERSION, obs)
  74 + ctobservation(CTEDISPCUBE_NAME, CTEDISPCUBE_VERSION, obs)
75 75 {
76 76 // Initialise members
77 77 init_members();
... ... @@ -92,7 +92,7 @@ ctedispcube::ctedispcube(const GObservations& obs) :
92 92 * on the command line.
93 93 ***************************************************************************/
94 94 ctedispcube::ctedispcube(int argc, char *argv[]) :
95   - ctobservation(CTEDISPCUBE_NAME, CTEDISPCUBE_VERSION, argc, argv)
  95 + ctobservation(CTEDISPCUBE_NAME, CTEDISPCUBE_VERSION, argc, argv)
96 96 {
97 97 // Initialise members
98 98 init_members();
... ...
src/ctexpcube/ctexpcube.cpp
  View file @eaa7524
... ... @@ -69,7 +69,7 @@ ctexpcube::ctexpcube(void) : ctobservation(CTEXPCUBE_NAME, CTEXPCUBE_VERSION)
69 69 * observations container.
70 70 ***************************************************************************/
71 71 ctexpcube::ctexpcube(const GObservations& obs) :
72   - ctobservation(CTEXPCUBE_NAME, CTEXPCUBE_VERSION, obs)
  72 + ctobservation(CTEXPCUBE_NAME, CTEXPCUBE_VERSION, obs)
73 73 {
74 74 // Initialise members
75 75 init_members();
... ... @@ -87,7 +87,7 @@ ctexpcube::ctexpcube(const GObservations& obs) :
87 87 * @param[in] argv Array of command line arguments.
88 88 ***************************************************************************/
89 89 ctexpcube::ctexpcube(int argc, char *argv[]) :
90   - ctobservation(CTEXPCUBE_NAME, CTEXPCUBE_VERSION, argc, argv)
  90 + ctobservation(CTEXPCUBE_NAME, CTEXPCUBE_VERSION, argc, argv)
91 91 {
92 92 // Initialise members
93 93 init_members();
... ...
src/ctmodel/ctmodel.cpp
  View file @eaa7524
... ... @@ -72,7 +72,7 @@ ctmodel::ctmodel(void) : ctobservation(CTMODEL_NAME, CTMODEL_VERSION)
72 72 * observations container.
73 73 ***************************************************************************/
74 74 ctmodel::ctmodel(const GObservations& obs) :
75   - ctobservation(CTMODEL_NAME, CTMODEL_VERSION, obs)
  75 + ctobservation(CTMODEL_NAME, CTMODEL_VERSION, obs)
76 76 {
77 77 // Initialise members
78 78 init_members();
... ... @@ -90,7 +90,7 @@ ctmodel::ctmodel(const GObservations& obs) :
90 90 * @param[in] argv Array of command line arguments.
91 91 ***************************************************************************/
92 92 ctmodel::ctmodel(int argc, char *argv[]) :
93   - ctobservation(CTMODEL_NAME, CTMODEL_VERSION, argc, argv)
  93 + ctobservation(CTMODEL_NAME, CTMODEL_VERSION, argc, argv)
94 94 {
95 95 // Initialise members
96 96 init_members();
... ...
src/ctmodel/ctmodel.hpp
  View file @eaa7524
... ... @@ -82,7 +82,7 @@ protected:
82 82 void get_obs(void);
83 83 void fill_cube(const GCTAObservation* obs);
84 84 bool has_cube(void) const;
85   -
  85 +
86 86 // User parameters
87 87 GFilename m_outcube; //!< Output model cube
88 88 bool m_apply_edisp; //!< Apply energy dispersion?
... ...
src/ctobssim/ctobssim.cpp
  View file @eaa7524
... ... @@ -101,7 +101,7 @@ ctobssim::ctobssim(const GObservations&amp; obs) :
101 101 * setting.
102 102 ***************************************************************************/
103 103 ctobssim::ctobssim(int argc, char *argv[]) :
104   - ctobservation(CTOBSSIM_NAME, CTOBSSIM_VERSION, argc, argv)
  104 + ctobservation(CTOBSSIM_NAME, CTOBSSIM_VERSION, argc, argv)
105 105 {
106 106 // Initialise members
107 107 init_members();
... ...
src/ctobssim/ctobssim.hpp
  View file @eaa7524
... ... @@ -62,11 +62,11 @@ public:
62 62 ctobssim& operator=(const ctobssim& app);
63 63  
64 64 // Methods
65   - void clear(void);
66   - void run(void);
67   - void save(void);
68   - const double& max_rate(void) const;
69   - void max_rate(const double& max_rate);
  65 + void clear(void);
  66 + void run(void);
  67 + void save(void);
  68 + const double& max_rate(void) const;
  69 + void max_rate(const double& max_rate);
70 70  
71 71 protected:
72 72 // Protected methods
... ...
src/ctpsfcube/ctpsfcube.cpp
  View file @eaa7524
... ... @@ -68,7 +68,7 @@ ctpsfcube::ctpsfcube(void) : ctobservation(CTPSFCUBE_NAME, CTPSFCUBE_VERSION)
68 68 * observations container.
69 69 ***************************************************************************/
70 70 ctpsfcube::ctpsfcube(const GObservations& obs) :
71   - ctobservation(CTPSFCUBE_NAME, CTPSFCUBE_VERSION, obs)
  71 + ctobservation(CTPSFCUBE_NAME, CTPSFCUBE_VERSION, obs)
72 72 {
73 73 // Initialise members
74 74 init_members();
... ... @@ -86,7 +86,7 @@ ctpsfcube::ctpsfcube(const GObservations&amp; obs) :
86 86 * @param[in] argv Array of command line arguments.
87 87 ***************************************************************************/
88 88 ctpsfcube::ctpsfcube(int argc, char *argv[]) :
89   - ctobservation(CTPSFCUBE_NAME, CTPSFCUBE_VERSION, argc, argv)
  89 + ctobservation(CTPSFCUBE_NAME, CTPSFCUBE_VERSION, argc, argv)
90 90 {
91 91 // Initialise members
92 92 init_members();
... ...
src/ctselect/ctselect.cpp
  View file @eaa7524
... ... @@ -72,7 +72,7 @@ ctselect::ctselect(void) : ctobservation(CTSELECT_NAME, CTSELECT_VERSION)
72 72 * provided in an observation container.
73 73 ***************************************************************************/
74 74 ctselect::ctselect(const GObservations& obs) :
75   - ctobservation(CTSELECT_NAME, CTSELECT_VERSION, obs)
  75 + ctobservation(CTSELECT_NAME, CTSELECT_VERSION, obs)
76 76 {
77 77 // Initialise members
78 78 init_members();
... ... @@ -91,7 +91,7 @@ ctselect::ctselect(const GObservations&amp; obs) :
91 91 * @param[in] argv Array of command line arguments.
92 92 ***************************************************************************/
93 93 ctselect::ctselect(int argc, char *argv[]) :
94   - ctobservation(CTSELECT_NAME, CTSELECT_VERSION, argc, argv)
  94 + ctobservation(CTSELECT_NAME, CTSELECT_VERSION, argc, argv)
95 95 {
96 96 // Initialise members
97 97 init_members();
... ... @@ -460,7 +460,7 @@ void ctselect::copy_members(const ctselect&amp; app)
460 460 m_select_energy = app.m_select_energy;
461 461 m_select_roi = app.m_select_roi;
462 462 m_select_time = app.m_select_time;
463   -
  463 +
464 464 // Return
465 465 return;
466 466 }
... ...
src/ctselect/ctselect.hpp
  View file @eaa7524
... ... @@ -58,9 +58,9 @@ public:
58 58 ctselect& operator=(const ctselect& app);
59 59  
60 60 // Methods
61   - void clear(void);
62   - void run(void);
63   - void save(void);
  61 + void clear(void);
  62 + void run(void);
  63 + void save(void);
64 64  
65 65 protected:
66 66 // Protected methods
... ...
test/test_ctbin.py
  View file @eaa7524
... ... @@ -100,7 +100,7 @@ class Test(test):
100 100 # Check if execution failed
101 101 self.test_assert(self._execute(cmd) != 0,
102 102 'Check invalid input file when executed from command line')
103   -
  103 +
104 104 # Setup ctbin command with different ebounds than input
105 105 cmd = ctbin+' inobs="'+self._events+'"'+ \
106 106 ' outcube="cntmap_cmd3.fits"'+\
... ...