From eaa752428c8553ef74f796c492fffb74ba202d87 Mon Sep 17 00:00:00 2001 From: Jürgen Knödlseder Date: Mon, 26 Sep 2016 09:43:32 +0200 Subject: [PATCH] Integrate code --- pyext/ctbutterfly.i | 9 ++++----- pyext/ctcubemask.i | 8 ++++---- pyext/ctobssim.i | 10 +++++----- pyext/ctselect.i | 6 +++--- src/ctbin/ctbin.cpp | 4 ++-- src/ctbutterfly/ctbutterfly.cpp | 4 ++-- src/ctbutterfly/ctbutterfly.hpp | 6 +++--- src/ctcubemask/ctcubemask.cpp | 4 ++-- src/ctcubemask/ctcubemask.hpp | 8 ++++---- src/ctedispcube/ctedispcube.cpp | 4 ++-- src/ctexpcube/ctexpcube.cpp | 4 ++-- src/ctmodel/ctmodel.cpp | 4 ++-- src/ctmodel/ctmodel.hpp | 2 +- src/ctobssim/ctobssim.cpp | 2 +- src/ctobssim/ctobssim.hpp | 10 +++++----- src/ctpsfcube/ctpsfcube.cpp | 4 ++-- src/ctselect/ctselect.cpp | 6 +++--- src/ctselect/ctselect.hpp | 6 +++--- test/test_ctbin.py | 2 +- 19 files changed, 51 insertions(+), 52 deletions(-) diff --git a/pyext/ctbutterfly.i b/pyext/ctbutterfly.i index 4d59895..3b157b0 100644 --- a/pyext/ctbutterfly.i +++ b/pyext/ctbutterfly.i @@ -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); }; diff --git a/pyext/ctcubemask.i b/pyext/ctcubemask.i index a164795..1d45667 100644 --- a/pyext/ctcubemask.i +++ b/pyext/ctcubemask.i @@ -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 = ""); }; diff --git a/pyext/ctobssim.i b/pyext/ctobssim.i index 561bfd4..392f94b 100644 --- a/pyext/ctobssim.i +++ b/pyext/ctobssim.i @@ -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); }; diff --git a/pyext/ctselect.i b/pyext/ctselect.i index dae5052..f69ba79 100644 --- a/pyext/ctselect.i +++ b/pyext/ctselect.i @@ -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); }; diff --git a/src/ctbin/ctbin.cpp b/src/ctbin/ctbin.cpp index 49a88e2..d2a75e7 100644 --- a/src/ctbin/ctbin.cpp +++ b/src/ctbin/ctbin.cpp @@ -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 diff --git a/src/ctbutterfly/ctbutterfly.cpp b/src/ctbutterfly/ctbutterfly.cpp index 454a0bb..cd462bb 100644 --- a/src/ctbutterfly/ctbutterfly.cpp +++ b/src/ctbutterfly/ctbutterfly.cpp @@ -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& 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(); diff --git a/src/ctbutterfly/ctbutterfly.hpp b/src/ctbutterfly/ctbutterfly.hpp index 4f15ef6..09ce0fc 100644 --- a/src/ctbutterfly/ctbutterfly.hpp +++ b/src/ctbutterfly/ctbutterfly.hpp @@ -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 diff --git a/src/ctcubemask/ctcubemask.cpp b/src/ctcubemask/ctcubemask.cpp index 3a872df..dc98944 100644 --- a/src/ctcubemask/ctcubemask.cpp +++ b/src/ctcubemask/ctcubemask.cpp @@ -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& 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(); diff --git a/src/ctcubemask/ctcubemask.hpp b/src/ctcubemask/ctcubemask.hpp index cb9c40b..0124aac 100644 --- a/src/ctcubemask/ctcubemask.hpp +++ b/src/ctcubemask/ctcubemask.hpp @@ -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 diff --git a/src/ctedispcube/ctedispcube.cpp b/src/ctedispcube/ctedispcube.cpp index 0f804d7..160f4ab 100644 --- a/src/ctedispcube/ctedispcube.cpp +++ b/src/ctedispcube/ctedispcube.cpp @@ -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& 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(); diff --git a/src/ctexpcube/ctexpcube.cpp b/src/ctexpcube/ctexpcube.cpp index 01cf5d7..9cfe847 100644 --- a/src/ctexpcube/ctexpcube.cpp +++ b/src/ctexpcube/ctexpcube.cpp @@ -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& 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(); diff --git a/src/ctmodel/ctmodel.cpp b/src/ctmodel/ctmodel.cpp index dcebcb0..0decffb 100644 --- a/src/ctmodel/ctmodel.cpp +++ b/src/ctmodel/ctmodel.cpp @@ -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& 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(); diff --git a/src/ctmodel/ctmodel.hpp b/src/ctmodel/ctmodel.hpp index e350b59..c7824f6 100644 --- a/src/ctmodel/ctmodel.hpp +++ b/src/ctmodel/ctmodel.hpp @@ -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? diff --git a/src/ctobssim/ctobssim.cpp b/src/ctobssim/ctobssim.cpp index 8cee905..9de576f 100644 --- a/src/ctobssim/ctobssim.cpp +++ b/src/ctobssim/ctobssim.cpp @@ -101,7 +101,7 @@ ctobssim::ctobssim(const GObservations& 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(); diff --git a/src/ctobssim/ctobssim.hpp b/src/ctobssim/ctobssim.hpp index dc05e6a..3721b6a 100644 --- a/src/ctobssim/ctobssim.hpp +++ b/src/ctobssim/ctobssim.hpp @@ -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 diff --git a/src/ctpsfcube/ctpsfcube.cpp b/src/ctpsfcube/ctpsfcube.cpp index 7174578..b751f38 100644 --- a/src/ctpsfcube/ctpsfcube.cpp +++ b/src/ctpsfcube/ctpsfcube.cpp @@ -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& 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(); diff --git a/src/ctselect/ctselect.cpp b/src/ctselect/ctselect.cpp index 95fd4db..c43fb21 100644 --- a/src/ctselect/ctselect.cpp +++ b/src/ctselect/ctselect.cpp @@ -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& 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& app) m_select_energy = app.m_select_energy; m_select_roi = app.m_select_roi; m_select_time = app.m_select_time; - + // Return return; } diff --git a/src/ctselect/ctselect.hpp b/src/ctselect/ctselect.hpp index 722dab5..cbde4c2 100644 --- a/src/ctselect/ctselect.hpp +++ b/src/ctselect/ctselect.hpp @@ -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 diff --git a/test/test_ctbin.py b/test/test_ctbin.py index 3983c4a..b197e4b 100755 --- a/test/test_ctbin.py +++ b/test/test_ctbin.py @@ -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"'+\ -- libgit2 0.21.4