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

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