Andreas Specovius / gammalib

Commit f1495d3b6f01adc6fa003addcfa8576f080f51be

Authored by Jürgen Knödlseder
2 parents 203d5efc a02887fb

Merge branch 'integration' into devel

Inline Side-by-side
Showing 66 changed files with 315 additions and 308 deletions
ChangeLog
  View file @f1495d3
... ... @@ -32,6 +32,7 @@
32 32 Add GCTAResponseIrf::rspname() method
33 33 Correct GCTAPsf2D containment radius computation (#1876)
34 34 Add GFilename::type() method (#1863)
  35 + Rename GFitsTableCol::length() to GFitsTableCol::nrows() (#1860)
35 36 Rename GFitsHDU::size() to GFitsHDU::cards() (#1859)
36 37 Rename GFitsImage::size() to GFitsImage::npix() (#1858)
37 38 Remove GFitsTable::size() method (#1857)
... ...
Makefile.am
  View file @f1495d3
... ... @@ -168,6 +168,11 @@ clean-wrappers:
168 168 rm -rf $(top_builddir)/pyext/gammalib/*.py
169 169 rm -rf $(top_builddir)/pyext/gammalib/*_wrap.cpp
170 170  
  171 +# Files to be removed in build directory
  172 +clean-local:
  173 + rm -rf $(top_builddir)/doc/html
  174 + rm -rf $(top_builddir)/doc/man
  175 +
171 176 # Add documentation rule:
172 177 doc: doxygen sphinx
173 178  
... ...
... ... @@ -70,6 +70,7 @@ The following methods have been removed:
70 70 The following methods have been renamed:
71 71 - GFitsImage::size() => GFitsImage::npix()
72 72 - GFitsHDU::size() => GFitsHDU::cards()
  73 +- GFitsTableCol::length() => GFitsTableCol::nrows()
73 74  
74 75 The arguments for the following methods have been changed:
75 76 - ...
... ... @@ -124,6 +125,9 @@ redundant (#1857).
124 125 The GFitsHDU::size() method has been renamed to GFitsHDU::cards() since the
125 126 meaning of the size() method was not clear (#1859).
126 127  
  128 +The GFitsTableCol::length() method was renamed to GFitsTableCol::nrows()
  129 +to clarify the meaning of thie method (#1860).
  130 +
127 131  
128 132 7. Linear algebra module
129 133 ------------------------
... ...
include/GFitsTableBitCol.hpp
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GFitsTableBitCol.hpp - FITS table bit column class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2008-2014 by Juergen Knoedlseder *
  4 + * copyright (C) 2008-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -46,7 +46,7 @@ class GFitsTableBitCol : public GFitsTableCol {
46 46 public:
47 47 // Constructors and destructors
48 48 GFitsTableBitCol(void);
49   - GFitsTableBitCol(const std::string& name, const int& length,
  49 + GFitsTableBitCol(const std::string& name, const int& nrows,
50 50 const int& size = 1);
51 51 GFitsTableBitCol(const GFitsTableBitCol& column);
52 52 virtual ~GFitsTableBitCol(void);
... ...
include/GFitsTableBoolCol.hpp
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GFitsTableBoolCol.hpp - FITS table boolean column class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2008-2014 by Juergen Knoedlseder *
  4 + * copyright (C) 2008-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -47,7 +47,7 @@ class GFitsTableBoolCol : public GFitsTableCol {
47 47 public:
48 48 // Constructors and destructors
49 49 GFitsTableBoolCol(void);
50   - GFitsTableBoolCol(const std::string& name, const int& length,
  50 + GFitsTableBoolCol(const std::string& name, const int& nrows,
51 51 const int& size = 1);
52 52 GFitsTableBoolCol(const GFitsTableBoolCol& column);
53 53 virtual ~GFitsTableBoolCol(void);
... ...
include/GFitsTableByteCol.hpp
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GFitsTableByteCol.hpp - FITS table Byte column class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2008-2014 by Juergen Knoedlseder *
  4 + * copyright (C) 2008-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -44,7 +44,7 @@ class GFitsTableByteCol : public GFitsTableCol {
44 44 public:
45 45 // Constructors and destructors
46 46 GFitsTableByteCol(void);
47   - GFitsTableByteCol(const std::string& name, const int& length,
  47 + GFitsTableByteCol(const std::string& name, const int& nrows,
48 48 const int& size = 1);
49 49 GFitsTableByteCol(const GFitsTableByteCol& column);
50 50 virtual ~GFitsTableByteCol(void);
... ...
include/GFitsTableCDoubleCol.hpp
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GFitsTableCDoubleCol.hpp - FITS table double precision complex column *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2008-2014 by Juergen Knoedlseder *
  4 + * copyright (C) 2008-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -45,7 +45,7 @@ class GFitsTableCDoubleCol : public GFitsTableCol {
45 45 public:
46 46 // Constructors and destructors
47 47 GFitsTableCDoubleCol(void);
48   - GFitsTableCDoubleCol(const std::string& name, const int& length,
  48 + GFitsTableCDoubleCol(const std::string& name, const int& nrows,
49 49 const int& size = 1);
50 50 GFitsTableCDoubleCol(const GFitsTableCDoubleCol& column);
51 51 virtual ~GFitsTableCDoubleCol(void);
... ...
include/GFitsTableCFloatCol.hpp
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GFitsTableCFloatCol.hpp - FITS table single precision complex column *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2008-2014 by Juergen Knoedlseder *
  4 + * copyright (C) 2008-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -45,7 +45,7 @@ class GFitsTableCFloatCol : public GFitsTableCol {
45 45 public:
46 46 // Constructors and destructors
47 47 GFitsTableCFloatCol(void);
48   - GFitsTableCFloatCol(const std::string& name, const int& length,
  48 + GFitsTableCFloatCol(const std::string& name, const int& nrows,
49 49 const int& size = 1);
50 50 GFitsTableCFloatCol(const GFitsTableCFloatCol& column);
51 51 virtual ~GFitsTableCFloatCol(void);
... ...
include/GFitsTableCol.hpp
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GFitsTableCol.hpp - FITS table column abstract base class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2008-2014 by Juergen Knoedlseder *
  4 + * copyright (C) 2008-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -50,7 +50,7 @@ public:
50 50 // Constructors and destructors
51 51 GFitsTableCol(void);
52 52 GFitsTableCol(const std::string& name,
53   - const int& length,
  53 + const int& nrows,
54 54 const int& number,
55 55 const int& width);
56 56 GFitsTableCol(const GFitsTableCol& column);
... ... @@ -89,8 +89,8 @@ public:
89 89 const int& number(void) const;
90 90 void elements(const int& row, const int& elements);
91 91 int elements(const int& row) const;
92   - void length(const int& length);
93   - const int& length(void) const;
  92 + void nrows(const int& nrows);
  93 + const int& nrows(void) const;
94 94 void is_variable(const bool& variable);
95 95 const bool& is_variable(void) const;
96 96 void anynul(const int& anynul);
... ... @@ -402,17 +402,17 @@ const int& GFitsTableCol::number(void) const
402 402  
403 403  
404 404 /***********************************************************************//**
405   - * @brief Set column length (number of rows)
  405 + * @brief Set number of rows in column
406 406 *
407   - * @param[in] length Column length.
  407 + * @param[in] nrows Number of rows in column.
408 408 *
409   - * Sets the number of rows in one column.
  409 + * Sets the number of rows in column.
410 410 ***************************************************************************/
411 411 inline
412   -void GFitsTableCol::length(const int& length)
  412 +void GFitsTableCol::nrows(const int& nrows)
413 413 {
414 414 // Set length
415   - m_length = length;
  415 + m_length = nrows;
416 416  
417 417 // Return
418 418 return;
... ... @@ -425,7 +425,7 @@ void GFitsTableCol::length(const int& length)
425 425 * @return Number of rows in column.
426 426 ***************************************************************************/
427 427 inline
428   -const int& GFitsTableCol::length(void) const
  428 +const int& GFitsTableCol::nrows(void) const
429 429 {
430 430 // Return column length
431 431 return m_length;
... ...
include/GFitsTableDoubleCol.hpp
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GFitsTableDoubleCol.hpp - FITS table double column class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2010-2014 by Juergen Knoedlseder *
  4 + * copyright (C) 2010-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -44,7 +44,7 @@ class GFitsTableDoubleCol : public GFitsTableCol {
44 44 public:
45 45 // Constructors and destructors
46 46 GFitsTableDoubleCol(void);
47   - GFitsTableDoubleCol(const std::string& name, const int& length,
  47 + GFitsTableDoubleCol(const std::string& name, const int& nrows,
48 48 const int& size = 1);
49 49 GFitsTableDoubleCol(const GFitsTableDoubleCol& column);
50 50 virtual ~GFitsTableDoubleCol(void);
... ...
include/GFitsTableFloatCol.hpp
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GFitsTableFloatCol.hpp - FITS table float column class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2010-2014 by Juergen Knoedlseder *
  4 + * copyright (C) 2010-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -21,7 +21,7 @@
21 21 /**
22 22 * @file GFitsTableFloatCol.hpp
23 23 * @brief FITS table float column class interface definition
24   - * @author J. Knodlseder
  24 + * @author Juergen Knoedlseder
25 25 */
26 26  
27 27 #ifndef GFITSTABLEFLOATCOL_HPP
... ... @@ -44,7 +44,7 @@ class GFitsTableFloatCol : public GFitsTableCol {
44 44 public:
45 45 // Constructors and destructors
46 46 GFitsTableFloatCol(void);
47   - GFitsTableFloatCol(const std::string& name, const int& length,
  47 + GFitsTableFloatCol(const std::string& name, const int& nrows,
48 48 const int& size = 1);
49 49 GFitsTableFloatCol(const GFitsTableFloatCol& column);
50 50 virtual ~GFitsTableFloatCol(void);
... ...
include/GFitsTableLongCol.hpp
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GFitsTableLongCol.hpp - FITS table long column class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2010-2014 by Jurgen Knodlseder *
  4 + * copyright (C) 2010-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -21,7 +21,7 @@
21 21 /**
22 22 * @file GFitsTableLongCol.hpp
23 23 * @brief FITS table long integer column class interface definition
24   - * @author J. Knodlseder
  24 + * @author Juergen Knoedlseder
25 25 */
26 26  
27 27 #ifndef GFITSTABLELONGCOL_HPP
... ... @@ -44,7 +44,7 @@ class GFitsTableLongCol : public GFitsTableCol {
44 44 public:
45 45 // Constructors and destructors
46 46 GFitsTableLongCol(void);
47   - GFitsTableLongCol(const std::string& name, const int& length,
  47 + GFitsTableLongCol(const std::string& name, const int& nrows,
48 48 const int& size = 1);
49 49 GFitsTableLongCol(const GFitsTableLongCol& column);
50 50 virtual ~GFitsTableLongCol(void);
... ...
include/GFitsTableLongLongCol.hpp
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GFitsTableLongLongCol.hpp - FITS table long long column class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2010-2014 by Juergen Knoedlseder *
  4 + * copyright (C) 2010-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -44,7 +44,7 @@ class GFitsTableLongLongCol : public GFitsTableCol {
44 44 public:
45 45 // Constructors and destructors
46 46 GFitsTableLongLongCol(void);
47   - GFitsTableLongLongCol(const std::string& name, const int& length,
  47 + GFitsTableLongLongCol(const std::string& name, const int& nrows,
48 48 const int& size = 1);
49 49 GFitsTableLongLongCol(const GFitsTableLongLongCol& column);
50 50 virtual ~GFitsTableLongLongCol(void);
... ...
include/GFitsTableShortCol.hpp
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GFitsTableShortCol.hpp - FITS table short column class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2010-2014 by Juergen Knoedlseder *
  4 + * copyright (C) 2010-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -44,7 +44,7 @@ class GFitsTableShortCol : public GFitsTableCol {
44 44 public:
45 45 // Constructors and destructors
46 46 GFitsTableShortCol(void);
47   - GFitsTableShortCol(const std::string& name, const int& length,
  47 + GFitsTableShortCol(const std::string& name, const int& nrows,
48 48 const int& size = 1);
49 49 GFitsTableShortCol(const GFitsTableShortCol& column);
50 50 virtual ~GFitsTableShortCol(void);
... ...
include/GFitsTableStringCol.hpp
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GFitsTableStringCol.hpp - FITS table string column class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2008-2014 by Juergen Knoedlseder *
  4 + * copyright (C) 2008-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -44,7 +44,7 @@ class GFitsTableStringCol : public GFitsTableCol {
44 44 public:
45 45 // Constructors and destructors
46 46 GFitsTableStringCol(void);
47   - GFitsTableStringCol(const std::string& name, const int& length,
  47 + GFitsTableStringCol(const std::string& name, const int& nrows,
48 48 const int& width, const int& size = 1);
49 49 GFitsTableStringCol(const GFitsTableStringCol& column);
50 50 virtual ~GFitsTableStringCol(void);
... ...
include/GFitsTableULongCol.hpp
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GFitsTableULongCol.hpp - FITS table unsigned long column class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2010-2014 by Juergen Knoedlseder *
  4 + * copyright (C) 2010-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -44,7 +44,7 @@ class GFitsTableULongCol : public GFitsTableCol {
44 44 public:
45 45 // Constructors and destructors
46 46 GFitsTableULongCol(void);
47   - GFitsTableULongCol(const std::string& name, const int& length,
  47 + GFitsTableULongCol(const std::string& name, const int& nrows,
48 48 const int& size = 1);
49 49 GFitsTableULongCol(const GFitsTableULongCol& column);
50 50 virtual ~GFitsTableULongCol(void);
... ...
include/GFitsTableUShortCol.hpp
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GFitsTableUShortCol.hpp - FITS table unsigned short column class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2010-2014 by Juergen Knoedlseder *
  4 + * copyright (C) 2010-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -44,7 +44,7 @@ class GFitsTableUShortCol : public GFitsTableCol {
44 44 public:
45 45 // Constructors and destructors
46 46 GFitsTableUShortCol(void);
47   - GFitsTableUShortCol(const std::string& name, const int& length,
  47 + GFitsTableUShortCol(const std::string& name, const int& nrows,
48 48 const int& size = 1);
49 49 GFitsTableUShortCol(const GFitsTableUShortCol& column);
50 50 virtual ~GFitsTableUShortCol(void);
... ...
include/GModelSpatialRadialProfileDMBurkert.hpp
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GModelSpatialRadialProfileDMBurkert.hpp - DM Burkert profile class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2016 by Nathan Kelley-Hoskins *
  4 + * copyright (C) 2016-2017 by Nathan Kelley-Hoskins *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -150,7 +150,7 @@ std::string GModelSpatialRadialProfileDMBurkert::type(void) const
150 150 /***********************************************************************//**
151 151 * @brief Return scale radius
152 152 *
153   - *@return scale radius (kpc).
  153 + * @return Scale radius (kpc).
154 154 *
155 155 * Returns the scale radius of the halo profile in kpc.
156 156 ***************************************************************************/
... ... @@ -163,21 +163,21 @@ double GModelSpatialRadialProfileDMBurkert::scale_radius(void) const
163 163 /***********************************************************************//**
164 164 * @brief Set scale radius
165 165 *
166   - * @param[in] radius scale radius (kpc).
  166 + * @param[in] radius Scale radius (kpc).
167 167 *
168 168 * Sets the scale radius of the halo profile in kpc.
169 169 ***************************************************************************/
170 170 inline
171   -void GModelSpatialRadialProfileDMBurkert::scale_radius(const double& scale_radius)
  171 +void GModelSpatialRadialProfileDMBurkert::scale_radius(const double& radius)
172 172 {
173   - m_scale_radius.value(scale_radius);
  173 + m_scale_radius.value(radius);
174 174 return;
175 175 }
176 176  
177 177 /***********************************************************************//**
178 178 * @brief Return scale density
179 179 *
180   - *@return scale density (GeV/cm^3).
  180 + * @return Scale density (GeV/cm^3).
181 181 *
182 182 * Returns the scale density (mass/volume density at the scale radius) of
183 183 * the halo profile in GeV/cm^3.
... ... @@ -191,22 +191,22 @@ double GModelSpatialRadialProfileDMBurkert::scale_density(void) const
191 191 /***********************************************************************//**
192 192 * @brief Set scale density
193 193 *
194   - * @param[in] scale density (GeV/cm^3).
  194 + * @param[in] density Scale density (GeV/cm^3).
195 195 *
196 196 * Sets the scale density ( mass/volume density at the scale radius) of the
197 197 * halo profile in GeV/cm^3.
198 198 ***************************************************************************/
199 199 inline
200   -void GModelSpatialRadialProfileDMBurkert::scale_density(const double& scale_density)
  200 +void GModelSpatialRadialProfileDMBurkert::scale_density(const double& density)
201 201 {
202   - m_scale_density.value(scale_density);
  202 + m_scale_density.value(density);
203 203 return;
204 204 }
205 205  
206 206 /***********************************************************************//**
207 207 * @brief Return halo distance
208 208 *
209   - * @return halo distance (kpc).
  209 + * @return Halo distance (kpc).
210 210 *
211 211 * Returns the distance to the halo center in kpc.
212 212 ***************************************************************************/
... ... @@ -219,14 +219,14 @@ double GModelSpatialRadialProfileDMBurkert::halo_distance(void) const
219 219 /***********************************************************************//**
220 220 * @brief Set halo distance
221 221 *
222   - * @param[in] halo distance (kpc).
  222 + * @param[in] distance Halo distance (kpc).
223 223 *
224 224 * Sets the distance between the observer and the halo center in kpc.
225 225 ***************************************************************************/
226 226 inline
227   -void GModelSpatialRadialProfileDMBurkert::halo_distance(const double& halo_distance)
  227 +void GModelSpatialRadialProfileDMBurkert::halo_distance(const double& distance)
228 228 {
229   - m_halo_distance.value(halo_distance);
  229 + m_halo_distance.value(distance);
230 230 return;
231 231 }
232 232  
... ...
include/GModelSpatialRadialProfileDMEinasto.hpp
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GModelSpatialRadialProfileDMEinasto.hpp - DM Einasto profile class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2016 by Nathan Kelley-Hoskins *
  4 + * copyright (C) 2016-2017 by Nathan Kelley-Hoskins *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -169,21 +169,21 @@ double GModelSpatialRadialProfileDMEinasto::scale_radius(void) const
169 169 /***********************************************************************//**
170 170 * @brief Set scale radius
171 171 *
172   - * @param[in] radius scale radius (kpc).
  172 + * @param[in] radius Scale radius (kpc).
173 173 *
174 174 * Sets the scale radius of the halo profile in kpc.
175 175 ***************************************************************************/
176 176 inline
177   -void GModelSpatialRadialProfileDMEinasto::scale_radius(const double& scale_radius)
  177 +void GModelSpatialRadialProfileDMEinasto::scale_radius(const double& radius)
178 178 {
179   - m_scale_radius.value(scale_radius);
  179 + m_scale_radius.value(radius);
180 180 return;
181 181 }
182 182  
183 183 /***********************************************************************//**
184 184 * @brief Return scale density
185 185 *
186   - * @return scale radius (GeV/cm^3).
  186 + * @return Scale density (GeV/cm^3).
187 187 *
188 188 * Returns the scale radius of the halo profile in kpc.
189 189 ***************************************************************************/
... ... @@ -196,22 +196,22 @@ double GModelSpatialRadialProfileDMEinasto::scale_density(void) const
196 196 /***********************************************************************//**
197 197 * @brief Set scale density
198 198 *
199   - * @param[in] radius scale density (GeV/cm^3).
  199 + * @param[in] density Scale density (GeV/cm^3).
200 200 *
201 201 * Sets the scale density (mass/volume density at the scale radius) of
202 202 * the halo profile in GeV/cm^3.
203 203 ***************************************************************************/
204 204 inline
205   -void GModelSpatialRadialProfileDMEinasto::scale_density(const double& scale_density)
  205 +void GModelSpatialRadialProfileDMEinasto::scale_density(const double& density)
206 206 {
207   - m_scale_density.value(scale_density);
  207 + m_scale_density.value(density);
208 208 return;
209 209 }
210 210  
211 211 /***********************************************************************//**
212 212 * @brief Return halo distance
213 213 *
214   - * @return halo distance (kpc).
  214 + * @return Halo distance (kpc).
215 215 *
216 216 * Returns the distance to the halo center in kpc.
217 217 ***************************************************************************/
... ... @@ -224,21 +224,21 @@ double GModelSpatialRadialProfileDMEinasto::halo_distance(void) const
224 224 /***********************************************************************//**
225 225 * @brief Set halo distance
226 226 *
227   - * @param[in] halo distance (kpc).
  227 + * @param[in] distance Halo distance (kpc).
228 228 *
229 229 * Sets the distance between the observer and the halo center in kpc.
230 230 ***************************************************************************/
231 231 inline
232   -void GModelSpatialRadialProfileDMEinasto::halo_distance(const double& halo_distance)
  232 +void GModelSpatialRadialProfileDMEinasto::halo_distance(const double& distance)
233 233 {
234   - m_halo_distance.value(halo_distance);
  234 + m_halo_distance.value(distance);
235 235 return;
236 236 }
237 237  
238 238 /***********************************************************************//**
239 239 * @brief Return Einasto alpha power index
240 240 *
241   - * @return alpha (unitless).
  241 + * @return Einasto profile power index alpha (unitless).
242 242 *
243 243 * Returns the alpha power index in the Einasto halo density function.
244 244 ***************************************************************************/
... ... @@ -249,9 +249,9 @@ double GModelSpatialRadialProfileDMEinasto::alpha(void) const
249 249 }
250 250  
251 251 /***********************************************************************//**
252   - * @brief Set Einasto alpha power index
  252 + * @brief Set Einasto profile power index
253 253 *
254   - * @param[in] alpha (unitless).
  254 + * @param[in] alpha Einasto profile power index (unitless).
255 255 *
256 256 * Sets the Einasto profile power index, should be positive.
257 257 ***************************************************************************/
... ...
include/GModelSpatialRadialProfileDMZhao.hpp
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GModelSpatialRadialProfileDMZhao.hpp - DM Zhao profile class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2016 by Nathan Kelley-Hoskins *
  4 + * copyright (C) 2016-2017 by Nathan Kelley-Hoskins *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -168,7 +168,7 @@ std::string GModelSpatialRadialProfileDMZhao::type(void) const
168 168 /***********************************************************************//**
169 169 * @brief Return scale radius
170 170 *
171   - * @return scale radius (kpc).
  171 + * @return Scale radius (kpc).
172 172 *
173 173 * Returns the scale radius of the halo profile in kpc.
174 174 ***************************************************************************/
... ... @@ -181,21 +181,21 @@ double GModelSpatialRadialProfileDMZhao::scale_radius(void) const
181 181 /***********************************************************************//**
182 182 * @brief Set scale radius
183 183 *
184   - * @param[in] radius scale radius (kpc).
  184 + * @param[in] radius Scale radius (kpc).
185 185 *
186 186 * Sets the scale radius of the halo profile in kpc.
187 187 ***************************************************************************/
188 188 inline
189   -void GModelSpatialRadialProfileDMZhao::scale_radius(const double& scale_radius)
  189 +void GModelSpatialRadialProfileDMZhao::scale_radius(const double& radius)
190 190 {
191   - m_scale_radius.value(scale_radius);
  191 + m_scale_radius.value(radius);
192 192 return;
193 193 }
194 194  
195 195 /***********************************************************************//**
196 196 * @brief Return scale density
197 197 *
198   - * @return scale density (GeV/cm^3).
  198 + * @return Scale density (GeV/cm^3).
199 199 *
200 200 * Returns the scale density (mass/volume density at the scale radius) of
201 201 * the halo profile in GeV/cm^3.
... ... @@ -209,22 +209,22 @@ double GModelSpatialRadialProfileDMZhao::scale_density(void) const
209 209 /***********************************************************************//**
210 210 * @brief Set scale density
211 211 *
212   - * @param[in] radius scale density (GeV/cm^3).
  212 + * @param[in] density Scale density (GeV/cm^3).
213 213 *
214 214 * Sets the scale density (mass/volume density at the scale radius) of the
215 215 * halo profile in GeV/cm^3.
216 216 ***************************************************************************/
217 217 inline
218   -void GModelSpatialRadialProfileDMZhao::scale_density(const double& scale_density)
  218 +void GModelSpatialRadialProfileDMZhao::scale_density(const double& density)
219 219 {
220   - m_scale_density.value(scale_density);
  220 + m_scale_density.value(density);
221 221 return;
222 222 }
223 223  
224 224 /***********************************************************************//**
225 225 * @brief Return halo distance
226 226 *
227   - * @return halo distance (kpc).
  227 + * @return Halo distance (kpc).
228 228 *
229 229 * Returns the distance to the halo center in kpc.
230 230 ***************************************************************************/
... ... @@ -237,14 +237,14 @@ double GModelSpatialRadialProfileDMZhao::halo_distance(void) const
237 237 /***********************************************************************//**
238 238 * @brief Set halo distance
239 239 *
240   - * @param[in] halo distance (kpc).
  240 + * @param[in] distance Halo distance (kpc).
241 241 *
242 242 * Sets the distance between the observer and the halo center in kpc.
243 243 ***************************************************************************/
244 244 inline
245   -void GModelSpatialRadialProfileDMZhao::halo_distance(const double& halo_distance)
  245 +void GModelSpatialRadialProfileDMZhao::halo_distance(const double& distance)
246 246 {
247   - m_halo_distance.value(halo_distance);
  247 + m_halo_distance.value(distance);
248 248 return;
249 249 }
250 250  
... ...
inst/cta/src/GCTAAeffArf.cpp
  View file @f1495d3
... ... @@ -319,7 +319,7 @@ void GCTAAeffArf::read(const GFitsTable& table)
319 319 }
320 320  
321 321 // Extract number of energy bins
322   - int num = energy_lo->length();
  322 + int num = energy_lo->nrows();
323 323  
324 324 // Set nodes
325 325 for (int i = 0; i < num; ++i) {
... ...
inst/cta/src/GCTAEventList.cpp
  View file @f1495d3
... ... @@ -585,7 +585,7 @@ void GCTAEventList::append(const GCTAEventAtom&amp; event)
585 585  
586 586 // Append an element to all additional columns
587 587 for (int i = 0; i < m_columns.size(); ++i) {
588   - m_columns[i]->insert(m_columns[i]->length(),1);
  588 + m_columns[i]->insert(m_columns[i]->nrows(),1);
589 589 }
590 590  
591 591 // Set number of events
... ... @@ -607,17 +607,17 @@ void GCTAEventList::append(const GCTAEventAtom&amp; event)
607 607 * @param[in] column FITS table column to be appended.
608 608 *
609 609 * @exception GException::invalid_argument
610   - * FITS column has incompatible length.
  610 + * FITS column has incompatible number of rows.
611 611 *
612 612 * Appends a FITS table column to the event list. The length of the FITS
613 613 * column must be identical to the number of events in the event list.
614 614 ***************************************************************************/
615 615 void GCTAEventList::append_column(const GFitsTableCol& column)
616 616 {
617   - // Throw an exception if the column has an incompatible length
618   - if (size() != column.length()) {
  617 + // Throw an exception if the column has an incompatible number of rows
  618 + if (size() != column.nrows()) {
619 619 std::string msg = "Incompatible column length. Attempt to append a "
620   - "column of length "+gammalib::str(column.length())+
  620 + "column of length "+gammalib::str(column.nrows())+
621 621 " to an event list with "+gammalib::str(size())+
622 622 " events. Please specify a column of length "+
623 623 gammalib::str(size())+".";
... ...
inst/cta/src/GCTAPsfVector.cpp
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GCTAPsfVector.cpp - CTA point spread function vector class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2012-2016 by Juergen Knoedlseder *
  4 + * copyright (C) 2012-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -347,7 +347,7 @@ void GCTAPsfVector::read(const GFitsTable&amp; table)
347 347 }
348 348  
349 349 // Extract number of energy bins
350   - int num = energy_lo->length();
  350 + int num = energy_lo->nrows();
351 351  
352 352 // Set nodes
353 353 for (int i = 0; i < num; ++i) {
... ...
inst/lat/src/GLATAeff.cpp
  View file @f1495d3
... ... @@ -642,7 +642,7 @@ void GLATAeff::read_efficiency(const GFitsTable&amp; hdu)
642 642  
643 643 // If we have 2 rows in the table we have a Pass 8 response and hence
644 644 // the table only applies to the specific event type
645   - if (ptr->length() == 2) {
  645 + if (ptr->nrows() == 2) {
646 646 for (int i = 0; i < 6; ++i) {
647 647 par1.push_back(ptr->real(0,i));
648 648 par2.push_back(ptr->real(1,i));
... ...
pyext/GFitsTableBitCol.i
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GFitsTableBitCol.i - FITS table bit column class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2008-2015 by Juergen Knoedlseder *
  4 + * copyright (C) 2008-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -38,7 +38,7 @@ class GFitsTableBitCol : public GFitsTableCol {
38 38 public:
39 39 // Constructors and destructors
40 40 GFitsTableBitCol(void);
41   - GFitsTableBitCol(const std::string& name, const int& length,
  41 + GFitsTableBitCol(const std::string& name, const int& nrows,
42 42 const int& size = 1);
43 43 GFitsTableBitCol(const GFitsTableBitCol& column);
44 44 virtual ~GFitsTableBitCol(void);
... ... @@ -71,9 +71,9 @@ public:
71 71 ***************************************************************************/
72 72 %extend GFitsTableBitCol {
73 73 bool __getitem__(int GFitsTableColInx[]) {
74   - if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->length()) {
  74 + if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->nrows()) {
75 75 throw GException::out_of_range("__getitem__()", "Row index",
76   - GFitsTableColInx[1], self->length());
  76 + GFitsTableColInx[1], self->nrows());
77 77 }
78 78 if (GFitsTableColInx[0] == 1) {
79 79 return (*self)(GFitsTableColInx[1]);
... ... @@ -91,9 +91,9 @@ public:
91 91 }
92 92 }
93 93 void __setitem__(int GFitsTableColInx[], bool value) {
94   - if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->length()) {
  94 + if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->nrows()) {
95 95 throw GException::out_of_range("__setitem__()", "Row index",
96   - GFitsTableColInx[1], self->length());
  96 + GFitsTableColInx[1], self->nrows());
97 97 }
98 98 if (GFitsTableColInx[0] == 1) {
99 99 (*self)(GFitsTableColInx[1]) = value;
... ...
pyext/GFitsTableBoolCol.i
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GFitsTableBoolCol.i - FITS table boolean column class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2008-2015 by Juergen Knoedlseder *
  4 + * copyright (C) 2008-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -38,7 +38,7 @@ class GFitsTableBoolCol : public GFitsTableCol {
38 38 public:
39 39 // Constructors and destructors
40 40 GFitsTableBoolCol(void);
41   - GFitsTableBoolCol(const std::string& name, const int& length,
  41 + GFitsTableBoolCol(const std::string& name, const int& nrows,
42 42 const int& size = 1);
43 43 GFitsTableBoolCol(const GFitsTableBoolCol& column);
44 44 virtual ~GFitsTableBoolCol(void);
... ... @@ -71,9 +71,9 @@ public:
71 71 ***************************************************************************/
72 72 %extend GFitsTableBoolCol {
73 73 bool __getitem__(int GFitsTableColInx[]) {
74   - if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->length()) {
  74 + if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->nrows()) {
75 75 throw GException::out_of_range("__getitem__()", "Row index",
76   - GFitsTableColInx[1], self->length());
  76 + GFitsTableColInx[1], self->nrows());
77 77 }
78 78 if (GFitsTableColInx[0] == 1) {
79 79 return (*self)(GFitsTableColInx[1]);
... ... @@ -91,9 +91,9 @@ public:
91 91 }
92 92 }
93 93 void __setitem__(int GFitsTableColInx[], bool value) {
94   - if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->length()) {
  94 + if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->nrows()) {
95 95 throw GException::out_of_range("__setitem__()", "Row index",
96   - GFitsTableColInx[1], self->length());
  96 + GFitsTableColInx[1], self->nrows());
97 97 }
98 98 if (GFitsTableColInx[0] == 1) {
99 99 (*self)(GFitsTableColInx[1]) = value;
... ...
pyext/GFitsTableByteCol.i
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GFitsTableByteCol.i - FITS table Byte column class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2008-2015 by Juergen Knoedlseder *
  4 + * copyright (C) 2008-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -38,7 +38,8 @@ class GFitsTableByteCol : public GFitsTableCol {
38 38 public:
39 39 // Constructors and destructors
40 40 GFitsTableByteCol(void);
41   - GFitsTableByteCol(const std::string& name, const int& length, const int& size = 1);
  41 + GFitsTableByteCol(const std::string& name, const int& nrows,
  42 + const int& size = 1);
42 43 GFitsTableByteCol(const GFitsTableByteCol& column);
43 44 virtual ~GFitsTableByteCol(void);
44 45  
... ... @@ -70,9 +71,9 @@ public:
70 71 ***************************************************************************/
71 72 %extend GFitsTableByteCol {
72 73 unsigned char __getitem__(int GFitsTableColInx[]) {
73   - if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->length()) {
  74 + if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->nrows()) {
74 75 throw GException::out_of_range("__getitem__()", "Row index",
75   - GFitsTableColInx[1], self->length());
  76 + GFitsTableColInx[1], self->nrows());
76 77 }
77 78 if (GFitsTableColInx[0] == 1) {
78 79 return (*self)(GFitsTableColInx[1]);
... ... @@ -90,9 +91,9 @@ public:
90 91 }
91 92 }
92 93 void __setitem__(int GFitsTableColInx[], unsigned char value) {
93   - if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->length()) {
  94 + if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->nrows()) {
94 95 throw GException::out_of_range("__setitem__()", "Row index",
95   - GFitsTableColInx[1], self->length());
  96 + GFitsTableColInx[1], self->nrows());
96 97 }
97 98 if (GFitsTableColInx[0] == 1) {
98 99 (*self)(GFitsTableColInx[1]) = value;
... ...
pyext/GFitsTableCDoubleCol.i
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GFitsTableCDoubleCol.i - FITS table double precision complex column *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2008-2015 by Juergen Knoedlseder *
  4 + * copyright (C) 2008-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -38,7 +38,7 @@ class GFitsTableCDoubleCol : public GFitsTableCol {
38 38 public:
39 39 // Constructors and destructors
40 40 GFitsTableCDoubleCol(void);
41   - GFitsTableCDoubleCol(const std::string& name, const int& length,
  41 + GFitsTableCDoubleCol(const std::string& name, const int& nrows,
42 42 const int& size = 1);
43 43 GFitsTableCDoubleCol(const GFitsTableCDoubleCol& column);
44 44 virtual ~GFitsTableCDoubleCol(void);
... ... @@ -75,9 +75,9 @@ public:
75 75 %extend GFitsTableCDoubleCol {
76 76 /*
77 77 GFits::cdouble __getitem__(int GFitsTableColInx[]) {
78   - if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->length()) {
  78 + if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->nrows()) {
79 79 throw GException::out_of_range("__getitem__()", "Row index",
80   - GFitsTableColInx[1], self->length());
  80 + GFitsTableColInx[1], self->nrows());
81 81 }
82 82 if (GFitsTableColInx[0] == 1) {
83 83 return (*self)(GFitsTableColInx[1]);
... ... @@ -96,9 +96,9 @@ public:
96 96 }
97 97 */
98 98 void __setitem__(int GFitsTableColInx[], GFits::cdouble value) {
99   - if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->length()) {
  99 + if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->nrows()) {
100 100 throw GException::out_of_range("__setitem__()", "Row index",
101   - GFitsTableColInx[1], self->length());
  101 + GFitsTableColInx[1], self->nrows());
102 102 }
103 103 if (GFitsTableColInx[0] == 1) {
104 104 (*self)(GFitsTableColInx[1]) = value;
... ...
pyext/GFitsTableCFloatCol.i
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GFitsTableCFloatCol.i - FITS table single precision complex column *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2008-2015 by Juergen Knoedlseder *
  4 + * copyright (C) 2008-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -38,7 +38,7 @@ class GFitsTableCFloatCol : public GFitsTableCol {
38 38 public:
39 39 // Constructors and destructors
40 40 GFitsTableCFloatCol(void);
41   - GFitsTableCFloatCol(const std::string& name, const int& length,
  41 + GFitsTableCFloatCol(const std::string& name, const int& nrows,
42 42 const int& size = 1);
43 43 GFitsTableCFloatCol(const GFitsTableCFloatCol& column);
44 44 virtual ~GFitsTableCFloatCol(void);
... ... @@ -75,9 +75,9 @@ public:
75 75 %extend GFitsTableCFloatCol {
76 76 /*
77 77 GFits::cfloat __getitem__(int GFitsTableColInx[]) {
78   - if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->length()) {
  78 + if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->nrows()) {
79 79 throw GException::out_of_range("__getitem__()", "Row index",
80   - GFitsTableColInx[1], self->length());
  80 + GFitsTableColInx[1], self->nrows());
81 81 }
82 82 if (GFitsTableColInx[0] == 1) {
83 83 return (*self)(GFitsTableColInx[1]);
... ... @@ -96,9 +96,9 @@ public:
96 96 }
97 97 */
98 98 void __setitem__(int GFitsTableColInx[], GFits::cfloat value) {
99   - if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->length()) {
  99 + if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->nrows()) {
100 100 throw GException::out_of_range("__setitem__()", "Row index",
101   - GFitsTableColInx[1], self->length());
  101 + GFitsTableColInx[1], self->nrows());
102 102 }
103 103 if (GFitsTableColInx[0] == 1) {
104 104 (*self)(GFitsTableColInx[1]) = value;
... ...
pyext/GFitsTableCol.i
  View file @f1495d3
... ... @@ -75,7 +75,7 @@ public:
75 75 // Constructors and destructors
76 76 GFitsTableCol(void);
77 77 GFitsTableCol(const std::string& name,
78   - const int& length,
  78 + const int& nrows,
79 79 const int& number,
80 80 const int& width);
81 81 GFitsTableCol(const GFitsTableCol& column);
... ... @@ -111,8 +111,8 @@ public:
111 111 const int& number(void) const;
112 112 void elements(const int& row, const int& elements);
113 113 int elements(const int& row) const;
114   - void length(const int& length);
115   - const int& length(void) const;
  114 + void nrows(const int& nrows);
  115 + const int& nrows(void) const;
116 116 void is_variable(const bool& variable);
117 117 const bool& is_variable(void) const;
118 118 void anynul(const int& anynul);
... ...
pyext/GFitsTableDoubleCol.i
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GFitsTableDoubleCol.i - FITS table double precision column class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2008-2015 by Juergen Knoedlseder *
  4 + * copyright (C) 2008-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -38,7 +38,7 @@ class GFitsTableDoubleCol : public GFitsTableCol {
38 38 public:
39 39 // Constructors and destructors
40 40 GFitsTableDoubleCol(void);
41   - GFitsTableDoubleCol(const std::string& name, const int& length,
  41 + GFitsTableDoubleCol(const std::string& name, const int& nrows,
42 42 const int& size = 1);
43 43 GFitsTableDoubleCol(const GFitsTableDoubleCol& column);
44 44 virtual ~GFitsTableDoubleCol(void);
... ... @@ -71,9 +71,9 @@ public:
71 71 ***************************************************************************/
72 72 %extend GFitsTableDoubleCol {
73 73 double __getitem__(int GFitsTableColInx[]) {
74   - if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->length()) {
  74 + if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->nrows()) {
75 75 throw GException::out_of_range("__getitem__()", "Row index",
76   - GFitsTableColInx[1], self->length());
  76 + GFitsTableColInx[1], self->nrows());
77 77 }
78 78 if (GFitsTableColInx[0] == 1) {
79 79 return (*self)(GFitsTableColInx[1]);
... ... @@ -91,9 +91,9 @@ public:
91 91 }
92 92 }
93 93 void __setitem__(int GFitsTableColInx[], double value) {
94   - if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->length()) {
  94 + if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->nrows()) {
95 95 throw GException::out_of_range("__setitem__()", "Row index",
96   - GFitsTableColInx[1], self->length());
  96 + GFitsTableColInx[1], self->nrows());
97 97 }
98 98 if (GFitsTableColInx[0] == 1) {
99 99 (*self)(GFitsTableColInx[1]) = value;
... ...
pyext/GFitsTableFloatCol.i
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GFitsTableFloatCol.i - FITS table single precision column class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2008-2015 by Juergen Knoedlseder *
  4 + * copyright (C) 2008-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -38,7 +38,7 @@ class GFitsTableFloatCol : public GFitsTableCol {
38 38 public:
39 39 // Constructors and destructors
40 40 GFitsTableFloatCol(void);
41   - GFitsTableFloatCol(const std::string& name, const int& length,
  41 + GFitsTableFloatCol(const std::string& name, const int& nrows,
42 42 const int& size = 1);
43 43 GFitsTableFloatCol(const GFitsTableFloatCol& column);
44 44 virtual ~GFitsTableFloatCol(void);
... ... @@ -71,9 +71,9 @@ public:
71 71 ***************************************************************************/
72 72 %extend GFitsTableFloatCol {
73 73 float __getitem__(int GFitsTableColInx[]) {
74   - if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->length()) {
  74 + if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->nrows()) {
75 75 throw GException::out_of_range("__getitem__()", "Row index",
76   - GFitsTableColInx[1], self->length());
  76 + GFitsTableColInx[1], self->nrows());
77 77 }
78 78 if (GFitsTableColInx[0] == 1) {
79 79 return (*self)(GFitsTableColInx[1]);
... ... @@ -91,9 +91,9 @@ public:
91 91 }
92 92 }
93 93 void __setitem__(int GFitsTableColInx[], float value) {
94   - if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->length()) {
  94 + if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->nrows()) {
95 95 throw GException::out_of_range("__setitem__()", "Row index",
96   - GFitsTableColInx[1], self->length());
  96 + GFitsTableColInx[1], self->nrows());
97 97 }
98 98 if (GFitsTableColInx[0] == 1) {
99 99 (*self)(GFitsTableColInx[1]) = value;
... ...
pyext/GFitsTableLongCol.i
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GFitsTableLongCol.i - FITS table long integer column class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2008-2015 by Juergen Knoedlseder *
  4 + * copyright (C) 2008-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -38,7 +38,7 @@ class GFitsTableLongCol : public GFitsTableCol {
38 38 public:
39 39 // Constructors and destructors
40 40 GFitsTableLongCol(void);
41   - GFitsTableLongCol(const std::string& name, const int& length,
  41 + GFitsTableLongCol(const std::string& name, const int& nrows,
42 42 const int& size = 1);
43 43 GFitsTableLongCol(const GFitsTableLongCol& column);
44 44 virtual ~GFitsTableLongCol(void);
... ... @@ -71,9 +71,9 @@ public:
71 71 ***************************************************************************/
72 72 %extend GFitsTableLongCol {
73 73 long __getitem__(int GFitsTableColInx[]) {
74   - if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->length()) {
  74 + if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->nrows()) {
75 75 throw GException::out_of_range("__getitem__()", "Row index",
76   - GFitsTableColInx[1], self->length());
  76 + GFitsTableColInx[1], self->nrows());
77 77 }
78 78 if (GFitsTableColInx[0] == 1) {
79 79 return (*self)(GFitsTableColInx[1]);
... ... @@ -91,9 +91,9 @@ public:
91 91 }
92 92 }
93 93 void __setitem__(int GFitsTableColInx[], long value) {
94   - if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->length()) {
  94 + if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->nrows()) {
95 95 throw GException::out_of_range("__setitem__()", "Row index",
96   - GFitsTableColInx[1], self->length());
  96 + GFitsTableColInx[1], self->nrows());
97 97 }
98 98 if (GFitsTableColInx[0] == 1) {
99 99 (*self)(GFitsTableColInx[1]) = value;
... ...
pyext/GFitsTableLongLongCol.i
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GFitsTableLongLongCol.i - FITS table long long integer column class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2008-2015 by Juergen Knoedlseder *
  4 + * copyright (C) 2008-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -38,7 +38,7 @@ class GFitsTableLongLongCol : public GFitsTableCol {
38 38 public:
39 39 // Constructors and destructors
40 40 GFitsTableLongLongCol(void);
41   - GFitsTableLongLongCol(const std::string& name, const int& length,
  41 + GFitsTableLongLongCol(const std::string& name, const int& nrows,
42 42 const int& size = 1);
43 43 GFitsTableLongLongCol(const GFitsTableLongLongCol& column);
44 44 virtual ~GFitsTableLongLongCol(void);
... ... @@ -71,9 +71,9 @@ public:
71 71 ***************************************************************************/
72 72 %extend GFitsTableLongLongCol {
73 73 long long __getitem__(int GFitsTableColInx[]) {
74   - if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->length()) {
  74 + if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->nrows()) {
75 75 throw GException::out_of_range("__getitem__()", "Row index",
76   - GFitsTableColInx[1], self->length());
  76 + GFitsTableColInx[1], self->nrows());
77 77 }
78 78 if (GFitsTableColInx[0] == 1) {
79 79 return (*self)(GFitsTableColInx[1]);
... ... @@ -91,9 +91,9 @@ public:
91 91 }
92 92 }
93 93 void __setitem__(int GFitsTableColInx[], long long value) {
94   - if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->length()) {
  94 + if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->nrows()) {
95 95 throw GException::out_of_range("__setitem__()", "Row index",
96   - GFitsTableColInx[1], self->length());
  96 + GFitsTableColInx[1], self->nrows());
97 97 }
98 98 if (GFitsTableColInx[0] == 1) {
99 99 (*self)(GFitsTableColInx[1]) = value;
... ...
pyext/GFitsTableShortCol.i
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GFitsTableShortCol.i - FITS table short integer column class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2008-2015 by Juergen Knoedlseder *
  4 + * copyright (C) 2008-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -38,7 +38,7 @@ class GFitsTableShortCol : public GFitsTableCol {
38 38 public:
39 39 // Constructors and destructors
40 40 GFitsTableShortCol(void);
41   - GFitsTableShortCol(const std::string& name, const int& length,
  41 + GFitsTableShortCol(const std::string& name, const int& nrows,
42 42 const int& size = 1);
43 43 GFitsTableShortCol(const GFitsTableShortCol& column);
44 44 virtual ~GFitsTableShortCol(void);
... ... @@ -71,9 +71,9 @@ public:
71 71 ***************************************************************************/
72 72 %extend GFitsTableShortCol {
73 73 short __getitem__(int GFitsTableColInx[]) {
74   - if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->length()) {
  74 + if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->nrows()) {
75 75 throw GException::out_of_range("__getitem__()", "Row index",
76   - GFitsTableColInx[1], self->length());
  76 + GFitsTableColInx[1], self->nrows());
77 77 }
78 78 if (GFitsTableColInx[0] == 1) {
79 79 return (*self)(GFitsTableColInx[1]);
... ... @@ -91,9 +91,9 @@ public:
91 91 }
92 92 }
93 93 void __setitem__(int GFitsTableColInx[], short value) {
94   - if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->length()) {
  94 + if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->nrows()) {
95 95 throw GException::out_of_range("__setitem__()", "Row index",
96   - GFitsTableColInx[1], self->length());
  96 + GFitsTableColInx[1], self->nrows());
97 97 }
98 98 if (GFitsTableColInx[0] == 1) {
99 99 (*self)(GFitsTableColInx[1]) = value;
... ...
pyext/GFitsTableStringCol.i
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GFitsTableStringCol.i - FITS table string column class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2008-2016 by Juergen Knoedlseder *
  4 + * copyright (C) 2008-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -39,7 +39,7 @@ class GFitsTableStringCol : public GFitsTableCol {
39 39 public:
40 40 // Constructors and destructors
41 41 GFitsTableStringCol(void);
42   - GFitsTableStringCol(const std::string& name, const int& length,
  42 + GFitsTableStringCol(const std::string& name, const int& nrows,
43 43 const int& width, const int& size = 1);
44 44 GFitsTableStringCol(const GFitsTableStringCol& column);
45 45 virtual ~GFitsTableStringCol(void);
... ... @@ -72,9 +72,9 @@ public:
72 72 ***************************************************************************/
73 73 %extend GFitsTableStringCol {
74 74 std::string __getitem__(int GFitsTableColInx[]) {
75   - if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->length()) {
  75 + if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->nrows()) {
76 76 throw GException::out_of_range("__getitem__()", "Row index",
77   - GFitsTableColInx[1], self->length());
  77 + GFitsTableColInx[1], self->nrows());
78 78 }
79 79 if (GFitsTableColInx[0] == 1) {
80 80 return (*self)(GFitsTableColInx[1]);
... ... @@ -92,9 +92,9 @@ public:
92 92 }
93 93 }
94 94 void __setitem__(int GFitsTableColInx[], std::string value) {
95   - if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->length()) {
  95 + if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->nrows()) {
96 96 throw GException::out_of_range("__setitem__()", "Row index",
97   - GFitsTableColInx[1], self->length());
  97 + GFitsTableColInx[1], self->nrows());
98 98 }
99 99 if (GFitsTableColInx[0] == 1) {
100 100 (*self)(GFitsTableColInx[1]) = value;
... ... @@ -112,9 +112,9 @@ public:
112 112 }
113 113 }
114 114 void __setitem__(int GFitsTableColInx[], GFilename value) {
115   - if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->length()) {
  115 + if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->nrows()) {
116 116 throw GException::out_of_range("__setitem__()", "Row index",
117   - GFitsTableColInx[1], self->length());
  117 + GFitsTableColInx[1], self->nrows());
118 118 }
119 119 if (GFitsTableColInx[0] == 1) {
120 120 (*self)(GFitsTableColInx[1]) = std::string(value);
... ...
pyext/GFitsTableULongCol.i
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GFitsTableULongCol.i - FITS table unsigned long integer column class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2010-2015 by Juergen Knoedlseder *
  4 + * copyright (C) 2010-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -38,7 +38,7 @@ class GFitsTableULongCol : public GFitsTableCol {
38 38 public:
39 39 // Constructors and destructors
40 40 GFitsTableULongCol(void);
41   - GFitsTableULongCol(const std::string& name, const int& length,
  41 + GFitsTableULongCol(const std::string& name, const int& nrows,
42 42 const int& size = 1);
43 43 GFitsTableULongCol(const GFitsTableULongCol& column);
44 44 virtual ~GFitsTableULongCol(void);
... ... @@ -71,9 +71,9 @@ public:
71 71 ***************************************************************************/
72 72 %extend GFitsTableULongCol {
73 73 unsigned long __getitem__(int GFitsTableColInx[]) {
74   - if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->length()) {
  74 + if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->nrows()) {
75 75 throw GException::out_of_range("__getitem__()", "Row index",
76   - GFitsTableColInx[1], self->length());
  76 + GFitsTableColInx[1], self->nrows());
77 77 }
78 78 if (GFitsTableColInx[0] == 1) {
79 79 return (*self)(GFitsTableColInx[1]);
... ... @@ -91,9 +91,9 @@ public:
91 91 }
92 92 }
93 93 void __setitem__(int GFitsTableColInx[], unsigned long value) {
94   - if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->length()) {
  94 + if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->nrows()) {
95 95 throw GException::out_of_range("__setitem__()", "Row index",
96   - GFitsTableColInx[1], self->length());
  96 + GFitsTableColInx[1], self->nrows());
97 97 }
98 98 if (GFitsTableColInx[0] == 1) {
99 99 (*self)(GFitsTableColInx[1]) = value;
... ...
pyext/GFitsTableUShortCol.i
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GFitsTableUShortCol.i - FITS table unsigned short integer column class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2008-2015 by Juergen Knoedlseder *
  4 + * copyright (C) 2008-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -38,7 +38,7 @@ class GFitsTableUShortCol : public GFitsTableCol {
38 38 public:
39 39 // Constructors and destructors
40 40 GFitsTableUShortCol(void);
41   - GFitsTableUShortCol(const std::string& name, const int& length,
  41 + GFitsTableUShortCol(const std::string& name, const int& nrows,
42 42 const int& size = 1);
43 43 GFitsTableUShortCol(const GFitsTableUShortCol& column);
44 44 virtual ~GFitsTableUShortCol(void);
... ... @@ -71,9 +71,9 @@ public:
71 71 ***************************************************************************/
72 72 %extend GFitsTableUShortCol {
73 73 unsigned short __getitem__(int GFitsTableColInx[]) {
74   - if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->length()) {
  74 + if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->nrows()) {
75 75 throw GException::out_of_range("__getitem__()", "Row index",
76   - GFitsTableColInx[1], self->length());
  76 + GFitsTableColInx[1], self->nrows());
77 77 }
78 78 if (GFitsTableColInx[0] == 1) {
79 79 return (*self)(GFitsTableColInx[1]);
... ... @@ -91,9 +91,9 @@ public:
91 91 }
92 92 }
93 93 void __setitem__(int GFitsTableColInx[], unsigned short value) {
94   - if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->length()) {
  94 + if (GFitsTableColInx[1] < 0 || GFitsTableColInx[1] >= self->nrows()) {
95 95 throw GException::out_of_range("__setitem__()", "Row index",
96   - GFitsTableColInx[1], self->length());
  96 + GFitsTableColInx[1], self->nrows());
97 97 }
98 98 if (GFitsTableColInx[0] == 1) {
99 99 (*self)(GFitsTableColInx[1]) = value;
... ...
src/fits/GFitsTable.cpp
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GFitsTable.cpp - FITS table base class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2008-2013 by Juergen Knoedlseder *
  4 + * copyright (C) 2008-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -412,14 +412,14 @@ GFitsTableCol* GFitsTable::insert(int colnum, const GFitsTableCol&amp; column)
412 412 // If the table is empty and has 0 rows then set the number of rows in
413 413 // the table to the length of the column
414 414 if (m_columns == NULL && m_rows == 0) {
415   - m_rows = column.length();
  415 + m_rows = column.nrows();
416 416 }
417 417  
418 418 // Throw exception if the column length is incompatible with number of
419 419 // rows in the table
420   - if (m_rows != column.length()) {
  420 + if (m_rows != column.nrows()) {
421 421 throw GException::fits_bad_col_length(G_INSERT1,
422   - column.length(), m_rows);
  422 + column.nrows(), m_rows);
423 423 }
424 424  
425 425 // If no column data exist then allocate them now
... ... @@ -860,7 +860,7 @@ void GFitsTable::data_open(void* vptr)
860 860 m_columns[i]->type(typecode);
861 861 m_columns[i]->repeat(repeat);
862 862 m_columns[i]->width(width);
863   - m_columns[i]->length(m_rows);
  863 + m_columns[i]->nrows(m_rows);
864 864 m_columns[i]->is_variable(typecode < 0);
865 865 m_columns[i]->connect(FPTR(m_fitsfile));
866 866  
... ... @@ -943,10 +943,10 @@ void GFitsTable::data_save(void)
943 943 // Make sure that column lengths are consistent with table length.
944 944 // Columns with zero length will not be considered (why?)
945 945 for (int i = 0; i < m_cols; ++i) {
946   - if (m_columns[i] != NULL && m_columns[i]->length() > 0) {
947   - if (m_columns[i]->length() != m_rows) {
  946 + if (m_columns[i] != NULL && m_columns[i]->nrows() > 0) {
  947 + if (m_columns[i]->nrows() != m_rows) {
948 948 throw GException::fits_bad_col_length(G_DATA_SAVE,
949   - m_columns[i]->length(),
  949 + m_columns[i]->nrows(),
950 950 m_rows);
951 951 }
952 952 }
... ... @@ -1179,7 +1179,7 @@ void GFitsTable::data_save(void)
1179 1179 } // endif: column appended to FITS file
1180 1180  
1181 1181 // Now write column into FITS file (only if length is positive)
1182   - if (m_columns[i]->length() > 0) {
  1182 + if (m_columns[i]->nrows() > 0) {
1183 1183 // Debug option: Show which column we're going to write
1184 1184 #if defined(G_DEBUG_SAVE)
1185 1185 std::cout << "GFitsTable::save: Write column " << i;
... ... @@ -1216,9 +1216,9 @@ void GFitsTable::data_save(void)
1216 1216 // Check if this column is actually in our list of columns
1217 1217 bool used = false;
1218 1218 for (int i = 0; i < m_cols; ++i) {
1219   - if (m_columns[i] != NULL &&
1220   - m_columns[i]->length() > 0 &&
1221   - m_columns[i]->name() == colname) {
  1219 + if (m_columns[i] != NULL &&
  1220 + m_columns[i]->nrows() > 0 &&
  1221 + m_columns[i]->name() == colname) {
1222 1222 used = true;
1223 1223 break;
1224 1224 }
... ...
src/fits/GFitsTableBitCol.cpp
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GFitsTableBitCol.cpp - FITS table Bit column class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2008-2016 by Juergen Knoedlseder *
  4 + * copyright (C) 2008-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -72,13 +72,13 @@ GFitsTableBitCol::GFitsTableBitCol(void) : GFitsTableCol()
72 72 * @brief Constructor
73 73 *
74 74 * @param[in] name Name of column.
75   - * @param[in] length Length of column.
  75 + * @param[in] nrows Number of rows in column.
76 76 * @param[in] size Vector size of column.
77 77 ***************************************************************************/
78 78 GFitsTableBitCol::GFitsTableBitCol(const std::string& name,
79   - const int& length,
  79 + const int& nrows,
80 80 const int& size) :
81   - GFitsTableCol(name, length, size, 1)
  81 + GFitsTableCol(name, nrows, size, 1)
82 82 {
83 83 // Initialise class members for clean destruction
84 84 init_members();
... ...
src/fits/GFitsTableBoolCol.cpp
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GFitsTableBoolCol.cpp - FITS table boolean column class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2010-2016 by Juergen Knoedlseder *
  4 + * copyright (C) 2010-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -68,13 +68,13 @@ GFitsTableBoolCol::GFitsTableBoolCol(void) : GFitsTableCol()
68 68 * @brief Constructor
69 69 *
70 70 * @param[in] name Name of column.
71   - * @param[in] length Length of column.
  71 + * @param[in] nrows Number of rows in column.
72 72 * @param[in] size Vector size of column.
73 73 ***************************************************************************/
74 74 GFitsTableBoolCol::GFitsTableBoolCol(const std::string& name,
75   - const int& length,
  75 + const int& nrows,
76 76 const int& size) :
77   - GFitsTableCol(name, length, size, 1)
  77 + GFitsTableCol(name, nrows, size, 1)
78 78 {
79 79 // Initialise class members for clean destruction
80 80 init_members();
... ...
src/fits/GFitsTableByteCol.cpp
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GFitsTableByteCol.cpp - FITS table Byte column class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2010-2016 by Juergen Knoedlseder *
  4 + * copyright (C) 2010-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -68,13 +68,13 @@ GFitsTableByteCol::GFitsTableByteCol(void) : GFitsTableCol()
68 68 * @brief Constructor
69 69 *
70 70 * @param[in] name Name of column.
71   - * @param[in] length Length of column.
  71 + * @param[in] nrows Number of rows in column.
72 72 * @param[in] size Vector size of column.
73 73 ***************************************************************************/
74 74 GFitsTableByteCol::GFitsTableByteCol(const std::string& name,
75   - const int& length,
  75 + const int& nrows,
76 76 const int& size) :
77   - GFitsTableCol(name, length, size, 2)
  77 + GFitsTableCol(name, nrows, size, 2)
78 78 {
79 79 // Initialise class members for clean destruction
80 80 init_members();
... ...
src/fits/GFitsTableCDoubleCol.cpp
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GFitsTableCDoubleCol.cpp - FITS table double precision complex column *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2010-2016 by Juergen Knoedlseder *
  4 + * copyright (C) 2010-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -68,13 +68,13 @@ GFitsTableCDoubleCol::GFitsTableCDoubleCol(void) : GFitsTableCol()
68 68 * @brief Constructor
69 69 *
70 70 * @param[in] name Name of column.
71   - * @param[in] length Length of column.
  71 + * @param[in] nrows Number of rows in column.
72 72 * @param[in] size Vector size of column.
73 73 ***************************************************************************/
74 74 GFitsTableCDoubleCol::GFitsTableCDoubleCol(const std::string& name,
75   - const int& length,
  75 + const int& nrows,
76 76 const int& size) :
77   - GFitsTableCol(name, length, size, 4)
  77 + GFitsTableCol(name, nrows, size, 4)
78 78 {
79 79 // Initialise class members for clean destruction
80 80 init_members();
... ...
src/fits/GFitsTableCFloatCol.cpp
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GFitsTableCFloatCol.cpp - FITS table single precision complex column *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2010-2016 by Juergen Knoedlseder *
  4 + * copyright (C) 2010-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -68,13 +68,13 @@ GFitsTableCFloatCol::GFitsTableCFloatCol(void) : GFitsTableCol()
68 68 * @brief Constructor
69 69 *
70 70 * @param[in] name Name of column.
71   - * @param[in] length Length of column.
  71 + * @param[in] nrows Number of rows in column.
72 72 * @param[in] size Vector size of column.
73 73 ***************************************************************************/
74 74 GFitsTableCFloatCol::GFitsTableCFloatCol(const std::string& name,
75   - const int& length,
  75 + const int& nrows,
76 76 const int& size) :
77   - GFitsTableCol(name, length, size, 4)
  77 + GFitsTableCol(name, nrows, size, 4)
78 78 {
79 79 // Initialise class members for clean destruction
80 80 init_members();
... ...
src/fits/GFitsTableCol.cpp
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GFitsTableCol.cpp - FITS table column abstract base class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2008-2013 by Juergen Knoedlseder *
  4 + * copyright (C) 2008-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -75,18 +75,18 @@ GFitsTableCol::GFitsTableCol(void)
75 75 * @brief Column constructor
76 76 *
77 77 * @param[in] name Name of column.
78   - * @param[in] length Length of column (number of rows).
  78 + * @param[in] nrows Number of rows in column.
79 79 * @param[in] number Number of elements in column (negative for variable-length).
80 80 * @param[in] width Width of one column element.
81 81 *
82   - * Construct column instance from @p name, @p length, @p number of elements
  82 + * Construct column instance from @p name, @p nrows, @p number of elements
83 83 * and @p width (or size) of one element. If @p number is negative, a
84 84 * variable-length column will be allocated. The repeat value, which is
85 85 * required for binary tables, is computed internally by multiplying the
86 86 * @p number by the @p width.
87 87 ***************************************************************************/
88 88 GFitsTableCol::GFitsTableCol(const std::string& name,
89   - const int& length,
  89 + const int& nrows,
90 90 const int& number,
91 91 const int& width)
92 92 {
... ... @@ -96,18 +96,18 @@ GFitsTableCol::GFitsTableCol(const std::string&amp; name,
96 96 // Store attributes
97 97 if (number >= 0) { // fixed-length column
98 98 m_name = name;
99   - m_length = length;
  99 + m_length = nrows;
100 100 m_number = number;
101 101 m_width = width;
102 102 m_variable = false;
103 103 }
104 104 else { // variable-length column
105 105 m_name = name;
106   - m_length = length;
  106 + m_length = nrows;
107 107 m_number = 1;
108 108 m_width = width;
109 109 m_variable = true;
110   - m_rowstart.assign(length+1, 0);
  110 + m_rowstart.assign(nrows+1, 0);
111 111 }
112 112  
113 113 // Calculate repeat value (only used for binary table!)
... ... @@ -204,8 +204,8 @@ GFitsTableCol&amp; GFitsTableCol::operator=(const GFitsTableCol&amp; column)
204 204 void GFitsTableCol::elements(const int& row, const int& elements)
205 205 {
206 206 // Check row value
207   - if (row < 0 || row >= length()) {
208   - throw GException::out_of_range(G_ELEMENTS1, "Row index", row, length());
  207 + if (row < 0 || row >= nrows()) {
  208 + throw GException::out_of_range(G_ELEMENTS1, "Row index", row, nrows());
209 209 }
210 210  
211 211 // Check that elements is non-negative
... ... @@ -238,13 +238,13 @@ void GFitsTableCol::elements(const int&amp; row, const int&amp; elements)
238 238 }
239 239  
240 240 // Update row start indices
241   - for (int i = row + 1; i <= length(); ++i) {
  241 + for (int i = row + 1; i <= nrows(); ++i) {
242 242 m_rowstart[i] += difference;
243 243 }
244 244  
245 245 // Update maximum column length
246 246 m_varlen = 0;
247   - for (int i = 0; i < length(); ++i) {
  247 + for (int i = 0; i < nrows(); ++i) {
248 248 int len = m_rowstart[row+1] - m_rowstart[row];
249 249 if (len > m_varlen) {
250 250 m_varlen = len;
... ... @@ -275,8 +275,8 @@ void GFitsTableCol::elements(const int&amp; row, const int&amp; elements)
275 275 int GFitsTableCol::elements(const int& row) const
276 276 {
277 277 // Check row value
278   - if (row < 0 || row >= length()) {
279   - throw GException::out_of_range(G_ELEMENTS2, "Row index", row, length());
  278 + if (row < 0 || row >= nrows()) {
  279 + throw GException::out_of_range(G_ELEMENTS2, "Row index", row, nrows());
280 280 }
281 281  
282 282 // Get number of elements
... ... @@ -433,7 +433,7 @@ std::string GFitsTableCol::print(const GChatter&amp; chatter) const
433 433 result.append(" repeat=" + gammalib::str(repeat()));
434 434 result.append(" width=" + gammalib::str(width()));
435 435 result.append(" number=" + gammalib::str(number()));
436   - result.append(" length=" + gammalib::str(length()));
  436 + result.append(" rows=" + gammalib::str(nrows()));
437 437 result.append(" size=" + gammalib::str(m_size));
438 438 result.append(" varlen=");
439 439 if (m_varlen > 0) {
... ... @@ -447,7 +447,7 @@ std::string GFitsTableCol::print(const GChatter&amp; chatter) const
447 447 result.append(" repeat=" + gammalib::str(repeat()));
448 448 result.append(" width=" + gammalib::str(width()));
449 449 result.append(" number=" + gammalib::str(number()));
450   - result.append(" length=" + gammalib::str(length()));
  450 + result.append(" rows=" + gammalib::str(nrows()));
451 451 result.append(" size=" + gammalib::str(m_size));
452 452 }
453 453  
... ... @@ -461,7 +461,7 @@ std::string GFitsTableCol::print(const GChatter&amp; chatter) const
461 461 if (!is_loaded()) fetch_data();
462 462  
463 463 // Loop over all rows
464   - for (int row = 0; row < length(); ++row) {
  464 + for (int row = 0; row < nrows(); ++row) {
465 465 result.append("\n");
466 466 if (is_variable()) {
467 467 result.append("start=");
... ... @@ -474,7 +474,7 @@ std::string GFitsTableCol::print(const GChatter&amp; chatter) const
474 474 }
475 475 if (is_variable()) {
476 476 result.append("\nend=");
477   - result.append(gammalib::str(m_rowstart[length()]));
  477 + result.append(gammalib::str(m_rowstart[nrows()]));
478 478 }
479 479 }
480 480 #endif
... ...
src/fits/GFitsTableDoubleCol.cpp
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GFitsTableDoubleCol.cpp - FITS table double column class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2010-2016 by Juergen Knoedlseder *
  4 + * copyright (C) 2010-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -68,13 +68,13 @@ GFitsTableDoubleCol::GFitsTableDoubleCol(void) : GFitsTableCol()
68 68 * @brief Constructor
69 69 *
70 70 * @param[in] name Name of column.
71   - * @param[in] length Length of column.
  71 + * @param[in] nrows Number of rows in column.
72 72 * @param[in] size Vector size of column.
73 73 ***************************************************************************/
74 74 GFitsTableDoubleCol::GFitsTableDoubleCol(const std::string& name,
75   - const int& length,
  75 + const int& nrows,
76 76 const int& size) :
77   - GFitsTableCol(name, length, size, 8)
  77 + GFitsTableCol(name, nrows, size, 8)
78 78 {
79 79 // Initialise class members for clean destruction
80 80 init_members();
... ...
src/fits/GFitsTableFloatCol.cpp
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GFitsTableFloatCol.cpp - FITS table float column class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2010-2016 by Juergen Knoedlseder *
  4 + * copyright (C) 2010-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -68,13 +68,13 @@ GFitsTableFloatCol::GFitsTableFloatCol(void) : GFitsTableCol()
68 68 * @brief Constructor
69 69 *
70 70 * @param[in] name Name of column.
71   - * @param[in] length Length of column.
  71 + * @param[in] nrows Number of rows in column.
72 72 * @param[in] size Vector size of column.
73 73 ***************************************************************************/
74 74 GFitsTableFloatCol::GFitsTableFloatCol(const std::string& name,
75   - const int& length,
  75 + const int& nrows,
76 76 const int& size) :
77   - GFitsTableCol(name, length, size, 4)
  77 + GFitsTableCol(name, nrows, size, 4)
78 78 {
79 79 // Initialise class members for clean destruction
80 80 init_members();
... ...
src/fits/GFitsTableLongCol.cpp
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GFitsTableLongCol.cpp - FITS table long integer column class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2010-2016 by Juergen Knoedlseder *
  4 + * copyright (C) 2010-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -68,13 +68,13 @@ GFitsTableLongCol::GFitsTableLongCol(void) : GFitsTableCol()
68 68 * @brief Constructor
69 69 *
70 70 * @param[in] name Name of column.
71   - * @param[in] length Length of column.
  71 + * @param[in] nrows Number of rows in column.
72 72 * @param[in] size Vector size of column.
73 73 ***************************************************************************/
74 74 GFitsTableLongCol::GFitsTableLongCol(const std::string& name,
75   - const int& length,
  75 + const int& nrows,
76 76 const int& size) :
77   - GFitsTableCol(name, length, size, 4)
  77 + GFitsTableCol(name, nrows, size, 4)
78 78 {
79 79 // Initialise class members for clean destruction
80 80 init_members();
... ...
src/fits/GFitsTableLongLongCol.cpp
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GFitsTableLongLongCol.cpp - FITS table long long integer column class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2010-2013 by Juergen Knoedlseder *
  4 + * copyright (C) 2010-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -68,13 +68,13 @@ GFitsTableLongLongCol::GFitsTableLongLongCol(void) : GFitsTableCol()
68 68 * @brief Constructor
69 69 *
70 70 * @param[in] name Name of column.
71   - * @param[in] length Length of column.
  71 + * @param[in] nrows Number of rows in column.
72 72 * @param[in] size Vector size of column.
73 73 ***************************************************************************/
74 74 GFitsTableLongLongCol::GFitsTableLongLongCol(const std::string& name,
75   - const int& length,
  75 + const int& nrows,
76 76 const int& size) :
77   - GFitsTableCol(name, length, size, 8)
  77 + GFitsTableCol(name, nrows, size, 8)
78 78 {
79 79 // Initialise class members for clean destruction
80 80 init_members();
... ...
src/fits/GFitsTableShortCol.cpp
  View file @f1495d3
... ... @@ -68,13 +68,13 @@ GFitsTableShortCol::GFitsTableShortCol(void) : GFitsTableCol()
68 68 * @brief Constructor
69 69 *
70 70 * @param[in] name Name of column.
71   - * @param[in] length Length of column (number of rows).
  71 + * @param[in] nrows Number of rows in column.
72 72 * @param[in] size Number of elements in column (negative for variable-length).
73 73 ***************************************************************************/
74 74 GFitsTableShortCol::GFitsTableShortCol(const std::string& name,
75   - const int& length,
  75 + const int& nrows,
76 76 const int& size) :
77   - GFitsTableCol(name, length, size, 2)
  77 + GFitsTableCol(name, nrows, size, 2)
78 78 {
79 79 // Initialise class members for clean destruction
80 80 init_members();
... ...
src/fits/GFitsTableStringCol.cpp
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GFitsTableStringCol.cpp - FITS table string column class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2010-2016 by Juergen Knoedlseder *
  4 + * copyright (C) 2010-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -69,15 +69,15 @@ GFitsTableStringCol::GFitsTableStringCol(void) : GFitsTableCol()
69 69 * @brief Constructor
70 70 *
71 71 * @param[in] name Name of column.
72   - * @param[in] length Length of column.
  72 + * @param[in] nrows Number of rows in column.
73 73 * @param[in] width Length of individual string.
74 74 * @param[in] size Number of strings in each column.
75 75 ***************************************************************************/
76 76 GFitsTableStringCol::GFitsTableStringCol(const std::string& name,
77   - const int& length,
  77 + const int& nrows,
78 78 const int& width,
79 79 const int& size) :
80   - GFitsTableCol(name, length, size, width)
  80 + GFitsTableCol(name, nrows, size, width)
81 81 {
82 82 // Initialise class members for clean destruction
83 83 init_members();
... ...
src/fits/GFitsTableULongCol.cpp
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GFitsTableULongCol.cpp - FITS table unsigned long integer column class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2010-2016 by Juergen Knoedlseder *
  4 + * copyright (C) 2010-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -68,13 +68,13 @@ GFitsTableULongCol::GFitsTableULongCol(void) : GFitsTableCol()
68 68 * @brief Constructor
69 69 *
70 70 * @param[in] name Name of column.
71   - * @param[in] length Length of column.
  71 + * @param[in] nrows Number of rows in column.
72 72 * @param[in] size Vector size of column.
73 73 ***************************************************************************/
74 74 GFitsTableULongCol::GFitsTableULongCol(const std::string& name,
75   - const int& length,
  75 + const int& nrows,
76 76 const int& size) :
77   - GFitsTableCol(name, length, size, 4)
  77 + GFitsTableCol(name, nrows, size, 4)
78 78 {
79 79 // Initialise class members for clean destruction
80 80 init_members();
... ...
src/fits/GFitsTableUShortCol.cpp
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GFitsTableUShortCol.cpp - FITS table unsigned short integer column class*
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2010-2016 by Juergen Knoedlseder *
  4 + * copyright (C) 2010-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -68,13 +68,13 @@ GFitsTableUShortCol::GFitsTableUShortCol(void) : GFitsTableCol()
68 68 * @brief Constructor
69 69 *
70 70 * @param[in] name Name of column.
71   - * @param[in] length Length of column.
  71 + * @param[in] nrows Number of rows in column.
72 72 * @param[in] size Vector size of column.
73 73 ***************************************************************************/
74 74 GFitsTableUShortCol::GFitsTableUShortCol(const std::string& name,
75   - const int& length,
  75 + const int& nrows,
76 76 const int& size) :
77   - GFitsTableCol(name, length, size, 2)
  77 + GFitsTableCol(name, nrows, size, 2)
78 78 {
79 79 // Initialise class members for clean destruction
80 80 init_members();
... ...
src/linalg/GMatrix.cpp
  View file @f1495d3
... ... @@ -364,7 +364,7 @@ GMatrix&amp; GMatrix::operator+=(const GMatrix&amp; matrix)
364 364 /***********************************************************************//**
365 365 * @brief Unary matrix scalar addition operator
366 366 *
367   - * @param[in] scaler Scalar.
  367 + * @param[in] scalar Scalar.
368 368 *
369 369 * Adds a @p scalar to each matrix element.
370 370 ***************************************************************************/
... ...
src/linalg/GMatrixSparse.cpp
  View file @f1495d3
... ... @@ -574,7 +574,7 @@ GMatrixSparse&amp; GMatrixSparse::operator+=(const GMatrixSparse&amp; matrix)
574 574 /***********************************************************************//**
575 575 * @brief Unary matrix scalar addition operator
576 576 *
577   - * @param[in] scaler Scalar.
  577 + * @param[in] scalar Scalar.
578 578 *
579 579 * Adds a @p scalar to each matrix element.
580 580 ***************************************************************************/
... ...
src/linalg/GMatrixSymmetric.cpp
  View file @f1495d3
... ... @@ -414,7 +414,7 @@ GMatrixSymmetric&amp; GMatrixSymmetric::operator+=(const GMatrixSymmetric&amp; matrix)
414 414 /***********************************************************************//**
415 415 * @brief Unary matrix scalar addition operator
416 416 *
417   - * @param[in] scaler Scalar.
  417 + * @param[in] scalar Scalar.
418 418 *
419 419 * Adds a @p scalar to each matrix element.
420 420 ***************************************************************************/
... ...
src/model/GModelSpatialRadialProfileDMBurkert.cpp
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GModelSpatialRadialProfileDMBurkert.cpp - Burkert radial profile class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2016 by Nathan Kelley-Hoskins *
  4 + * copyright (C) 2016-2017 by Nathan Kelley-Hoskins *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -565,8 +565,8 @@ double GModelSpatialRadialProfileDMBurkert::profile_value(const double&amp; theta) c
565 565 /***********************************************************************//**
566 566 * @brief Kernel for halo density profile squared
567 567 *
568   - * @param[in] distance from observer to point in space (meters)
569   - * @return Density profile value
  568 + * @param[in] los Distance from observer to point in space (meters).
  569 + * @return Halo density.
570 570 *
571 571 * Computes the value of an einasto halo density profile squared,
572 572 * at distance l from observer, at angle \f[\theta\f] from the halo center:
... ... @@ -657,11 +657,11 @@ void GModelSpatialRadialProfileDMBurkert::update() const
657 657 /***********************************************************************//**
658 658 * @brief Calculate Halo Mass Density
659 659 *
660   - * @param[in] distance from halo center (kpc)
661   - * @return Halo mass density
  660 + * @param[in] radius Distance from halo centre (kpc).
  661 + * @return Halo mass density.
662 662 *
663   - * Calculates the halo's mass density at a given radial distance from the halo
664   - * center.
  663 + * Calculates the halo's mass density at a given radial distance from the
  664 + * halo centre.
665 665 ***************************************************************************/
666 666 double GModelSpatialRadialProfileDMBurkert::mass_density(const double& radius) const
667 667 {
... ...
src/model/GModelSpatialRadialProfileDMEinasto.cpp
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GModelSpatialRadialProfileDMEinasto.cpp - Einasto radial profile class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2016 by Nathan Kelley-Hoskins *
  4 + * copyright (C) 2016-2017 by Nathan Kelley-Hoskins *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -622,7 +622,8 @@ double GModelSpatialRadialProfileDMEinasto::profile_value(const double&amp; theta) c
622 622 /***********************************************************************//**
623 623 * @brief Kernel for halo density profile squared
624 624 *
625   - * @param[in] distance from observer to point in space (meters)
  625 + * @param[in] los Distance from observer to point in space (meters)
  626 + * @return Halo density.
626 627 *
627 628 * Computes the value of an einasto halo density profile squared,
628 629 * at distance l from observer, at angle \f[\theta\f] from the halo center:
... ... @@ -647,11 +648,8 @@ double GModelSpatialRadialProfileDMEinasto::profile_value(const double&amp; theta) c
647 648 * J. Einasto, 1965
648 649 * "Kinematics and dynamics of stellar systems"
649 650 * Trudy Inst. Astrofiz. Alma-Ata 5, 87
650   - *
651   - * @return unit
652   - *
653 651 ***************************************************************************/
654   -double GModelSpatialRadialProfileDMEinasto::halo_kernel_los::eval( const double &los )
  652 +double GModelSpatialRadialProfileDMEinasto::halo_kernel_los::eval(const double &los)
655 653 {
656 654 // Calculate the scale distance g, the ( distance from integration point
657 655 // to the halo center ) divided by ( the halo scale radius )
... ... @@ -717,13 +715,13 @@ void GModelSpatialRadialProfileDMEinasto::update() const
717 715 /***********************************************************************//**
718 716 * @brief Calculate halo mass density
719 717 *
720   - * @param[in] radius from halo center (kpc)
  718 + * @param[in] radius Distance from halo center (kpc).
721 719 * @return Halo mass density.
722 720 *
723 721 * Calculates the halo's mass density at a given radial distance from the
724 722 * halo center.
725 723 ***************************************************************************/
726   -double GModelSpatialRadialProfileDMEinasto::mass_density( const double& radius ) const
  724 +double GModelSpatialRadialProfileDMEinasto::mass_density(const double& radius) const
727 725 {
728 726 // Set-up kernel
729 727 halo_kernel_los halo_shape(m_scale_radius.value(),
... ...
src/model/GModelSpatialRadialProfileDMZhao.cpp
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GModelSpatialRadialProfileDMZhao.cpp - Zhao radial profile class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2016 by Nathan Kelley-Hoskins *
  4 + * copyright (C) 2016-2017 by Nathan Kelley-Hoskins *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -665,8 +665,8 @@ double GModelSpatialRadialProfileDMZhao::profile_value(const double&amp; theta) cons
665 665 /***********************************************************************//**
666 666 * @brief Kernel for zhao halo density profile squared
667 667 *
668   - * @param[in] distance from observer to point in space (meters)
669   - * @return Jalo density.
  668 + * @param[in] los Distance from observer to point in space (meters)
  669 + * @return Halo density.
670 670 *
671 671 * Computes the value of a zhao halo density profile squared,
672 672 * at distance l from observer, at angle \f[\theta\f] from the halo center,
... ... @@ -692,8 +692,6 @@ double GModelSpatialRadialProfileDMZhao::profile_value(const double&amp; theta) cons
692 692 * "Analytical models for galactic nuclei"
693 693 * Monthly Notices of the Royal Astronomical Society, 278, 488-49
694 694 * http://mnras.oxfordjournals.org/content/278/2/488.short
695   - *
696   - *
697 695 ***************************************************************************/
698 696 double GModelSpatialRadialProfileDMZhao::halo_kernel_los::eval(const double &los)
699 697 {
... ... @@ -762,11 +760,11 @@ void GModelSpatialRadialProfileDMZhao::update() const
762 760 /***********************************************************************//**
763 761 * @brief Calculate Halo Mass Density
764 762 *
765   - * @param[in] distance from halo center (kpc)
  763 + * @param[in] radius Distance from halo center (kpc).
  764 + * @return Halo mass density.
766 765 *
767 766 * Calculates the halo's mass density at a given radial distance from the halo
768 767 * center.
769   - *
770 768 ***************************************************************************/
771 769 double GModelSpatialRadialProfileDMZhao::mass_density(const double& radius) const
772 770 {
... ...
src/model/GModelTemporalLightCurve.cpp
  View file @f1495d3
... ... @@ -604,30 +604,30 @@ void GModelTemporalLightCurve::load_nodes(const GFilename&amp; filename)
604 604 m_timeref.read(*table);
605 605  
606 606 // Extract columns
607   - GFitsTableCol* time_col = (*table)["TIME"];
  607 + GFitsTableCol* time_col = (*table)["TIME"];
608 608 GFitsTableCol* norm_col = (*table)["NORM"];
609 609  
610 610 // Check that there are at least two nodes in table
611   - if (time_col->length() < 2) {
  611 + if (time_col->nrows() < 2) {
612 612 std::string msg = "\"TIME\" column contains "+
613   - gammalib::str(time_col->length())+" rows but at "
  613 + gammalib::str(time_col->nrows())+" rows but at "
614 614 "least two rows are required. Please specify a valid "
615 615 "temporal file function.";
616 616 throw GException::invalid_value(G_LOAD_NODES, msg);
617 617 }
618 618  
619 619 // Check that both columns are consistent
620   - if (time_col->length() != norm_col->length()) {
  620 + if (time_col->nrows() != norm_col->nrows()) {
621 621 std::string msg = "\"TIME\" and \"NORM\" columns have inconsistent "
622 622 "number of rows ("+
623   - gammalib::str(time_col->length())+", "+
624   - gammalib::str(norm_col->length())+"). Please "
  623 + gammalib::str(time_col->nrows())+", "+
  624 + gammalib::str(norm_col->nrows())+"). Please "
625 625 "specify a valid temporal file function.";
626 626 throw GException::invalid_value(G_LOAD_NODES, msg);
627 627 }
628 628  
629 629 // Set number of nodes
630   - int nodes = time_col->length();
  630 + int nodes = time_col->nrows();
631 631  
632 632 // Check that time values are in ascending order and that no node is
633 633 // larger than one
... ... @@ -663,7 +663,7 @@ void GModelTemporalLightCurve::load_nodes(const GFilename&amp; filename)
663 663  
664 664 // Set minimum and maximum times (assumes that times are ordered)
665 665 m_tmin.set(time_col->real(0), m_timeref);
666   - m_tmax.set(time_col->real(time_col->length()-1), m_timeref);
  666 + m_tmax.set(time_col->real(time_col->nrows()-1), m_timeref);
667 667  
668 668 // Close FITS file
669 669 fits.close();
... ...
src/model/GModelTemporalPhaseCurve.cpp
  View file @f1495d3
... ... @@ -706,26 +706,26 @@ void GModelTemporalPhaseCurve::load_nodes(const GFilename&amp; filename)
706 706 GFitsTableCol* norm_col = (*table)["NORM"];
707 707  
708 708 // Check that there are at least two nodes in table
709   - if (phase_col->length() < 2) {
  709 + if (phase_col->nrows() < 2) {
710 710 std::string msg = "\"PHASE\" column contains "+
711   - gammalib::str(phase_col->length())+" rows but at "
  711 + gammalib::str(phase_col->nrows())+" rows but at "
712 712 "least two rows are required. Please specify a valid "
713 713 "phase curve file.";
714 714 throw GException::invalid_value(G_LOAD_NODES, msg);
715 715 }
716 716  
717 717 // Check that both columns are consistent
718   - if (phase_col->length() != norm_col->length()) {
  718 + if (phase_col->nrows() != norm_col->nrows()) {
719 719 std::string msg = "\"PHASE\" and \"NORM\" columns have inconsistent "
720 720 "number of rows ("+
721   - gammalib::str(phase_col->length())+", "+
722   - gammalib::str(norm_col->length())+"). Please "
  721 + gammalib::str(phase_col->nrows())+", "+
  722 + gammalib::str(norm_col->nrows())+"). Please "
723 723 "specify a valid phase curve file.";
724 724 throw GException::invalid_value(G_LOAD_NODES, msg);
725 725 }
726 726  
727 727 // Set number of nodes
728   - int nodes = phase_col->length();
  728 + int nodes = phase_col->nrows();
729 729  
730 730 // Check that phase values are in ascending order and comprised between
731 731 // 0 and 1, and that no node is larger than one
... ...
src/sky/GSkyMap.cpp
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GSkyMap.cpp - Sky map class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2010-2016 by Juergen Knoedlseder *
  4 + * copyright (C) 2010-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -2517,7 +2517,7 @@ void GSkyMap::read_healpix(const GFitsTable&amp; table)
2517 2517  
2518 2518 // Load map
2519 2519 double *ptr = m_pixels + m_num_pixels*imap;
2520   - for (int row = 0; row < col->length(); ++row) {
  2520 + for (int row = 0; row < col->nrows(); ++row) {
2521 2521 for (int inx = inx_start; inx < inx_end; ++inx) {
2522 2522 *ptr++ = col->real(row,inx);
2523 2523 }
... ...
src/xspec/GArf.cpp
  View file @f1495d3
1 1 /***************************************************************************
2 2 * GArf.cpp - XSPEC Auxiliary Response File class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2013-2016 by Juergen Knoedlseder *
  4 + * copyright (C) 2013-2017 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -487,7 +487,7 @@ void GArf::read(const GFitsTable&amp; table)
487 487 }
488 488  
489 489 // Extract number of energy bins
490   - int num = energy_lo->length();
  490 + int num = energy_lo->nrows();
491 491  
492 492 // Set energy bins
493 493 for (int i = 0; i < num; ++i) {
... ...
src/xspec/GPha.cpp
  View file @f1495d3
... ... @@ -432,7 +432,7 @@ void GPha::read(const GFitsTable&amp; table)
432 432 const GFitsTableCol* col_data = table["COUNTS"];
433 433  
434 434 // Extract number of channels in FITS file
435   - int length = col_data->length();
  435 + int length = col_data->nrows();
436 436  
437 437 // Check whether column length is consistent with energy boundaries
438 438 if (m_ebounds.size() > 0) {
... ...
src/xspec/GRmf.cpp
  View file @f1495d3
... ... @@ -474,7 +474,7 @@ void GRmf::read(const GFitsTable&amp; table)
474 474 const GFitsTableCol* matrix = table["MATRIX"];
475 475  
476 476 // Set matrix rows and columns
477   - int rows = energy_lo->length();
  477 + int rows = energy_lo->nrows();
478 478 int columns = m_ebds_measured.size();
479 479  
480 480 // Initialize matrix
... ...
test/test_GFits.py
  View file @f1495d3
1 1 # ==========================================================================
2 2 # This module performs unit tests for the GammaLib FITS module.
3 3 #
4   -# Copyright (C) 2012-2016 Juergen Knoedlseder
  4 +# Copyright (C) 2012-2017 Juergen Knoedlseder
5 5 #
6 6 # This program is free software: you can redistribute it and/or modify
7 7 # it under the terms of the GNU General Public License as published by
... ... @@ -335,17 +335,17 @@ class Test(gammalib.GPythonTestSuite):
335 335 col11 = gammalib.GFitsTableUShortCol("USHORT", nrows)
336 336  
337 337 # Test number of rows
338   - self.test_value(col1.length(), nrows, "Check number of rows in Bit column")
339   - self.test_value(col2.length(), nrows, "Check number of rows in Boolean column")
340   - self.test_value(col3.length(), nrows, "Check number of rows in Byte column")
341   - self.test_value(col4.length(), nrows, "Check number of rows in Double column")
342   - self.test_value(col5.length(), nrows, "Check number of rows in Float column")
343   - self.test_value(col6.length(), nrows, "Check number of rows in Long column")
344   - self.test_value(col7.length(), nrows, "Check number of rows in LongLong column")
345   - self.test_value(col8.length(), nrows, "Check number of rows in Short column")
346   - self.test_value(col9.length(), nrows, "Check number of rows in String column")
347   - self.test_value(col10.length(), nrows, "Check number of rows in ULong column")
348   - self.test_value(col11.length(), nrows, "Check number of rows in UShort column")
  338 + self.test_value(col1.nrows(), nrows, "Check number of rows in Bit column")
  339 + self.test_value(col2.nrows(), nrows, "Check number of rows in Boolean column")
  340 + self.test_value(col3.nrows(), nrows, "Check number of rows in Byte column")
  341 + self.test_value(col4.nrows(), nrows, "Check number of rows in Double column")
  342 + self.test_value(col5.nrows(), nrows, "Check number of rows in Float column")
  343 + self.test_value(col6.nrows(), nrows, "Check number of rows in Long column")
  344 + self.test_value(col7.nrows(), nrows, "Check number of rows in LongLong column")
  345 + self.test_value(col8.nrows(), nrows, "Check number of rows in Short column")
  346 + self.test_value(col9.nrows(), nrows, "Check number of rows in String column")
  347 + self.test_value(col10.nrows(), nrows, "Check number of rows in ULong column")
  348 + self.test_value(col11.nrows(), nrows, "Check number of rows in UShort column")
349 349  
350 350 # Test iterators
351 351 for row in col1:
... ...