use pointing as image centre if observations are provided

knodlseder
1 parent cff1b706
Showing 3 changed files with 53 additions and 18 deletions
ChangeLog
NEWS
src/ctbin/ctbin.cpp
+2011-07-27  Juergen Knoedlseder  <knodlseder@cesr.fr>
+
+        * Version 0.2.5 released
+        ========================
+
+        ctbin extracts the image centre from an observation if provided
+
 2011-07-20  Juergen Knoedlseder  <knodlseder@cesr.fr>
  
         * Version 0.2.4 released
-New Features and Important Changes in ctatools 00-02-04
+New Features and Important Changes in ctatools 00-02-05
  
 Author(s) : Juergen Knoedlseder
  
-July 20, 2011
+July 27, 2011
  
  
 1. Introduction
@@ -12,15 +12,7 @@ This document briefly summarizes executable by executable the most important cha
  
 2. Configuration
 -----------------
-The configuration script aborts now if no C++ compiler is found.
-
-Added ctatools-init.sh, ctatools-init.csh and ctatools-setup
-scripts. They needed to be called when ctatools is installed
-in a location that differs from GammaLib, so that the 
-environment is set up correctly also for this case. If ctatools
-is in the same location as GammaLib, these scripts do not need
-to be used.
-
+None
  
 3. Python interface
 -------------------
@@ -39,7 +31,11 @@ None
  
 6. ctbin - CTA event binning
 ----------------------------
-None
+If an observation container is passed to ctbin, the counts map reference
+pixel is taken from the pointing of each observation and the xref and yref
+parameters are ignored. This allows for pipeline processing of a list of
+observations using ctbin. Note that this feature is only available if cabin
+is used from Python.
  
  
 7. ctlike - CTA maximum likelihood fitting
@@ -368,6 +368,11 @@ void ctbin::get_parameters(void)
  
         // Append CTA observation to container
         m_obs.append(obs);
+        
+        // Use the xref and yref parameters for binning (otherwise the
+        // pointing direction(s) is/are used)
+        m_xref = (*this)["xref"].real();
+        m_yref = (*this)["yref"].real();
  
     } // endif: there was no observation in the container
  
@@ -377,8 +382,6 @@ void ctbin::get_parameters(void)
     m_enumbins = (*this)["enumbins"].integer();
     m_proj     = (*this)["proj"].string();
     m_coordsys = (*this)["coordsys"].string();
-    m_xref     = (*this)["xref"].real();
-    m_yref     = (*this)["yref"].real();
     m_binsz    = (*this)["binsz"].real();
     m_nxpix    = (*this)["nxpix"].integer();
     m_nypix    = (*this)["nypix"].integer();
@@ -395,6 +398,8 @@ void ctbin::get_parameters(void)
  *
  * @exception GException::no_list
  *            No event list found in observation.
+ * @exception GCTAException::no_pointing
+ *            No valid CTA pointing found.
  *
  * This method bins the events found in a CTA events list into a counts map
  * and replaces the event list by the counts map in the observation. The
@@ -421,11 +426,38 @@ void ctbin::bin_events(GCTAObservation* obs)
  
         // Get Good Time intervals
         GGti gti = obs->events()->gti();
+        
+        // Get map centre
+        double xref;
+        double yref;
+        if (m_xref != 9999.0 && m_yref != 9999.0) {
+            xref = m_xref;
+            yref = m_yref;
+        }
+        else {
+            
+            // Get pointer on CTA pointing
+            const GTime         srcTime; // Dummy time
+            const GCTAPointing *pnt = obs->pointing(srcTime);
+            if (pnt == NULL)
+                throw GCTAException::no_pointing(G_BIN_EVENTS);
+            
+            // Set reference point to pointing
+            if (toupper(m_coordsys) == "GAL") {
+                xref = pnt->dir().l_deg();
+                yref = pnt->dir().b_deg();
+            }
+            else {
+                xref = pnt->dir().ra_deg();
+                yref = pnt->dir().dec_deg();
+            }
+
+        } // endelse: map centre set to pointing
  
         // Create skymap
         GSkymap map = GSkymap(m_proj, m_coordsys,
-                             m_xref, m_yref, m_binsz, m_binsz,
-                             m_nxpix, m_nypix, m_enumbins);
+                              xref, yref, m_binsz, m_binsz,
+                              m_nxpix, m_nypix, m_enumbins);
  
         // Initialise binning statistics
         int num_outside_map  = 0;
@@ -515,8 +547,8 @@ void ctbin::init_members(void)
     m_emin     = 0.0;
     m_emax     = 0.0;
     m_enumbins = 0;
-    m_xref     = 0.0;
-    m_yref     = 0.0;
+    m_xref     = 9999.0; // Flags unset (use pointing direction)
+    m_yref     = 9999.0; // Flags unset (use pointing direction)
     m_binsz    = 0.0;
     m_nxpix    = 0;
     m_nypix    = 0;