Commit 725afee3986b389f035f7299d6c98603df513f44

Authored by Jürgen Knödlseder
1 parent 6c5343c6

Increment version number of 1.0.0 and adapt to GammaLib 1.0.0 interface (renamed…

… GCTAExposure to GCTACubeExposure and GCTAMeanPsf to GCTACubePsf).
ChangeLog
1 2015-02-02 Juergen Knoedlseder <jurgen.knodlseder@irap.omp.eu> 1 2015-02-02 Juergen Knoedlseder <jurgen.knodlseder@irap.omp.eu>
2 2
3 - * Bug fix version 0.8.2 released  
4 - ================================ 3 + * Version 1.0.0 released
  4 + ========================
5 5
  6 + Adapt to GammaLib 1.0.0 interface
6 Do not import automatically Python scripts 7 Do not import automatically Python scripts
7 8
8 9
1 -New Features and Important Changes in ctools 0.8.2 1 +New Features and Important Changes in ctools 1.0.0
2 2
3 Author(s) : Juergen Knoedlseder 3 Author(s) : Juergen Knoedlseder
4 4
@@ -7,8 +7,9 @@ Author(s) : Juergen Knoedlseder @@ -7,8 +7,9 @@ Author(s) : Juergen Knoedlseder
7 7
8 1. Introduction 8 1. Introduction
9 --------------- 9 ---------------
10 -This document briefly summarizes executable by executable the most  
11 -important changes made since the last release of ctools. 10 +This document briefly summarizes executable by executable the most important
  11 +changes made since the last release of ctools. The code complies to GammaLib
  12 +version 1.0.0 or above.
