Merge branch 'integration' into devel

Conflicts: scripts/cssens.py scripts/cstsdist.py src/ctmodel/ctmodel.cpp

Merge branch 'integration' into devel
Conflicts: scripts/cssens.py scripts/cstsdist.py src/ctmodel/ctmodel.cpp
Jürgen Knödlseder
2 parents a89a318d 92df60c8
Showing 13 changed files with 49 additions and 50 deletions
ChangeLog
NEWS
configure.ac
ctools.pc.in
src/ctbin/ctbin.cpp
src/ctlike/ctlike.cpp
src/ctlike/ctlike.hpp
src/ctmodel/ctmodel.cpp
src/ctobssim/ctobssim.cpp
src/ctselect/ctselect.cpp
src/ctselect/ctselect.hpp
src/ctskymap/ctskymap.cpp
src/ctskymap/ctskymap.hpp
+2013-02-21  Juergen Knoedlseder  <jurgen.knodlseder@irap.omp.eu>
+
+        * Version 0.7.0 released
+        ========================
+
+        Adapt to GammaLib-00-08-00 interface
+
 2012-12-21  Juergen Knoedlseder  <jurgen.knodlseder@irap.omp.eu>
         * Version 0.6.0 released
-New Features and Important Changes in ctools 00-06-00
+New Features and Important Changes in ctools 00-07-00
 Author(s) : Juergen Knoedlseder
-December 21th, 2012
+February 21th, 2013
 1. Introduction
@@ -10,6 +10,10 @@ December 21th, 2012
 This document briefly summarizes executable by executable the most
 important changes made since the last release of ctools.
+With version 00-08-00, GammaLib has undergone a major interface
+change. The adaption of ctools to this interface changed will not be
+detailed below as they do not impact the functionalities.
+
 2. Configuration
 -----------------
@@ -23,20 +27,12 @@ None
 4. ctobssim - CTA observation simulation
 ----------------------------------------
-Adapt to new GTime interface. The time parameters are now given in the CTA
-time reference.
-
-A bug was corrected that prevented correct usage of the seed value. The
-introduction of OpenMP support in version 0.5.0 led to an internal seed
-value of 0 event if different seed parameters were specified. The bug
-was corrected and the internal seed values that are used are now dumped
-into the log file.
+None
 5. ctselect - CTA event selection
 ---------------------------------
-Adapt to new GTime interface. The time parameters are now given in the CTA
-time reference.
+None
 6. ctbin - CTA event binning
@@ -56,11 +52,7 @@ None
 9. ctmodel - CTA counts map modelling
 -------------------------------------
-The executable ctmodel has been added. ctmodel takes a model XML file
-and computes the corresponding model map. The definiton of the model
-map is either taken from an input counts map or an observation
-definiton file, or from the task parameters with an interface that
-is similiar to that of ctbin.
+None
 10. Examples
@@ -2,7 +2,7 @@
 # Configuration for ctools - a set of tools for science analysis of CTA     #
 #                            data                                           #
 # ------------------------------------------------------------------------- #
-# Copyright (C) 2011-2012 Juergen Knoedlseder                               #
+# Copyright (C) 2011-2013 Juergen Knoedlseder                               #
 # ------------------------------------------------------------------------- #
 #                                                                           #
 #  This program is free software: you can redistribute it and/or modify     #
@@ -29,7 +29,7 @@
 #############################################################################
 # Initialisation                                                            #
 #############################################################################
-AC_INIT([ctools], [0.6.0], [jurgen.knodlseder@irap.omp.eu], [ctools])
+AC_INIT([ctools], [0.7.0], [jurgen.knodlseder@irap.omp.eu], [ctools])
 AC_CONFIG_SRCDIR([src/ctselect/ctselect.cpp])
 AC_CONFIG_MACRO_DIR([m4])
 #AM_INIT_AUTOMAKE([gnu no-dependencies])
@@ -6,9 +6,9 @@ includedir=${prefix}/include
 Name: ctools
 Description: CTA science analysis tools
 URL: http://cta.irap.omp.eu/ctools
-Version: 0.6.0
+Version: 0.7.0
 Requires: 
-Requires.private: GammaLib >= 0.7.0
+Requires.private: GammaLib >= 0.8.0
 Conflicts: 
 Cflags: -I${includedir}/ctools
 Libs: -L${libdir} -lctools
@@ -277,7 +277,7 @@ void ctbin::run(void)
         m_infiles.push_back("");
         // Get CTA observation
