Justine Devin / gammalib

Commit ec8154a990b618672fc383c9450f29898c4e2a81

Authored by Jürgen Knödlseder
1 parent 211c2251

Remove __str__() extension as it is now implemented in the base class.

Inline Side-by-side
Showing 92 changed files with 134 additions and 385 deletions
inst/cta/pyext/GCTAAeff.i
  View file @ec8154a
1 1 /***************************************************************************
2 2 * GCTAAeff.i - CTA effective area base class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2012-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -63,7 +63,4 @@ public:
63 63 * @brief GCTAAeff class extension
64 64 ***************************************************************************/
65 65 %extend GCTAAeff {
66   - char *__str__() {
67   - return tochar(self->print());
68   - }
69 66 };
... ...
inst/cta/pyext/GCTAAeff2D.i
  View file @ec8154a
... ... @@ -67,9 +67,6 @@ public:
67 67 * @brief GCTAAeff2D class extension
68 68 ***************************************************************************/
69 69 %extend GCTAAeff2D {
70   - char *__str__() {
71   - return tochar(self->print());
72   - }
73 70 GCTAAeff2D copy() {
74 71 return (*self);
75 72 }
... ...
inst/cta/pyext/GCTAAeffArf.i
  View file @ec8154a
... ... @@ -74,9 +74,6 @@ public:
74 74 * @brief GCTAAeffArf class extension
75 75 ***************************************************************************/
76 76 %extend GCTAAeffArf {
77   - char *__str__() {
78   - return tochar(self->print());
79   - }
80 77 GCTAAeffArf copy() {
81 78 return (*self);
82 79 }
... ...
inst/cta/pyext/GCTAAeffPerfTable.i
  View file @ec8154a
1 1 /***************************************************************************
2 2 * GCTAAeffPerfTable.i - CTA performance table effective area class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2012-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -69,9 +69,6 @@ public:
69 69 * @brief GCTAAeffPerfTable class extension
70 70 ***************************************************************************/
71 71 %extend GCTAAeffPerfTable {
72   - char *__str__() {
73   - return tochar(self->print());
74   - }
75 72 GCTAAeffPerfTable copy() {
76 73 return (*self);
77 74 }
... ...
inst/cta/pyext/GCTADir.i
  View file @ec8154a
1 1 /***************************************************************************
2   - * GCTADir.i - CTA direction class *
  2 + * GCTADir.i - CTA direction class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2011 by Jurgen Knodlseder *
  4 + * copyright (C) 2011-2013 by Jurgen Knodlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -20,8 +20,8 @@
20 20 ***************************************************************************/
21 21 /**
22 22 * @file GCTADir.i
23   - * @brief CTA camera direction class Python interface definition
24   - * @author J. Knodlseder
  23 + * @brief CTA camera direction class interface definition
  24 + * @author Juergen Knoedlseder
25 25 */
26 26 %{
27 27 /* Put headers and other declarations here that are needed for compilation */
... ... @@ -63,9 +63,6 @@ public:
63 63 * @brief GCTADir class extension
64 64 ***************************************************************************/
65 65 %extend GCTADir {
66   - char *__str__() {
67   - return tochar(self->print());
68   - }
69 66 GCTADir copy() {
70 67 return (*self);
71 68 }
... ...
inst/cta/pyext/GCTAEdisp.i
  View file @ec8154a
1 1 /***************************************************************************
2   - * GCTAEdisp.i - CTA energy dispersion base class *
  2 + * GCTAEdisp.i - Energy dispersion base class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2012-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -20,7 +20,7 @@
20 20 ***************************************************************************/
21 21 /**
22 22 * @file GCTAEdisp.i
23   - * @brief CTA energy dispersion base class definition
  23 + * @brief Energy dispersion base class definition
24 24 * @author Juergen Knoedlseder
25 25 */
26 26 %{
... ... @@ -65,7 +65,4 @@ public:
65 65 * @brief GCTAEdisp class extension
66 66 ***************************************************************************/
67 67 %extend GCTAEdisp {
68   - char *__str__() {
69   - return tochar(self->print());
70   - }
71 68 };
... ...
inst/cta/pyext/GCTAModelRadial.i
  View file @ec8154a
1 1 /***************************************************************************
2   - * GCTAModelRadial.i - Radial model abstract base class python interface *
  2 + * GCTAModelRadial.i - Abstract radial model base class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2011 by Jurgen Knodlseder *
  4 + * copyright (C) 2011-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -20,8 +20,8 @@
20 20 ***************************************************************************/
21 21 /**
22 22 * @file GCTAModelRadial.i
23   - * @brief Abstract radial acceptance model class Python interface.
24   - * @author J. Knodlseder
  23 + * @brief Abstract radial model class interface definition
  24 + * @author Juergen Knoedlseder
25 25 */
26 26 %{
27 27 /* Put headers and other declarations here that are needed for compilation */
... ... @@ -63,9 +63,6 @@ public:
63 63 * @brief GCTAModelRadial class extension
64 64 ***************************************************************************/
65 65 %extend GCTAModelRadial {
66   - char *__str__() {
67   - return tochar(self->print());
68   - }
69 66 GModelPar& __getitem__(const int& index) {
70 67 if (index >= 0 && index < self->size())
71 68 return (*self)[index];
... ...
inst/cta/pyext/GCTAModelRadialAcceptance.i
  View file @ec8154a
1 1 /***************************************************************************
2   - * GCTAModelRadialAcceptance.i - Radial acceptance model class python I/F*
  2 + * GCTAModelRadialAcceptance.i - Radial acceptance model class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2011-2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2011-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -20,7 +20,7 @@
20 20 ***************************************************************************/
21 21 /**
22 22 * @file GCTAModelRadialAcceptance.i
23   - * @brief Radial acceptance model class Python interface definition
  23 + * @brief Radial acceptance model class interface definition
24 24 * @author Juergen Knoedlseder
25 25 */
26 26 %{
... ...
inst/cta/pyext/GCTAModelRadialGauss.i
  View file @ec8154a
1 1 /***************************************************************************
2   - * GCTAModelRadialGauss.i - Radial Gaussian model class python interface *
  2 + * GCTAModelRadialGauss.i - Radial Gaussian model class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2011-2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2011-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -20,7 +20,7 @@
20 20 ***************************************************************************/
21 21 /**
22 22 * @file GCTAModelRadialGauss.i
23   - * @brief Radial Gaussian model class Python interface definition
  23 + * @brief Radial Gaussian model class interface definition
24 24 * @author Juergen Knoedlseder
25 25 */
26 26 %{
... ... @@ -65,7 +65,4 @@ public:
65 65 * @brief GCTAModelRadialGauss class extension
66 66 ***************************************************************************/
67 67 %extend GCTAModelRadialGauss {
68   - char *__str__() {
69   - return tochar(self->print());
70   - }
71 68 };
... ...
inst/cta/pyext/GCTAModelRadialPolynom.i
  View file @ec8154a
1 1 /***************************************************************************
2   - * GCTAModelRadialPolynom.i - Radial Polynom CTA model class *
  2 + * GCTAModelRadialPolynom.i - Radial Polynom model class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2011-2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2011-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -20,7 +20,7 @@
20 20 ***************************************************************************/
21 21 /**
22 22 * @file GCTAModelRadialPolynom.i
23   - * @brief Radial Polynom model class Python interface definition
  23 + * @brief Radial Polynom model class interface definition
24 24 * @author Juergen Knoedlseder
25 25 */
26 26 %{
... ... @@ -66,7 +66,4 @@ public:
66 66 * @brief GCTAModelRadialPolynom class extension
67 67 ***************************************************************************/
68 68 %extend GCTAModelRadialPolynom {
69   - char *__str__() {
70   - return tochar(self->print());
71   - }
72 69 };
... ...
inst/cta/pyext/GCTAModelRadialProfile.i
  View file @ec8154a
1 1 /***************************************************************************
2   - * GCTAModelRadialProfile.i - Radial Profile CTA model class *
  2 + * GCTAModelRadialProfile.i - Radial Profile model class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2011-2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2011-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -70,7 +70,4 @@ public:
70 70 * @brief GCTAModelRadialProfile class extension
71 71 ***************************************************************************/
72 72 %extend GCTAModelRadialProfile {
73   - char *__str__() {
74   - return tochar(self->print());
75   - }
76 73 };
... ...
inst/cta/pyext/GCTAModelRadialRegistry.i
  View file @ec8154a
1 1 /***************************************************************************
2   - * GCTAModelRadialRegistry.i - CTA Radial model registry class *
  2 + * GCTAModelRadialRegistry.i - Radial model registry class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2011-2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2011-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -20,7 +20,7 @@
20 20 ***************************************************************************/
21 21 /**
22 22 * @file GCTAModelRadialRegistry.i
23   - * @brief CTA radial model registry class definition
  23 + * @brief Radial model registry class definition
24 24 * @author Juergen Knoedlseder
25 25 */
26 26 %{
... ... @@ -55,7 +55,4 @@ public:
55 55 * @brief GCTAModelRadialRegistry class extension
56 56 ***************************************************************************/
57 57 %extend GCTAModelRadialRegistry {
58   - char *__str__() {
59   - return tochar(self->print());
60   - }
61 58 };
... ...
inst/cta/pyext/GCTAPsf.i
  View file @ec8154a
... ... @@ -77,7 +77,4 @@ public:
77 77 * @brief GCTAPsf class extension
78 78 ***************************************************************************/
79 79 %extend GCTAPsf {
80   - char *__str__() {
81   - return tochar(self->print());
82   - }
83 80 };
... ...
inst/cta/pyext/GCTAPsf2D.i
  View file @ec8154a
... ... @@ -78,7 +78,4 @@ public:
78 78 * @brief GCTAPsf2D class extension
79 79 ***************************************************************************/
80 80 %extend GCTAPsf2D {
81   - char *__str__() {
82   - return tochar(self->print());
83   - }
84 81 };
... ...
inst/cta/pyext/GCTAPsfPerfTable.i
  View file @ec8154a
... ... @@ -78,7 +78,4 @@ public:
78 78 * @brief GCTAPsfPerfTable class extension
79 79 ***************************************************************************/
80 80 %extend GCTAPsfPerfTable {
81   - char *__str__() {
82   - return tochar(self->print());
83   - }
84 81 };
... ...
inst/cta/pyext/GCTAPsfVector.i
  View file @ec8154a
... ... @@ -84,7 +84,4 @@ public:
84 84 * @brief GCTAPsfVector class extension
85 85 ***************************************************************************/
86 86 %extend GCTAPsfVector {
87   - char *__str__() {
88   - return tochar(self->print());
89   - }
90 87 };
... ...
inst/cta/pyext/GCTAResponseTable.i
  View file @ec8154a
1 1 /***************************************************************************
2 2 * GCTAResponseTable.i - CTA response table class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2012-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -78,9 +78,6 @@ public:
78 78 * @brief GCTAResponse class extension
79 79 ***************************************************************************/
80 80 %extend GCTAResponseTable {
81   - char *__str__() {
82   - return tochar(self->print());
83   - }
84 81 GCTAResponseTable copy() {
85 82 return (*self);
86 83 }
... ...
inst/lat/pyext/GLATAeff.i
  View file @ec8154a
1 1 /***************************************************************************
2   - * GLATAeff.i - Fermi/LAT effective area *
  2 + * GLATAeff.i - Fermi/LAT effective area class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2012-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -74,9 +74,6 @@ public:
74 74 * @brief GLATAeff class extension
75 75 ***************************************************************************/
76 76 %extend GLATAeff {
77   - char *__str__() {
78   - return tochar(self->print());
79   - }
80 77 GLATAeff copy() {
81 78 return (*self);
82 79 }
... ...
inst/lat/pyext/GLATEdisp.i
  View file @ec8154a
1 1 /***************************************************************************
2   - * GLATEdisp.i - Fermi/LAT energy dispersion *
  2 + * GLATEdisp.i - Fermi/LAT energy dispersion class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2012-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -69,9 +69,6 @@ public:
69 69 * @brief GLATEdisp class extension
70 70 ***************************************************************************/
71 71 %extend GLATEdisp {
72   - char *__str__() {
73   - return tochar(self->print());
74   - }
75 72 GLATEdisp copy() {
76 73 return (*self);
77 74 }
... ...
inst/lat/pyext/GLATEventAtom.i
  View file @ec8154a
1 1 /***************************************************************************
2   - * GLATEventAtom.i - Fermi/LAT event atom class *
  2 + * GLATEventAtom.i - Fermi/LAT event atom class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2012-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -55,9 +55,6 @@ public:
55 55 * @brief GLATEventAtom class extension
56 56 ***************************************************************************/
57 57 %extend GLATEventAtom {
58   - char *__str__() {
59   - return tochar(self->print());
60   - }
61 58 GLATEventAtom copy() {
62 59 return (*self);
63 60 }
... ...
inst/lat/pyext/GLATEventList.i
  View file @ec8154a
1 1 /***************************************************************************
2   - * GLATEventList.i - Fermi-LAT event atom container class *
  2 + * GLATEventList.i - Fermi/LAT event atom container class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2012-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -60,9 +60,6 @@ public:
60 60 * @brief GLATEventList class extension
61 61 ***************************************************************************/
62 62 %extend GLATEventList {
63   - char *__str__() {
64   - return tochar(self->print());
65   - }
66 63 GLATEventList copy() {
67 64 return (*self);
68 65 }
... ...
inst/lat/pyext/GLATLtCube.i
  View file @ec8154a
1 1 /***************************************************************************
2   - * GLATLtCube.i - Fermi/LAT lifetime cube *
  2 + * GLATLtCube.i - Fermi/LAT lifetime cube class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2010-2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2010-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -20,8 +20,8 @@
20 20 ***************************************************************************/
21 21 /**
22 22 * @file GLATLtCube.i
23   - * @brief Fermi/LAT lifetime cube Python interface definition
24   - * @author J. Knoedlseder
  23 + * @brief Fermi/LAT lifetime cube interface definition
  24 + * @author Juergen Knoedlseder
25 25 */
26 26 %{
27 27 /* Put headers and other declarations here that are needed for compilation */
... ... @@ -65,9 +65,6 @@ public:
65 65 * @brief GLATLtCube class extension
66 66 ***************************************************************************/
67 67 %extend GLATLtCube {
68   - char *__str__() {
69   - return tochar(self->print());
70   - }
71 68 GLATLtCube copy() {
72 69 return (*self);
73 70 }
... ...
inst/lat/pyext/GLATMeanPsf.i
  View file @ec8154a
1 1 /***************************************************************************
2   - * GLATMeanPsf.hpp - Fermi/LAT mean PSF *
  2 + * GLATMeanPsf.hpp - Fermi/LAT mean PSF class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2010-2011 by Jurgen Knodlseder *
  4 + * copyright (C) 2010-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -20,8 +20,8 @@
20 20 ***************************************************************************/
21 21 /**
22 22 * @file GLATMeanPsf.hpp
23   - * @brief Fermi LAT mean PSF Python interface definition
24   - * @author J. Knodlseder
  23 + * @brief Fermi/LAT mean PSF interface definition
  24 + * @author Juergen Knoedlseder
25 25 */
26 26 %{
27 27 /* Put headers and other declarations here that are needed for compilation */
... ... @@ -75,9 +75,6 @@ public:
75 75 * @brief GLATMeanPsf class extension
76 76 ***************************************************************************/
77 77 %extend GLATMeanPsf {
78   - char *__str__() {
79   - return tochar(self->print());
80   - }
81 78 GLATMeanPsf copy() {
82 79 return (*self);
83 80 }
... ...
inst/lat/pyext/GLATPointing.i
  View file @ec8154a
1 1 /***************************************************************************
2   - * GLATPointing.i - Fermi-LAT pointing class *
  2 + * GLATPointing.i - Fermi/LAT pointing class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2012-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -54,9 +54,6 @@ public:
54 54 * @brief GLATPointing class extension
55 55 ***************************************************************************/
56 56 %extend GLATPointing {
57   - char *__str__() {
58   - return tochar(self->print());
59   - }
60 57 GLATPointing copy() {
61 58 return (*self);
62 59 }
... ...
inst/lat/pyext/GLATPsf.i
  View file @ec8154a
1 1 /***************************************************************************
2   - * GLATPsf.i - Fermi/LAT point spread function *
  2 + * GLATPsf.i - Fermi/LAT point spread function class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2012-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -21,7 +21,7 @@
21 21 /**
22 22 * @file GLATPsf.i
23 23 * @brief Fermi/LAT point spread function class definition
24   - * @author J. Knoedlseder
  24 + * @author Juergen Knoedlseder
25 25 */
26 26 %{
27 27 /* Put headers and other declarations here that are needed for compilation */
... ... @@ -74,9 +74,6 @@ public:
74 74 * @brief GLATPsf class extension
75 75 ***************************************************************************/
76 76 %extend GLATPsf {
77   - char *__str__() {
78   - return tochar(self->print());
79   - }
80 77 GLATPsf copy() {
81 78 return (*self);
82 79 }
... ...
pyext/GApplication.i
  View file @ec8154a
... ... @@ -80,7 +80,7 @@ public:
80 80 ***************************************************************************/
81 81 %extend GApplication {
82 82 char *__str__() {
83   - return tochar(self->print());
  83 + return gammalib::tochar(self->print());
84 84 }
85 85 GPar& __getitem__(const std::string& name) {
86 86 return (*self)[name];
... ...
pyext/GCaldb.i
  View file @ec8154a
1 1 /***************************************************************************
2   - * GCaldb.i - Calibration database class *
  2 + * GCaldb.i - Calibration database class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2011-2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2011-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -59,7 +59,7 @@ public:
59 59 ***************************************************************************/
60 60 %extend GCaldb {
61 61 char *__str__() {
62   - return tochar(self->print());
  62 + return gammalib::tochar(self->print());
63 63 }
64 64 GCaldb copy() {
65 65 return (*self);
... ...
pyext/GCsv.i
  View file @ec8154a
1 1 /***************************************************************************
2 2 * GCsv.i - Column separated values table class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2010-2011 by Jurgen Knodlseder *
  4 + * copyright (C) 2010-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -21,7 +21,7 @@
21 21 /**
22 22 * @file GCsv.hpp
23 23 * @brief Column separated values table class Python bindings
24   - * @author J. Knodlseder
  24 + * @author Juergen Knoedlseder
25 25 */
26 26 %{
27 27 /* Put headers and other declarations here that are needed for compilation */
... ... @@ -107,9 +107,6 @@ public:
107 107 * @brief GCsv class extension
108 108 ***************************************************************************/
109 109 %extend GCsv {
110   - char *__str__() {
111   - return tochar(self->print());
112   - }
113 110 std::string __getitem__(int GCsvInx[]) {
114 111 return (*self)(GCsvInx[0], GCsvInx[1]);
115 112 }
... ...
pyext/GDerivative.i
  View file @ec8154a
1 1 /***************************************************************************
2 2 * GDerivative.i - Derivative class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2011-2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2011-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -68,9 +68,6 @@ public:
68 68 * @brief GDerivative class extension
69 69 ***************************************************************************/
70 70 %extend GDerivative {
71   - char *__str__() {
72   - return tochar(self->print());
73   - }
74 71 GDerivative copy() {
75 72 return (*self);
76 73 }
... ...
pyext/GEbounds.i
  View file @ec8154a
... ... @@ -80,9 +80,6 @@ public:
80 80 * @brief GEbounds class extension
81 81 ***************************************************************************/
82 82 %extend GEbounds {
83   - char *__str__() {
84   - return tochar(self->print());
85   - }
86 83 int __len__() {
87 84 return (self->size());
88 85 }
... ...
pyext/GEnergy.i
  View file @ec8154a
1 1 /***************************************************************************
2 2 * GEnergy.i - Energy class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2010-2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2010-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -80,9 +80,6 @@ public:
80 80 * @brief GEnergy class extension
81 81 ***************************************************************************/
82 82 %extend GEnergy {
83   - char *__str__() {
84   - return tochar(self->print());
85   - }
86 83 GEnergy __add__(const GEnergy& eng) const {
87 84 return ((*self) + eng);
88 85 }
... ...
pyext/GEvent.i
  View file @ec8154a
1 1 /***************************************************************************
2   - * GEvent.i - Abstract event class python I/F *
  2 + * GEvent.i - Abstract event class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2010-2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2010-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -20,7 +20,7 @@
20 20 ***************************************************************************/
21 21 /**
22 22 * @file GEvent.i
23   - * @brief GEvent class python interface
  23 + * @brief Abstract event base class interface definition
24 24 * @author Juergen Knoedlseder
25 25 */
26 26 %{
... ... @@ -89,7 +89,4 @@ public:
89 89 * @brief GEvent class extension
90 90 ***************************************************************************/
91 91 %extend GEvent {
92   - char *__str__() {
93   - return tochar(self->print());
94   - }
95 92 };
... ...
pyext/GEvents.i
  View file @ec8154a
1 1 /***************************************************************************
2   - * GEvents.i - Abstract event container class *
  2 + * GEvents.i - Abstract event container class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2010-2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2010-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -84,9 +84,6 @@ public:
84 84 * @brief GEvents class extension
85 85 ***************************************************************************/
86 86 %extend GEvents {
87   - char *__str__() {
88   - return tochar(self->print());
89   - }
90 87 GEvent* __getitem__(int index) {
91 88 if (index >= 0 && index < self->size()) {
92 89 return (*self)[index];
... ...
pyext/GFits.i
  View file @ec8154a
1 1 /***************************************************************************
2   - * GFits.i - FITS file access class *
  2 + * GFits.i - FITS file access class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2008-2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2008-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -180,9 +180,6 @@ public:
180 180 * @brief GFits class SWIG extension
181 181 ***************************************************************************/
182 182 %extend GFits {
183   - char *__str__() {
184   - return tochar(self->print());
185   - }
186 183 GFits copy() {
187 184 return (*self);
188 185 }
... ...
pyext/GFitsAsciiTable.i
  View file @ec8154a
1 1 /***************************************************************************
2 2 * GFitsAsciiTable.i - FITS ASCII table class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2008-2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2008-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -54,9 +54,6 @@ public:
54 54 * @brief GFitsAsciiTable class SWIG extension
55 55 ***************************************************************************/
56 56 %extend GFitsAsciiTable {
57   - char *__str__() {
58   - return tochar(self->print());
59   - }
60 57 GFitsAsciiTable copy() {
61 58 return (*self);
62 59 }
... ...
pyext/GFitsBinTable.i
  View file @ec8154a
1 1 /***************************************************************************
2 2 * GFitsBinTable.i - FITS binary table class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2008-2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2008-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -54,9 +54,6 @@ public:
54 54 * @brief GFitsBinTable class SWIG extension
55 55 ***************************************************************************/
56 56 %extend GFitsBinTable {
57   - char *__str__() {
58   - return tochar(self->print());
59   - }
60 57 GFitsBinTable copy() {
61 58 return (*self);
62 59 }
... ...
pyext/GFitsHDU.i
  View file @ec8154a
1 1 /***************************************************************************
2   - * GFitsHDU.i - FITS HDU handling class *
  2 + * GFitsHDU.i - FITS HDU handling class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2008-2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2008-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -87,7 +87,4 @@ public:
87 87 * @brief GFitsHDU class SWIG extension
88 88 ***************************************************************************/
89 89 %extend GFitsHDU {
90   - char *__str__() {
91   - return tochar(self->print());
92   - }
93 90 };
... ...
pyext/GFitsHeader.i
  View file @ec8154a
1 1 /***************************************************************************
2   - * GFitsHeader.i - FITS header handling class SWIG file *
  2 + * GFitsHeader.i - FITS header class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright : (C) 2008-2011 by Juergen Knoedlseder *
  4 + * copyright (C) 2008-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -20,8 +20,8 @@
20 20 ***************************************************************************/
21 21 /**
22 22 * @file GFitsHeader.i
23   - * @brief FITS header class Python interface definition
24   - * @author J. Knoedlseder
  23 + * @brief FITS header class interface definition
  24 + * @author Juergen Knoedlseder
25 25 */
26 26 %{
27 27 /* Put headers and other declarations here that are needed for compilation */
... ... @@ -75,9 +75,6 @@ public:
75 75 * @brief GFitsHeader class SWIG extension
76 76 ***************************************************************************/
77 77 %extend GFitsHeader {
78   - char *__str__() {
79   - return tochar(self->print());
80   - }
81 78 GFitsHeader copy() {
82 79 return (*self);
83 80 }
... ...
pyext/GFitsHeaderCard.i
  View file @ec8154a
1 1 /***************************************************************************
2   - * GFitsHeaderCard.hpp - FITS header card class SWIG file *
  2 + * GFitsHeaderCard.hpp - FITS header card class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2008-2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2008-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -86,9 +86,6 @@ public:
86 86 * @brief GFitsHeaderCard class SWIG extension
87 87 ***************************************************************************/
88 88 %extend GFitsHeaderCard {
89   - char *__str__() {
90   - return tochar(self->print());
91   - }
92 89 GFitsHeaderCard copy() {
93 90 return (*self);
94 91 }
... ...
pyext/GFitsImage.i
  View file @ec8154a
1 1 /***************************************************************************
2   - * GFitsImage.i - FITS image abstract base class SWIG interface *
  2 + * GFitsImage.i - FITS abstract image base class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright : (C) 2008-2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2008-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -131,7 +131,4 @@ public:
131 131 * @brief GFitsImage class extension
132 132 ***************************************************************************/
133 133 %extend GFitsImage {
134   - char *__str__() {
135   - return tochar(self->print());
136   - }
137 134 };
... ...
pyext/GFitsTable.i
  View file @ec8154a
1 1 /***************************************************************************
2   - * GFitsTable.i - FITS table abstract base class SWIG interface *
  2 + * GFitsTable.i - FITS abstract table base class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2008-2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2008-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -134,9 +134,6 @@ public:
134 134 * @brief GFitsTable class extension
135 135 ***************************************************************************/
136 136 %extend GFitsTable {
137   - char *__str__() {
138   - return tochar(self->print());
139   - }
140 137 GFitsTableCol& __getitem__(const int& colnum) {
141 138 return (*self)[colnum];
142 139 }
... ...
pyext/GFitsTableCol.i
  View file @ec8154a
1 1 /***************************************************************************
2   - * GFitsTableCol.i - FITS table column abstract base class *
  2 + * GFitsTableCol.i - FITS abstract table column base class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2008-2011 by Jurgen Knodlseder *
  4 + * copyright (C) 2008-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -20,8 +20,8 @@
20 20 ***************************************************************************/
21 21 /**
22 22 * @file GFitsTableCol.i
23   - * @brief FITS table column abstract Python base class definition
24   - * @author J. Knodlseder
  23 + * @brief FITS abstract table column base class definition
  24 + * @author Juergen Knoedlseder
25 25 */
26 26 %{
27 27 /* Put headers and other declarations here that are needed for compilation */
... ... @@ -104,9 +104,6 @@ public:
104 104 * @todo Add range checking for type casting
105 105 ***************************************************************************/
106 106 %extend GFitsTableCol {
107   - char *__str__() {
108   - return tochar(self->print());
109   - }
110 107  
111 108 // String setting
112 109 void __setitem__(int GFitsTableColInx[], std::string value) {
... ...
pyext/GGti.i
  View file @ec8154a
... ... @@ -79,9 +79,6 @@ public:
79 79 * @brief GGti class extension
80 80 ***************************************************************************/
81 81 %extend GGti {
82   - char *__str__() {
83   - return tochar(self->print());
84   - }
85 82 int __len__() {
86 83 return (self->size());
87 84 }
... ...
pyext/GInstDir.i
  View file @ec8154a
1 1 /***************************************************************************
2   - * GInstDir.i - Instrument direction class python I/F *
  2 + * GInstDir.i - Abstract instrument direction base class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2010-2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2010-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -60,7 +60,4 @@ public:
60 60 * @brief GInstDir class extension
61 61 ***************************************************************************/
62 62 %extend GInstDir {
63   - char *__str__() {
64   - return tochar(self->print());
65   - }
66 63 };
... ...
pyext/GIntegral.i
  View file @ec8154a
1 1 /***************************************************************************
2   - * GIntegral.hpp - Integration class *
  2 + * GIntegral.hpp - Integration class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2010-2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2010-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -68,9 +68,6 @@ public:
68 68 * @brief GIntegral class extension
69 69 ***************************************************************************/
70 70 %extend GIntegral {
71   - char *__str__() {
72   - return tochar(self->print());
73   - }
74 71 GIntegral copy() {
75 72 return (*self);
76 73 }
... ...
pyext/GLog.i
  View file @ec8154a
... ... @@ -94,24 +94,24 @@ public:
94 94 (*self) << value;
95 95 }
96 96 void parformat(const std::string& arg) {
97   - (*self) << parformat(arg);
  97 + (*self) << gammalib::parformat(arg);
98 98 }
99 99 void toupper(const std::string& arg) {
100   - (*self) << toupper(arg);
  100 + (*self) << gammalib::toupper(arg);
101 101 }
102 102 void tolower(const std::string& arg) {
103   - (*self) << tolower(arg);
  103 + (*self) << gammalib::tolower(arg);
104 104 }
105 105 void fill(const std::string& arg, const int& n) {
106   - (*self) << fill(arg, n);
  106 + (*self) << gammalib::fill(arg, n);
107 107 }
108 108 void left(const std::string& arg, const int& n) {
109   - (*self) << left(arg, n);
  109 + (*self) << gammalib::left(arg, n);
110 110 }
111 111 void right(const std::string& arg, const int& n) {
112   - (*self) << right(arg, n);
  112 + (*self) << gammalib::right(arg, n);
113 113 }
114 114 void center(const std::string& arg, const int& n) {
115   - (*self) << center(arg, n);
  115 + (*self) << gammalib::center(arg, n);
116 116 }
117 117 }
... ...
pyext/GMatrix.i
  View file @ec8154a
... ... @@ -96,9 +96,6 @@ public:
96 96 * @brief GMatrix class extension
97 97 ***************************************************************************/
98 98 %extend GMatrix {
99   - char *__str__() {
100   - return tochar(self->print());
101   - }
102 99 double __getitem__(int GTuple[2]) {
103 100 return (*self)(GTuple[0], GTuple[1]);
104 101 }
... ...
pyext/GMatrixSparse.i
  View file @ec8154a
... ... @@ -110,9 +110,6 @@ public:
110 110 * @brief GMatrixSparse class extension
111 111 ***************************************************************************/
112 112 %extend GMatrixSparse {
113   - char *__str__() {
114   - return tochar(self->print());
115   - }
116 113 double __getitem__(int GTuple[2]) {
117 114 return (*self)(GTuple[0], GTuple[1]);
118 115 }
... ...
pyext/GMatrixSymmetric.i
  View file @ec8154a
... ... @@ -95,9 +95,6 @@ public:
95 95 * @brief GMatrixSymmetric class extension
96 96 ***************************************************************************/
97 97 %extend GMatrixSymmetric {
98   - char *__str__() {
99   - return tochar(self->print());
100   - }
101 98 double __getitem__(int GTuple[2]) {
102 99 return (*self)(GTuple[0], GTuple[1]);
103 100 }
... ...
pyext/GModel.i
  View file @ec8154a
... ... @@ -78,9 +78,6 @@ public:
78 78 * @brief GModel class extension
79 79 ***************************************************************************/
80 80 %extend GModel {
81   - char *__str__() {
82   - return tochar(self->print());
83   - }
84 81 GModelPar& __getitem__(const int& index) {
85 82 if (index >= 0 && index < self->size()) {
86 83 return (*self)[index];
... ...
pyext/GModelPar.i
  View file @ec8154a
... ... @@ -105,9 +105,6 @@ public:
105 105 * @brief GModelPar class extension
106 106 ***************************************************************************/
107 107 %extend GModelPar {
108   - char *__str__() {
109   - return tochar(self->print());
110   - }
111 108 GModelPar copy() {
112 109 return (*self);
113 110 }
... ...
pyext/GModelRegistry.i
  View file @ec8154a
... ... @@ -55,7 +55,4 @@ public:
55 55 * @brief GModelRegistry class extension
56 56 ***************************************************************************/
57 57 %extend GModelRegistry {
58   - char *__str__() {
59   - return tochar(self->print());
60   - }
61 58 };
... ...
pyext/GModelSpatial.i
  View file @ec8154a
... ... @@ -64,9 +64,6 @@ public:
64 64 * @brief GModelSpatial class extension
65 65 ***************************************************************************/
66 66 %extend GModelSpatial {
67   - char *__str__() {
68   - return tochar(self->print());
69   - }
70 67 GModelPar& __getitem__(const int& index) {
71 68 if (index >= 0 && index < self->size()) {
72 69 return (*self)[index];
... ...
pyext/GModelSpatialRegistry.i
  View file @ec8154a
1 1 /***************************************************************************
2 2 * GModelSpatialRegistry.i - Spatial model registry class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2011-2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2011-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -56,6 +56,6 @@ public:
56 56 ***************************************************************************/
57 57 %extend GModelSpatialRegistry {
58 58 char *__str__() {
59   - return tochar(self->print());
  59 + return gammalib::tochar(self->print());
60 60 }
61 61 };
... ...
pyext/GModelSpectral.i
  View file @ec8154a
... ... @@ -35,7 +35,7 @@
35 35 *
36 36 * @brief Abstract spectral model class
37 37 ***************************************************************************/
38   -class GModelSpectral {
  38 +class GModelSpectral : public GBase {
39 39  
40 40 public:
41 41 // Constructors and destructors
... ... @@ -70,9 +70,6 @@ public:
70 70 * @brief GModelSpectral class extension
71 71 ***************************************************************************/
72 72 %extend GModelSpectral {
73   - char *__str__() {
74   - return tochar(self->print());
75   - }
76 73 GModelPar& __getitem__(const int& index) {
77 74 if (index >= 0 && index < self->size()) {
78 75 return (*self)[index];
... ...
pyext/GModelSpectralRegistry.i
  View file @ec8154a
1 1 /***************************************************************************
2 2 * GModelSpectralRegistry.i - Spectral model registry class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2011-2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2011-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -56,6 +56,6 @@ public:
56 56 ***************************************************************************/
57 57 %extend GModelSpectralRegistry {
58 58 char *__str__() {
59   - return tochar(self->print());
  59 + return gammalib::tochar(self->print());
60 60 }
61 61 };
... ...
pyext/GModelTemporal.i
  View file @ec8154a
... ... @@ -35,7 +35,7 @@
35 35 *
36 36 * @brief Abstract temporal model base class
37 37 ***************************************************************************/
38   -class GModelTemporal {
  38 +class GModelTemporal : public GBase {
39 39  
40 40 public:
41 41 // Constructors and destructors
... ... @@ -64,9 +64,6 @@ public:
64 64 * @brief GModelTemporal class extension
65 65 ***************************************************************************/
66 66 %extend GModelTemporal {
67   - char *__str__() {
68   - return tochar(self->print());
69   - }
70 67 GModelPar& __getitem__(const int& index) {
71 68 if (index >= 0 && index < self->size()) {
72 69 return (*self)[index];
... ...
pyext/GModelTemporalRegistry.i
  View file @ec8154a
1 1 /***************************************************************************
2 2 * GModelTemporalRegistry.i - Temporal model registry class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2011-2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2011-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -55,7 +55,4 @@ public:
55 55 * @brief GModelTemporalRegistry class extension
56 56 ***************************************************************************/
57 57 %extend GModelTemporalRegistry {
58   - char *__str__() {
59   - return tochar(self->print());
60   - }
61 58 };
... ...
pyext/GNodeArray.i
  View file @ec8154a
1 1 /***************************************************************************
2   - * GNodeArray.i - Array of nodes class SWIG definition *
  2 + * GNodeArray.i - Array of nodes class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2008-2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2008-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -68,9 +68,6 @@ public:
68 68 * @brief GNodeArray class extension
69 69 ***************************************************************************/
70 70 %extend GNodeArray {
71   - char *__str__() {
72   - return tochar(self->print());
73   - }
74 71 double __getitem__(const int& index) {
75 72 if (index >= 0 && index < self->size())
76 73 return (*self)[index];
... ...
pyext/GObservation.i
  View file @ec8154a
1 1 /***************************************************************************
2   - * GObservation.i - Abstract observation abstract base class *
  2 + * GObservation.i - Abstract observation base class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2008-2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2008-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -20,7 +20,7 @@
20 20 ***************************************************************************/
21 21 /**
22 22 * @file GObservation.i
23   - * @brief Abstract observation base class Python interface definition
  23 + * @brief Abstract observation base class interface definition
24 24 * @author Juergen Knoedlseder
25 25 */
26 26 %{
... ... @@ -96,7 +96,4 @@ public:
96 96 * @brief GObservation class extension
97 97 ***************************************************************************/
98 98 %extend GObservation {
99   - char *__str__() {
100   - return tochar(self->print());
101   - }
102 99 };
... ...
pyext/GObservationRegistry.i
  View file @ec8154a
1 1 /***************************************************************************
2 2 * GObservationRegistry.i - Observation registry class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2011-2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2011-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -55,7 +55,4 @@ public:
55 55 * @brief GObservationRegistry class extension
56 56 ***************************************************************************/
57 57 %extend GObservationRegistry {
58   - char *__str__() {
59   - return tochar(self->print());
60   - }
61 58 };
... ...
pyext/GObservations.i
  View file @ec8154a
... ... @@ -75,9 +75,6 @@ public:
75 75 * @brief GObservations class extension
76 76 ***************************************************************************/
77 77 %extend GObservations {
78   - char *__str__() {
79   - return tochar(self->print());
80   - }
81 78 GObservation* __getitem__(const int& index) {
82 79 if (index >= 0 && index < self->size()) {
83 80 return (*self)[index];
... ...
pyext/GOptimizer.i
  View file @ec8154a
... ... @@ -57,7 +57,4 @@ public:
57 57 * @brief GOptimizer class extension
58 58 ***************************************************************************/
59 59 %extend GOptimizer {
60   - char *__str__() {
61   - return tochar(self->print());
62   - }
63 60 };
... ...
pyext/GPar.i
  View file @ec8154a
1 1 /***************************************************************************
2   - * GPar.i - Application parameter class SWIG file *
  2 + * GPar.i - Application parameter class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2010-2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2010-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -20,7 +20,7 @@
20 20 ***************************************************************************/
21 21 /**
22 22 * @file GPar.i
23   - * @brief Application parameter class SWIG file.
  23 + * @brief Application parameter class definition
24 24 * @author Juergen Knoedlseder
25 25 */
26 26 %{
... ... @@ -83,7 +83,7 @@ public:
83 83 ***************************************************************************/
84 84 %extend GPar {
85 85 char *__str__() {
86   - return tochar(self->print());
  86 + return gammalib::tochar(self->print());
87 87 }
88 88 GPar copy() {
89 89 return (*self);
... ...
pyext/GPars.i
  View file @ec8154a
1 1 /***************************************************************************
2   - * GPars.i - Application parameters Python interface *
  2 + * GPars.i - Application parameter container *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2010-2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2010-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -64,7 +64,7 @@ public:
64 64 ***************************************************************************/
65 65 %extend GPars {
66 66 char *__str__() {
67   - return tochar(self->print());
  67 + return gammalib::tochar(self->print());
68 68 }
69 69 GPar& __getitem__(const int& index) {
70 70 if (index >= 0 && index < self->size())
... ...
pyext/GPhoton.i
  View file @ec8154a
1 1 /***************************************************************************
2 2 * GPhoton.i - Photon class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2011-2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2011-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -65,9 +65,6 @@ public:
65 65 * @brief GPhoton class extension
66 66 ***************************************************************************/
67 67 %extend GPhoton {
68   - char *__str__() {
69   - return tochar(self->print());
70   - }
71 68 bool __eq__(const GPhoton& ph) const {
72 69 return ((*self) == ph);
73 70 }
... ...
pyext/GPhotons.i
  View file @ec8154a
... ... @@ -59,9 +59,6 @@ public:
59 59 * @brief GPhotons class extension
60 60 ***************************************************************************/
61 61 %extend GPhotons {
62   - char *__str__() {
63   - return tochar(self->print());
64   - }
65 62 GPhoton& __getitem__(const int& index) {
66 63 if (index >= 0 && index < self->size()) {
67 64 return (*self)[index];
... ...
pyext/GPointing.i
  View file @ec8154a
1 1 /***************************************************************************
2   - * GPointing.i - Abstract pointing class *
  2 + * GPointing.i - Abstract pointing class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2010-2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2010-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -54,7 +54,4 @@ public:
54 54 * @brief GPointing class extension
55 55 ***************************************************************************/
56 56 %extend GPointing {
57   - char *__str__() {
58   - return tochar(self->print());
59   - }
60 57 };
... ...
pyext/GRan.i
  View file @ec8154a
1 1 /***************************************************************************
2 2 * GRan.i - Random number generator class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2011-2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2011-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -64,9 +64,6 @@ public:
64 64 * @brief GRan class extension
65 65 ***************************************************************************/
66 66 %extend GRan {
67   - char *__str__() {
68   - return tochar(self->print());
69   - }
70 67 GRan copy() {
71 68 return (*self);
72 69 }
... ...
pyext/GResponse.i
  View file @ec8154a
... ... @@ -87,7 +87,4 @@ public:
87 87 * @brief GResponse class extension
88 88 ***************************************************************************/
89 89 %extend GResponse {
90   - char *__str__() {
91   - return tochar(self->print());
92   - }
93 90 };
... ...
pyext/GRoi.i
  View file @ec8154a
1 1 /***************************************************************************
2   - * GRoi.i - Region of interest abstract base class *
  2 + * GRoi.i - Abstract Region of interest base class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2010-2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2010-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -58,7 +58,4 @@ public:
58 58 * @brief GRoi class extension
59 59 ***************************************************************************/
60 60 %extend GRoi {
61   - char *__str__() {
62   - return tochar(self->print());
63   - }
64 61 };
... ...
pyext/GSkyDir.i
  View file @ec8154a
... ... @@ -72,9 +72,6 @@ public:
72 72 * @brief GSkyDir class extension
73 73 ***************************************************************************/
74 74 %extend GSkyDir {
75   - char *__str__() {
76   - return tochar(self->print());
77   - }
78 75 bool __eq__(const GSkyDir& dir) const {
79 76 return ((*self) == dir);
80 77 }
... ...
pyext/GSkyPixel.i
  View file @ec8154a
1 1 /***************************************************************************
2   - * GSkyPixel.i - 2D sky pixel index class SWIG definition *
  2 + * GSkyPixel.i - 2D sky pixel index class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2010-2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2010-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -58,9 +58,6 @@ public:
58 58 * @brief GSkyPixel class extension
59 59 ***************************************************************************/
60 60 %extend GSkyPixel {
61   - char *__str__() {
62   - return tochar(self->print());
63   - }
64 61 GSkyPixel copy() {
65 62 return (*self);
66 63 }
... ...
pyext/GSkymap.i
  View file @ec8154a
1 1 /***************************************************************************
2   - * GSkymap.i - Sky map class SWIG definition *
  2 + * GSkymap.i - Sky map class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2010-2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2010-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -154,9 +154,6 @@ public:
154 154 * GSkyDir
155 155 ***************************************************************************/
156 156 %extend GSkymap {
157   - char *__str__() {
158   - return tochar(self->print());
159   - }
160 157 double __getitem__(int GSkymapInx[]) {
161 158 if (GSkymapInx[0] == 1) {
162 159 return (*self)(GSkymapInx[1]);
... ...
pyext/GSource.i
  View file @ec8154a
... ... @@ -64,9 +64,6 @@ public:
64 64 * @brief GSource class extension
65 65 ***************************************************************************/
66 66 %extend GSource {
67   - char *__str__() {
68   - return tochar(self->print());
69   - }
70 67 GSource copy() {
71 68 return (*self);
72 69 }
... ...
pyext/GTestCase.i
  View file @ec8154a
1 1 /***************************************************************************
2 2 * GTestCase.i - Test case class Python interface *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2012 Jean-Baptiste Cayrou *
  4 + * copyright (C) 2012-2013 Jean-Baptiste Cayrou *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -72,9 +72,6 @@ public:
72 72 * @brief GTestCase class extension
73 73 ***************************************************************************/
74 74 %extend GTestCase {
75   - char *__str__() {
76   - return tochar(self->print());
77   - }
78 75 GTestCase copy() {
79 76 return (*self);
80 77 }
... ...
pyext/GTestSuites.i
  View file @ec8154a
1 1 /***************************************************************************
2 2 * GTestSuites.i - Test suites class Python interface *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2012 Jean-Baptiste Cayrou *
  4 + * copyright (C) 2012-2013 Jean-Baptiste Cayrou *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -66,9 +66,6 @@ public:
66 66 * @brief GTestSuites class extension
67 67 ***************************************************************************/
68 68 %extend GTestSuites {
69   - char *__str__() {
70   - return tochar(self->print());
71   - }
72 69 GTestSuite& __getitem__(const int& index) {
73 70 if (index >= 0 && index < self->size()) {
74 71 return (*self)[index];
... ...
pyext/GTime.i
  View file @ec8154a
1 1 /***************************************************************************
2   - * GTime.i - Time class *
  2 + * GTime.i - Time class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2010-2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2010-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -20,7 +20,7 @@
20 20 ***************************************************************************/
21 21 /**
22 22 * @file GTime.i
23   - * @brief Time class python interface definition
  23 + * @brief Time class interface definition
24 24 * @author Juergen Knoedlseder
25 25 */
26 26 %{
... ... @@ -69,9 +69,6 @@ public:
69 69 * @brief GTime class extension
70 70 ***************************************************************************/
71 71 %extend GTime {
72   - char *__str__() {
73   - return tochar(self->print());
74   - }
75 72 GTime __add__(const GTime& time) const {
76 73 return ((*self) + time);
77 74 }
... ...
pyext/GTimeReference.i
  View file @ec8154a
1 1 /***************************************************************************
2 2 * GTimeReference.i - Time reference class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2012-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -80,9 +80,6 @@ public:
80 80 * @brief GTimeReference class extension
81 81 ***************************************************************************/
82 82 %extend GTimeReference {
83   - char *__str__() {
84   - return tochar(self->print());
85   - }
86 83 GTimeReference copy() {
87 84 return (*self);
88 85 }
... ...
pyext/GTimes.i
  View file @ec8154a
1 1 /***************************************************************************
2 2 * GTimes.i - Time container class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2012-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -61,9 +61,6 @@ public:
61 61 * @brief GTimes class extension
62 62 ***************************************************************************/
63 63 %extend GTimes {
64   - char *__str__() {
65   - return tochar(self->print());
66   - }
67 64 GTime& __getitem__(const int& index) {
68 65 if (index >= 0 && index < self->size()) {
69 66 return (*self)[index];
... ...
pyext/GUrl.i
  View file @ec8154a
... ... @@ -49,8 +49,6 @@ public:
49 49 virtual void close(void) = 0;
50 50 virtual int getchar(void) = 0;
51 51 virtual void putchar(const int& character) = 0;
52   - //virtual void scanf(const char* format, ...) = 0;
53   - //virtual void printf(const char* format, ...) = 0;
54 52 };
55 53  
56 54  
... ... @@ -58,9 +56,6 @@ public:
58 56 * @brief GUrl class extension
59 57 ***************************************************************************/
60 58 %extend GUrl {
61   - char *__str__() {
62   - return tochar(self->print());
63   - }
64 59 char* read(const int& nbyte) {
65 60 char* buffer = new char[nbyte+1];
66 61 int nread = self->read(buffer, nbyte);
... ...
pyext/GVector.i
  View file @ec8154a
... ... @@ -71,9 +71,6 @@ public:
71 71 * @brief GVector class extension
72 72 ***************************************************************************/
73 73 %extend GVector {
74   - char *__str__() {
75   - return tochar(self->print());
76   - }
77 74 double __getitem__(const int& index) {
78 75 if (index >= 0 && index < self->size()) {
79 76 return (*self)[index];
... ...
pyext/GWcs.i
  View file @ec8154a
1 1 /***************************************************************************
2   - * GWcs.i - World Coordinate System virtual base class *
  2 + * GWcs.i - World Coordinate System virtual base class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2010-2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2010-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -69,9 +69,6 @@ public:
69 69 * @brief GWcs class extension
70 70 ***************************************************************************/
71 71 %extend GWcs {
72   - char *__str__() {
73   - return tochar(self->print());
74   - }
75 72 bool __is__(const GWcs &a) {
76 73 return (*self) == a;
77 74 }
... ...
pyext/GWcsRegistry.i
  View file @ec8154a
1 1 /***************************************************************************
2 2 * GWcsRegistry.i - World Coordinate Projection registry class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2011-2012 by Juergen Knoedlseder *
  4 + * copyright (C) 2011-2013 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -57,7 +57,4 @@ public:
57 57 * @brief GWcsRegistry class extension
58 58 ***************************************************************************/
59 59 %extend GWcsRegistry {
60   - char *__str__() {
61   - return tochar(self->print());
62   - }
63 60 };
... ...
pyext/GXml.i
  View file @ec8154a
... ... @@ -92,9 +92,6 @@ public:
92 92 * @brief GXml class extension
93 93 ***************************************************************************/
94 94 %extend GXml {
95   - char *__str__() {
96   - return tochar(self->print(NORMAL, 0));
97   - }
98 95 GXmlNode* __getitem__(const int& index) {
99 96 if (index >= 0 && index < self->size()) {
100 97 return (*self)[index];
... ...
pyext/GXmlAttribute.i
  View file @ec8154a
... ... @@ -58,7 +58,4 @@ public:
58 58 * @brief GXmlAttribute class extension
59 59 ***************************************************************************/
60 60 %extend GXmlAttribute {
61   - char *__str__() {
62   - return tochar(self->print());
63   - }
64 61 };
... ...
pyext/GXmlComment.i
  View file @ec8154a
... ... @@ -59,9 +59,6 @@ public:
59 59 * @brief GXmlComment class extension
60 60 ***************************************************************************/
61 61 %extend GXmlComment {
62   - char *__str__() {
63   - return tochar(self->print());
64   - }
65 62 GXmlComment copy() {
66 63 return (*self);
67 64 }
... ...
pyext/GXmlDocument.i
  View file @ec8154a
... ... @@ -62,9 +62,6 @@ public:
62 62 * @brief GXmlDocument class extension
63 63 ***************************************************************************/
64 64 %extend GXmlDocument {
65   - char *__str__() {
66   - return tochar(self->print());
67   - }
68 65 GXmlDocument copy() {
69 66 return (*self);
70 67 }
... ...
pyext/GXmlElement.i
  View file @ec8154a
... ... @@ -62,9 +62,6 @@ public:
62 62 * @brief GXmlElement class extension
63 63 ***************************************************************************/
64 64 %extend GXmlElement {
65   - char *__str__() {
66   - return tochar(self->print());
67   - }
68 65 GXmlElement copy() {
69 66 return (*self);
70 67 }
... ...
pyext/GXmlNode.i
  View file @ec8154a
... ... @@ -107,7 +107,7 @@ public:
107 107 ***************************************************************************/
108 108 %extend GXmlNode {
109 109 char *__str__() {
110   - return tochar(self->print(NORMAL, 0));
  110 + return gammalib::tochar(self->print(NORMAL, 0));
111 111 }
112 112 GXmlNode* __getitem__(const int& index) {
113 113 if (index >= 0 && index < self->size()) {
... ...
pyext/GXmlPI.i
  View file @ec8154a
... ... @@ -59,9 +59,6 @@ public:
59 59 * @brief GXmlPI class extension
60 60 ***************************************************************************/
61 61 %extend GXmlPI {
62   - char *__str__() {
63   - return tochar(self->print());
64   - }
65 62 GXmlPI copy() {
66 63 return (*self);
67 64 }
... ...
pyext/GXmlText.i
  View file @ec8154a
... ... @@ -59,9 +59,6 @@ public:
59 59 * @brief GXmlText class extension
60 60 ***************************************************************************/
61 61 %extend GXmlText {
62   - char *__str__() {
63   - return tochar(self->print());
64   - }
65 62 GXmlText copy() {
66 63 return (*self);
67 64 }
... ...