12 13
13 14
14 2. Configuration 15 2. Configuration
configure.ac
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 ############################################################################# 29 #############################################################################
30 # Initialisation # 30 # Initialisation #
31 ############################################################################# 31 #############################################################################
32 -AC_INIT([ctools], [0.8.2], [jurgen.knodlseder@irap.omp.eu], [ctools]) 32 +AC_INIT([ctools], [1.0.0], [jurgen.knodlseder@irap.omp.eu], [ctools])
33 AC_CONFIG_SRCDIR([src/ctselect/ctselect.cpp]) 33 AC_CONFIG_SRCDIR([src/ctselect/ctselect.cpp])
34 AC_CONFIG_MACRO_DIR([m4]) 34 AC_CONFIG_MACRO_DIR([m4])
35 #AM_INIT_AUTOMAKE([gnu no-dependencies]) 35 #AM_INIT_AUTOMAKE([gnu no-dependencies])
ctools.pc.in
@@ -6,9 +6,9 @@ includedir=${prefix}/include @@ -6,9 +6,9 @@ includedir=${prefix}/include
6 Name: ctools 6 Name: ctools
7 Description: CTA science analysis tools 7 Description: CTA science analysis tools
8 URL: http://cta.irap.omp.eu/ctools 8 URL: http://cta.irap.omp.eu/ctools
9 -Version: 0.8.2 9 +Version: 1.0.0
10 Requires: 10 Requires:
11 -Requires.private: gammalib >= 0.9.2 11 +Requires.private: gammalib >= 1.0.0
12 Conflicts: 12 Conflicts:
13 Cflags: -I${includedir}/ctools @OPENMP_CXXFLAGS@ 13 Cflags: -I${includedir}/ctools @OPENMP_CXXFLAGS@
14 Libs: -L${libdir} -lctools 14 Libs: -L${libdir} -lctools
doc/Doxyfile
@@ -32,7 +32,7 @@ PROJECT_NAME = ctools @@ -32,7 +32,7 @@ PROJECT_NAME = ctools
32 # This could be handy for archiving the generated documentation or 32 # This could be handy for archiving the generated documentation or
33 # if some version control system is used. 33 # if some version control system is used.
34 34
35 -PROJECT_NUMBER = 0.8.1 35 +PROJECT_NUMBER = 1.0.0
36 36
37 # Using the PROJECT_BRIEF tag one can provide an optional one line description 37 # Using the PROJECT_BRIEF tag one can provide an optional one line description
38 # for a project that appears at the top of each page and should give viewer 38 # for a project that appears at the top of each page and should give viewer
doc/source/conf.py
@@ -73,10 +73,10 @@ copyright = u&#39;2014-2015, ctools developers&#39; @@ -73,10 +73,10 @@ copyright = u&#39;2014-2015, ctools developers&#39;
73 # built documents. 73 # built documents.
74 # 74 #
75 # The short X.Y version. 75 # The short X.Y version.
76 -version = '0.8' 76 +version = '1.0'
77 77
78 # The full version, including alpha/beta/rc tags. 78 # The full version, including alpha/beta/rc tags.
79 -release = '0.8.1' 79 +release = '1.0.0'
80 80
81 # The language for content autogenerated by Sphinx. Refer to documentation 81 # The language for content autogenerated by Sphinx. Refer to documentation
82 # for a list of supported languages. 82 # for a list of supported languages.
pyext/ctexpcube.i
1 /*************************************************************************** 1 /***************************************************************************
2 * ctexpcube - Exposure cube generation tool * 2 * ctexpcube - Exposure cube generation tool *
3 * ----------------------------------------------------------------------- * 3 * ----------------------------------------------------------------------- *
4 - * copyright (C) 2014 by Juergen Knoedlseder * 4 + * copyright (C) 2014-2015 by Juergen Knoedlseder *
5 * ----------------------------------------------------------------------- * 5 * ----------------------------------------------------------------------- *
6 * * 6 * *
7 * This program is free software: you can redistribute it and/or modify * 7 * This program is free software: you can redistribute it and/or modify *
@@ -44,10 +44,10 @@ public: @@ -44,10 +44,10 @@ public:
44 virtual ~ctexpcube(void); 44 virtual ~ctexpcube(void);
45 45
46 // Methods 46 // Methods
47 - void clear(void);  
48 - void run(void);  
49 - void save(void);  
50 - const GCTAExposure& expcube(void) const; 47 + void clear(void);
  48 + void run(void);
  49 + void save(void);
  50 + const GCTACubeExposure& expcube(void) const;
51 }; 51 };
52 52
53 53
pyext/ctpsfcube.i
1 /*************************************************************************** 1 /***************************************************************************
2 * ctpsfcube - PSF cube generation tool * 2 * ctpsfcube - PSF cube generation tool *
3 * ----------------------------------------------------------------------- * 3 * ----------------------------------------------------------------------- *
4 - * copyright (C) 2014 by Chia-Chun Lu * 4 + * copyright (C) 2014-2015 by Chia-Chun Lu *
5 * ----------------------------------------------------------------------- * 5 * ----------------------------------------------------------------------- *
6 * * 6 * *
7 * This program is free software: you can redistribute it and/or modify * 7 * This program is free software: you can redistribute it and/or modify *
@@ -48,7 +48,7 @@ public: @@ -48,7 +48,7 @@ public:
48 void clear(void); 48 void clear(void);
49 void run(void); 49 void run(void);
50 void save(void); 50 void save(void);
51 - const GCTAMeanPsf& psfcube(void) const; 51 + const GCTACubePsf& psfcube(void) const;
52 }; 52 };
53 53
54 /***********************************************************************//** 54 /***********************************************************************//**
src/ctexpcube/ctexpcube.cpp
@@ -381,7 +381,7 @@ void ctexpcube::get_parameters(void) @@ -381,7 +381,7 @@ void ctexpcube::get_parameters(void)
381 GCTAEventCube cube = create_cube(m_obs); 381 GCTAEventCube cube = create_cube(m_obs);
382 382
383 // Define exposure cube 383 // Define exposure cube
384 - m_expcube = GCTAExposure(cube); 384 + m_expcube = GCTACubeExposure(cube);
385 385
386 } // endif: filename was not valid 386 } // endif: filename was not valid
387 387
@@ -392,7 +392,7 @@ void ctexpcube::get_parameters(void) @@ -392,7 +392,7 @@ void ctexpcube::get_parameters(void)
392 GCTAEventCube cube(incube); 392 GCTAEventCube cube(incube);
393 393
394 // Define exposure cube 394 // Define exposure cube
395 - m_expcube = GCTAExposure(cube); 395 + m_expcube = GCTACubeExposure(cube);
396 396
397 } // endelse: cube loaded from file 397 } // endelse: cube loaded from file
398 398
src/ctexpcube/ctexpcube.hpp
1 /*************************************************************************** 1 /***************************************************************************
2 * ctexpcube - Exposure cube generation tool * 2 * ctexpcube - Exposure cube generation tool *
3 * ----------------------------------------------------------------------- * 3 * ----------------------------------------------------------------------- *
4 - * copyright (C) 2014 by Juergen Knoedlseder * 4 + * copyright (C) 2014-2015 by Juergen Knoedlseder *
5 * ----------------------------------------------------------------------- * 5 * ----------------------------------------------------------------------- *
6 * * 6 * *
7 * This program is free software: you can redistribute it and/or modify * 7 * This program is free software: you can redistribute it and/or modify *
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
34 34
35 /* __Definitions _________________________________________________________ */ 35 /* __Definitions _________________________________________________________ */
36 #define CTEXPCUBE_NAME "ctexpcube" 36 #define CTEXPCUBE_NAME "ctexpcube"
37 -#define CTEXPCUBE_VERSION "00-02-00" 37 +#define CTEXPCUBE_VERSION "1.0.0"
38 38
39 39
40 /***********************************************************************//** 40 /***********************************************************************//**
@@ -56,10 +56,10 @@ public: @@ -56,10 +56,10 @@ public:
56 ctexpcube& operator=(const ctexpcube& app); 56 ctexpcube& operator=(const ctexpcube& app);
57 57
58 // Methods 58 // Methods
59 - void clear(void);  
60 - void run(void);  
61 - void save(void);  
62 - const GCTAExposure& expcube(void) const; 59 + void clear(void);
  60 + void run(void);
  61 + void save(void);
  62 + const GCTACubeExposure& expcube(void) const;
63 63
64 protected: 64 protected:
65 // Protected methods 65 // Protected methods
@@ -73,8 +73,8 @@ protected: @@ -73,8 +73,8 @@ protected:
73 bool m_apply_edisp; //!< Apply energy dispersion? 73 bool m_apply_edisp; //!< Apply energy dispersion?
74 74
75 // Protected members 75 // Protected members
76 - GObservations m_obs; //!< Observation container  
77 - GCTAExposure m_expcube; //!< Exposure cube 76 + GObservations m_obs; //!< Observation container
  77 + GCTACubeExposure m_expcube; //!< Exposure cube
78 }; 78 };
79 79
80 80
@@ -84,7 +84,7 @@ protected: @@ -84,7 +84,7 @@ protected:
84 * @return Exposure cube 84 * @return Exposure cube
85 ***************************************************************************/ 85 ***************************************************************************/
86 inline 86 inline
87 -const GCTAExposure& ctexpcube::expcube(void) const 87 +const GCTACubeExposure& ctexpcube::expcube(void) const
88 { 88 {
89 return (m_expcube); 89 return (m_expcube);
90 } 90 }
src/ctpsfcube/ctpsfcube.cpp
@@ -372,7 +372,7 @@ void ctpsfcube::get_parameters(void) @@ -372,7 +372,7 @@ void ctpsfcube::get_parameters(void)
372 GCTAEventCube cube = create_cube(m_obs); 372 GCTAEventCube cube = create_cube(m_obs);
373 373
374 // Define psf cube 374 // Define psf cube
375 - m_psfcube = GCTAMeanPsf(cube, amax, anumbins); 375 + m_psfcube = GCTACubePsf(cube, amax, anumbins);
376 376
377 } 377 }
378 378
@@ -383,7 +383,7 @@ void ctpsfcube::get_parameters(void) @@ -383,7 +383,7 @@ void ctpsfcube::get_parameters(void)
383 GCTAEventCube cube(incube); 383 GCTAEventCube cube(incube);
384 384
385 // Define psf cube 385 // Define psf cube
386 - m_psfcube = GCTAMeanPsf(cube, amax, anumbins); 386 + m_psfcube = GCTACubePsf(cube, amax, anumbins);
387 387
388 } // endelse: cube loaded from file 388 } // endelse: cube loaded from file
389 389
src/ctpsfcube/ctpsfcube.hpp
1 /*************************************************************************** 1 /***************************************************************************
2 * ctpsfcube - PSF cube generation tool * 2 * ctpsfcube - PSF cube generation tool *
3 * ----------------------------------------------------------------------- * 3 * ----------------------------------------------------------------------- *
4 - * copyright (C) 2014 by Chia-Chun Lu * 4 + * copyright (C) 2014-2015 by Chia-Chun Lu *
5 * ----------------------------------------------------------------------- * 5 * ----------------------------------------------------------------------- *
6 * * 6 * *
7 * This program is free software: you can redistribute it and/or modify * 7 * This program is free software: you can redistribute it and/or modify *
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
34 34
35 /* __Definitions _________________________________________________________ */ 35 /* __Definitions _________________________________________________________ */
36 #define CTPSFCUBE_NAME "ctpsfcube" 36 #define CTPSFCUBE_NAME "ctpsfcube"
37 -#define CTPSFCUBE_VERSION "00-02-00" 37 +#define CTPSFCUBE_VERSION "1.0.0"
38 38
39 39
40 /***********************************************************************//** 40 /***********************************************************************//**
@@ -59,7 +59,7 @@ public: @@ -59,7 +59,7 @@ public:
59 void clear(void); 59 void clear(void);
60 void run(void); 60 void run(void);
61 void save(void); 61 void save(void);
62 - const GCTAMeanPsf& psfcube(void) const; 62 + const GCTACubePsf& psfcube(void) const;
63 63
64 protected: 64 protected:
65 // Protected methods 65 // Protected methods
@@ -74,7 +74,7 @@ protected: @@ -74,7 +74,7 @@ protected:
74 74
75 // Protected members 75 // Protected members
76 GObservations m_obs; //!< Observation container 76 GObservations m_obs; //!< Observation container
77 - GCTAMeanPsf m_psfcube; //!< PSF cube 77 + GCTACubePsf m_psfcube; //!< PSF cube
78 }; 78 };
79 79
80 80
@@ -84,7 +84,7 @@ protected: @@ -84,7 +84,7 @@ protected:
84 * @return PSF cube 84 * @return PSF cube
85 ***************************************************************************/ 85 ***************************************************************************/
86 inline 86 inline
87 -const GCTAMeanPsf& ctpsfcube::psfcube(void) const 87 +const GCTACubePsf& ctpsfcube::psfcube(void) const
88 { 88 {
89 return (m_psfcube); 89 return (m_psfcube);
90 } 90 }