GSkyProjection::coordsys() method now returns CEL instead of EQU (#1829)

Jürgen Knödlseder
1 parent a96dc02e
Showing 10 changed files with 22 additions and 31 deletions
ChangeLog
NEWS
doc/source/admin/release_history/1.7.rst
include/GHealpix.hpp
include/GSkyProjection.hpp
src/sky/GException_sky.cpp
src/sky/GHealpix.cpp
src/sky/GSkyProjection.cpp
src/sky/GWcs.cpp
test/test_GSky.cpp
@@ -32,6 +32,7 @@
         Add GSkyDir::moon() method (#1855)
         Add GSkyDir::sun(), GSkyDir::precess() and GTime::julian_epoch() methods
           (#1854)
+        GSkyProjection::coordsys() method now returns CEL instead of EQU (#1829)
         Remove GModelSpatialDiffuseCube::maps() and
           GModelSpatialDiffuseCube::pixels() methods (#1761)
         Implement INTEGRAL/SPI instrument interface (#733, #734, #735, #736,
@@ -226,6 +226,8 @@ the Sun for a given date and a specific epoch. To support the method, a
 GSkyDir::precess() method was added that allows precessing a sky direction to
 a specific epoch (#1854).
  
+The GSkyProjection::coordsys() method now returns CEL instead of EQU (#1829).
+
  
 13. Support module
 ------------------
@@ -96,5 +96,7 @@ Clean up
   Rename ``GModelSpatialDiffuseMap::set_mc_cone()`` to ``GModelSpatialDiffuseMap::mc_cone()`` and add ``mc_cone()``getter methods.
 * [`2893 <https://cta-redmine.irap.omp.eu/issues/2893>`_] -
   Remove ``GCTAResponseCache::ndirs()``, ``GCTAResponseCache::nerecos()`` and ``GCTAResponseCache::netrues()`` methods.
+* [`1829 <https://cta-redmine.irap.omp.eu/issues/1829>`_] -
+  ``GSkyProjection::coordsys()`` method now returns ``CEL`` instead of ``EQU``.
 * [`1761 <https://cta-redmine.irap.omp.eu/issues/1761>`_] -
   Remove ``GModelSpatialDiffuseCube::maps()`` and ``GModelSpatialDiffuseCube::pixels()`` methods.
 /***************************************************************************
  *                  GHealpix.hpp - Healpix projection class                *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2010-2015 by Juergen Knoedlseder                         *
+ *  copyright (C) 2010-2020 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -51,7 +51,7 @@ public:
     GHealpix(void);
     GHealpix(const int&         nside,
              const std::string& ordering = "NESTED",
-             const std::string& coordsys = "EQU");
+             const std::string& coordsys = "CEL");
     explicit GHealpix(const GFitsHDU& hdu);
     GHealpix(const GHealpix& wcs);
     virtual ~GHealpix(void);
 /***************************************************************************
  *          GSkyProjection.hpp - Abstract sky projection base class        *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2010-2014 by Juergen Knoedlseder                         *
+ *  copyright (C) 2010-2020 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -85,7 +85,7 @@ protected:
     virtual bool compare(const GSkyProjection& proj) const = 0;
  
     // Protected members
-    int m_coordsys;   //!< 0=EQU, 1=GAL
+    int m_coordsys;   //!< 0=CEL, 1=GAL
 };
  
 #endif /* GSKYPROJECTION_HPP */
 /***************************************************************************
  *               GException_sky.cpp  -  sky exception handlers             *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2010-2015 by Jurgen Knodlseder                           *
+ *  copyright (C) 2010-2020 by Jurgen Knodlseder                           *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -187,7 +187,7 @@ GException::wcs_bad_coords::wcs_bad_coords(std::string origin,
     // Set origin and message
     m_origin  = origin;
     m_message = "Invalid WCS coordinate system ("+coordsys+"). "
-                "Should be one of EQU/CEL/GAL/ECL/HEL/SGL.";
+                "Should be one of CEL/GAL/ECL/HEL/SGL.";
  
     // Return
     return;
 /***************************************************************************
  *                 GHealpix.cpp - Healpix projection class                 *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2010-2015 by Juergen Knoedlseder                         *
+ *  copyright (C) 2010-2020 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -114,7 +114,7 @@ GHealpix::GHealpix(void) : GSkyProjection()
  *
  * @param[in] nside Number of sides.
  * @param[in] order Pixel ordering ('RING' or 'NESTED').
- * @param[in] coords Coordinate system ('EQU' or 'GAL').
+ * @param[in] coords Coordinate system ('CEL' or 'GAL').
  *
  * @exception GException::wcs_hpx_bad_nside 
  *            Invalid nside parameter.
@@ -370,7 +370,7 @@ void GHealpix::write(GFitsHDU&amp; hdu) const
     hdu.card("ORDERING", ordering(),
              "Pixel ordering scheme, either RING or NESTED");
     hdu.card("COORDSYS", coordsys(),
-             "Coordinate system, either EQU or GAL");
+             "Coordinate system, either CEL or GAL");
  
     // Return
     return;
 /***************************************************************************
  *          GSkyProjection.cpp - Abstract sky projection base class        *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2010-2012 by Juergen Knoedlseder                         *
+ *  copyright (C) 2010-2020 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -141,7 +141,7 @@ GSkyProjection&amp; GSkyProjection::operator= (const GSkyProjection&amp; proj)
  * @return Coordinate system string.
  *
  * Returns one of 
- * 'EQU' (equatorial),
+ * 'CEL' (celestial),
  * 'GAL' (galactic),
  ***************************************************************************/
 std::string GSkyProjection::coordsys(void) const
@@ -150,7 +150,7 @@ std::string GSkyProjection::coordsys(void) const
     std::string s_coordsys;
     switch (m_coordsys) {
     case 0:
-        s_coordsys = "EQU";
+        s_coordsys = "CEL";
         break;
     case 1:
         s_coordsys = "GAL";
@@ -211,7 +211,7 @@ void GSkyProjection::coordsys(const std::string&amp; coordsys)
 void GSkyProjection::init_members(void)
 {
     // Initialise members
-    m_coordsys = 0; // 0 means EQU
+    m_coordsys = 0; // 0 means CEL
  
     // Return
     return;
 /***************************************************************************
  *          GWcs.cpp - Abstract world coordinate system base class         *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2011-2019 by Juergen Knoedlseder                         *
+ *  copyright (C) 2011-2020 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -245,12 +245,12 @@ void GWcs::read(const GFitsHDU&amp; hdu)
         if (xcoord == "RA--" && ycoord == "DEC-") {
             m_lng  = 0;
             m_lat  = 1;
-            coords = "EQU";
+            coords = "CEL";
         }
         else if (xcoord == "DEC-" && ycoord == "RA--") {
             m_lng  = 1;
             m_lat  = 0;
-            coords = "EQU";
+            coords = "CEL";
         }
         else if (xcoord == "GLON" && ycoord == "GLAT") {
             m_lng  = 0;
@@ -733,26 +733,12 @@ void TestGSky::test_GSkyMap_healpix_construct(void)
 	test_value(map1.ny(), 0, "Check for no Y-direction map pixels");
 	test_value(map1.nmaps(), 1, "Check for one sky map");
     //
-    GSkyMap map2("CEL", 1, "RING", 2);
+    GSkyMap map2("CEL", 1, "NESTED", 2);
 	test_assert(!map2.is_empty(), "Check for non-empty sky map");
 	test_value(map2.npix(), 12, "Check for 12 sky map pixels");
 	test_value(map2.nx(), 0, "Check for no X-direction map pixels");
 	test_value(map2.ny(), 0, "Check for no Y-direction map pixels");
 	test_value(map2.nmaps(), 2, "Check for one sky map");
-    //
-    GSkyMap map3("EQU", 1, "RING", 1);
-	test_assert(!map3.is_empty(), "Check for non-empty sky map");
-	test_value(map3.npix(), 12, "Check for 12 sky map pixels");
-	test_value(map3.nx(), 0, "Check for no X-direction map pixels");
-	test_value(map3.ny(), 0, "Check for no Y-direction map pixels");
-	test_value(map3.nmaps(), 1, "Check for one sky map");
-    //
-    GSkyMap map4("EQU", 1, "NESTED", 2);
-	test_assert(!map4.is_empty(), "Check for non-empty sky map");
-	test_value(map4.npix(), 12, "Check for 12 sky map pixels");
-	test_value(map4.nx(), 0, "Check for no X-direction map pixels");
-	test_value(map4.ny(), 0, "Check for no Y-direction map pixels");
-	test_value(map4.nmaps(), 2, "Check for one sky map");
  
     // Test Healpix copy constructor
     GSkyMap ring1cpy = ring1;