Replace alias() method by type constructor for spatial model components (#1818).

It seems better to not introduce the alias method but to use a type constructor instead. This allows writing out the same model type that was read in, enhancing the compatibility with the legacy XML format.

Replace alias() method by type constructor for spatial model components (#1818).
It seems better to not introduce the alias method but to use a type constructor instead. This allows writing out the same model type that was read in, enhancing the compatibility with the legacy XML format.
Jürgen Knödlseder
1 parent 4a1f879a
Showing 24 changed files with 327 additions and 214 deletions
configure.ac
include/GModelSpatial.hpp
include/GModelSpatialDiffuse.hpp
include/GModelSpatialDiffuseConst.hpp
include/GModelSpatialDiffuseCube.hpp
include/GModelSpatialDiffuseMap.hpp
include/GModelSpatialElliptical.hpp
include/GModelSpatialEllipticalDisk.hpp
include/GModelSpatialEllipticalGauss.hpp
include/GModelSpatialPointSource.hpp
include/GModelSpatialRadial.hpp
include/GModelSpatialRadialDisk.hpp
include/GModelSpatialRadialGauss.hpp
include/GModelSpatialRadialShell.hpp
src/model/GModelSpatialDiffuseConst.cpp
src/model/GModelSpatialDiffuseCube.cpp
src/model/GModelSpatialDiffuseMap.cpp
src/model/GModelSpatialEllipticalGauss.cpp
src/model/GModelSpatialPointSource.cpp
src/model/GModelSpatialRadialDisk.cpp
@@ -699,16 +699,16 @@ fi
 #############################################################################
-# Checks for Legacy model names option (G_LEGACY_MODEL_NAMES)               #
-#############################################################################
-AC_MSG_CHECKING(whether to enable legacy model names option)
-AC_ARG_ENABLE([legacy_model_names],
-              AS_HELP_STRING([--enable-legacy-model-names],
-                             [enables legacy model names [default=yes]]),
-             [LEGACY_MODEL_NAMES="$enableval"],
-             [LEGACY_MODEL_NAMES="yes"])
-if test "x$LEGACY_MODEL_NAMES" = "xyes"; then
-  AC_DEFINE([G_LEGACY_MODEL_NAMES], [1], [Legacy model names are enabled])
+# Checks for Legacy XML format option (G_LEGACY_XML_FORMAT)                #
+#############################################################################
+AC_MSG_CHECKING(whether to support legacy XML format option)
+AC_ARG_ENABLE([legacy_xml_format],
+              AS_HELP_STRING([--enable-legacy-xml-format],
+                             [support legacy XML format [default=yes]]),
+              [LEGACY_XML_FORMAT="$enableval"],
+              [LEGACY_XML_FORMAT="yes"])
+if test "x$LEGACY_XML_FORMAT" = "xyes"; then
+  AC_DEFINE([G_LEGACY_XML_FORMAT], [1], [Legacy XML format is supported])
   AC_MSG_RESULT(yes)
 else
   AC_MSG_RESULT(no)
@@ -1577,10 +1577,10 @@ if test &quot;x$SMALL_MEMORY&quot; = &quot;xyes&quot;; then
 else
   echo "  - Optimize memory usage        (no)"
 fi
-if test "x$LEGACY_MODEL_NAMES" = "xyes"; then
-  echo "  * Enable legacy model names    (yes)   (default)"
+if test "x$LEGACY_XML_FORMAT" = "xyes"; then
+  echo "  * Support legacy XML format    (yes)   (default)"
 else
-  echo "  - Enable legacy model names    (no)"
+  echo "  - Support legacy XML format    (no)"
 fi
 if test "x$enable_openmp" = "xyes"; then
   echo "  * Enable OpenMP                (yes)   (default)"
@@ -86,7 +86,6 @@ public:
     virtual GModelSpatial* clone(void) const = 0;
     virtual std::string    classname(void) const = 0;
     virtual std::string    type(void) const = 0;
-    virtual std::string    alias(void) const = 0;
     virtual GClassCode     code(void) const = 0;
     virtual double         eval(const GPhoton& photon) const = 0;
     virtual double         eval_gradients(const GPhoton& photon) const = 0;
@@ -62,7 +62,6 @@ public:
     virtual GModelSpatialDiffuse* clone(void) const = 0;
     virtual std::string           classname(void) const = 0;
     virtual std::string           type(void) const = 0;
-    virtual std::string           alias(void) const = 0;
     virtual double                eval(const GPhoton& photon) const = 0;
     virtual double                eval_gradients(const GPhoton& photon) const = 0;
     virtual GSkyDir               mc(const GEnergy& energy, const GTime& time,
@@ -49,6 +49,7 @@ class GModelSpatialDiffuseConst : public GModelSpatialDiffuse {
 public:
     // Constructors and destructors
     GModelSpatialDiffuseConst(void);
+    GModelSpatialDiffuseConst(const bool& dummy, const std::string& type);
     explicit GModelSpatialDiffuseConst(const GXmlElement& xml);
     explicit GModelSpatialDiffuseConst(const double& value);
     GModelSpatialDiffuseConst(const GModelSpatialDiffuseConst& model);
@@ -62,7 +63,6 @@ public:
     virtual GModelSpatialDiffuseConst* clone(void) const;
     virtual std::string                classname(void) const;
     virtual std::string                type(void) const;
-    virtual std::string                alias(void) const;
     virtual double                     eval(const GPhoton& photon) const;
     virtual double                     eval_gradients(const GPhoton& photon) const;
     virtual GSkyDir                    mc(const GEnergy& energy,
@@ -87,6 +87,7 @@ protected:
     void free_members(void);
     // Protected members
+    std::string     m_type;          //!< Model type
     GModelPar       m_value;         //!< Value
     mutable GSkyDir m_mc_centre;     //!< Simulation cone centre
     mutable double  m_mc_cos_radius; //!< Cosine of simulation cone radius
@@ -108,28 +109,14 @@ std::string GModelSpatialDiffuseConst::classname(void) const
 /***********************************************************************//**
  * @brief Return spatial model type
  *
- * @return "DiffuseIsotropic".
+ * @return Model type.
  *
  * Returns the type of the isotropic spatial model.
  ***************************************************************************/
 inline
 std::string GModelSpatialDiffuseConst::type(void) const
 {
-    return "DiffuseIsotropic";
-}
-
-
-/***********************************************************************//**
- * @brief Return spatial model type alias
- *
- * @return "ConstantValue".
- *
- * Returns the alias of the isotropic spatial model.
- ***************************************************************************/
-inline
-std::string GModelSpatialDiffuseConst::alias(void) const
-{
-    return "ConstantValue";
+    return (m_type);
 }
@@ -60,6 +60,7 @@ class GModelSpatialDiffuseCube : public GModelSpatialDiffuse {
 public:
     // Constructors and destructors
     GModelSpatialDiffuseCube(void);
+    GModelSpatialDiffuseCube(const bool& dummy, const std::string& type);
     explicit GModelSpatialDiffuseCube(const GXmlElement& xml);
     GModelSpatialDiffuseCube(const GFilename& filename,
                              const double&    value = 1.0);
@@ -77,7 +78,6 @@ public:
     virtual GModelSpatialDiffuseCube* clone(void) const;
     virtual std::string               classname(void) const;
     virtual std::string               type(void) const;
-    virtual std::string               alias(void) const;
     virtual double                    eval(const GPhoton& photon) const;
     virtual double                    eval_gradients(const GPhoton& photon) const;
     virtual GSkyDir                   mc(const GEnergy& energy,
@@ -122,12 +122,13 @@ protected:
     double cube_intensity(const GPhoton& photon) const;
     // Protected members
-    GModelPar  m_value;       //!< Value
-    GFilename  m_filename;    //!< Name of map cube
-    bool       m_loaded;      //!< Signals if map cube has been loaded
-    GSkyMap    m_cube;        //!< Map cube
-    GNodeArray m_logE;        //!< Log10(energy) values of the maps
-    GEbounds   m_ebounds;     //!< Energy bounds of the maps
+    std::string m_type;        //!< Model type
+    GModelPar   m_value;       //!< Value
+    GFilename   m_filename;    //!< Name of map cube
+    bool        m_loaded;      //!< Signals if map cube has been loaded
+    GSkyMap     m_cube;        //!< Map cube
+    GNodeArray  m_logE;        //!< Log10(energy) values of the maps
+    GEbounds    m_ebounds;     //!< Energy bounds of the maps
     // Monte Carlo cache
     mutable GSkyDir             m_mc_centre;           //!< Centre of MC cone
@@ -153,28 +154,14 @@ std::string GModelSpatialDiffuseCube::classname(void) const
 /***********************************************************************//**
  * @brief Return spatial model type
  *
- * @return "DiffuseMapCube".
+ * @return Model type.
  *
  * Returns the type of the spatial map cube model.
  ***************************************************************************/
 inline
 std::string GModelSpatialDiffuseCube::type(void) const
 {
-    return "DiffuseMapCube";
-}
-
-
-/***********************************************************************//**
- * @brief Return spatial model type alias
- *
- * @return "MapCubeFunction".
- *
- * Returns the alias of the spatial map cube model.
- ***************************************************************************/
-inline
-std::string GModelSpatialDiffuseCube::alias(void) const
-{
-    return "MapCubeFunction";
+    return (m_type);
 }
@@ -51,6 +51,7 @@ class GModelSpatialDiffuseMap : public GModelSpatialDiffuse {
 public:
     // Constructors and destructors
     GModelSpatialDiffuseMap(void);
+    GModelSpatialDiffuseMap(const bool& dummy, const std::string& type);
     explicit GModelSpatialDiffuseMap(const GXmlElement& xml);
     GModelSpatialDiffuseMap(const GFilename& filename,
                             const double&    value = 1.0,
@@ -69,7 +70,6 @@ public:
     virtual GModelSpatialDiffuseMap* clone(void) const;
     virtual std::string              classname(void) const;
     virtual std::string              type(void) const;
-    virtual std::string              alias(void) const;
     virtual double                   eval(const GPhoton& photon) const;
     virtual double                   eval_gradients(const GPhoton& photon) const;
     virtual GSkyDir                  mc(const GEnergy& energy,
@@ -102,13 +102,14 @@ protected:
     void prepare_map(void);
     // Protected members
-    GModelPar m_value;         //!< Value
-    GSkyMap   m_map;           //!< Skymap
-    GFilename m_filename;      //!< Name of skymap
-    GSkyDir   m_centre;        //!< Centre of bounding circle
-    double    m_radius;        //!< Radius of bounding circle
-    bool      m_normalize;     //!< Normalize map (default: true)
-    bool      m_has_normalize; //!< XML has normalize attribute
+    std::string m_type;          //!< Model type
+    GModelPar   m_value;         //!< Value
+    GSkyMap     m_map;           //!< Skymap
+    GFilename   m_filename;      //!< Name of skymap
+    GSkyDir     m_centre;        //!< Centre of bounding circle
+    double      m_radius;        //!< Radius of bounding circle
+    bool        m_normalize;     //!< Normalize map (default: true)
+    bool        m_has_normalize; //!< XML has normalize attribute
     // MC simulation cache
     mutable GSkyDir m_mc_centre;           //!< Centre of MC cone
@@ -134,28 +135,14 @@ std::string GModelSpatialDiffuseMap::classname(void) const
 /***********************************************************************//**
  * @brief Return spatial model type
  *
- * @return "DiffuseMap".
+ * @return Model type.
  *
  * Returns the type of the spatial map model.
  ***************************************************************************/
 inline
 std::string GModelSpatialDiffuseMap::type(void) const
 {
-    return "DiffuseMap";
-}
-
-
-/***********************************************************************//**
- * @brief Return spatial model type alias
- *
- * @return "SpatialMap".
- *
- * Returns the alias of the spatial map model.
- ***************************************************************************/
-inline
-std::string GModelSpatialDiffuseMap::alias(void) const
-{
-    return "SpatialMap";
+    return (m_type);
 }
@@ -66,7 +66,6 @@ public:
     virtual GModelSpatialElliptical* clone(void) const = 0;
     virtual std::string              classname(void) const = 0;
     virtual std::string              type(void) const = 0;
-    virtual std::string              alias(void) const = 0;
     virtual double                   eval(const double&  theta,
                                           const double&  posangle,
                                           const GEnergy& energy,
@@ -65,7 +65,6 @@ public:
     virtual GModelSpatialEllipticalDisk* clone(void) const;
     virtual std::string                  classname(void) const;
     virtual std::string                  type(void) const;
-    virtual std::string                  alias(void) const;
     virtual double                       eval(const double&  theta,
                                               const double&  posangle,
                                               const GEnergy& energy,
@@ -126,18 +125,4 @@ std::string GModelSpatialEllipticalDisk::type(void) const
     return "EllipticalDisk";
 }
-
-/***********************************************************************//**
- * @brief Return model type alias
- *
- * @return "EllipticalDisk".
- *
- * Returns the alias of the elliptical disk model.
- ***************************************************************************/
-inline
-std::string GModelSpatialEllipticalDisk::alias(void) const
-{
-    return "EllipticalDisk";
-}
-
 #endif /* GMODELSPATIALELLIPTICALDISK_HPP */
@@ -49,6 +49,7 @@ class GModelSpatialEllipticalGauss : public GModelSpatialElliptical {
 public:
     // Constructors and destructors
     GModelSpatialEllipticalGauss(void);
+    GModelSpatialEllipticalGauss(const bool& dummy, const std::string& type);
     GModelSpatialEllipticalGauss(const GSkyDir& dir,
                                  const double&  major,
                                  const double&  minor,
@@ -65,7 +66,6 @@ public:
     virtual GModelSpatialEllipticalGauss* clone(void) const;
     virtual std::string                   classname(void) const;
     virtual std::string                   type(void) const;
-    virtual std::string                   alias(void) const;
     virtual double                        eval(const double&  theta,
                                                const double&  posangle,
                                                const GEnergy& energy,
@@ -92,6 +92,9 @@ protected:
     void free_members(void);
     void update(void) const;
+    // Protected members
+    std::string m_type;   //!< Model type
+
     // Cached members used for pre-computations
     mutable double m_last_minor;        //!< Last semi-minor axis
     mutable double m_last_major;        //!< Last semi-major axis
@@ -126,28 +129,14 @@ std::string GModelSpatialEllipticalGauss::classname(void) const
 /***********************************************************************//**
  * @brief Return model type
  *
- * @return "EllipticalGaussian".
+ * @return Model type.
  *
  * Returns the type of the elliptical gauss model.
  ***************************************************************************/
 inline
 std::string GModelSpatialEllipticalGauss::type(void) const
 {
-    return "EllipticalGaussian";
-}
-
-
-/***********************************************************************//**
- * @brief Return model type alias
- *
- * @return "EllipticalGauss".
- *
- * Returns the alias of the elliptical gauss model.
- ***************************************************************************/
-inline
-std::string GModelSpatialEllipticalGauss::alias(void) const
-{
-    return "EllipticalGauss";
+    return (m_type);
 }
 #endif /* GMODELSPATIALELLIPTICALGAUSS_HPP */
@@ -43,14 +43,13 @@
  * This class implements a point source as the spatial component of the
  * factorised source model. The point source has two parameters: the Right
  * Ascension and Declination of the point source location.
- *
- * The model is of type "SkyDirFunction".
  ***************************************************************************/
 class GModelSpatialPointSource : public GModelSpatial {
 public:
     // Constructors and destructors
     GModelSpatialPointSource(void);
+    GModelSpatialPointSource(const bool& dummy, const std::string& type);
     explicit GModelSpatialPointSource(const GSkyDir& dir);
     GModelSpatialPointSource(const double& ra, const double& dec);
     explicit GModelSpatialPointSource(const GXmlElement& xml);
@@ -65,7 +64,6 @@ public:
     virtual GModelSpatialPointSource* clone(void) const;
     virtual std::string               classname(void) const;
     virtual std::string               type(void) const;
-    virtual std::string               alias(void) const;
     virtual GClassCode                code(void) const;
     virtual double                    eval(const GPhoton& photon) const;
     virtual double                    eval_gradients(const GPhoton& photon) const;
@@ -95,8 +93,9 @@ protected:
     void free_members(void);
     // Protected members
-    GModelPar m_ra;          //!< Right Ascension (deg)
-    GModelPar m_dec;         //!< Declination (deg)
+    std::string m_type;   //!< Model type
+    GModelPar   m_ra;     //!< Right Ascension (deg)
+    GModelPar   m_dec;    //!< Declination (deg)
 };
@@ -115,28 +114,14 @@ std::string GModelSpatialPointSource::classname(void) const
 /***********************************************************************//**
  * @brief Return model type
  *
- * @return "PointSource".
+ * @return Model type.
  *
  * Returns the type of the spatial model.
  ***************************************************************************/
 inline
 std::string GModelSpatialPointSource::type(void) const
 {
-    return "PointSource";
-}
-
-
-/***********************************************************************//**
- * @brief Return model type alias
- *
- * @return "SkyDirFunction".
- *
- * Returns the alias of the spatial model.
- ***************************************************************************/
-inline
-std::string GModelSpatialPointSource::alias(void) const
-{
-    return "SkyDirFunction";
+    return (m_type);
 }
@@ -66,7 +66,6 @@ public:
     virtual GModelSpatialRadial* clone(void) const = 0;
     virtual std::string          classname(void) const = 0;
     virtual std::string          type(void) const = 0;
-    virtual std::string          alias(void) const = 0;
     virtual double               eval(const double&  theta,
                                       const GEnergy& energy,
                                       const GTime& time) const = 0;
@@ -49,6 +49,7 @@ class GModelSpatialRadialDisk : public GModelSpatialRadial {
 public:
     // Constructors and destructors
     GModelSpatialRadialDisk(void);
+    GModelSpatialRadialDisk(const bool& dummy, const std::string& type);
     GModelSpatialRadialDisk(const GSkyDir& dir, const double& radius);
     explicit GModelSpatialRadialDisk(const GXmlElement& xml);
     GModelSpatialRadialDisk(const GModelSpatialRadialDisk& model);
@@ -62,7 +63,6 @@ public:
     virtual GModelSpatialRadialDisk* clone(void) const;
     virtual std::string              classname(void) const;
     virtual std::string              type(void) const;
-    virtual std::string              alias(void) const;
     virtual double                   eval(const double&  theta,
                                           const GEnergy& energy,
                                           const GTime&   time) const;
@@ -91,7 +91,8 @@ protected:
     void update(void) const;
     // Protected members
-    GModelPar m_radius;    //!< Disk radius (degrees)
+    std::string m_type;      //!< Model type
+    GModelPar   m_radius;    //!< Disk radius (degrees)
     // Cached members used for pre-computations
     mutable double m_last_radius;   //!< Last disk radius
@@ -115,28 +116,14 @@ std::string GModelSpatialRadialDisk::classname(void) const
 /***********************************************************************//**
  * @brief Return model type
  *
- * @return "RadialDisk".
+ * @return Model type.
  *
  * Returns the type of the radial disk model.
  ***************************************************************************/
 inline
 std::string GModelSpatialRadialDisk::type(void) const
 {
-    return "RadialDisk";
-}
-
-
-/***********************************************************************//**
- * @brief Return model type alias
- *
- * @return "DiskFunction".
- *
- * Returns the alias of the radial disk model.
- ***************************************************************************/
-inline
-std::string GModelSpatialRadialDisk::alias(void) const
-{
-    return "DiskFunction";
+    return (m_type);
 }
@@ -50,6 +50,7 @@ class GModelSpatialRadialGauss : public GModelSpatialRadial {
 public:
     // Constructors and destructors
     GModelSpatialRadialGauss(void);
+    GModelSpatialRadialGauss(const bool& dummy, const std::string& type);
     GModelSpatialRadialGauss(const GSkyDir& dir, const double& sigma);
     explicit GModelSpatialRadialGauss(const GXmlElement& xml);
     GModelSpatialRadialGauss(const GModelSpatialRadialGauss& model);
@@ -63,7 +64,6 @@ public:
     virtual GModelSpatialRadialGauss* clone(void) const;
     virtual std::string               classname(void) const;
     virtual std::string               type(void) const;
-    virtual std::string               alias(void) const;
     virtual double                    eval(const double&  theta,
                                            const GEnergy& energy,
                                            const GTime& time) const;
@@ -91,7 +91,8 @@ protected:
     void free_members(void);
     // Protected members
-    GModelPar m_sigma;      //!< Gaussian width (deg)
+    std::string m_type;      //!< Model type
+    GModelPar   m_sigma;     //!< Gaussian width (deg)
 };
@@ -110,28 +111,14 @@ std::string GModelSpatialRadialGauss::classname(void) const
 /***********************************************************************//**
  * @brief Return model type
  *
- * @return "RadialGaussian".
+ * @return Model type.
  *
  * Returns the type of the radial Gauss model.
  ***************************************************************************/
 inline
 std::string GModelSpatialRadialGauss::type(void) const
 {
-    return "RadialGaussian";
-}
-
-
-/***********************************************************************//**
- * @brief Return model type alias
- *
- * @return "GaussFunction".
- *
- * Returns the alias of the radial Gauss model.
- ***************************************************************************/
-inline
-std::string GModelSpatialRadialGauss::alias(void) const
-{
-    return "GaussFunction";
+    return (m_type);
 }
@@ -59,6 +59,7 @@ class GModelSpatialRadialShell : public GModelSpatialRadial {
 public:
     // Constructors and destructors
     GModelSpatialRadialShell(void);
+    GModelSpatialRadialShell(const bool& dummy, const std::string& type);
     GModelSpatialRadialShell(const GSkyDir& dir,
                              const double&  radius,
                              const double&  width);
@@ -74,7 +75,6 @@ public:
     virtual GModelSpatialRadialShell* clone(void) const;
     virtual std::string               classname(void) const;
     virtual std::string               type(void) const;
-    virtual std::string               alias(void) const;
     virtual double                    eval(const double&  theta,
                                            const GEnergy& energy,
                                            const GTime& time) const;
@@ -107,6 +107,7 @@ protected:
     static double f2(double x);
     // Protected members
+    std::string     m_type;          //!< Model type
     GModelPar       m_radius;        //!< Inner shell radius (deg)
     GModelPar       m_width;         //!< Shell thickness (deg)
@@ -136,28 +137,14 @@ std::string GModelSpatialRadialShell::classname(void) const
 /***********************************************************************//**
  * @brief Return model type
  *
- * @return "RadialShell".
+ * @return Model type.
  *
  * Returns the type of the radial shell model.
  ***************************************************************************/
 inline
 std::string GModelSpatialRadialShell::type(void) const
 {
-    return "RadialShell";
-}
-
-
-/***********************************************************************//**
- * @brief Return model type alias
- *
- * @return "ShellFunction".
- *
- * Returns the alias of the radial shell model.
- ***************************************************************************/
-inline
-std::string GModelSpatialRadialShell::alias(void) const
-{
-    return "ShellFunction";
+    return (m_type);
 }
@@ -39,6 +39,10 @@
 /* __ Globals ____________________________________________________________ */
 const GModelSpatialDiffuseConst g_spatial_const_seed;
 const GModelSpatialRegistry     g_spatial_const_registry(&g_spatial_const_seed);
+#if defined(G_LEGACY_XML_FORMAT)
+const GModelSpatialDiffuseConst g_spatial_const_legacy_seed(true, "ConstantValue");
+const GModelSpatialRegistry     g_spatial_const_legacy_registry(&g_spatial_const_legacy_seed);
+#endif
 /* __ Method name definitions ____________________________________________ */
 #define G_MC_NORM     "GModelSpatialDiffuseConst::mc_norm(GSkyDir&, double&)"
@@ -61,7 +65,7 @@ const GModelSpatialRegistry     g_spatial_const_registry(&amp;g_spatial_const_seed);
 /***********************************************************************//**
  * @brief Void constructor
  *
- * Construct empty isotropic spatial model.
+ * Constructs empty isotropic spatial model.
  ***************************************************************************/
 GModelSpatialDiffuseConst::GModelSpatialDiffuseConst(void) :
                            GModelSpatialDiffuse()
@@ -75,6 +79,29 @@ GModelSpatialDiffuseConst::GModelSpatialDiffuseConst(void) :
 /***********************************************************************//**
+ * @brief Model type constructor
+ *
+ * @param[in] dummy Dummy flag.
+ * @param[in] type Model type.
+ *
+ * Constructs empty isotropic spatial model by specifying a model @p type.
+ ***************************************************************************/
+GModelSpatialDiffuseConst::GModelSpatialDiffuseConst(const bool&        dummy,
+                                                     const std::string& type) :
+                           GModelSpatialDiffuse()
+{
+    // Initialise members
+    init_members();
+
+    // Set model type
+    m_type = type;
+
+    // Return
+    return;
+}
+
+
+/***********************************************************************//**
  * @brief XML constructor
  *
  * @param[in] xml XML element.
@@ -513,6 +540,9 @@ std::string GModelSpatialDiffuseConst::print(const GChatter&amp; chatter) const
  ***************************************************************************/
 void GModelSpatialDiffuseConst::init_members(void)
 {
+    // Initialise model type
+    m_type = "DiffuseIsotropic";
+
     // Initialise Value
     m_value.clear();
     m_value.name("Value");
@@ -544,6 +574,7 @@ void GModelSpatialDiffuseConst::init_members(void)
 void GModelSpatialDiffuseConst::copy_members(const GModelSpatialDiffuseConst& model)
 {
     // Copy members
+    m_type          = model.m_type;
     m_value         = model.m_value;
     m_mc_centre     = model.m_mc_centre;
     m_mc_cos_radius = model.m_mc_cos_radius;
@@ -45,6 +45,10 @@
 /* __ Globals ____________________________________________________________ */
 const GModelSpatialDiffuseCube g_spatial_cube_seed;
 const GModelSpatialRegistry    g_spatial_cube_registry(&g_spatial_cube_seed);
+#if defined(G_LEGACY_XML_FORMAT)
+const GModelSpatialDiffuseCube g_spatial_cube_legacy_seed(true, "MapCubeFunction");
+const GModelSpatialRegistry    g_spatial_cube_legacy_registry(&g_spatial_cube_legacy_seed);
+#endif
 /* __ Method name definitions ____________________________________________ */
 #define G_MC          "GModelSpatialDiffuseCube::mc(GEnergy&, GTime&, GRan&)"
@@ -85,6 +89,29 @@ GModelSpatialDiffuseCube::GModelSpatialDiffuseCube(void) :
 /***********************************************************************//**
+ * @brief Model type constructor
+ *
+ * @param[in] dummy Dummy flag.
+ * @param[in] type Model type.
+ *
+ * Constructs empty map cube model by specifying a model @p type.
+ ***************************************************************************/
+GModelSpatialDiffuseCube::GModelSpatialDiffuseCube(const bool&        dummy,
+                                                   const std::string& type) :
+                          GModelSpatialDiffuse()
+{
+    // Initialise members
+    init_members();
+
+    // Set model type
+    m_type = type;
+
+    // Return
+    return;
+}
+
+
+/***********************************************************************//**
  * @brief XML constructor
  *
  * @param[in] xml XML element.
@@ -1017,6 +1044,9 @@ std::string GModelSpatialDiffuseCube::print(const GChatter&amp; chatter) const
  ***************************************************************************/
 void GModelSpatialDiffuseCube::init_members(void)
 {
+    // Initialise model type
+    m_type = "DiffuseMapCube";
+
     // Initialise Value
     m_value.clear();
     m_value.name("Normalization");
@@ -1058,6 +1088,7 @@ void GModelSpatialDiffuseCube::init_members(void)
 void GModelSpatialDiffuseCube::copy_members(const GModelSpatialDiffuseCube& model)
 {
     // Copy members
+    m_type     = model.m_type;
     m_value    = model.m_value;
     m_filename = model.m_filename;
     m_cube     = model.m_cube;
@@ -40,6 +40,10 @@
 /* __ Globals ____________________________________________________________ */
 const GModelSpatialDiffuseMap g_spatial_map_seed;
 const GModelSpatialRegistry   g_spatial_map_registry(&g_spatial_map_seed);
+#if defined(G_LEGACY_XML_FORMAT)
+const GModelSpatialDiffuseMap g_spatial_map_legacy_seed(true, "SpatialMap");
+const GModelSpatialRegistry   g_spatial_map_legacy_registry(&g_spatial_map_legacy_seed);
+#endif
 /* __ Method name definitions ____________________________________________ */
 #define G_MC           "GModelSpatialDiffuseMap::mc(GEnergy&, GTime&, GRan&)"
@@ -78,6 +82,29 @@ GModelSpatialDiffuseMap::GModelSpatialDiffuseMap(void) :
 /***********************************************************************//**
+ * @brief Model type constructor
+ *
+ * @param[in] dummy Dummy flag.
+ * @param[in] type Model type.
+ *
+ * Constructs empty spatial map model by specifying a model @p type.
+ ***************************************************************************/
+GModelSpatialDiffuseMap::GModelSpatialDiffuseMap(const bool&        dummy,
+                                                 const std::string& type) :
+                         GModelSpatialDiffuse()
+{
+    // Initialise members
+    init_members();
+
+    // Set model type
+    m_type = type;
+
+    // Return
+    return;
+}
+
+
+/***********************************************************************//**
  * @brief XML constructor
  *
  * @param[in] xml XML element.
@@ -814,6 +841,9 @@ void GModelSpatialDiffuseMap::load(const GFilename&amp; filename)
  ***************************************************************************/
 void GModelSpatialDiffuseMap::init_members(void)
 {
+    // Initialise model type
+    m_type = "DiffuseMap";
+
     // Initialise Value
     m_value.clear();
     m_value.name("Prefactor");
@@ -856,6 +886,7 @@ void GModelSpatialDiffuseMap::init_members(void)
 void GModelSpatialDiffuseMap::copy_members(const GModelSpatialDiffuseMap& model)
 {
     // Copy members
+    m_type          = model.m_type;
     m_value         = model.m_value;
     m_map           = model.m_map;
     m_filename      = model.m_filename;
@@ -44,7 +44,11 @@ namespace {
 /* __ Globals ____________________________________________________________ */
 const GModelSpatialEllipticalGauss g_elliptical_gauss_seed;
-const GModelSpatialRegistry g_elliptical_gauss_registry(&g_elliptical_gauss_seed);
+const GModelSpatialRegistry        g_elliptical_gauss_registry(&g_elliptical_gauss_seed);
+#if defined(G_LEGACY_XML_FORMAT)
+const GModelSpatialEllipticalGauss g_elliptical_gauss_legacy_seed(true, "EllipticalGauss");
+const GModelSpatialRegistry        g_elliptical_gauss_legacy_registry(&g_elliptical_gauss_legacy_seed);
+#endif
 /* __ Method name definitions ____________________________________________ */
 #define G_READ             "GModelSpatialEllipticalGauss::read(GXmlElement&)"
@@ -79,6 +83,29 @@ GModelSpatialEllipticalGauss::GModelSpatialEllipticalGauss(void) :
 /***********************************************************************//**
+ * @brief Model type constructor
+ *
+ * @param[in] dummy Dummy flag.
+ * @param[in] type Model type.
+ *
+ * Constructs empty elliptical Gaussian model by specifying a model @p type.
+ ***************************************************************************/
+GModelSpatialEllipticalGauss::GModelSpatialEllipticalGauss(const bool&        dummy,
+                                                           const std::string& type) :
+                              GModelSpatialElliptical()
+{
+    // Initialise members
+    init_members();
+
+    // Set model type
+    m_type = type;
+
+    // Return
+    return;
+}
+
+
+/***********************************************************************//**
  * @brief Elliptical Gaussian constructor
  *
  * @param[in] dir Centre of elliptical Gaussian.
@@ -700,6 +727,9 @@ std::string GModelSpatialEllipticalGauss::print(const GChatter&amp; chatter) const
  ***************************************************************************/
 void GModelSpatialEllipticalGauss::init_members(void)
 {
+    // Initialise model type
+    m_type = "EllipticalGaussian";
+
     // Initialise precomputation cache. Note that zero values flag
     // uninitialised as a zero radius is not meaningful
     m_last_minor        = 0.0;
@@ -729,6 +759,9 @@ void GModelSpatialEllipticalGauss::init_members(void)
  ***************************************************************************/
 void GModelSpatialEllipticalGauss::copy_members(const GModelSpatialEllipticalGauss& model)
 {
+    // Copy members
+    m_type = model.m_type;
+
     // Copy precomputation cache
     m_last_minor        = model.m_last_minor;
     m_last_major        = model.m_last_major;
@@ -37,9 +37,14 @@
 /* __ Constants __________________________________________________________ */
 const double tolerance =  0.000027777778;    // angular tolerance is 1 arcsec
+
 /* __ Globals ____________________________________________________________ */
 const GModelSpatialPointSource g_spatial_ptsrc_seed;
 const GModelSpatialRegistry    g_spatial_ptsrc_registry(&g_spatial_ptsrc_seed);
+#if defined(G_LEGACY_XML_FORMAT)
+const GModelSpatialPointSource g_spatial_ptsrc_legacy_seed(true, "SkyDirFunction");
+const GModelSpatialRegistry    g_spatial_ptsrc_legacy_registry(&g_spatial_ptsrc_legacy_seed);
+#endif
 /* __ Method name definitions ____________________________________________ */
 #define G_READ                 "GModelSpatialPointSource::read(GXmlElement&)"
@@ -60,6 +65,8 @@ const GModelSpatialRegistry    g_spatial_ptsrc_registry(&amp;g_spatial_ptsrc_seed);
 /***********************************************************************//**
  * @brief Void constructor
+ *
+ * Constructs empty point source model.
  ***************************************************************************/
 GModelSpatialPointSource::GModelSpatialPointSource(void) : GModelSpatial()
 {
@@ -72,6 +79,29 @@ GModelSpatialPointSource::GModelSpatialPointSource(void) : GModelSpatial()
 /***********************************************************************//**
+ * @brief Model type constructor
+ *
+ * @param[in] dummy Dummy flag.
+ * @param[in] type Model type.
+ *
+ * Constructs empty point source model by specifying a model @p type.
+ ***************************************************************************/
+GModelSpatialPointSource::GModelSpatialPointSource(const bool&        dummy,
+                                                   const std::string& type) :
+                          GModelSpatial()
+{
+    // Initialise members
+    init_members();
+
+    // Set model type
+    m_type = type;
+
+    // Return
+    return;
+}
+
+
+/***********************************************************************//**
  * @brief Sky direction constructor
  *
  * @param[in] dir Sky direction.
@@ -560,6 +590,9 @@ void GModelSpatialPointSource::dir(const GSkyDir&amp; dir)
  ***************************************************************************/
 void GModelSpatialPointSource::init_members(void)
 {
+    // Initialise model type
+    m_type = "PointSource";
+
     // Initialise Right Ascension
     m_ra.clear();
     m_ra.name("RA");
@@ -596,8 +629,9 @@ void GModelSpatialPointSource::init_members(void)
 void GModelSpatialPointSource::copy_members(const GModelSpatialPointSource& model)
 {
     // Copy members
-    m_ra  = model.m_ra;
-    m_dec = model.m_dec;
+    m_type = model.m_type;
+    m_ra   = model.m_ra;
+    m_dec  = model.m_dec;
     // Set parameter pointer(s)
     m_pars.clear();
@@ -39,6 +39,10 @@
 /* __ Globals ____________________________________________________________ */
 const GModelSpatialRadialDisk g_radial_disk_seed;
 const GModelSpatialRegistry   g_radial_disk_registry(&g_radial_disk_seed);
+#if defined(G_LEGACY_XML_FORMAT)
+const GModelSpatialRadialDisk g_radial_disk_legacy_seed(true, "DiskFunction");
+const GModelSpatialRegistry   g_radial_disk_legacy_registry(&g_radial_disk_legacy_seed);
+#endif
 /* __ Method name definitions ____________________________________________ */
 #define G_READ                  "GModelSpatialRadialDisk::read(GXmlElement&)"
@@ -59,6 +63,8 @@ const GModelSpatialRegistry   g_radial_disk_registry(&amp;g_radial_disk_seed);
 /***********************************************************************//**
  * @brief Void constructor
+ *
+ * Constructs empty radial disk model.
  ***************************************************************************/
 GModelSpatialRadialDisk::GModelSpatialRadialDisk(void) : GModelSpatialRadial()
 {
@@ -71,6 +77,29 @@ GModelSpatialRadialDisk::GModelSpatialRadialDisk(void) : GModelSpatialRadial()
 /***********************************************************************//**
+ * @brief Model type constructor
+ *
+ * @param[in] dummy Dummy flag.
+ * @param[in] type Model type.
+ *
+ * Constructs empty radial disk model by specifying a model @p type.
+ ***************************************************************************/
+GModelSpatialRadialDisk::GModelSpatialRadialDisk(const bool&        dummy,
+                                                 const std::string& type) :
+                         GModelSpatialRadial()
+{
+    // Initialise members
+    init_members();
+
+    // Set model type
+    m_type = type;
+
+    // Return
+    return;
+}
+
+
+/***********************************************************************//**
  * @brief Disk constructor
  *
  * @param[in] dir Sky position of disk centre.
@@ -549,6 +578,9 @@ std::string GModelSpatialRadialDisk::print(const GChatter&amp; chatter) const
  ***************************************************************************/
 void GModelSpatialRadialDisk::init_members(void)
 {
+    // Initialise model type
+    m_type = "RadialDisk";
+
     // Initialise Radius
     m_radius.clear();
     m_radius.name("Radius");
@@ -586,6 +618,7 @@ void GModelSpatialRadialDisk::init_members(void)
 void GModelSpatialRadialDisk::copy_members(const GModelSpatialRadialDisk& model)
 {
     // Copy members
+    m_type   = model.m_type;
     m_radius = model.m_radius;
     // Copy precomputation cache
@@ -39,6 +39,10 @@
 /* __ Globals ____________________________________________________________ */
 const GModelSpatialRadialGauss g_radial_gauss_seed;
 const GModelSpatialRegistry    g_radial_gauss_registry(&g_radial_gauss_seed);
+#if defined(G_LEGACY_XML_FORMAT)
+const GModelSpatialRadialGauss g_radial_gauss_legacy_seed(true, "GaussFunction");
+const GModelSpatialRegistry    g_radial_gauss_legacy_registry(&g_radial_gauss_legacy_seed);
+#endif
 /* __ Method name definitions ____________________________________________ */
 #define G_READ                 "GModelSpatialRadialGauss::read(GXmlElement&)"
@@ -59,6 +63,8 @@ const GModelSpatialRegistry    g_radial_gauss_registry(&amp;g_radial_gauss_seed);
 /***********************************************************************//**
  * @brief Void constructor
+ *
+ * Constructs empty radial Gaussian model.
  ***************************************************************************/
 GModelSpatialRadialGauss::GModelSpatialRadialGauss(void) : GModelSpatialRadial()
 {
@@ -71,6 +77,29 @@ GModelSpatialRadialGauss::GModelSpatialRadialGauss(void) : GModelSpatialRadial()
 /***********************************************************************//**
+ * @brief Model type constructor
+ *
+ * @param[in] dummy Dummy flag.
+ * @param[in] type Model type.
+ *
+ * Constructs empty radial Gaussian model by specifying a model @p type.
+ ***************************************************************************/
+GModelSpatialRadialGauss::GModelSpatialRadialGauss(const bool&        dummy,
+                                                   const std::string& type) :
+                          GModelSpatialRadial()
+{
+    // Initialise members
+    init_members();
+
+    // Set model type
+    m_type = type;
+
+    // Return
+    return;
+}
+
+
+/***********************************************************************//**
  * @brief Constructor
  *
  * @param[in] dir Sky position of Gaussian.
@@ -548,6 +577,8 @@ std::string GModelSpatialRadialGauss::print(const GChatter&amp; chatter) const
  ***************************************************************************/
 void GModelSpatialRadialGauss::init_members(void)
 {
+    // Initialise model type
+    m_type = "RadialGaussian";
     // Initialise Gaussian sigma
     m_sigma.clear();
@@ -580,6 +611,7 @@ void GModelSpatialRadialGauss::init_members(void)
 void GModelSpatialRadialGauss::copy_members(const GModelSpatialRadialGauss& model)
 {
     // Copy members
+    m_type  = model.m_type;
     m_sigma = model.m_sigma;
     // Return
@@ -39,6 +39,10 @@
 /* __ Globals ____________________________________________________________ */
 const GModelSpatialRadialShell g_radial_shell_seed;
 const GModelSpatialRegistry    g_radial_shell_registry(&g_radial_shell_seed);
+#if defined(G_LEGACY_XML_FORMAT)
+const GModelSpatialRadialShell g_radial_shell_legacy_seed(true, "ShellFunction");
+const GModelSpatialRegistry    g_radial_shell_legacy_registry(&g_radial_shell_legacy_seed);
+#endif
 /* __ Method name definitions ____________________________________________ */
 #define G_READ                 "GModelSpatialRadialShell::read(GXmlElement&)"
@@ -60,6 +64,8 @@ const GModelSpatialRegistry    g_radial_shell_registry(&amp;g_radial_shell_seed);
 /***********************************************************************//**
  * @brief Void constructor
+ *
+ * Constructs empty radial shell model.
  ***************************************************************************/
 GModelSpatialRadialShell::GModelSpatialRadialShell(void) : GModelSpatialRadial()
 {
@@ -72,6 +78,29 @@ GModelSpatialRadialShell::GModelSpatialRadialShell(void) : GModelSpatialRadial()
 /***********************************************************************//**
+ * @brief Model type constructor
+ *
+ * @param[in] dummy Dummy flag.
+ * @param[in] type Model type.
+ *
+ * Constructs empty radial shell model by specifying a model @p type.
+ ***************************************************************************/
+GModelSpatialRadialShell::GModelSpatialRadialShell(const bool&        dummy,
+                                                   const std::string& type) :
+                          GModelSpatialRadial()
+{
+    // Initialise members
+    init_members();
+
+    // Set model type
+    m_type = type;
+
+    // Return
+    return;
+}
+
+
+/***********************************************************************//**
  * @brief Shell constructor
  *
  * @param[in] dir Sky position of shell centre.
@@ -616,6 +645,9 @@ std::string GModelSpatialRadialShell::print(const GChatter&amp; chatter) const
  ***************************************************************************/
 void GModelSpatialRadialShell::init_members(void)
 {
+    // Initialise model type
+    m_type = "RadialShell";
+
     // Initialise Radius
     m_radius.clear();
     m_radius.name("Radius");
@@ -669,6 +701,7 @@ void GModelSpatialRadialShell::init_members(void)
 void GModelSpatialRadialShell::copy_members(const GModelSpatialRadialShell& model)
 {
     // Copy members
+    m_type        = model.m_type;
     m_radius      = model.m_radius;
     m_width       = model.m_width;
@@ -91,13 +91,8 @@ GModelSpatialRegistry::GModelSpatialRegistry(const GModelSpatial* model)
     #endif
     // Allocate new registry
-    #if defined(G_LEGACY_MODEL_NAMES)
-    std::string*          new_names  = new std::string[size()+2];
-    const GModelSpatial** new_models = new const GModelSpatial*[size()+2];
-    #else
     std::string*          new_names  = new std::string[size()+1];
     const GModelSpatial** new_models = new const GModelSpatial*[size()+1];
-    #endif
     // Save old registry
     for (int i = 0; i < size(); ++i) {
@@ -109,20 +104,11 @@ GModelSpatialRegistry::GModelSpatialRegistry(const GModelSpatial* model)
     new_names[size()]  = model->type();
     new_models[size()] = model;
-    // Add new model with alias to registry for legacy naming convention
-    #if defined(G_LEGACY_MODEL_NAMES)
-    new_names[size()+1]  = model->alias();
-    new_models[size()+1] = model;
-    #endif
-
     // Set pointers on new registry
     names().assign(new_names);
     models().assign(new_models);
     // Increment number of models in registry
-    #if defined(G_LEGACY_MODEL_NAMES)
-    number()++;
-    #endif
     number()++;
     // Debug option: Show actual registry
@@ -182,7 +168,7 @@ GModelSpatialRegistry::~GModelSpatialRegistry(void)
  * @param[in] registry Registry.
  * @return Reference to registry.
  ***************************************************************************/
-GModelSpatialRegistry& GModelSpatialRegistry::operator= (const GModelSpatialRegistry& registry)
+GModelSpatialRegistry& GModelSpatialRegistry::operator=(const GModelSpatialRegistry& registry)
 {
     // Execute only if object is not identical
     if (this != &registry) {
@@ -2642,17 +2642,9 @@ void TestGModel::test_model_registry(void)
             if (ptr != NULL) {
                 // Test model type
-                #if defined(G_LEGACY_MODEL_NAMES)
-                test_assert((ptr->type()  == registry.name(i)) ||
-                            (ptr->alias() == registry.name(i)),
-                            "Expected \""+registry.name(i)+"\" instead"
-                            " of \""+ptr->type()+"\" or \""+
-                            ptr->alias()+"\".");
-                #else
                 test_assert(ptr->type()  == registry.name(i),
                             "Expected \""+registry.name(i)+"\" instead"
                             " of \""+ptr->type()+"\".");
-                #endif
                 // Free model
                 delete ptr;