Commit d932bba54ffd7b5c70611a2073c9211a41eb12b1

Authored by knodlseder
1 parent 3cf567e2

add #include "GTools.hpp"

pyext/ctbin.i
@@ -18,6 +18,7 @@ @@ -18,6 +18,7 @@
18 %{ 18 %{
19 /* Put headers and other declarations here that are needed for compilation */ 19 /* Put headers and other declarations here that are needed for compilation */
20 #include "ctbin.hpp" 20 #include "ctbin.hpp"
  21 +#include "GTools.hpp"
21 %} 22 %}
22 %include gammalib.i 23 %include gammalib.i
23 24
@@ -25,7 +26,7 @@ @@ -25,7 +26,7 @@
25 /***********************************************************************//** 26 /***********************************************************************//**
26 * @class ctbin 27 * @class ctbin
27 * 28 *
28 - * @brief CTA data binning tool Python interface defintion 29 + * @brief CTA data binning tool Python interface
29 ***************************************************************************/ 30 ***************************************************************************/
30 class ctbin : public GApplication { 31 class ctbin : public GApplication {
31 public: 32 public:
@@ -48,7 +49,7 @@ public: @@ -48,7 +49,7 @@ public:
48 49
49 50
50 /***********************************************************************//** 51 /***********************************************************************//**
51 - * @brief CTA data binning tool SWIG extension 52 + * @brief CTA data binning tool Python extension
52 ***************************************************************************/ 53 ***************************************************************************/
53 %extend ctbin { 54 %extend ctbin {
54 ctbin copy() { 55 ctbin copy() {
pyext/ctlike.i
@@ -18,6 +18,7 @@ @@ -18,6 +18,7 @@
18 %{ 18 %{
19 /* Put headers and other declarations here that are needed for compilation */ 19 /* Put headers and other declarations here that are needed for compilation */
20 #include "ctlike.hpp" 20 #include "ctlike.hpp"
  21 +#include "GTools.hpp"
21 %} 22 %}
22 %include gammalib.i 23 %include gammalib.i
23 24
@@ -25,7 +26,7 @@ @@ -25,7 +26,7 @@
25 /***********************************************************************//** 26 /***********************************************************************//**
26 * @class ctlike 27 * @class ctlike
27 * 28 *
28 - * @brief CTA maximum likelihood tool Python interface defintion 29 + * @brief CTA maximum likelihood tool Python interface
29 ***************************************************************************/ 30 ***************************************************************************/
30 class ctlike : public GApplication { 31 class ctlike : public GApplication {
31 public: 32 public:
@@ -50,7 +51,7 @@ public: @@ -50,7 +51,7 @@ public:
50 51
51 52
52 /***********************************************************************//** 53 /***********************************************************************//**
53 - * @brief CTA maximum likelihood tool SWIG extension 54 + * @brief CTA maximum likelihood tool Python extension
54 ***************************************************************************/ 55 ***************************************************************************/
55 %extend ctlike { 56 %extend ctlike {
56 ctlike copy() { 57 ctlike copy() {
pyext/ctobssim.i
@@ -12,12 +12,13 @@ @@ -12,12 +12,13 @@
12 ***************************************************************************/ 12 ***************************************************************************/
13 /** 13 /**
14 * @file ctobssim.i 14 * @file ctobssim.i
15 - * @brief CTA observation simulation tool python interface definition 15 + * @brief CTA observation simulation tool Python interface definition
16 * @author J. Knodlseder 16 * @author J. Knodlseder
17 */ 17 */
18 %{ 18 %{
19 /* Put headers and other declarations here that are needed for compilation */ 19 /* Put headers and other declarations here that are needed for compilation */
20 #include "ctobssim.hpp" 20 #include "ctobssim.hpp"
  21 +#include "GTools.hpp"
21 %} 22 %}
22 %include gammalib.i 23 %include gammalib.i
23 24
@@ -25,7 +26,7 @@ @@ -25,7 +26,7 @@
25 /***********************************************************************//** 26 /***********************************************************************//**
26 * @class ctobssim 27 * @class ctobssim
27 * 28 *
28 - * @brief CTA data selection tool python interface defintion. 29 + * @brief CTA data selection tool Python interface
29 ***************************************************************************/ 30 ***************************************************************************/
30 class ctobssim : public GApplication { 31 class ctobssim : public GApplication {
31 public: 32 public:
@@ -51,7 +52,7 @@ public: @@ -51,7 +52,7 @@ public:
51 52
52 53
53 /***********************************************************************//** 54 /***********************************************************************//**
54 - * @brief CTA observation simulation tool extension 55 + * @brief CTA observation simulation tool Python extension
55 ***************************************************************************/ 56 ***************************************************************************/
56 %extend ctobssim { 57 %extend ctobssim {
57 ctobssim copy() { 58 ctobssim copy() {
pyext/ctselect.i
1 /*************************************************************************** 1 /***************************************************************************
2 * ctselect - CTA data selection tool * 2 * ctselect - CTA data selection tool *
3 * ----------------------------------------------------------------------- * 3 * ----------------------------------------------------------------------- *
4 - * copyright (C) 2010 by Jurgen Knodlseder * 4 + * copyright (C) 2010-2011 by Jurgen Knodlseder *
5 * ----------------------------------------------------------------------- * 5 * ----------------------------------------------------------------------- *
6 * * 6 * *
7 * This program is free software; you can redistribute it and/or modify * 7 * This program is free software; you can redistribute it and/or modify *
@@ -12,12 +12,13 @@ @@ -12,12 +12,13 @@
12 ***************************************************************************/ 12 ***************************************************************************/
13 /** 13 /**
14 * @file ctselect.i 14 * @file ctselect.i
15 - * @brief CTA data selection tool SWIG definition 15 + * @brief CTA data selection tool Python interface definition
16 * @author J. Knodlseder 16 * @author J. Knodlseder
17 */ 17 */
18 %{ 18 %{
19 /* Put headers and other declarations here that are needed for compilation */ 19 /* Put headers and other declarations here that are needed for compilation */
20 #include "ctselect.hpp" 20 #include "ctselect.hpp"
  21 +#include "GTools.hpp"
21 %} 22 %}
22 %include gammalib.i 23 %include gammalib.i
23 24
@@ -25,25 +26,30 @@ @@ -25,25 +26,30 @@
25 /***********************************************************************//** 26 /***********************************************************************//**
26 * @class ctselect 27 * @class ctselect
27 * 28 *
28 - * @brief CTA data selection tool SWIG interface defintion. 29 + * @brief CTA data selection tool Python interface
29 ***************************************************************************/ 30 ***************************************************************************/
30 class ctselect : public GApplication { 31 class ctselect : public GApplication {
31 public: 32 public:
32 // Constructors and destructors 33 // Constructors and destructors
33 ctselect(void); 34 ctselect(void);
  35 + explicit ctselect(GObservations obs);
34 ctselect(int argc, char *argv[]); 36 ctselect(int argc, char *argv[]);
35 - ~ctselect(void); 37 + ctselect(const ctselect& app);
  38 + virtual ~ctselect(void);
36 39
37 // Methods 40 // Methods
38 - void run(void);  
39 - void get_parameters(void);  
40 - void select(void);  
41 - void append_gti(void); 41 + void clear(void);
  42 + void execute(void);
  43 + void run(void);
  44 + void save(void);
  45 + GObservations& obs(void) { return m_obs; }
  46 + void get_parameters(void);
  47 + void select_events(GCTAObservation* obs, const std::string& filename);
42 }; 48 };
43 49
44 50
45 /***********************************************************************//** 51 /***********************************************************************//**
46 - * @brief CTA data selection tool SWIG extension 52 + * @brief CTA data selection tool Python extension
47 ***************************************************************************/ 53 ***************************************************************************/
48 %extend ctselect { 54 %extend ctselect {
49 ctselect copy() { 55 ctselect copy() {