Do final adjustments after introduction of GBase class.

I went over all .hpp to make sure that the GBase.hpp file is properly included, and no supoerfluous other includes remain. I also checked that no ostream and GLog friends are no longer available. I went over all .i files to make sure that classes are derived from GBase.

Do final adjustments after introduction of GBase class.
I went over all .hpp to make sure that the GBase.hpp file is properly included, and no supoerfluous other includes remain. I also checked that no ostream and GLog friends are no longer available. I went over all .i files to make sure that classes are derived from GBase.
Jürgen Knödlseder
1 parent bac7285b
Showing 45 changed files with 124 additions and 162 deletions
include/GCaldb.hpp
include/GCsv.hpp
include/GDerivative.hpp
include/GEbounds.hpp
include/GFitsTableCol.hpp
include/GModelPar.hpp
include/GModels.hpp
include/GNodeArray.hpp
include/GOptimizer.hpp
include/GPointing.hpp
include/GRan.hpp
include/GTestCase.hpp
include/GTestSuite.hpp
pyext/GCaldb.i
pyext/GEbounds.i
pyext/GEnergy.i
pyext/GEvent.i
pyext/GEvents.i
pyext/GFits.i
pyext/GFitsHeader.i
@@ -28,11 +28,10 @@
 #define GCALDB_HPP
 /* __ Includes ___________________________________________________________ */
-#include <iostream>
 #include <string>
 #include "GBase.hpp"
 #include "GFits.hpp"
-#include "GFitsBinTable.hpp"
+#include "GFitsTable.hpp"
 /***********************************************************************//**
@@ -30,9 +30,7 @@
 /* __ Includes ___________________________________________________________ */
 #include <vector>
 #include <string>
-#include <iostream>
 #include "GBase.hpp"
-#include "GLog.hpp"
 /***********************************************************************//**
@@ -29,7 +29,6 @@
 /* __ Includes ___________________________________________________________ */
 #include <string>
-#include <iostream>
 #include "GBase.hpp"
 #include "GFunction.hpp"
@@ -28,7 +28,6 @@
 #define GEBOUNDS_HPP
 /* __ Includes ___________________________________________________________ */
-#include <iostream>
 #include <string>
 #include "GBase.hpp"
 #include "GFits.hpp"
@@ -30,6 +30,7 @@
 /* __ Includes ___________________________________________________________ */
 #include <string>
 #include <vector>
+#include "GBase.hpp"
 /***********************************************************************//**
@@ -30,7 +30,6 @@
 /* __ Includes ___________________________________________________________ */
 #include <string>
 #include "GBase.hpp"
-#include "GException.hpp"
 #include "GXmlElement.hpp"
@@ -28,6 +28,7 @@
 #define GMODELS_HPP
 /* __ Includes ___________________________________________________________ */
+#include <string>
 #include "GOptimizerPars.hpp"
 #include "GModel.hpp"
 #include "GXml.hpp"
@@ -30,7 +30,6 @@
 /* __ Includes ___________________________________________________________ */
 #include <vector>
 #include <string>
-#include <iostream>
 #include "GBase.hpp"
 #include "GVector.hpp"
@@ -29,9 +29,7 @@
 /* __ Includes ___________________________________________________________ */
 #include <string>
-#include <iostream>
 #include "GBase.hpp"
-#include "GLog.hpp"
 #include "GOptimizerPars.hpp"
 #include "GOptimizerFunction.hpp"
 #include "GModels.hpp"
