diff --git a/ChangeLog b/ChangeLog index 9fcc748..e14c26e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,21 +3,16 @@ * Version 1.3.0 released ========================= - 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) + Increase maximum CTA King PSF radius to 2 degrees (#2112) Support "BKG" as name of CTA background template Scale optimizer convergence criterion with step size (#2022) Put response cube loading and saving in OpenMP critical zone (#2021) Add GPhases class (#1996) - Add support for Monte Carlo identifier metadata (#1483) - Add GEventList::has_mc_id() and GEventAtom::mc_id() methods (#1483) - Add GEventList::has_phase() and GEventList::has_detxy() methods (#1982) + Allow fitting of scale parameter in composite models (#1992) Add GEventList::append_column() method (#1991) Add scalar addition and subtraction operators to matrix classes (#1990) - Allow fitting of scale parameter in composite models (#1992) Add GCTAAeff::ebounds() method (#1989) Add GEbounds::emin() and GEbounds::emax() setter methods (#1989) Protect GEbounds::set_lin() and set_log() methods from invalid arguments (#1989) @@ -26,22 +21,28 @@ Added FITS image conversion operators (#1986) If code originates from Git, always compile the Python bindings (#1985) Raise exception instead of exiting with return code in Python tests (#1983) + Add GEventList::has_phase() and GEventList::has_detxy() methods (#1982) Enhance precision of GCTAEdisp2D::compute_ebounds_src Add conversion methods between GEbounds and GEnergies (#1977) + Do no longer interpret a CTA calibration database as file path (#1969) + GWcs now supports CD keywords instead of CDELT (#1951) Add GModelSpectralSmoothBrokenPlaw class (#1948) Implement lazy loading of energy dispersion in GCTAEdisp2D (#1940) Add GCTARoi::contains method - Do no longer interpret a CTA calibration database as file path (#1969) Add GCTAResponseIrf::rspname() method - GWcs now supports CD keywords instead of CDELT (#1951) Correct GCTAPsf2D containment radius computation (#1876) Add GFilename::type() method (#1863) + Rename GFitsHDU::size() to GFitsHDU::cards() (#1859) + Rename GFitsImage::size() to GFitsImage::npix() (#1858) + Remove GFitsTable::size() method (#1857) Add GLS and SFL WCS projections (#1851) Add GModelSpatialRadialProfile class (#1520) Add GModelSpatialRadialProfileGauss class (#1520) Add GModelSpatialRadialProfileDMBurkert class (#1520) Add GModelSpatialRadialProfileDMEinasto class (#1520) Add GModelSpatialRadialProfileDMZhao class (#1520) + Add support for Monte Carlo identifier metadata (#1483) + Add GEventList::has_mc_id() and GEventAtom::mc_id() methods (#1483) GModelSpectralNodes throws exception for non-positive energy or intensity (#990) diff --git a/NEWS b/NEWS index f373adc..d6d94dc 100644 --- a/NEWS +++ b/NEWS @@ -69,6 +69,7 @@ The following methods have been removed: The following methods have been renamed: - GFitsImage::size() => GFitsImage::npix() +- GFitsHDU::size() => GFitsHDU::cards() The arguments for the following methods have been changed: - ... @@ -120,6 +121,9 @@ 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). +The GFitsHDU::size() method has been renamed to GFitsHDU::cards() since the +meaning of the size() method was not clear (#1859). + 7. Linear algebra module ------------------------ diff --git a/include/GFitsHDU.hpp b/include/GFitsHDU.hpp index 7cf9ef2..34ba368 100644 --- a/include/GFitsHDU.hpp +++ b/include/GFitsHDU.hpp @@ -1,7 +1,7 @@ /*************************************************************************** * GFitsHDU.hpp - Abstract FITS extension base class * * ----------------------------------------------------------------------- * - * copyright (C) 2008-2016 by Juergen Knoedlseder * + * copyright (C) 2008-2017 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -77,7 +77,7 @@ public: virtual std::string print(const GChatter& chatter = NORMAL) const = 0; // Implemented methods - int size(void) const; + int cards(void) const; const std::string& extname(void) const; void extname(const std::string& extname); const int& extno(void) const; @@ -139,7 +139,7 @@ protected: * Returns the number of cards in the header of the FITS extension. ***************************************************************************/ inline -int GFitsHDU::size(void) const +int GFitsHDU::cards(void) const { return (m_header.size()); } diff --git a/pyext/GFitsHDU.i b/pyext/GFitsHDU.i index 1147525..e343db9 100644 --- a/pyext/GFitsHDU.i +++ b/pyext/GFitsHDU.i @@ -1,7 +1,7 @@ /*************************************************************************** * GFitsHDU.i - FITS HDU handling 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 * @@ -62,7 +62,7 @@ public: virtual HDUType exttype(void) const = 0; // Implemented methods - int size(void) const; + int cards(void) const; const std::string& extname(void) const; void extname(const std::string& extname); const int& extno(void) const; diff --git a/src/fits/GFitsImage.cpp b/src/fits/GFitsImage.cpp index 240b908..06d2279 100644 --- a/src/fits/GFitsImage.cpp +++ b/src/fits/GFitsImage.cpp @@ -1,7 +1,7 @@ /*************************************************************************** * GFitsImage.cpp - Abstract FITS image base class * * ----------------------------------------------------------------------- * - * copyright (C) 2008-2016 by Juergen Knoedlseder * + * copyright (C) 2008-2017 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -385,7 +385,7 @@ void GFitsImage::nulval(const void* value) /***********************************************************************//** * @brief Print column information * - * @param[in] chatter Chattiness (defaults to NORMAL). + * @param[in] chatter Chattiness. * @return String containing column information. * * @todo Format and cfitsio information is mainly for debugging. This could @@ -412,7 +412,7 @@ std::string GFitsImage::print(const GChatter& chatter) const result.append("\n"+gammalib::parformat("Number of dimensions")); result.append(gammalib::str(naxis())); result.append("\n"+gammalib::parformat("Number of image pixels")); - result.append(gammalib::str(size())); + result.append(gammalib::str(npix())); for (int i = 0; i < naxis(); ++i) { result.append("\n"+gammalib::parformat("Number of bins in "+gammalib::str(i))); result.append(gammalib::str(naxes(i)));