From 2b558c78b6e0d4f616fc83b92eeccc66e8af2bf6 Mon Sep 17 00:00:00 2001 From: knodlseder <> Date: Fri, 16 Oct 2009 15:37:38 +0000 Subject: [PATCH] use pointers in eval_gradient() --- include/GModel.hpp | 2 +- include/GModelSpatial.hpp | 2 +- include/GModelSpatialPtsrc.hpp | 2 +- include/GModelSpectral.hpp | 2 +- include/GModelSpectralPlaw.hpp | 2 +- include/GModelTemporal.hpp | 2 +- include/GModelTemporalConst.hpp | 2 +- include/GModels.hpp | 2 +- src/model/GModel.cpp | 2 +- src/model/GModelSpatialPtsrc.cpp | 2 +- src/model/GModelSpectralPlaw.cpp | 6 +++--- src/model/GModelTemporalConst.cpp | 2 +- src/model/GModels.cpp | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/GModel.hpp b/include/GModel.hpp index d60f3c6..b6f1836 100644 --- a/include/GModel.hpp +++ b/include/GModel.hpp @@ -56,7 +56,7 @@ public: void name(const std::string& name) { m_name=name; return; } int npars(void) const { return m_npars; } GModelPar* par(int index) const; - void eval_gradients(GSkyDir& dir, const double& energy, const double& time); + void eval_gradients(GSkyDir* dir, double* energy, double* time); protected: // Protected methods diff --git a/include/GModelSpatial.hpp b/include/GModelSpatial.hpp index 02949e9..6da2bbc 100644 --- a/include/GModelSpatial.hpp +++ b/include/GModelSpatial.hpp @@ -45,7 +45,7 @@ public: // Virtual methods virtual int npars(void) const = 0; virtual GModelPar* par(int index) const = 0; - virtual void eval_gradients(GSkyDir& dir) = 0; + virtual void eval_gradients(GSkyDir* dir) = 0; protected: // Protected methods diff --git a/include/GModelSpatialPtsrc.hpp b/include/GModelSpatialPtsrc.hpp index f86934e..6e9a4fb 100644 --- a/include/GModelSpatialPtsrc.hpp +++ b/include/GModelSpatialPtsrc.hpp @@ -49,7 +49,7 @@ public: // Methods int npars(void) const { return m_npars; } GModelPar* par(int index) const; - void eval_gradients(GSkyDir& dir); + void eval_gradients(GSkyDir* dir); double ra(void) const { return m_ra.real_value(); } double dec(void) const { return m_dec.real_value(); } diff --git a/include/GModelSpectral.hpp b/include/GModelSpectral.hpp index 1d57269..d893829 100644 --- a/include/GModelSpectral.hpp +++ b/include/GModelSpectral.hpp @@ -45,7 +45,7 @@ public: // Virtual methods virtual int npars(void) const = 0; virtual GModelPar* par(int index) const = 0; - virtual void eval_gradients(const double& energy) = 0; + virtual void eval_gradients(double* energy) = 0; protected: // Protected methods diff --git a/include/GModelSpectralPlaw.hpp b/include/GModelSpectralPlaw.hpp index 51fbe37..8a41492 100644 --- a/include/GModelSpectralPlaw.hpp +++ b/include/GModelSpectralPlaw.hpp @@ -48,7 +48,7 @@ public: // Methods int npars(void) const { return m_npars; } GModelPar* par(int index) const; - void eval_gradients(const double& energy); + void eval_gradients(double* energy); void autoscale(void); double norm(void) const { return m_norm.real_value(); } double index(void) const { return m_index.real_value(); } diff --git a/include/GModelTemporal.hpp b/include/GModelTemporal.hpp index 31d61e2..2bcc09a 100644 --- a/include/GModelTemporal.hpp +++ b/include/GModelTemporal.hpp @@ -45,7 +45,7 @@ public: // Virtual methods virtual int npars(void) const = 0; virtual GModelPar* par(int index) const = 0; - virtual void eval_gradients(const double& time) = 0; + virtual void eval_gradients(double* time) = 0; protected: // Protected methods diff --git a/include/GModelTemporalConst.hpp b/include/GModelTemporalConst.hpp index 09ed802..d70b006 100644 --- a/include/GModelTemporalConst.hpp +++ b/include/GModelTemporalConst.hpp @@ -49,7 +49,7 @@ public: // Methods int npars(void) const { return m_npars; } GModelPar* par(int index) const; - void eval_gradients(const double& time); + void eval_gradients(double* time); protected: // Protected methods diff --git a/include/GModels.hpp b/include/GModels.hpp index 64b7660..ebda36d 100644 --- a/include/GModels.hpp +++ b/include/GModels.hpp @@ -48,7 +48,7 @@ public: // Methods void add(const GModel& model); - void eval_gradients(GSkyDir& dir, const double& energy, const double& time); + void eval_gradients(GSkyDir* dir, double* energy, double* time); protected: // Protected methods diff --git a/src/model/GModel.cpp b/src/model/GModel.cpp index e810283..442d35e 100644 --- a/src/model/GModel.cpp +++ b/src/model/GModel.cpp @@ -167,7 +167,7 @@ GModelPar* GModel::par(int index) const /***********************************************************************//** * @brief Evaluate function gradients ***************************************************************************/ -void GModel::eval_gradients(GSkyDir& dir, const double& energy, const double& time) +void GModel::eval_gradients(GSkyDir* dir, double* energy, double* time) { // Evaluate gradients in all components if (m_spatial != NULL) m_spatial->eval_gradients(dir); diff --git a/src/model/GModelSpatialPtsrc.cpp b/src/model/GModelSpatialPtsrc.cpp index 399aa2e..daf7adb 100644 --- a/src/model/GModelSpatialPtsrc.cpp +++ b/src/model/GModelSpatialPtsrc.cpp @@ -161,7 +161,7 @@ GModelPar* GModelSpatialPtsrc::par(int index) const /***********************************************************************//** * @brief Evaluate function gradients ***************************************************************************/ -void GModelSpatialPtsrc::eval_gradients(GSkyDir& dir) +void GModelSpatialPtsrc::eval_gradients(GSkyDir* dir) { // Return return; diff --git a/src/model/GModelSpectralPlaw.cpp b/src/model/GModelSpectralPlaw.cpp index dff1ae3..f052cf7 100644 --- a/src/model/GModelSpectralPlaw.cpp +++ b/src/model/GModelSpectralPlaw.cpp @@ -166,7 +166,7 @@ GModelPar* GModelSpectralPlaw::par(int index) const * * @param[in] energy Energy at which the gradients are to be computed. ***************************************************************************/ -void GModelSpectralPlaw::eval_gradients(const double& energy) +void GModelSpectralPlaw::eval_gradients(double* energy) { // Set gradient to 0 is all parameters are fixed ... if ( !m_norm.isfree() && !m_index.isfree() && !m_pivot.isfree() ) { @@ -179,7 +179,7 @@ void GModelSpectralPlaw::eval_gradients(const double& energy) else { // Precompute some values - double e = energy/m_pivot.value(); + double e = *energy/m_pivot.value(); double p = pow(e, m_index.value()); // Compute normalization gradient @@ -190,7 +190,7 @@ void GModelSpectralPlaw::eval_gradients(const double& energy) // Compute index gradient if (m_index.isfree()) { - double g = m_norm.value() * p * log(energy); + double g = m_norm.value() * p * log(*energy); m_index.gradient(g); } else diff --git a/src/model/GModelTemporalConst.cpp b/src/model/GModelTemporalConst.cpp index 439fa05..543f4c2 100644 --- a/src/model/GModelTemporalConst.cpp +++ b/src/model/GModelTemporalConst.cpp @@ -142,7 +142,7 @@ GModelPar* GModelTemporalConst::par(int index) const /***********************************************************************//** * @brief Evaluate function gradients ***************************************************************************/ -void GModelTemporalConst::eval_gradients(const double& time) +void GModelTemporalConst::eval_gradients(double* time) { // Return return; diff --git a/src/model/GModels.cpp b/src/model/GModels.cpp index e85d788..87ae8a0 100644 --- a/src/model/GModels.cpp +++ b/src/model/GModels.cpp @@ -165,7 +165,7 @@ void GModels::add(const GModel& model) /***********************************************************************//** * @brief Evaluate function gradients ***************************************************************************/ -void GModels::eval_gradients(GSkyDir& dir, const double& energy, const double& time) +void GModels::eval_gradients(GSkyDir* dir, double* energy, double* time) { // Evaluate gradients for all models for (int i = 0; i < m_elements; ++i) -- libgit2 0.21.4