Commit 703a04091b8bf3d9c74e26ac938abdc4c3241c3f
1 parent
a9b4ad9d
Remove m_scales
Showing
2 changed files
with
1 additions
and
6 deletions
include/GModelSpatialComposite.hpp
| ... | ... | @@ -99,7 +99,6 @@ protected: |
| 99 | 99 | std::string m_type; //!< Model type |
| 100 | 100 | std::vector<GModelSpatial*> m_components; //!< Components |
| 101 | 101 | std::vector<std::string> m_names; //!< Component names |
| 102 | - std::vector<double> m_scales; //!< Component scales | |
| 103 | 102 | std::vector<GModelPar*> m_scales_fit; //!< scales to be fitted |
| 104 | 103 | mutable GSkyRegionCircle m_region; //!< Bounding circle |
| 105 | 104 | }; | ... | ... |
src/model/GModelSpatialComposite.cpp
| ... | ... | @@ -528,14 +528,12 @@ void GModelSpatialComposite::append(const GModelSpatial& component, |
| 528 | 528 | |
| 529 | 529 | } // endfor: loop over model parameters |
| 530 | 530 | |
| 531 | - // Push back model scale | |
| 532 | - m_scales.push_back(scale); | |
| 533 | 531 | |
| 534 | 532 | // Initialise i-th scale parameter |
| 535 | 533 | m_scales_fit.push_back(new GModelPar()); |
| 536 | 534 | m_scales_fit[index]->clear(); |
| 537 | 535 | m_scales_fit[index]->name("scales_fit" + gammalib::str(m_components.size())); |
| 538 | - m_scales_fit[index]->value(m_scales[index]); | |
| 536 | + m_scales_fit[index]->value(scale); | |
| 539 | 537 | m_scales_fit[index]->range(0.001,1000.); |
| 540 | 538 | if(index==0) |
| 541 | 539 | m_scales_fit[index]->fix(); |
| ... | ... | @@ -709,7 +707,6 @@ void GModelSpatialComposite::init_members(void) |
| 709 | 707 | // Initialise other members |
| 710 | 708 | m_components.clear(); |
| 711 | 709 | m_names.clear(); |
| 712 | - m_scales.clear(); | |
| 713 | 710 | m_scales_fit.clear(); |
| 714 | 711 | m_region.clear(); |
| 715 | 712 | |
| ... | ... | @@ -728,7 +725,6 @@ void GModelSpatialComposite::copy_members(const GModelSpatialComposite& model) |
| 728 | 725 | // Copy members |
| 729 | 726 | m_type = model.m_type; |
| 730 | 727 | m_names = model.m_names; |
| 731 | - m_scales = model.m_scales; | |
| 732 | 728 | m_region = model.m_region; |
| 733 | 729 | |
| 734 | 730 | // Initialise components | ... | ... |