@@ -46,10 +44,6 @@
  ***************************************************************************/
 class GOptimizer : public GBase {
-    // I/O friends
-    friend std::ostream& operator<<(std::ostream& os, const GOptimizer& opt);
-    friend GLog&         operator<<(GLog& log,        const GOptimizer& opt);
-
 public:
     // Constructors and destructors
     GOptimizer(void);
@@ -31,7 +31,6 @@
 #include <string>
 #include "GBase.hpp"
 #include "GSkyDir.hpp"
-#include "GTime.hpp"
 /***********************************************************************//**
@@ -39,8 +38,7 @@
  *
  * @brief Interface for the pointing classes
  *
- * The pointing class holds information about the time dependent telescope
- * pointing.
+ * The pointing class holds information about the telescope pointing.
  ***************************************************************************/
 class GPointing : public GBase {
@@ -29,11 +29,7 @@
 /* __ Includes ___________________________________________________________ */
 #include <string>
-#include <iostream>
 #include "GBase.hpp"
-#include "GSkyDir.hpp"
-#include "GEnergy.hpp"
-#include "GTime.hpp"
 /***********************************************************************//**
@@ -28,7 +28,6 @@
 #define GTESTCASE_H
 /* __ Includes ___________________________________________________________ */
-#include <iostream>
 #include <string>
 #include "GBase.hpp"
@@ -34,7 +34,6 @@ class GTestSuite;
 typedef void (GTestSuite::*pfunction)(void);
 /* __ Includes ___________________________________________________________ */
-#include <iostream>
 #include <vector>
 #include <string>
 #include "GLog.hpp"
 /***************************************************************************
  *                 GCaldb.i  -  Calibration database class                 *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2011 by Juergen Knoedlseder                              *
+ *  copyright (C) 2011-2012 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -21,7 +21,7 @@
 /**
  * @file GCaldb.i
  * @brief Calibration database class interface definition
- * @author J. Knoedlseder
+ * @author Juergen Knoedlseder
  */
 %{
 /* Put headers and other declarations here that are needed for compilation */
@@ -35,7 +35,7 @@
  *
  * @brief Interface for the Calibration database class
  ***************************************************************************/
-class GCaldb {
+class GCaldb : public GBase {
 public:
     // Constructors and destructors
     GCaldb(void);
 /***************************************************************************
  *             GEbounds.i  -  Energy boundary class python I/F             *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2010-2011 by Jurgen Knodlseder                           *
+ *  copyright (C) 2010-2012 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -21,7 +21,7 @@
 /**
  * @file GEbounds.i
  * @brief GEbounds class python interface
- * @author J. Knodlseder
+ * @author Juergen Knoedlseder
  */
 %{
 /* Put headers and other declarations here that are needed for compilation */
@@ -37,7 +37,7 @@
  *
  * This class holds a list of energy intervals.
  ***************************************************************************/
-class GEbounds {
+class GEbounds : public GBase {
 public:
     // Constructors and destructors
     GEbounds(void);
@@ -46,26 +46,27 @@ public:
     virtual ~GEbounds(void);
     // Methods
-    void    clear(void);
-    void    append(const GEnergy& emin, const GEnergy& emax);
-    void    insert(const GEnergy& emin, const GEnergy& emax);
-    void    setlin(const GEnergy& emin, const GEnergy& emax, const int& num);
-    void    setlog(const GEnergy& emin, const GEnergy& emax, const int& num);
-	void    load(const std::string& filename,
-                 const std::string& extname);
-	void    save(const std::string& filename, bool clobber,
-                 const std::string& extname) const;
-    void    read(GFitsTable* hdu);
-    void    write(GFits* file, const std::string& extname) const;
-    int     index(const GEnergy& eng) const;
-    int     size(void) const { return m_num; }
-    GEnergy emin(void) const { return m_emin; }
-    GEnergy emax(void) const { return m_emax; }
-    GEnergy emin(int inx) const;
-    GEnergy emax(int inx) const;
-    GEnergy emean(int inx) const;
-    GEnergy elogmean(int inx) const;
-    bool    isin(const GEnergy& eng) const;
+    void      clear(void);
+    GEbounds* clone(void) const;
+    void      append(const GEnergy& emin, const GEnergy& emax);
+    void      insert(const GEnergy& emin, const GEnergy& emax);
+    void      setlin(const GEnergy& emin, const GEnergy& emax, const int& num);
+    void      setlog(const GEnergy& emin, const GEnergy& emax, const int& num);
+	void      load(const std::string& filename,
+                   const std::string& extname);
+	void      save(const std::string& filename, bool clobber,
+                   const std::string& extname) const;
+    void      read(GFitsTable* hdu);
+    void      write(GFits* file, const std::string& extname) const;
+    int       index(const GEnergy& eng) const;
+    int       size(void) const;
+    GEnergy   emin(void) const;
+    GEnergy   emax(void) const;
+    GEnergy   emin(int inx) const;
+    GEnergy   emax(int inx) const;
+    GEnergy   emean(int inx) const;
+    GEnergy   elogmean(int inx) const;
+    bool      isin(const GEnergy& eng) const;
 };
@@ -40,7 +40,7 @@
  * units. This makes instrument specific implementations more robust and
  * reduces the risk of unit errors.
  ***************************************************************************/
-class GEnergy {
+class GEnergy : public GBase {
 public:
     // Constructors and destructors
     GEnergy(void);
 /***************************************************************************
  *               GEvent.i  -  Abstract event class python I/F              *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2010-2011 by Jurgen Knodlseder                           *
+ *  copyright (C) 2010-2012 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -21,7 +21,7 @@
 /**
  * @file GEvent.i
  * @brief GEvent class python interface
- * @author J. Knodlseder
+ * @author Juergen Knoedlseder
  */
 %{
 /* Put headers and other declarations here that are needed for compilation */
@@ -63,7 +63,7 @@
  * The GEvent class does not hold any data members. Data members are stored
  * in the derived classes.
  ***************************************************************************/
-class GEvent {
+class GEvent : public GBase {
 public:
     // Constructors and destructors
 /***************************************************************************
  *               GEvents.i  -  Abstract event container class              *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2010-2011 by Juergen Knoedlseder                         *
+ *  copyright (C) 2010-2012 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -21,7 +21,7 @@
 /**
  * @file GEvents.i
  * @brief Abstract event container class Python interface definition
- * @author J. Knoedlseder
+ * @author Juergen Knoedlseder
  */
 %{
 /* Put headers and other declarations here that are needed for compilation */
@@ -35,7 +35,7 @@
  *
  * @brief Abstract event container class Python interface
  ***************************************************************************/
-class GEvents {
+class GEvents : public GBase {
 public:
     // Constructors and destructors
     GEvents(void);
@@ -56,7 +56,7 @@
  * via members of GFits. A FITS file is composed of Header Data Units (HDU)
  * which are implemented by the GFitsHDU class.
  ***************************************************************************/
-class GFits {
+class GFits : public GBase {
 public:
     // Constructors and destructors
@@ -43,7 +43,7 @@
  * saved into another file (using the 'save' method). Cards are added or
  * changed using the 'update' method.
  ***************************************************************************/
-class GFitsHeader {
+class GFitsHeader : public GBase {
 public:
     // Constructors and destructors
     GFitsHeader(void);
@@ -40,7 +40,8 @@
  * keyname (string), a value (string, floating pointer, integer or logical)
  * and a comment (string). COMMENT or HISTORY cards do not have any value.
  ***************************************************************************/
-class GFitsHeaderCard {
+class GFitsHeaderCard : public GBase {
+
 public:
     // Constructors & Destructors
     GFitsHeaderCard(void);
@@ -49,7 +49,8 @@
  *
  * @brief FITS table column abstract Python base class definition
  ***************************************************************************/
-class GFitsTableCol {
+class GFitsTableCol : public GBase {
+
 public:
     // Constructors and destructors
     GFitsTableCol(void);
 /***************************************************************************
  *                   GGti.i  -  Good time interval class                   *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2010-2011 by Juergen Knoedlseder                         *
+ *  copyright (C) 2010-2012 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -21,7 +21,7 @@
 /**
  * @file GGti.i
  * @brief Good time interval class Python interface definition
- * @author J. Knoedlseder
+ * @author Juergen Knoedlseder
  */
 %{
 /* Put headers and other declarations here that are needed for compilation */
@@ -38,7 +38,7 @@
  * This class holds a list of Good Time Intervals, i.e. time intervals that
  * are valid for science analysis. Times are stored using the GTime class.
  ***************************************************************************/
-class GGti {
+class GGti : public GBase {
 public:
     // Constructors and destructors
     GGti(void);
@@ -47,6 +47,7 @@ public:
     // Methods
     void   clear(void);
+    GGti*  clone(void) const;
     int    size(void) const;
     void   add(const GTime& tstart, const GTime& tstop);
     void   append(const GTime& tstart, const GTime& tstop);
@@ -64,7 +65,7 @@ public:
 	GTime  tstop(int inx) const;
 	double telapse(void) const;
 	double ontime(void) const;
-    double mjdref(void) const { return m_mjdref; }
+    double mjdref(void) const;
     bool   isin(const GTime& time) const;
 };
 /***************************************************************************
  *           GInstDir.i  -  Instrument direction class python I/F          *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2010-2011 by Jurgen Knodlseder                           *
+ *  copyright (C) 2010-2012 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -21,7 +21,7 @@
 /**
  * @file GInstDir.i
  * @brief GInstDir class python interface
- * @author J. Knodlseder
+ * @author Juergen Knoedlseder
  */
 %{
 /* Put headers and other declarations here that are needed for compilation */
@@ -42,7 +42,8 @@
  * reconstructions for imaging devices or detector numbers etc. for
  * non-imaging devices.
  ***************************************************************************/
-class GInstDir {
+class GInstDir : public GBase {
+
 public:
     // Constructors and destructors
     GInstDir(void);
 /***************************************************************************
  *                  GIntegral.hpp  -  Integration class                    *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2010-2011 by Jurgen Knodlseder                           *
+ *  copyright (C) 2010-2012 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -21,7 +21,7 @@
 /**
  * @file GIntegral.hpp
  * @brief Integration class Python interface definition
- * @author J. Knodlseder
+ * @author Juergen Knoedlseder
  */
 %{
 /* Put headers and other declarations here that are needed for compilation */
@@ -38,7 +38,7 @@
  * This class allows to perform integration using various methods. The
  * integrand is implemented by a derived class of GIntegrand.
  ***************************************************************************/
-class GIntegral {
+class GIntegral : public GBase {
 public:
     // Constructors and destructors
 /***************************************************************************
  *              GModel.i - Abstract virtual model base class               *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2009-2011 by Juergen Knoedlseder                         *
+ *  copyright (C) 2009-2012 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -21,7 +21,7 @@
 /**
  * @file GModel.i
  * @brief Abstract model base class python interface
- * @author J. Knoedlseder
+ * @author Juergen Knoedlseder
  */
 %{
 /* Put headers and other declarations here that are needed for compilation */
@@ -35,7 +35,8 @@
  *
  * @brief Abstract model base class python interface
  ***************************************************************************/
-class GModel {
+class GModel : public GBase {
+
 public:
     // Constructors and destructors
     GModel(void);
 /***************************************************************************
  *           GModelPar.i  -  Model parameter class Python interface        *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2009-2011 by Jurgen Knodlseder                           *
+ *  copyright (C) 2009-2012 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -21,7 +21,7 @@
 /**
  * @file GModelPar.i
  * @brief Model parameter class Python interface
- * @author J. Knodlseder
+ * @author Juergen Knoedlseder
  */
 %{
 /* Put headers and other declarations here that are needed for compilation */
@@ -35,7 +35,8 @@
  *
  * @brief Model parameter class
  ***************************************************************************/
-class GModelPar {
+class GModelPar : public GBase {
+
 public:
     // Constructors and destructors
     GModelPar(void);
@@ -21,7 +21,7 @@
 /**
  * @file GNodeArray.i
  * @brief Node array class Python interface definition
- * @author J. Knoedlseder
+ * @author Juergen Knoedlseder
  */
 %{
 /* Put headers and other declarations here that are needed for compilation */
@@ -35,7 +35,8 @@
  *
  * @brief Python interface for the node array class
  ***************************************************************************/
-class GNodeArray {
+class GNodeArray : public GBase {
+
 public:
     // Constructors and destructors
     GNodeArray(void);
 /***************************************************************************
  *       GObservation.i  -  Abstract observation abstract base class       *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2008-2011 by Juergen Knoedlseder                         *
+ *  copyright (C) 2008-2012 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -21,7 +21,7 @@
 /**
  * @file GObservation.i
  * @brief Abstract observation base class Python interface definition
- * @author J. Knoedlseder
+ * @author Juergen Knoedlseder
  */
 %{
 /* Put headers and other declarations here that are needed for compilation */
@@ -35,7 +35,8 @@
  *
  * @brief Abstract Python interface for the observation classes
  ***************************************************************************/
-class GObservation {
+class GObservation : public GBase {
+
 public:
     // Constructors and destructors
     GObservation(void);
 /***************************************************************************
  *            GOptimizer.i  -  Optimizer class Python interface            *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2009-2011 by Jurgen Knodlseder                           *
+ *  copyright (C) 2009-2012 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -21,7 +21,7 @@
 /**
  * @file GOptimizer.i
  * @brief Optimizer abstract base class Python interface
- * @author J. Knodlseder
+ * @author Juergen Knoedlseder
  */
 %{
 /* Put headers and other declarations here that are needed for compilation */
@@ -37,7 +37,8 @@
  *
  * This class defines the abstract interface for the optimizer class.
  ***************************************************************************/
-class GOptimizer {
+class GOptimizer : public GBase {
+
 public:
     // Constructors and destructors
     GOptimizer(void);
 /***************************************************************************
  *            GPars.i - Application parameters Python interface            *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2010-2011 by Jurgen Knodlseder                           *
+ *  copyright (C) 2010-2012 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -21,7 +21,7 @@
 /**
  * @file GPars.i
  * @brief Application parameter container class Python interface definition
- * @author Jurgen Knodlseder
+ * @author Juergen Knoedlseder
  */
 %{
 /* Put headers and other declarations here that are needed for compilation */
@@ -36,7 +36,7 @@
  *
  * @brief Application parameter container class
  ***************************************************************************/
-class GPars {
+class GPars : public GBase {
 public:
     // Constructors and destructors
@@ -47,15 +47,15 @@ public:
     virtual ~GPars(void);
     // Methods
-    void        clear(void);
-    GPars*      clone(void) const;
-    int         size(void) const;
-    void        append(const GPar& par);
-    void        append_standard(void);
-    void        load(const std::string& filename);
-    void        load(const std::string& filename, const std::vector<std::string>& args);
-    void        save(const std::string& filename);
-    bool        haspar(const std::string& name) const;
+    void   clear(void);
+    GPars* clone(void) const;
+    int    size(void) const;
+    void   append(const GPar& par);
+    void   append_standard(void);
+    void   load(const std::string& filename);
+    void   load(const std::string& filename, const std::vector<std::string>& args);
+    void   save(const std::string& filename);
+    bool   haspar(const std::string& name) const;
 };
 /***************************************************************************
  *                 GPointing.i  -  Abstract pointing class                 *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2010-2011 by Jurgen Knodlseder                           *
+ *  copyright (C) 2010-2012 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -21,7 +21,7 @@
 /**
  * @file GPointing.i
  * @brief Abstract pointing class Python interface definition.
- * @author J. Knodlseder
+ * @author Juergen Knoedlseder
  */
 %{
 /* Put headers and other declarations here that are needed for compilation */
@@ -35,7 +35,7 @@
  *
  * @brief Abstract Pointing class
  ***************************************************************************/
-class GPointing {
+class GPointing : public GBase {
 public:
     // Constructors and destructors
 /***************************************************************************
  *               GResponse.i  -  Abstract response base class              *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2008-2011 by Jurgen Knodlseder                           *
+ *  copyright (C) 2008-2012 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -21,7 +21,7 @@
 /**
  * @file GResponse.i
  * @brief Abstract response base class Python interface definition
- * @author J. Knodlseder
+ * @author Juergen Knoedlseder
  */
 %{
 /* Put headers and other declarations here that are needed for compilation */
@@ -35,7 +35,7 @@
  *
  * @brief Abstract response base class
  ***************************************************************************/
-class GResponse {
+class GResponse : public GBase {
 public:
     // Constructors and destructors
 /***************************************************************************
  *            GRoi.i  -  Region of interest abstract base class            *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2010-2011 by Jurgen Knodlseder                           *
+ *  copyright (C) 2010-2012 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -21,7 +21,7 @@
 /**
  * @file GRoi.i
  * @brief GRoi class python interface
- * @author J. Knodlseder
+ * @author Juergen Knoedlseder
  */
 %{
 /* Put headers and other declarations here that are needed for compilation */
@@ -40,7 +40,8 @@
  * for an analysis. In particular, the definition of a region of interest
  * is required for an unbinned analysis.
  ***************************************************************************/
-class GRoi {
+class GRoi : public GBase {
+
 public:
     // Constructors and destructors
     GRoi(void);
@@ -35,7 +35,7 @@
  *
  * @brief Sky direction class
  ***************************************************************************/
-class GSkyDir {
+class GSkyDir : public GBase {
 public:
     // Constructors and destructors
@@ -35,7 +35,8 @@
  *
  * @brief GSkyPixel class interface defintion
  ***************************************************************************/
-class GSkyPixel {
+class GSkyPixel : public GBase {
+
 public:
     // Constructors and destructors
     GSkyPixel(void);
@@ -21,7 +21,7 @@
 /**
  * @file GSkymap.i
  * @brief Sky map class SWIG file.
- * @author J. Knoedlseder
+ * @author Juergen Knoedlseder
  */
 %{
 /* Put headers and other declarations here that are needed for compilation */
@@ -105,7 +105,8 @@ static int skymap_tuple(PyObject *input, int *ptr) {
  *
  * @brief GSkymap class interface defintion
  ***************************************************************************/
-class GSkymap {
+class GSkymap : public GBase {
+
 public:
     // Constructors and destructors
     GSkymap(void);
@@ -121,12 +122,13 @@ public:
     virtual ~GSkymap(void);
     // Methods
+    void      clear(void);
+    GSkymap*  clone(void) const;
     GSkyDir   pix2dir(const int& pix);
     int       dir2pix(const GSkyDir& dir) const;
     double    omega(const int& pix) const;
     GSkyDir   xy2dir(const GSkyPixel& pix);
     GSkyPixel dir2xy(const GSkyDir& dir) const;
-    void      clear(void);
     void      load(const std::string& filename);
     void      save(const std::string& filename, bool clobber = false) const;
     void      read(const GFitsHDU* hdu);
@@ -35,7 +35,7 @@
  *
  * @brief Test suites Python interface defintion
  ***************************************************************************/
-class GTestSuites {
+class GTestSuites : public GBase {
 public:
@@ -40,7 +40,8 @@
  * The GTime class stores a time value in seconds and its MJD reference in
  * days. The time can be retrieved in any MJD reference.
  ***************************************************************************/
-class GTime {
+class GTime : public GBase {
+
 public:
     // Constructors and destructors
     GTime(void);
 /***************************************************************************
  *          GWcs.i  -  World Coordinate System virtual base class          *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2010-2011 by Jurgen Knodlseder                           *
+ *  copyright (C) 2010-2012 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -21,7 +21,7 @@
 /**
  * @file GWcs.i
  * @brief World Coordinate System virtual base class Python interface
- * @author J. Knodlseder
+ * @author Juergen Knoedlseder
  */
 %{
 /* Put headers and other declarations here that are needed for compilation */
@@ -35,7 +35,8 @@
  *
  * @brief World Coordinate System virtual base class Python interface
  ***************************************************************************/
-class GWcs {
+class GWcs : public GBase {
+
 public:
     // Constructors and destructors
     GWcs(void);
 /***************************************************************************
  *                 GXmlNode.i - Abstract XML node base class               *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2010-2011 by Jurgen Knodlseder                           *
+ *  copyright (C) 2010-2012 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -21,7 +21,7 @@
 /**
  * @file GXmlNode.i
  * @brief Abstract XML node base class Python interface definition
- * @author J. Knodlseder
+ * @author Juergen Knoedlseder
  */
 %{
 /* Put headers and other declarations here that are needed for compilation */
@@ -37,7 +37,7 @@
  *
  * This class defines an abstract node of a XML document.
  ***************************************************************************/
-class GXmlNode {
+class GXmlNode : public GBase {
 public:
     // Constructors and destructors
@@ -58,9 +58,10 @@ public:
     };
     // Pure virtual methods
-    virtual void     clear(void) = 0;
-    virtual void     write(FILE* fptr, int indent = 0) const = 0;
-    virtual NodeType type(void) const = 0;
+    virtual void      clear(void) = 0;
+    virtual GXmlNode* clone(void) const = 0;
+    virtual void      write(FILE* fptr, int indent = 0) const = 0;
+    virtual NodeType  type(void) const = 0;
     // Methods
     void      append(GXmlNode* node);
@@ -29,6 +29,7 @@
 #include <config.h>
 #endif
 #include "GModelRegistry.hpp"
+#include "GException.hpp"
 #include "GTools.hpp"
 /* __ Static members _____________________________________________________ */
@@ -29,6 +29,7 @@
 #include <config.h>
 #endif
 #include "GModelSpectralRegistry.hpp"
+#include "GException.hpp"
 #include "GTools.hpp"
 /* __ Static members _____________________________________________________ */
@@ -29,6 +29,7 @@
 #include <config.h>
 #endif
 #include "GModelTemporalRegistry.hpp"
+#include "GException.hpp"
 #include "GTools.hpp"
 /* __ Static members _____________________________________________________ */
 /***************************************************************************
  *           GOptimizer.cpp  -  Abstract base class for optimizer          *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2009-2011 by Jurgen Knodlseder                           *
+ *  copyright (C) 2009-2012 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -21,7 +21,7 @@
 /**
  * @file GOptimizer.cpp
  * @brief GOptimizer abstract base class implementation.
- * @author J. Knodlseder
+ * @author Juergen Knoedlseder
  */
 /* __ Includes ___________________________________________________________ */
@@ -160,42 +160,3 @@ void GOptimizer::free_members(void)
     // Return
     return;
 }
-
-
-/*==========================================================================
- =                                                                         =
- =                                 Friends                                 =
- =                                                                         =
- ==========================================================================*/
-
-/***********************************************************************//**
- * @brief Output operator
- *
- * @param[in] os Output stream.
- * @param[in] opt Optimizer.
- ***************************************************************************/
-std::ostream& operator<< (std::ostream& os, const GOptimizer& opt)
-{
-     // Write optimizer in output stream
-    os << opt.print();
-
-    // Return output stream
-    return os;
-}
-
-
-/***********************************************************************//**
- * @brief Log operator
- *
- * @param[in] log Logger.
- * @param[in] opt Optimizer.
- ***************************************************************************/
-GLog& operator<< (GLog& log, const GOptimizer& opt)
-{
-    // Write optimizer into logger
-    log << opt.print();
-
-    // Return logger
-    return log;
-}
-