Rename GSkymap to GSkyMap.

Jürgen Knödlseder
1 parent 3233a1d2
Showing 13 changed files with 32 additions and 32 deletions
cscripts/csresmap.py
cscripts/obsutils.py
cscripts/tsmerge.py
pyext/ctool.i
pyext/ctskymap.i
pyext/cttsmap.i
src/ctbin/ctbin.hpp
src/ctcubemask/ctcubemask.cpp
src/ctskymap/ctskymap.hpp
src/cttsmap/cttsmap.cpp
src/cttsmap/cttsmap.hpp
src/support/ctool.cpp
src/support/ctool.hpp
@@ -251,8 +251,8 @@ class csresmap(ctools.cscript):
         # Use input file directly if given
         if self.m_use_maps:
-            countmap = gammalib.GSkymap(self["inobs"].filename())
-            modelmap = gammalib.GSkymap(self.m_modcube)
+            countmap = gammalib.GSkyMap(self["inobs"].filename())
+            modelmap = gammalib.GSkyMap(self.m_modcube)
         else:
@@ -303,7 +303,7 @@ class csresmap(ctools.cscript):
             model["debug"].boolean(self.m_debug)
             model.run()
-            # Get model map into GSkymap object
+            # Get model map into GSkyMap object
             modelmap = model.cube().map().copy()
@@ -232,7 +232,7 @@ def cntmap(obs, proj=&quot;TAN&quot;, coord=&quot;GAL&quot;, xval=0.0, yval=0.0, \
      outname - Counts map FITS filename (default: cntmap.fits)
     """
     # Allocate counts map
-    map = gammalib.GSkymap(proj, coord, xval, yval, -binsz, binsz, nxpix, nypix, 1)
+    map = gammalib.GSkyMap(proj, coord, xval, yval, -binsz, binsz, nxpix, nypix, 1)
     # Set maximum pixel number
     maxpixel = nxpix * nypix
@@ -284,7 +284,7 @@ def modmap(obs, eref=0.1, proj=&quot;TAN&quot;, coord=&quot;GAL&quot;, xval=0.0, yval=0.0, \
      outname - Model map FITS filename (default: modmap.fits)
     """
     # Allocate model map
-    map = gammalib.GSkymap(proj, coord, xval, yval, -binsz, binsz, nxpix, nypix, 1)
+    map = gammalib.GSkyMap(proj, coord, xval, yval, -binsz, binsz, nxpix, nypix, 1)
     # Set reference energy, time and direction. The time is not initialised and is
     # in fact not used (as the IRF is assumed to be time independent for now).
@@ -37,13 +37,13 @@ class maps:
         fits = gammalib.GFits(fitsfile)
         # get TS map
-        self.tsmap = gammalib.GSkymap()
+        self.tsmap = gammalib.GSkyMap()
         self.tsmap.read(fits[0])
         # Get status map
         if not fits.contains("STATUS MAP"):
             self.error("No extension \"STATUS MAP\" found in \""+self.filename+"\"")
-        self.statusmap = gammalib.GSkymap()
+        self.statusmap = gammalib.GSkyMap()
         self.statusmap.read(fits["STATUS MAP"])
         # Get other maps 
@@ -51,7 +51,7 @@ class maps:
         self.mapnames = []
         for hdu in fits:
             if hdu.extname() != "IMAGE" and hdu.extname() != "STATUS MAP":
-                skymap = gammalib.GSkymap()
+                skymap = gammalib.GSkyMap()
                 skymap.read(hdu)
                 self.maps.append(skymap)
                 self.mapnames.append(hdu.extname())
@@ -93,7 +93,7 @@ public:
     // Protected methods that create objects from user parameters
     GEbounds        create_ebounds(void);
-    GSkymap         create_map(const GObservations& obs);
+    GSkyMap         create_map(const GObservations& obs);
     GCTAEventCube   create_cube(const GObservations& obs);
     GCTAObservation create_cta_obs(void);
 /***************************************************************************
  *                       ctskymap - Sky mapping tool                       *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2012-2014 by Juergen Knoedlseder                         *
+ *  copyright (C) 2012-2015 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -47,7 +47,7 @@ public:
     void           clear(void);
     void           run(void);
     void           save(void);
-    const GSkymap& map(void) const;
+    const GSkyMap& map(void) const;
 };
 /***************************************************************************
  *                    cttsmap - TS map calculation tool                    *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2014 by Michael Mayer                                    *
+ *  copyright (C) 2014-2015 by Michael Mayer                               *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -48,7 +48,7 @@ public:
     void                 run(void);
     void                 save(void);
     const GObservations& obs(void) const;
-    const GSkymap&       tsmap(void) const;
+    const GSkyMap&       tsmap(void) const;
 };
@@ -96,7 +96,7 @@ protected:
     // Protected members
     GObservations m_obs;        //!< Observation container
-    GSkymap       m_cube;       //!< Event cube
+    GSkyMap       m_cube;       //!< Event cube
     GEbounds      m_ebounds;    //!< Energy boundaries
     GGti          m_gti;        //!< Good time intervals
     double        m_ontime;     //!< Total ontime
@@ -407,7 +407,7 @@ void ctcubemask::apply_mask(GCTAObservation* obs)
     if (cube != NULL) {
         // Extract event cube and energy boundaries
-        GSkymap         map     = cube->map();
+        GSkyMap         map     = cube->map();
         const GEbounds& ebounds = cube->ebounds();
         // Initialise energy selection
@@ -61,7 +61,7 @@ public:
     void           clear(void);
     void           run(void);
     void           save(void);
-    const GSkymap& map(void) const;
+    const GSkyMap& map(void) const;
 protected:
     // Protected methods
@@ -79,7 +79,7 @@ protected:
     // Protected members
     GObservations m_obs;        //!< Observation container
-    GSkymap       m_skymap;     //!< Sky map
+    GSkyMap       m_skymap;     //!< Sky map
 };
@@ -89,7 +89,7 @@ protected:
  * @return Reference to observation container
  ***************************************************************************/
 inline
-const GSkymap& ctskymap::map(void) const
+const GSkyMap& ctskymap::map(void) const
 {
     return m_skymap;
 }
@@ -537,7 +537,7 @@ void cttsmap::get_parameters(void)
     }
     // Create sky map based on task parameters
