Use GEnergies container instead of GEnergy vector.

Jürgen Knödlseder
1 parent 85e462cd
Showing 4 changed files with 22 additions and 22 deletions
include/GModelSpatialDiffuseCube.hpp
pyext/GModelSpatialDiffuseCube.i
src/model/GModelSpatialDiffuseCube.cpp
test/test_GModel.cpp
@@ -38,6 +38,7 @@
 #include "GNodeArray.hpp"
 #include "GXmlElement.hpp"
 #include "GEbounds.hpp"
+#include "GEnergies.hpp"
 /***********************************************************************//**
@@ -58,9 +59,9 @@ public:
     explicit GModelSpatialDiffuseCube(const GXmlElement& xml);
     explicit GModelSpatialDiffuseCube(const std::string& filename,
                                       const double&      value = 1.0);
-    explicit GModelSpatialDiffuseCube(const GSkymap&              cube,
-                                      const std::vector<GEnergy>& energies,
-                                      const double&               value = 1.0);
+    explicit GModelSpatialDiffuseCube(const GSkymap&   cube,
+                                      const GEnergies& energies,
+                                      const double&    value = 1.0);
     GModelSpatialDiffuseCube(const GModelSpatialDiffuseCube& model);
     virtual ~GModelSpatialDiffuseCube(void);
@@ -90,8 +91,8 @@ public:
     void                       filename(const std::string& filename);
     const GSkymap&             cube(void) const;
     void                       cube(const GSkymap& cube);
-    std::vector<GEnergy>       energies(void);
-    void                       energies(const std::vector<GEnergy>& energies);
+    GEnergies                  energies(void);
+    void                       energies(const GEnergies& energies);
     const GModelSpectralNodes& spectrum(void) const;
     void                       set_mc_cone(const GSkyDir& centre,
                                            const double&  radius);
@@ -42,9 +42,9 @@ public:
     explicit GModelSpatialDiffuseCube(const GXmlElement& xml);
     explicit GModelSpatialDiffuseCube(const std::string& filename,
                                       const double&      value = 1.0);
-    explicit GModelSpatialDiffuseCube(const GSkymap&              map,
-                                      const std::vector<GEnergy>& energies,
-                                      const double&               value = 1.0);
+    explicit GModelSpatialDiffuseCube(const GSkymap&   map,
+                                      const GEnergies& energies,
+                                      const double&    value = 1.0);
     GModelSpatialDiffuseCube(const GModelSpatialDiffuseCube& model);
     virtual ~GModelSpatialDiffuseCube(void);
@@ -70,8 +70,8 @@ public:
     void                       filename(const std::string& filename);
     const GSkymap&             cube(void) const;
     void                       cube(const GSkymap& cube);
-    std::vector<GEnergy>       energies(void);
-    void                       energies(const std::vector<GEnergy>& energies);
+    GEnergies                  energies(void);
+    void                       energies(const GEnergies& energies);
     const GModelSpectralNodes& spectrum(void) const;
     void                       set_mc_cone(const GSkyDir& centre,
                                            const double&  radius);
@@ -49,8 +49,7 @@ const GModelSpatialRegistry    g_spatial_cube_registry(&amp;g_spatial_cube_seed);
 #define G_READ                 "GModelSpatialDiffuseCube::read(GXmlElement&)"
 #define G_WRITE               "GModelSpatialDiffuseCube::write(GXmlElement&)"
 #define G_LOAD                 "GModelSpatialDiffuseCube::load(std::string&)"
-#define G_ENERGIES           "GModelSpatialDiffuseCube::energies(std::vector"\
-                                                                "<GEnergy>&)"
+#define G_ENERGIES           "GModelSpatialDiffuseCube::energies(GEnergies&)"
 /* __ Macros _____________________________________________________________ */
@@ -144,9 +143,9 @@ GModelSpatialDiffuseCube::GModelSpatialDiffuseCube(const std::string&amp; filename,
  * constructor also assigns the energy values for all maps and sets the
  * scaling @p value. The filename will remain blank.
  ***************************************************************************/
-GModelSpatialDiffuseCube::GModelSpatialDiffuseCube(const GSkymap&              cube,
-                                                   const std::vector<GEnergy>& energies,
-                                                   const double&               value) :
+GModelSpatialDiffuseCube::GModelSpatialDiffuseCube(const GSkymap&   cube,
+                                                   const GEnergies& energies,
+                                                   const double&    value) :
                           GModelSpatialDiffuse()
 {
     // Initialise members
@@ -676,7 +675,7 @@ void GModelSpatialDiffuseCube::load(const std::string&amp; filename)
  *
  * Sets the energies for the map cube.
  ***************************************************************************/
-void GModelSpatialDiffuseCube::energies(const std::vector<GEnergy>& energies)
+void GModelSpatialDiffuseCube::energies(const GEnergies& energies)
 {
     // Initialise energies
     m_logE.clear();
@@ -717,10 +716,10 @@ void GModelSpatialDiffuseCube::energies(const std::vector&lt;GEnergy&gt;&amp; energies)
  *
  * Returns the energies for the map cube in a vector.
  ***************************************************************************/
-std::vector<GEnergy> GModelSpatialDiffuseCube::energies(void)
+GEnergies GModelSpatialDiffuseCube::energies(void)
 {
-    // Initialise vector of energies
-    std::vector<GEnergy> energies;
+    // Initialise energies container
+    GEnergies energies;
     // Get number of map energies
     int num = m_logE.size();
@@ -735,7 +734,7 @@ std::vector&lt;GEnergy&gt; GModelSpatialDiffuseCube::energies(void)
         for (int i = 0; i < num; ++i) {
             GEnergy energy;
             energy.log10MeV(m_logE[i]);
-            energies.push_back(energy);
+            energies.append(energy);
         }
     } // endif: there were maps in the cube
@@ -550,9 +550,9 @@ void TestGModel::test_diffuse_cube(void)
     test_try("Test skymap value constructor");
     try {
         GSkymap map("HPX", "GAL", 16, "RING", 10);
-        std::vector<GEnergy> energies;
+        GEnergies energies;
         for (int i = 0; i < 10; ++i) {
-            energies.push_back(GEnergy(double(i+1.0), "MeV"));
+            energies.append(GEnergy(double(i+1.0), "MeV"));
         }
         GModelSpatialDiffuseCube model(map, energies, 3.0);
         test_value(model.value(), 3.0);