Commit 96e64cf061eded37dc9bfd18436a8d142e413ac2
1 parent
91794fa6
Rename norm to value.
Showing
3 changed files
with
20 additions
and
20 deletions
include/GModelSpectralConst.hpp
| @@ -56,7 +56,7 @@ public: | @@ -56,7 +56,7 @@ public: | ||
| 56 | // Constructors and destructors | 56 | // Constructors and destructors |
| 57 | GModelSpectralConst(void); | 57 | GModelSpectralConst(void); |
| 58 | explicit GModelSpectralConst(const GXmlElement& xml); | 58 | explicit GModelSpectralConst(const GXmlElement& xml); |
| 59 | - explicit GModelSpectralConst(const double& norm); | 59 | + explicit GModelSpectralConst(const double& value); |
| 60 | GModelSpectralConst(const GModelSpectralConst& model); | 60 | GModelSpectralConst(const GModelSpectralConst& model); |
| 61 | virtual ~GModelSpectralConst(void); | 61 | virtual ~GModelSpectralConst(void); |
| 62 | 62 | ||
| @@ -84,8 +84,8 @@ public: | @@ -84,8 +84,8 @@ public: | ||
| 84 | virtual std::string print(void) const; | 84 | virtual std::string print(void) const; |
| 85 | 85 | ||
| 86 | // Other methods | 86 | // Other methods |
| 87 | - double norm(void) const; | ||
| 88 | - void norm(const double& norm); | 87 | + double value(void) const; |
| 88 | + void value(const double& value); | ||
| 89 | 89 | ||
| 90 | protected: | 90 | protected: |
| 91 | // Protected methods | 91 | // Protected methods |
| @@ -113,30 +113,30 @@ std::string GModelSpectralConst::type(void) const | @@ -113,30 +113,30 @@ std::string GModelSpectralConst::type(void) const | ||
| 113 | 113 | ||
| 114 | 114 | ||
| 115 | /***********************************************************************//** | 115 | /***********************************************************************//** |
| 116 | - * @brief Return normalization factor | 116 | + * @brief Return model value |
| 117 | * | 117 | * |
| 118 | - * @return Normalization factor (ph/cm2/s/MeV). | 118 | + * @return Model value (ph/cm2/s/MeV). |
| 119 | * | 119 | * |
| 120 | - * Returns the normalization factor. | 120 | + * Returns the model value. |
| 121 | ***************************************************************************/ | 121 | ***************************************************************************/ |
| 122 | inline | 122 | inline |
| 123 | -double GModelSpectralConst::norm(void) const | 123 | +double GModelSpectralConst::value(void) const |
| 124 | { | 124 | { |
| 125 | return (m_norm.value()); | 125 | return (m_norm.value()); |
| 126 | } | 126 | } |
| 127 | 127 | ||
| 128 | 128 | ||
| 129 | /***********************************************************************//** | 129 | /***********************************************************************//** |
| 130 | - * @brief Set normalization factor | 130 | + * @brief Set model value |
| 131 | * | 131 | * |
| 132 | - * @param[in] norm Normalization factor (ph/cm2/s/MeV). | 132 | + * @param[in] value Model value (ph/cm2/s/MeV). |
| 133 | * | 133 | * |
| 134 | - * Sets the normalization factor. | 134 | + * Sets the model value. |
| 135 | ***************************************************************************/ | 135 | ***************************************************************************/ |
| 136 | inline | 136 | inline |
| 137 | -void GModelSpectralConst::norm(const double& norm) | 137 | +void GModelSpectralConst::value(const double& value) |
| 138 | { | 138 | { |
| 139 | - m_norm.value(norm); | 139 | + m_norm.value(value); |
| 140 | return; | 140 | return; |
| 141 | } | 141 | } |
| 142 | 142 |
pyext/GModelSpectralConst.i
| @@ -40,7 +40,7 @@ public: | @@ -40,7 +40,7 @@ public: | ||
| 40 | // Constructors and destructors | 40 | // Constructors and destructors |
| 41 | GModelSpectralConst(void); | 41 | GModelSpectralConst(void); |
| 42 | explicit GModelSpectralConst(const GXmlElement& xml); | 42 | explicit GModelSpectralConst(const GXmlElement& xml); |
| 43 | - explicit GModelSpectralConst(const double& norm); | 43 | + explicit GModelSpectralConst(const double& value); |
| 44 | GModelSpectralConst(const GModelSpectralConst& model); | 44 | GModelSpectralConst(const GModelSpectralConst& model); |
| 45 | virtual ~GModelSpectralConst(void); | 45 | virtual ~GModelSpectralConst(void); |
| 46 | 46 | ||
| @@ -62,8 +62,8 @@ public: | @@ -62,8 +62,8 @@ public: | ||
| 62 | virtual void write(GXmlElement& xml) const; | 62 | virtual void write(GXmlElement& xml) const; |
| 63 | 63 | ||
| 64 | // Other methods | 64 | // Other methods |
| 65 | - double norm(void) const; | ||
| 66 | - void norm(const double& norm); | 65 | + double value(void) const; |
| 66 | + void value(const double& value); | ||
| 67 | }; | 67 | }; |
| 68 | 68 | ||
| 69 | 69 |
src/model/GModelSpectralConst.cpp
| @@ -98,18 +98,18 @@ GModelSpectralConst::GModelSpectralConst(const GXmlElement& xml) : | @@ -98,18 +98,18 @@ GModelSpectralConst::GModelSpectralConst(const GXmlElement& xml) : | ||
| 98 | /***********************************************************************//** | 98 | /***********************************************************************//** |
| 99 | * @brief Value constructor | 99 | * @brief Value constructor |
| 100 | * | 100 | * |
| 101 | - * @param[in] norm Normalization factor (ph/cm2/s/MeV). | 101 | + * @param[in] value Model value (ph/cm2/s/MeV). |
| 102 | * | 102 | * |
| 103 | - * Constructs constant spectral model by setting the normalization factor. | 103 | + * Constructs constant spectral model by setting the model value. |
| 104 | ***************************************************************************/ | 104 | ***************************************************************************/ |
| 105 | -GModelSpectralConst::GModelSpectralConst(const double& norm) : | 105 | +GModelSpectralConst::GModelSpectralConst(const double& value) : |
| 106 | GModelSpectral() | 106 | GModelSpectral() |
| 107 | { | 107 | { |
| 108 | // Initialise members | 108 | // Initialise members |
| 109 | init_members(); | 109 | init_members(); |
| 110 | 110 | ||
| 111 | - // Set normalization factor | ||
| 112 | - m_norm.value(norm); | 111 | + // Set model value |
| 112 | + m_norm.value(value); | ||
| 113 | 113 | ||
| 114 | // Return | 114 | // Return |
| 115 | return; | 115 | return; |