Observation container constructor now always takes a const reference as argument.

Jürgen Knödlseder
1 parent a4075c60
Showing 23 changed files with 55 additions and 31 deletions
pyext/ctbin.i
pyext/ctexpcube.i
pyext/ctlike.i
pyext/ctmodel.i
pyext/ctobssim.i
pyext/ctselect.i
pyext/ctskymap.i
src/ctbin/ctbin.cpp
src/ctbin/ctbin.hpp
src/ctcubemask/ctcubemask.cpp
src/ctexpcube/ctexpcube.cpp
src/ctexpcube/ctexpcube.hpp
src/ctlike/ctlike.cpp
src/ctlike/ctlike.hpp
src/ctmodel/ctmodel.cpp
src/ctmodel/ctmodel.hpp
src/ctobssim/ctobssim.cpp
src/ctobssim/ctobssim.hpp
src/ctselect/ctselect.cpp
src/ctselect/ctselect.hpp
@@ -39,7 +39,7 @@ class ctbin : public GApplication  {
 public:
     // Constructors and destructors
     ctbin(void);
-    explicit ctbin(GObservations obs);
+    explicit ctbin(const GObservations& obs);
     ctbin(int argc, char *argv[]);
     ctbin(const ctbin& app);
     virtual ~ctbin(void);
@@ -40,7 +40,7 @@ class ctexpcube : public GApplication  {
 public:
     // Constructors and destructors
     ctexpcube(void);
-    explicit ctexpcube(GObservations obs);
+    explicit ctexpcube(const GObservations& obs);
     ctexpcube(int argc, char *argv[]);
     ctexpcube(const ctexpcube& app);
     virtual ~ctexpcube(void);
 /***************************************************************************
  *                   ctlike - CTA maximum likelihood tool                  *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2010-2012 by Jurgen Knodlseder                           *
+ *  copyright (C) 2010-2014 by Jurgen Knodlseder                           *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -40,7 +40,7 @@ class ctlike : public GApplication  {
 public:
     // Constructors and destructors
     ctlike(void);
-    explicit ctlike(GObservations obs);
+    explicit ctlike(const GObservations& obs);
     ctlike(int argc, char *argv[]);
     ctlike(const ctlike& app);
     virtual ~ctlike(void);
 /***************************************************************************
  *                     ctmodel - CTA counts model tool                     *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2012 by Juergen Knoedlseder                              *
+ *  copyright (C) 2012-2014 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -40,7 +40,7 @@ class ctmodel : public GApplication  {
 public:
     // Constructors and destructors
     ctmodel(void);
-    explicit ctmodel(GObservations obs);
+    explicit ctmodel(const GObservations& obs);
     ctmodel(int argc, char *argv[]);
     ctmodel(const ctmodel& app);
     virtual ~ctmodel(void);
 /***************************************************************************
  *               ctobssim - CTA observation simulation tool                *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2011 by Jurgen Knodlseder                                *
+ *  copyright (C) 2011-2014 by Jurgen Knodlseder                           *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -39,7 +39,7 @@ class ctobssim : public GApplication  {
 public:
     // Constructors and destructors
     ctobssim(void);
-    explicit ctobssim(GObservations obs);
+    explicit ctobssim(const GObservations& obs);
     ctobssim(int argc, char *argv[]);
     ctobssim(const ctobssim& app);
     virtual ~ctobssim(void);
 /***************************************************************************
  *                    ctselect - CTA data selection tool                   *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2010-2011 by Jurgen Knodlseder                           *
+ *  copyright (C) 2010-2014 by Jurgen Knodlseder                           *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -39,7 +39,7 @@ class ctselect : public GApplication  {
 public:
     // Constructors and destructors
     ctselect(void);
-    explicit ctselect(GObservations obs);
+    explicit ctselect(const GObservations& obs);
     ctselect(int argc, char *argv[]);
     ctselect(const ctselect& app);
     virtual ~ctselect(void);
 /***************************************************************************
  *                     ctskymap - CTA sky mapping tool                     *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2012 by Juergen Knoedlseder                              *
+ *  copyright (C) 2012-2014 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -39,7 +39,7 @@ class ctskymap : public GApplication  {
 public:
     // Constructors and destructors
     ctskymap(void);
-    explicit ctskymap(GObservations obs);
+    explicit ctskymap(const GObservations& obs);
     ctskymap(int argc, char *argv[]);
     ctskymap(const ctskymap& app);
     virtual ~ctskymap(void);
@@ -69,10 +69,13 @@ ctbin::ctbin(void) : GApplication(CTBIN_NAME, CTBIN_VERSION)
 /***********************************************************************//**
  * @brief Observations constructor
  *
+ * param[in] obs Observation container.
+ *
  * This method creates an instance of the class by copying an existing
  * observations container.
  ***************************************************************************/
-ctbin::ctbin(GObservations obs) : GApplication(CTBIN_NAME, CTBIN_VERSION)
+ctbin::ctbin(const GObservations& obs) :
+       GApplication(CTBIN_NAME, CTBIN_VERSION)
 {
     // Initialise members
     init_members();
@@ -64,7 +64,7 @@ class ctbin : public GApplication  {
 public:
     // Constructors and destructors
     ctbin(void);
-    explicit ctbin(GObservations obs);
+    explicit ctbin(const GObservations& obs);
     ctbin(int argc, char *argv[]);
     ctbin(const ctbin& app);
     virtual ~ctbin(void);
@@ -67,6 +67,8 @@ ctcubemask::ctcubemask(void) : GApplication(CTCUBEMASK_NAME, CTCUBEMASK_VERSION)
 /***********************************************************************//**
  * @brief Observations constructor
  *
+ * param[in] obs Observation container.
+ *
  * This constructor creates an instance of the class that is initialised from
  * an observation container.
  ***************************************************************************/
@@ -68,10 +68,13 @@ ctexpcube::ctexpcube(void) : GApplication(CTEXPCUBE_NAME, CTEXPCUBE_VERSION)
 /***********************************************************************//**
  * @brief Observations constructor
  *
+ * param[in] obs Observation container.
+ *
  * This method creates an instance of the class by copying an existing
  * observations container.
  ***************************************************************************/
-ctexpcube::ctexpcube(GObservations obs) : GApplication(CTEXPCUBE_NAME, CTEXPCUBE_VERSION)
+ctexpcube::ctexpcube(const GObservations& obs) :
+           GApplication(CTEXPCUBE_NAME, CTEXPCUBE_VERSION)
 {
     // Initialise members
     init_members();
@@ -46,7 +46,7 @@ class ctexpcube : public GApplication  {
 public:
     // Constructors and destructors
     ctexpcube(void);
-    explicit ctexpcube(GObservations obs);
+    explicit ctexpcube(const GObservations& obs);
     ctexpcube(int argc, char *argv[]);
     ctexpcube(const ctexpcube& app);
     virtual ~ctexpcube(void);
@@ -65,10 +65,13 @@ ctlike::ctlike(void) : GApplication(CTLIKE_NAME, CTLIKE_VERSION)
 /***********************************************************************//**
  * @brief Observations constructor
  *
+ * param[in] obs Observation container.
+ *
  * This method creates an instance of the class by copying an existing
  * observations container.
  ***************************************************************************/
-ctlike::ctlike(GObservations obs) : GApplication(CTLIKE_NAME, CTLIKE_VERSION)
+ctlike::ctlike(const GObservations& obs) :
+        GApplication(CTLIKE_NAME, CTLIKE_VERSION)
 {
     // Initialise members
     init_members();
@@ -46,7 +46,7 @@ class ctlike : public GApplication  {
 public:
     // Constructors and destructors
     ctlike(void);
-    explicit ctlike(GObservations obs);
+    explicit ctlike(const GObservations& obs);
     ctlike(int argc, char *argv[]);
     ctlike(const ctlike& app);
     virtual ~ctlike(void);
@@ -66,10 +66,13 @@ ctmodel::ctmodel(void) : GApplication(CTMODEL_NAME, CTMODEL_VERSION)
 /***********************************************************************//**
  * @brief Observations constructor
  *
+ * param[in] obs Observation container.
+ *
  * This method creates an instance of the class by copying an existing
  * observations container.
  ***************************************************************************/
-ctmodel::ctmodel(GObservations obs) : GApplication(CTMODEL_NAME, CTMODEL_VERSION)
+ctmodel::ctmodel(const GObservations& obs) :
+         GApplication(CTMODEL_NAME, CTMODEL_VERSION)
 {
     // Initialise members
     init_members();
@@ -55,7 +55,7 @@ class ctmodel : public GApplication  {
 public:
     // Constructors and destructors
     ctmodel(void);
-    explicit ctmodel(GObservations obs);
+    explicit ctmodel(const GObservations& obs);
     ctmodel(int argc, char *argv[]);
     ctmodel(const ctmodel& app);
     virtual ~ctmodel(void);
@@ -73,7 +73,7 @@ ctobssim::ctobssim(void) : GApplication(CTOBSSIM_NAME, CTOBSSIM_VERSION)
  *
  * Constructs application by initialising from an observation container.
  ***************************************************************************/
-ctobssim::ctobssim(GObservations obs) :
+ctobssim::ctobssim(const GObservations& obs) :
           GApplication(CTOBSSIM_NAME, CTOBSSIM_VERSION)
 {
     // Initialise members
@@ -51,7 +51,7 @@ class ctobssim : public GApplication  {
 public:
     // Constructors and destructors
     ctobssim(void);
-    explicit ctobssim(GObservations obs);
+    explicit ctobssim(const GObservations& obs);
     ctobssim(int argc, char *argv[]);
     ctobssim(const ctobssim& app);
     virtual ~ctobssim(void);
@@ -68,10 +68,13 @@ ctselect::ctselect(void) : GApplication(CTSELECT_NAME, CTSELECT_VERSION)
 /***********************************************************************//**
  * @brief Observations constructor
  *
+ * param[in] obs Observation container.
+ *
  * This constructor creates an instance of the class that is initialised from
  * an observation container.
  ***************************************************************************/
-ctselect::ctselect(GObservations obs) : GApplication(CTSELECT_NAME, CTSELECT_VERSION)
+ctselect::ctselect(const GObservations& obs) :
+          GApplication(CTSELECT_NAME, CTSELECT_VERSION)
 {
     // Initialise members
     init_members();
@@ -47,7 +47,7 @@ class ctselect : public GApplication  {
 public:
     // Constructors and destructors
     ctselect(void);
-    explicit ctselect(GObservations obs);
+    explicit ctselect(const GObservations& obs);
     ctselect(int argc, char *argv[]);
     ctselect(const ctselect& app);
     virtual ~ctselect(void);
@@ -66,10 +66,13 @@ ctskymap::ctskymap(void) : GApplication(CTSKYMAP_NAME, CTSKYMAP_VERSION)
 /***********************************************************************//**
  * @brief Observations constructor
  *
+ * param[in] obs Observation container.
+ *
  * This method creates an instance of the class by copying an existing
  * observations container.
  ***************************************************************************/
-ctskymap::ctskymap(GObservations obs) : GApplication(CTSKYMAP_NAME, CTSKYMAP_VERSION)
+ctskymap::ctskymap(const GObservations& obs) :
+          GApplication(CTSKYMAP_NAME, CTSKYMAP_VERSION)
 {
     // Initialise members
     init_members();
@@ -47,7 +47,7 @@ class ctskymap : public GApplication  {
 public:
     // Constructors and destructors
     ctskymap(void);
-    explicit ctskymap(GObservations obs);
+    explicit ctskymap(const GObservations& obs);
     ctskymap(int argc, char *argv[]);
     ctskymap(const ctskymap& app);
     virtual ~ctskymap(void);
@@ -406,13 +406,15 @@ $ctpsfcube infile=&quot;data/crab_events.fits&quot; \
            emin=0.1 \
            emax=100.0 \
            enumbins=20 \
-           nxpix=200 \
-           nypix=200 \
-           binsz=0.02 \
+           nxpix=10 \
+           nypix=10 \
+           binsz=0.4 \
            coordsys="CEL" \
            xref=83.63 \
            yref=22.01 \
-           proj="CAR"
+           proj="CAR" \
+           amax=0.3 \
+           anumbins=10
 $ECHO -n "."
 if [ -s "psfcube1.fits" ]
 then
@@ -427,7 +429,9 @@ $ctpsfcube infile=&quot;data/crab_events.fits&quot; \
            cntmap="data/crab_cntmap.fits" \
            outfile="psfcube2.fits" \
            caldb="irf" \
-           irf="cta_dummy_irf"
+           irf="cta_dummy_irf" \
+           amax=0.3 \
+           anumbins=10
 $ECHO -n "."
 if [ -s "psfcube2.fits" ]
 then