-        GCTAObservation* obs = dynamic_cast<GCTAObservation*>(&m_obs[i]);
+        GCTAObservation* obs = dynamic_cast<GCTAObservation*>(m_obs[i]);
         // Continue only if observation is a CTA observation
         if (obs != NULL) {
@@ -710,7 +710,7 @@ void ctbin::save_fits(void)
     m_outfile = (*this)["outfile"].filename();
     // Get CTA observation from observation container
-    GCTAObservation* obs = dynamic_cast<GCTAObservation*>(&m_obs[0]);
+    GCTAObservation* obs = dynamic_cast<GCTAObservation*>(m_obs[0]);
     // Save event list
     save_counts_map(obs, m_outfile);
@@ -741,7 +741,7 @@ void ctbin::save_xml(void)
     for (int i = 0; i < m_obs.size(); ++i) {
         // Get CTA observation
-        GCTAObservation* obs = dynamic_cast<GCTAObservation*>(&m_obs[i]);
+        GCTAObservation* obs = dynamic_cast<GCTAObservation*>(m_obs[i]);
         // Handle only CTA observations
         if (obs != NULL) {
 /***************************************************************************
  *                   ctlike - CTA maximum likelihood tool                  *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2010-2012 by Juergen Knoedlseder                         *
+ *  copyright (C) 2010-2013 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -21,7 +21,7 @@
 /**
  * @file ctlike.cpp
  * @brief CTA maximum likelihood tool implementation
- * @author J. Knoedlseder
+ * @author Juergen Knoedlseder
  */
 /* __ Includes ___________________________________________________________ */
@@ -259,7 +259,7 @@ void ctlike::run(void)
     // Compute number of observed events in all observations
     double num_events = 0.0;
     for (int i = 0; i < m_obs.size(); ++i) {
-        num_events += m_obs[i].events()->number();
+        num_events += m_obs[i]->events()->number();
     }
     // Write results into logger
 /***************************************************************************
  *                   ctlike - CTA maximum likelihood tool                  *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2010-2012 by Juergen Knoedlseder                         *
+ *  copyright (C) 2010-2013 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -21,7 +21,7 @@
 /**
  * @file ctlike.hpp
  * @brief CTA maximum likelihood tool interface definition
- * @author J. Knoedlseder
+ * @author Juergen Knoedlseder
  */
 #ifndef CTLIKE_HPP
@@ -34,7 +34,7 @@
 /* __Definitions _________________________________________________________ */
 #define CTLIKE_NAME    "ctlike"
-#define CTLIKE_VERSION "00-04-00"
+#define CTLIKE_VERSION "00-05-00"
 /***********************************************************************//**
@@ -279,7 +279,7 @@ void ctmodel::run(void)
         m_infiles.push_back("");
         // Get CTA observation
-        GCTAObservation* obs = dynamic_cast<GCTAObservation*>(&m_obs[i]);
+        GCTAObservation* obs = dynamic_cast<GCTAObservation*>(m_obs[i]);
         // Continue only if observation is a CTA observation
         if (obs != NULL) {
@@ -482,7 +482,7 @@ void ctmodel::setup_obs(void)
             skydir.radec_deg(m_ra, m_dec);
             pnt.dir(skydir);
-            // Setup energy range covered by data
+            // Setup energy range covered by model
             GEnergy  emin(m_emin, "TeV");
             GEnergy  emax(m_emax, "TeV");
             GEbounds ebds(m_enumbins, emin, emax);
@@ -568,7 +568,7 @@ void ctmodel::setup_obs(void)
     for (int i = 0; i < m_obs.size(); ++i) {
         // Is this observation a CTA observation?
-        GCTAObservation* obs = dynamic_cast<GCTAObservation*>(&m_obs[i]);
+        GCTAObservation* obs = dynamic_cast<GCTAObservation*>(m_obs[i]);
         // Yes ...
         if (obs != NULL) {
@@ -789,7 +789,7 @@ void ctmodel::save_fits(void)
     m_outfile = (*this)["outfile"].filename();
     // Get CTA observation from observation container
-    GCTAObservation* obs = dynamic_cast<GCTAObservation*>(&m_obs[0]);
+    GCTAObservation* obs = dynamic_cast<GCTAObservation*>(m_obs[0]);
     // Save model map
     save_model_map(obs, m_outfile);
@@ -820,7 +820,7 @@ void ctmodel::save_xml(void)
     for (int i = 0; i < m_obs.size(); ++i) {
         // Get CTA observation
-        GCTAObservation* obs = dynamic_cast<GCTAObservation*>(&m_obs[i]);
+        GCTAObservation* obs = dynamic_cast<GCTAObservation*>(m_obs[i]);
         // Handle only CTA observations
         if (obs != NULL) {
@@ -295,7 +295,7 @@ void ctobssim::run(void)
         for (int i = 0; i < m_obs.size(); ++i) {
             // Get CTA observation
-            GCTAObservation* obs = dynamic_cast<GCTAObservation*>(&m_obs[i]);
+            GCTAObservation* obs = dynamic_cast<GCTAObservation*>(m_obs[i]);
             // Continue only if observation is a CTA observation
             if (obs != NULL) {
@@ -1036,7 +1036,7 @@ void ctobssim::save_fits(void)
     m_outfile = (*this)["outfile"].filename();
     // Get CTA observation from observation container
-    GCTAObservation* obs = dynamic_cast<GCTAObservation*>(&m_obs[0]);
+    GCTAObservation* obs = dynamic_cast<GCTAObservation*>(m_obs[0]);
     // Save observation into FITS file
     obs->save(m_outfile, clobber());
@@ -1069,7 +1069,7 @@ void ctobssim::save_xml(void)
     for (int i = 0; i < m_obs.size(); ++i) {
         // Get CTA observation
-        GCTAObservation* obs = dynamic_cast<GCTAObservation*>(&m_obs[i]);
+        GCTAObservation* obs = dynamic_cast<GCTAObservation*>(m_obs[i]);
         // Handle only CTA observations
         if (obs != NULL) {
 /***************************************************************************
  *                    ctselect - CTA data selection tool                   *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2010-2012 by Juergen Knoedlseder                         *
+ *  copyright (C) 2010-2013 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -269,7 +269,7 @@ void ctselect::run(void)
         m_infiles.push_back("");
         // Get CTA observation
-        GCTAObservation* obs = dynamic_cast<GCTAObservation*>(&m_obs[i]);
+        GCTAObservation* obs = dynamic_cast<GCTAObservation*>(m_obs[i]);
         // Continue only if observation is a CTA observation
         if (obs != NULL) {
@@ -872,7 +872,7 @@ void ctselect::save_fits(void)
     m_outfile = (*this)["outfile"].filename();
     // Get CTA observation from observation container
-    GCTAObservation* obs = dynamic_cast<GCTAObservation*>(&m_obs[0]);
+    GCTAObservation* obs = dynamic_cast<GCTAObservation*>(m_obs[0]);
     // Save event list
     save_event_list(obs, m_infiles[0], m_outfile);
@@ -902,7 +902,7 @@ void ctselect::save_xml(void)
     for (int i = 0; i < m_obs.size(); ++i) {
         // Get CTA observation
-        GCTAObservation* obs = dynamic_cast<GCTAObservation*>(&m_obs[i]);
+        GCTAObservation* obs = dynamic_cast<GCTAObservation*>(m_obs[i]);
         // Handle only CTA observations
         if (obs != NULL) {
 /***************************************************************************
  *                    ctselect - CTA data selection tool                   *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2010-2012 by Juergen Knoedlseder                         *
+ *  copyright (C) 2010-2013 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -35,7 +35,7 @@
 /* __Definitions _________________________________________________________ */
 #define CTSELECT_NAME    "ctselect"
-#define CTSELECT_VERSION "00-04-00"
+#define CTSELECT_VERSION "00-05-00"
 /***********************************************************************//**
 /***************************************************************************
  *                     ctskymap - CTA sky mapping tool                     *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2011 by Juergen Knoedlseder                              *
+ *  copyright (C) 2011-2013 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -21,7 +21,7 @@
 /**
  * @file ctskymap.cpp
  * @brief CTA sky mapping tool implementation
- * @author J. Knoedlseder
+ * @author Juergen Knoedlseder
  */
 /* __ Includes ___________________________________________________________ */
@@ -272,7 +272,7 @@ void ctskymap::run(void)
     for (int i = 0; i < m_obs.size(); ++i) {
         // Get CTA observation
-        GCTAObservation* obs = dynamic_cast<GCTAObservation*>(&m_obs[i]);
+        GCTAObservation* obs = dynamic_cast<GCTAObservation*>(m_obs[i]);
         // Continue only if observation is a CTA observation
         if (obs != NULL) {
 /***************************************************************************
  *                     ctskymap - CTA sky mapping tool                     *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2010-2011 by Juergen Knoedlseder                         *
+ *  copyright (C) 2010-2013 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -21,7 +21,7 @@
 /**
  * @file ctskymap.hpp
  * @brief CTA sky mapping tool definition
- * @author J. Knoedlseder
+ * @author Juergen Knoedlseder
  */
 #ifndef CTSKYMAP_HPP
@@ -33,7 +33,7 @@
 /* __Definitions _________________________________________________________ */
 #define CTSKYMAP_NAME    "ctskymap"
-#define CTSKYMAP_VERSION "00-01-00"
+#define CTSKYMAP_VERSION "00-02-00"
 /***********************************************************************//**