diff --git a/ChangeLog b/ChangeLog index f09ab38..9fcc748 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ ========================= Rename GFitsImage::size() to GFitsImage::npix() (#1858) + Remove GFitsTable::size() method (#1857) Add header card keyword map to GFitsHeader for fast access (#2120) Increase maximum CTA King PSF radius to 2 degrees (#2112) Correct set names of spatial GLON/GLAT model parameters (#2113) diff --git a/NEWS b/NEWS index c92ea3f..f373adc 100644 --- a/NEWS +++ b/NEWS @@ -65,7 +65,7 @@ The following methods have been added: - GCTAEventAtom::mc_id() The following methods have been removed: -- ... +- GFitsTable::size() The following methods have been renamed: - GFitsImage::size() => GFitsImage::npix() @@ -115,6 +115,11 @@ GFitsHeader to speed up the access of FITS header cards (#2120). The GFitsImage::size() method has been renamed to GFitsImage::npix() since the size() method overloaded the GFitsHDU::size() method (#1858). +The GFitsTable::size() method has been removed since the meaning of the +method was ambiguous. It returned the number of table columns, but the +GFitsTable::ncols() does exactly the same thing, hence the method was +redundant (#1857). + 7. Linear algebra module ------------------------ diff --git a/include/GFitsTable.hpp b/include/GFitsTable.hpp index bdf2f59..9e58b99 100644 --- a/include/GFitsTable.hpp +++ b/include/GFitsTable.hpp @@ -1,7 +1,7 @@ /*************************************************************************** * GFitsTable.hpp - FITS table abstract base class * * ----------------------------------------------------------------------- * - * copyright (C) 2008-2014 by Juergen Knoedlseder * + * copyright (C) 2008-2017 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -66,7 +66,6 @@ public: virtual HDUType exttype(void) const = 0; // Implemented Methods - const int& size(void) const; GFitsTableCol* set(const int& colnum, const GFitsTableCol& column); GFitsTableCol* set(const std::string& colname, const GFitsTableCol& column); GFitsTableCol* append(const GFitsTableCol& column); @@ -108,21 +107,6 @@ private: /***********************************************************************//** - * @brief Return number of columns in table - * - * @return Number of columns in table - * - * Returns the number of columns in table. This method is equivalent to the - * ncols() method. - ***************************************************************************/ -inline -const int& GFitsTable::size(void) const -{ - return m_cols; -} - - -/***********************************************************************//** * @brief Return number of rows in table * * @return Number of rows in table diff --git a/pyext/GFitsTable.i b/pyext/GFitsTable.i index d1dee3a..2413c06 100644 --- a/pyext/GFitsTable.i +++ b/pyext/GFitsTable.i @@ -1,7 +1,7 @@ /*************************************************************************** * GFitsTable.i - FITS abstract table base class * * ----------------------------------------------------------------------- * - * copyright (C) 2008-2015 by Juergen Knoedlseder * + * copyright (C) 2008-2017 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -120,7 +120,6 @@ public: virtual HDUType exttype(void) const = 0; // Implemented Methods - const int& size(void) const; GFitsTableCol* set(const int& colnum, const GFitsTableCol& column); GFitsTableCol* set(const std::string& colname, const GFitsTableCol& column); GFitsTableCol* append(const GFitsTableCol& column);