From 703a04091b8bf3d9c74e26ac938abdc4c3241c3f Mon Sep 17 00:00:00 2001 From: Domenico Tiziani Date: Thu, 6 Apr 2017 15:10:04 +0200 Subject: [PATCH] Remove m_scales --- include/GModelSpatialComposite.hpp | 1 - src/model/GModelSpatialComposite.cpp | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/include/GModelSpatialComposite.hpp b/include/GModelSpatialComposite.hpp index b950551..0c7df2d 100644 --- a/include/GModelSpatialComposite.hpp +++ b/include/GModelSpatialComposite.hpp @@ -99,7 +99,6 @@ protected: std::string m_type; //!< Model type std::vector m_components; //!< Components std::vector m_names; //!< Component names - std::vector m_scales; //!< Component scales std::vector m_scales_fit; //!< scales to be fitted mutable GSkyRegionCircle m_region; //!< Bounding circle }; diff --git a/src/model/GModelSpatialComposite.cpp b/src/model/GModelSpatialComposite.cpp index 7ea621e..246aeb7 100644 --- a/src/model/GModelSpatialComposite.cpp +++ b/src/model/GModelSpatialComposite.cpp @@ -528,14 +528,12 @@ void GModelSpatialComposite::append(const GModelSpatial& component, } // endfor: loop over model parameters - // Push back model scale - m_scales.push_back(scale); // Initialise i-th scale parameter m_scales_fit.push_back(new GModelPar()); m_scales_fit[index]->clear(); m_scales_fit[index]->name("scales_fit" + gammalib::str(m_components.size())); - m_scales_fit[index]->value(m_scales[index]); + m_scales_fit[index]->value(scale); m_scales_fit[index]->range(0.001,1000.); if(index==0) m_scales_fit[index]->fix(); @@ -709,7 +707,6 @@ void GModelSpatialComposite::init_members(void) // Initialise other members m_components.clear(); m_names.clear(); - m_scales.clear(); m_scales_fit.clear(); m_region.clear(); @@ -728,7 +725,6 @@ void GModelSpatialComposite::copy_members(const GModelSpatialComposite& model) // Copy members m_type = model.m_type; m_names = model.m_names; - m_scales = model.m_scales; m_region = model.m_region; // Initialise components -- libgit2 0.21.4