Samuel Flis / gammalib

Commit 5a377f0101d8443edfc241b1920d3d8b794d7197

Authored by Jürgen Knödlseder
2 parents c8461aca f5b17634

Merge branch '1857-remove-GFitsTable-size' into integration 

# Conflicts:
#	ChangeLog
#	NEWS
Inline Side-by-side
Showing 4 changed files with 9 additions and 20 deletions
ChangeLog
  View file @5a377f0
... ... @@ -4,6 +4,7 @@
4 4 =========================
5 5  
6 6 Rename GFitsImage::size() to GFitsImage::npix() (#1858)
  7 + Remove GFitsTable::size() method (#1857)
7 8 Add header card keyword map to GFitsHeader for fast access (#2120)
8 9 Increase maximum CTA King PSF radius to 2 degrees (#2112)
9 10 Correct set names of spatial GLON/GLAT model parameters (#2113)
... ...
... ... @@ -65,7 +65,7 @@ The following methods have been added:
65 65 - GCTAEventAtom::mc_id()
66 66  
67 67 The following methods have been removed:
68   -- ...
  68 +- GFitsTable::size()
69 69  
70 70 The following methods have been renamed:
71 71 - GFitsImage::size() => GFitsImage::npix()
... ... @@ -115,6 +115,11 @@ GFitsHeader to speed up the access of FITS header cards (#2120).
115 115 The GFitsImage::size() method has been renamed to GFitsImage::npix() since
116 116 the size() method overloaded the GFitsHDU::size() method (#1858).
117 117  
  118 +The GFitsTable::size() method has been removed since the meaning of the
  119 +method was ambiguous. It returned the number of table columns, but the
  120 +GFitsTable::ncols() does exactly the same thing, hence the method was
  121 +redundant (#1857).
  122 +
118 123  
119 124 7. Linear algebra module
120 125 ------------------------
... ...
include/GFitsTable.hpp
  View file @5a377f0
1 1 /***************************************************************************
2 2 * GFitsTable.hpp - FITS table 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 *
... ... @@ -66,7 +66,6 @@ public:
66 66 virtual HDUType exttype(void) const = 0;
67 67  
68 68 // Implemented Methods
69   - const int& size(void) const;
70 69 GFitsTableCol* set(const int& colnum, const GFitsTableCol& column);
71 70 GFitsTableCol* set(const std::string& colname, const GFitsTableCol& column);
72 71 GFitsTableCol* append(const GFitsTableCol& column);
... ... @@ -108,21 +107,6 @@ private:
108 107  
109 108  
110 109 /***********************************************************************//**
111   - * @brief Return number of columns in table
112   - *
113   - * @return Number of columns in table
114   - *
115   - * Returns the number of columns in table. This method is equivalent to the
116   - * ncols() method.
117   - ***************************************************************************/
118   -inline
119   -const int& GFitsTable::size(void) const
120   -{
121   - return m_cols;
122   -}
123   -
124   -
125   -/***********************************************************************//**
126 110 * @brief Return number of rows in table
127 111 *
128 112 * @return Number of rows in table
... ...
pyext/GFitsTable.i
  View file @5a377f0
1 1 /***************************************************************************
2 2 * GFitsTable.i - FITS abstract table base 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 *
... ... @@ -120,7 +120,6 @@ public:
120 120 virtual HDUType exttype(void) const = 0;
121 121  
122 122 // Implemented Methods
123   - const int& size(void) const;
124 123 GFitsTableCol* set(const int& colnum, const GFitsTableCol& column);
125 124 GFitsTableCol* set(const std::string& colname, const GFitsTableCol& column);
126 125 GFitsTableCol* append(const GFitsTableCol& column);
... ...