diff --git a/ChangeLog b/ChangeLog index 1fef8ed..4af419f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,9 @@ 2015-02-02 Juergen Knoedlseder - * Bug fix version 0.8.2 released - ================================ + * Version 1.0.0 released + ======================== + Adapt to GammaLib 1.0.0 interface Do not import automatically Python scripts diff --git a/NEWS b/NEWS index abe143d..1e8a6be 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -New Features and Important Changes in ctools 0.8.2 +New Features and Important Changes in ctools 1.0.0 Author(s) : Juergen Knoedlseder @@ -7,8 +7,9 @@ Author(s) : Juergen Knoedlseder 1. Introduction --------------- -This document briefly summarizes executable by executable the most -important changes made since the last release of ctools. +This document briefly summarizes executable by executable the most important +changes made since the last release of ctools. The code complies to GammaLib +version 1.0.0 or above. 2. Configuration diff --git a/configure.ac b/configure.ac index a57eb1e..8c174ef 100644 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,7 @@ ############################################################################# # Initialisation # ############################################################################# -AC_INIT([ctools], [0.8.2], [jurgen.knodlseder@irap.omp.eu], [ctools]) +AC_INIT([ctools], [1.0.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]) diff --git a/ctools.pc.in b/ctools.pc.in index ac140b8..f150c20 100644 --- a/ctools.pc.in +++ b/ctools.pc.in @@ -6,9 +6,9 @@ includedir=${prefix}/include Name: ctools Description: CTA science analysis tools URL: http://cta.irap.omp.eu/ctools -Version: 0.8.2 +Version: 1.0.0 Requires: -Requires.private: gammalib >= 0.9.2 +Requires.private: gammalib >= 1.0.0 Conflicts: Cflags: -I${includedir}/ctools @OPENMP_CXXFLAGS@ Libs: -L${libdir} -lctools diff --git a/doc/Doxyfile b/doc/Doxyfile index f01a1ce..da6b3e5 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -32,7 +32,7 @@ PROJECT_NAME = ctools # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 0.8.1 +PROJECT_NUMBER = 1.0.0 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer diff --git a/doc/source/conf.py b/doc/source/conf.py index 64eb3cd..1795b20 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -73,10 +73,10 @@ copyright = u'2014-2015, ctools developers' # built documents. # # The short X.Y version. -version = '0.8' +version = '1.0' # The full version, including alpha/beta/rc tags. -release = '0.8.1' +release = '1.0.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/pyext/ctexpcube.i b/pyext/ctexpcube.i index 771384c..e1c7404 100644 --- a/pyext/ctexpcube.i +++ b/pyext/ctexpcube.i @@ -1,7 +1,7 @@ /*************************************************************************** * ctexpcube - Exposure cube generation tool * * ----------------------------------------------------------------------- * - * copyright (C) 2014 by Juergen Knoedlseder * + * copyright (C) 2014-2015 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -44,10 +44,10 @@ public: virtual ~ctexpcube(void); // Methods - void clear(void); - void run(void); - void save(void); - const GCTAExposure& expcube(void) const; + void clear(void); + void run(void); + void save(void); + const GCTACubeExposure& expcube(void) const; }; diff --git a/pyext/ctpsfcube.i b/pyext/ctpsfcube.i index 4548228..0a4f9c6 100644 --- a/pyext/ctpsfcube.i +++ b/pyext/ctpsfcube.i @@ -1,7 +1,7 @@ /*************************************************************************** * ctpsfcube - PSF cube generation tool * * ----------------------------------------------------------------------- * - * copyright (C) 2014 by Chia-Chun Lu * + * copyright (C) 2014-2015 by Chia-Chun Lu * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -48,7 +48,7 @@ public: void clear(void); void run(void); void save(void); - const GCTAMeanPsf& psfcube(void) const; + const GCTACubePsf& psfcube(void) const; }; /***********************************************************************//** diff --git a/src/ctexpcube/ctexpcube.cpp b/src/ctexpcube/ctexpcube.cpp index fa4c134..40b0d43 100644 --- a/src/ctexpcube/ctexpcube.cpp +++ b/src/ctexpcube/ctexpcube.cpp @@ -381,7 +381,7 @@ void ctexpcube::get_parameters(void) GCTAEventCube cube = create_cube(m_obs); // Define exposure cube - m_expcube = GCTAExposure(cube); + m_expcube = GCTACubeExposure(cube); } // endif: filename was not valid @@ -392,7 +392,7 @@ void ctexpcube::get_parameters(void) GCTAEventCube cube(incube); // Define exposure cube - m_expcube = GCTAExposure(cube); + m_expcube = GCTACubeExposure(cube); } // endelse: cube loaded from file diff --git a/src/ctexpcube/ctexpcube.hpp b/src/ctexpcube/ctexpcube.hpp index cd43db6..8a6cfda 100644 --- a/src/ctexpcube/ctexpcube.hpp +++ b/src/ctexpcube/ctexpcube.hpp @@ -1,7 +1,7 @@ /*************************************************************************** * ctexpcube - Exposure cube generation tool * * ----------------------------------------------------------------------- * - * copyright (C) 2014 by Juergen Knoedlseder * + * copyright (C) 2014-2015 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -34,7 +34,7 @@ /* __Definitions _________________________________________________________ */ #define CTEXPCUBE_NAME "ctexpcube" -#define CTEXPCUBE_VERSION "00-02-00" +#define CTEXPCUBE_VERSION "1.0.0" /***********************************************************************//** @@ -56,10 +56,10 @@ public: ctexpcube& operator=(const ctexpcube& app); // Methods - void clear(void); - void run(void); - void save(void); - const GCTAExposure& expcube(void) const; + void clear(void); + void run(void); + void save(void); + const GCTACubeExposure& expcube(void) const; protected: // Protected methods @@ -73,8 +73,8 @@ protected: bool m_apply_edisp; //!< Apply energy dispersion? // Protected members - GObservations m_obs; //!< Observation container - GCTAExposure m_expcube; //!< Exposure cube + GObservations m_obs; //!< Observation container + GCTACubeExposure m_expcube; //!< Exposure cube }; @@ -84,7 +84,7 @@ protected: * @return Exposure cube ***************************************************************************/ inline -const GCTAExposure& ctexpcube::expcube(void) const +const GCTACubeExposure& ctexpcube::expcube(void) const { return (m_expcube); } diff --git a/src/ctpsfcube/ctpsfcube.cpp b/src/ctpsfcube/ctpsfcube.cpp index 0e88fe4..c11bdf8 100644 --- a/src/ctpsfcube/ctpsfcube.cpp +++ b/src/ctpsfcube/ctpsfcube.cpp @@ -372,7 +372,7 @@ void ctpsfcube::get_parameters(void) GCTAEventCube cube = create_cube(m_obs); // Define psf cube - m_psfcube = GCTAMeanPsf(cube, amax, anumbins); + m_psfcube = GCTACubePsf(cube, amax, anumbins); } @@ -383,7 +383,7 @@ void ctpsfcube::get_parameters(void) GCTAEventCube cube(incube); // Define psf cube - m_psfcube = GCTAMeanPsf(cube, amax, anumbins); + m_psfcube = GCTACubePsf(cube, amax, anumbins); } // endelse: cube loaded from file diff --git a/src/ctpsfcube/ctpsfcube.hpp b/src/ctpsfcube/ctpsfcube.hpp index 2cac0b7..d17f006 100644 --- a/src/ctpsfcube/ctpsfcube.hpp +++ b/src/ctpsfcube/ctpsfcube.hpp @@ -1,7 +1,7 @@ /*************************************************************************** * ctpsfcube - PSF cube generation tool * * ----------------------------------------------------------------------- * - * copyright (C) 2014 by Chia-Chun Lu * + * copyright (C) 2014-2015 by Chia-Chun Lu * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -34,7 +34,7 @@ /* __Definitions _________________________________________________________ */ #define CTPSFCUBE_NAME "ctpsfcube" -#define CTPSFCUBE_VERSION "00-02-00" +#define CTPSFCUBE_VERSION "1.0.0" /***********************************************************************//** @@ -59,7 +59,7 @@ public: void clear(void); void run(void); void save(void); - const GCTAMeanPsf& psfcube(void) const; + const GCTACubePsf& psfcube(void) const; protected: // Protected methods @@ -74,7 +74,7 @@ protected: // Protected members GObservations m_obs; //!< Observation container - GCTAMeanPsf m_psfcube; //!< PSF cube + GCTACubePsf m_psfcube; //!< PSF cube }; @@ -84,7 +84,7 @@ protected: * @return PSF cube ***************************************************************************/ inline -const GCTAMeanPsf& ctpsfcube::psfcube(void) const +const GCTACubePsf& ctpsfcube::psfcube(void) const { return (m_psfcube); }