Samuel Flis / gammalib

Commit 96e64cf061eded37dc9bfd18436a8d142e413ac2

Authored by Jürgen Knödlseder
1 parent 91794fa6

Rename norm to value.

Inline Side-by-side
Showing 3 changed files with 20 additions and 20 deletions
include/GModelSpectralConst.hpp
  View file @96e64cf
... ... @@ -56,7 +56,7 @@ public:
56 56 // Constructors and destructors
57 57 GModelSpectralConst(void);
58 58 explicit GModelSpectralConst(const GXmlElement& xml);
59   - explicit GModelSpectralConst(const double& norm);
  59 + explicit GModelSpectralConst(const double& value);
60 60 GModelSpectralConst(const GModelSpectralConst& model);
61 61 virtual ~GModelSpectralConst(void);
62 62  
... ... @@ -84,8 +84,8 @@ public:
84 84 virtual std::string print(void) const;
85 85  
86 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 90 protected:
91 91 // Protected methods
... ... @@ -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 122 inline
123   -double GModelSpectralConst::norm(void) const
  123 +double GModelSpectralConst::value(void) const
124 124 {
125 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 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 140 return;
141 141 }
142 142  
... ...
pyext/GModelSpectralConst.i
  View file @96e64cf
... ... @@ -40,7 +40,7 @@ public:
40 40 // Constructors and destructors
41 41 GModelSpectralConst(void);
42 42 explicit GModelSpectralConst(const GXmlElement& xml);
43   - explicit GModelSpectralConst(const double& norm);
  43 + explicit GModelSpectralConst(const double& value);
44 44 GModelSpectralConst(const GModelSpectralConst& model);
45 45 virtual ~GModelSpectralConst(void);
46 46  
... ... @@ -62,8 +62,8 @@ public:
62 62 virtual void write(GXmlElement& xml) const;
63 63  
64 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
  View file @96e64cf
... ... @@ -98,18 +98,18 @@ GModelSpectralConst::GModelSpectralConst(const GXmlElement& xml) :
98 98 /***********************************************************************//**
99 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 106 GModelSpectral()
107 107 {
108 108 // Initialise members
109 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 114 // Return
115 115 return;
... ...