-    GSkymap map = create_map(m_obs);
+    GSkyMap map = create_map(m_obs);
     // Initialise maps from user parameters
     init_maps(map);
@@ -563,19 +563,19 @@ void cttsmap::get_parameters(void)
  *
  * Initialises skymaps that will contain map information.
  ***************************************************************************/
-void cttsmap::init_maps(const GSkymap& map)
+void cttsmap::init_maps(const GSkyMap& map)
 {
     // Initialise map information
     m_tsmap.clear();
     // Create skymap
-    m_tsmap = GSkymap(map);
+    m_tsmap = GSkyMap(map);
     // Initialise map information
 	m_statusmap.clear();
 	// Create status map
-	m_statusmap = GSkymap(map);
+	m_statusmap = GSkyMap(map);
 	// Initialise maps of free parameters
     if (m_testsource != NULL) {
@@ -73,7 +73,7 @@ public:
     void                 run(void);
     void                 save(void);
     const GObservations& obs(void) const;
-    const GSkymap&       tsmap(void) const;
+    const GSkyMap&       tsmap(void) const;
 protected:
     // Protected methods
@@ -81,7 +81,7 @@ protected:
     void copy_members(const cttsmap& app);
     void free_members(void);
     void get_parameters(void);
-    void init_maps(const GSkymap& map);
+    void init_maps(const GSkyMap& map);
     // User parameters
     std::string              m_srcname;    //!< Name of source which is moved around
@@ -94,10 +94,10 @@ protected:
     // Protected members
     GObservations            m_obs;        //!< Observation container
-    GSkymap                  m_tsmap;      //!< TS map
-    GSkymap                  m_statusmap;  //!< Map of computed bins
+    GSkyMap                  m_tsmap;      //!< TS map
+    GSkyMap                  m_statusmap;  //!< Map of computed bins
     std::vector<std::string> m_mapnames;   //!< Names of free parameters
-    std::vector<GSkymap>     m_maps;       //!< Sky maps for each free parameter
+    std::vector<GSkyMap>     m_maps;       //!< Sky maps for each free parameter
     GModel*                  m_testsource; //!< Pointer to test source for TS computation
 };
@@ -120,7 +120,7 @@ const GObservations&amp; cttsmap::obs(void) const
  * @return Reference to TS skymap
  ***************************************************************************/
 inline
-const GSkymap& cttsmap::tsmap(void) const
+const GSkyMap& cttsmap::tsmap(void) const
 {
     return m_tsmap;
 }
@@ -475,7 +475,7 @@ GEbounds ctool::create_ebounds(void)
  *      nxpix - Number of pixels in Right Ascension or longitude
  *      nypix - Number of pixels in Declination or latitude
  ***************************************************************************/
-GSkymap ctool::create_map(const GObservations& obs)
+GSkyMap ctool::create_map(const GObservations& obs)
 {
     // Read task parameters
     double xref   = 0.0;
@@ -510,7 +510,7 @@ GSkymap ctool::create_map(const GObservations&amp; obs)
     } // endif: got mean pointing as reference
     // Initialise sky map
-    GSkymap map = GSkymap(proj, coordsys, xref, yref, -binsz, binsz, 
+    GSkyMap map = GSkyMap(proj, coordsys, xref, yref, -binsz, binsz, 
                           nxpix, nypix, 1);
     // Return sky map
@@ -543,7 +543,7 @@ GSkymap ctool::create_map(const GObservations&amp; obs)
 GCTAEventCube ctool::create_cube(const GObservations& obs)
 {
     // Get skymap
-    GSkymap map = create_map(obs);
+    GSkyMap map = create_map(obs);
     // Set energy boundaries
     GEbounds ebounds = create_ebounds();
@@ -75,7 +75,7 @@ protected:
     // Protected methods that create objects from user parameters
     GEbounds        create_ebounds(void);
-    GSkymap         create_map(const GObservations& obs);
+    GSkyMap         create_map(const GObservations& obs);
     GCTAEventCube   create_cube(const GObservations& obs);
     GCTAObservation create_cta_obs(void);