Andreas Specovius / ctools

Commit 803c48d3952fa19c33c564d4508e742fd4ad9e11

Authored by Josh Cardenzana
2 parents 3123ece2 629d633b

Merge branch 'devel' of https://cta-gitlab.irap.omp.eu/ctools/ctools into 1970-parallelize_ctbin

Inline Side-by-side
Showing 25 changed files with 198 additions and 20 deletions
ChangeLog
  View file @803c48d
1   -2017-06-23
  1 +2017-07-03
2 2  
3 3 * Version 1.4.0 released
4 4 ========================
5 5  
  6 + Install ctools header files (#2145)
  7 +
6 8  
7 9 2017-06-23
8 10  
... ...
1 1 New Features and Important Changes in ctools 1.4.0
2 2  
3   -23 June 2017
  3 +3 July 2017
4 4  
5 5  
6 6 Introduction
... ... @@ -11,7 +11,8 @@ ctools release with respect to the precedent release.
11 11  
12 12 Configuration
13 13 -------------
14   -None
  14 +The ctools header files are now installed into $(prefix)/include/ctools
  15 +(#2145).
15 16  
16 17  
17 18 Python interface
... ...
doc/source/admin/release_history/1.4.rst 0 → 100644
  View file @803c48d
  1 +.. _1.4:
  2 +
  3 +ctools 1.4 release (TBD)
  4 +================================
  5 +
  6 +Overview
  7 +--------
  8 +
  9 +ctools 1.4 is a major release that adds significant functionality.
  10 +
  11 +In particular, this release provides:
  12 +
  13 +* TBW
  14 +
  15 +
  16 +Bug fixes
  17 +---------
  18 +
  19 +
  20 +
  21 +Improvements
  22 +------------
  23 +
  24 +* [`2145 <https://cta-redmine.irap.omp.eu/issues/2145>`_] -
  25 + Install C++ header files
  26 +
  27 +
  28 +New features
  29 +------------
... ...
doc/source/admin/release_history/index.rst
  View file @803c48d
... ... @@ -8,6 +8,7 @@ Major releases:
8 8 .. toctree::
9 9 :maxdepth: 1
10 10  
  11 + ctools 1.4 <1.4>
11 12 ctools 1.3 <1.3>
12 13 ctools 1.2 <1.2>
13 14 ctools 1.1 <1.1>
... ...
src/Makefile.am
  View file @803c48d
... ... @@ -49,6 +49,9 @@ scripts = ctools-setup \
49 49 ctools-init.sh \
50 50 ctools-init.csh
51 51  
  52 +# Headers to be distributed
  53 +pkginclude_HEADERS = ctools.hpp
  54 +
52 55 # Build libtool library for ctools. This is needed to provide
53 56 # a shared library that can be loaded for python bindings. We do
54 57 # not have to build this library if no python bindings are used.
... ...
src/ctbin/Makefile.am
  View file @803c48d
1 1 #############################################################################
2 2 # Makefile.am for ctbin tool #
3 3 # ------------------------------------------------------------------------- #
4   -# Copyright (C) 2016 Juergen Knoedlseder #
  4 +# Copyright (C) 2016-2017 Juergen Knoedlseder #
5 5 # ------------------------------------------------------------------------- #
6 6 # #
7 7 # This program is free software: you can redistribute it and/or modify #
... ... @@ -28,6 +28,9 @@ bin_PROGRAMS = ctbin
28 28 # Sources
29 29 sources = ctbin.cpp ctbin.hpp
30 30  
  31 +# Headers
  32 +pkginclude_HEADERS = ctbin.hpp
  33 +
31 34 # Libtool library
32 35 noinst_LTLIBRARIES = libctbin.la
33 36 libctbin_la_SOURCES = $(sources)
... ...
src/ctbkgcube/Makefile.am
  View file @803c48d
1 1 #############################################################################
2 2 # Makefile.am for ctbkgcube tool #
3 3 # ------------------------------------------------------------------------- #
4   -# Copyright (C) 2016 Juergen Knoedlseder #
  4 +# Copyright (C) 2016-2017 Juergen Knoedlseder #
5 5 # ------------------------------------------------------------------------- #
6 6 # #
7 7 # This program is free software: you can redistribute it and/or modify #
... ... @@ -28,6 +28,9 @@ bin_PROGRAMS = ctbkgcube
28 28 # Sources
29 29 sources = ctbkgcube.cpp ctbkgcube.hpp
30 30  
  31 +# Headers
  32 +pkginclude_HEADERS = ctbkgcube.hpp
  33 +
31 34 # Libtool library
32 35 noinst_LTLIBRARIES = libctbkgcube.la
33 36 libctbkgcube_la_SOURCES = $(sources)
... ...
src/ctbutterfly/Makefile.am
  View file @803c48d
1 1 #############################################################################
2 2 # Makefile.am for ctbutterfly tool #
3 3 # ------------------------------------------------------------------------- #
4   -# Copyright (C) 2016 Juergen Knoedlseder #
  4 +# Copyright (C) 2016-2017 Juergen Knoedlseder #
5 5 # ------------------------------------------------------------------------- #
6 6 # #
7 7 # This program is free software: you can redistribute it and/or modify #
... ... @@ -28,6 +28,9 @@ bin_PROGRAMS = ctbutterfly
28 28 # Sources
29 29 sources = ctbutterfly.cpp ctbutterfly.hpp
30 30  
  31 +# Headers
  32 +pkginclude_HEADERS = ctbutterfly.hpp
  33 +
31 34 # Libtool library
32 35 noinst_LTLIBRARIES = libctbutterfly.la
33 36 libctbutterfly_la_SOURCES = $(sources)
... ...
src/ctcubemask/Makefile.am
  View file @803c48d
1 1 #############################################################################
2 2 # Makefile.am for ctcubemask tool #
3 3 # ------------------------------------------------------------------------- #
4   -# Copyright (C) 2016 Juergen Knoedlseder #
  4 +# Copyright (C) 2016-2017 Juergen Knoedlseder #
5 5 # ------------------------------------------------------------------------- #
6 6 # #
7 7 # This program is free software: you can redistribute it and/or modify #
... ... @@ -28,6 +28,9 @@ bin_PROGRAMS = ctcubemask
28 28 # Sources
29 29 sources = ctcubemask.cpp ctcubemask.hpp
30 30  
  31 +# Headers
  32 +pkginclude_HEADERS = ctcubemask.hpp
  33 +
31 34 # Libtool library (only needed for python bindings)
32 35 noinst_LTLIBRARIES = libctcubemask.la
33 36 libctcubemask_la_SOURCES = $(sources)
... ...
src/ctedispcube/Makefile.am
  View file @803c48d
1 1 #############################################################################
2 2 # Makefile.am for ctedispcube tool #
3 3 # ------------------------------------------------------------------------- #
4   -# Copyright (C) 2016 Juergen Knoedlseder #
  4 +# Copyright (C) 2016-2017 Juergen Knoedlseder #
5 5 # ------------------------------------------------------------------------- #
6 6 # #
7 7 # This program is free software: you can redistribute it and/or modify #
... ... @@ -28,6 +28,9 @@ bin_PROGRAMS = ctedispcube
28 28 # Sources
29 29 sources = ctedispcube.cpp ctedispcube.hpp
30 30  
  31 +# Headers
  32 +pkginclude_HEADERS = ctedispcube.hpp
  33 +
31 34 # Libtool library
32 35 noinst_LTLIBRARIES = libctedispcube.la
33 36 libctedispcube_la_SOURCES = $(sources)
... ...
src/cterror/Makefile.am
  View file @803c48d
1 1 #############################################################################
2 2 # Makefile.am for cterror tool #
3 3 # ------------------------------------------------------------------------- #
4   -# Copyright (C) 2016 Juergen Knoedlseder #
  4 +# Copyright (C) 2016-2017 Juergen Knoedlseder #
5 5 # ------------------------------------------------------------------------- #
6 6 # #
7 7 # This program is free software: you can redistribute it and/or modify #
... ... @@ -28,6 +28,9 @@ bin_PROGRAMS = cterror
28 28 # Sources
29 29 sources = cterror.cpp cterror.hpp
30 30  
  31 +# Headers
  32 +pkginclude_HEADERS = cterror.hpp
  33 +
31 34 # Libtool library
32 35 noinst_LTLIBRARIES = libcterror.la
33 36 libcterror_la_SOURCES = $(sources)
... ...
src/ctexpcube/Makefile.am
  View file @803c48d
1 1 #############################################################################
2 2 # Makefile.am for ctexpcube tool #
3 3 # ------------------------------------------------------------------------- #
4   -# Copyright (C) 2016 Juergen Knoedlseder #
  4 +# Copyright (C) 2016-2017 Juergen Knoedlseder #
5 5 # ------------------------------------------------------------------------- #
6 6 # #
7 7 # This program is free software: you can redistribute it and/or modify #
... ... @@ -28,6 +28,9 @@ bin_PROGRAMS = ctexpcube
28 28 # Sources
29 29 sources = ctexpcube.cpp ctexpcube.hpp
30 30  
  31 +# Headers
  32 +pkginclude_HEADERS = ctexpcube.hpp
  33 +
31 34 # Libtool library
32 35 noinst_LTLIBRARIES = libctexpcube.la
33 36 libctexpcube_la_SOURCES = $(sources)
... ...
src/ctlike/Makefile.am
  View file @803c48d
1 1 #############################################################################
2 2 # Makefile.am for ctlike tool #
3 3 # ------------------------------------------------------------------------- #
4   -# Copyright (C) 2016 Juergen Knoedlseder #
  4 +# Copyright (C) 2016-2017 Juergen Knoedlseder #
5 5 # ------------------------------------------------------------------------- #
6 6 # #
7 7 # This program is free software: you can redistribute it and/or modify #
... ... @@ -28,6 +28,9 @@ bin_PROGRAMS = ctlike
28 28 # Sources
29 29 sources = ctlike.cpp ctlike.hpp
30 30  
  31 +# Headers
  32 +pkginclude_HEADERS = ctlike.hpp
  33 +
31 34 # Libtool library
32 35 noinst_LTLIBRARIES = libctlike.la
33 36 libctlike_la_SOURCES = $(sources)
... ...
src/ctmapcube/Makefile.am
  View file @803c48d
1 1 #############################################################################
2 2 # Makefile.am for ctmapcube tool #
3 3 # ------------------------------------------------------------------------- #
4   -# Copyright (C) 2016 Juergen Knoedlseder #
  4 +# Copyright (C) 2016-2017 Juergen Knoedlseder #
5 5 # ------------------------------------------------------------------------- #
6 6 # #
7 7 # This program is free software: you can redistribute it and/or modify #
... ... @@ -28,6 +28,9 @@ bin_PROGRAMS = ctmapcube
28 28 # Sources
29 29 sources = ctmapcube.cpp ctmapcube.hpp
30 30  
  31 +# Headers
  32 +pkginclude_HEADERS = ctmapcube.hpp
  33 +
31 34 # Libtool library
32 35 noinst_LTLIBRARIES = libctmapcube.la
33 36 libctmapcube_la_SOURCES = $(sources)
... ...
src/ctmodel/Makefile.am
  View file @803c48d
1 1 #############################################################################
2 2 # Makefile.am for ctmodel tool #
3 3 # ------------------------------------------------------------------------- #
4   -# Copyright (C) 2016 Juergen Knoedlseder #
  4 +# Copyright (C) 2016-2017 Juergen Knoedlseder #
5 5 # ------------------------------------------------------------------------- #
6 6 # #
7 7 # This program is free software: you can redistribute it and/or modify #
... ... @@ -28,6 +28,9 @@ bin_PROGRAMS = ctmodel
28 28 # Sources
29 29 sources = ctmodel.cpp ctmodel.hpp
30 30  
  31 +# Headers
  32 +pkginclude_HEADERS = ctmodel.hpp
  33 +
31 34 # Libtool library
32 35 noinst_LTLIBRARIES = libctmodel.la
33 36 libctmodel_la_SOURCES = $(sources)
... ...
src/ctobssim/Makefile.am
  View file @803c48d
1 1 #############################################################################
2 2 # Makefile.am for ctobssim tool #
3 3 # ------------------------------------------------------------------------- #
4   -# Copyright (C) 2016 Juergen Knoedlseder #
  4 +# Copyright (C) 2016-2017 Juergen Knoedlseder #
5 5 # ------------------------------------------------------------------------- #
6 6 # #
7 7 # This program is free software: you can redistribute it and/or modify #
... ... @@ -28,6 +28,9 @@ bin_PROGRAMS = ctobssim
28 28 # Sources
29 29 sources = ctobssim.cpp ctobssim.hpp
30 30  
  31 +# Headers
  32 +pkginclude_HEADERS = ctobssim.hpp
  33 +
31 34 # Libtool library
32 35 noinst_LTLIBRARIES = libctobssim.la
33 36 libctobssim_la_SOURCES = $(sources)
... ...
src/ctools.hpp 0 → 100644
  View file @803c48d
  1 +/***************************************************************************
  2 + * ctools.hpp - Cherenkov Telescope Array Analysis tools Header file *
  3 + * ----------------------------------------------------------------------- *
  4 + * copyright (C) 2017 by Juergen Knoedlseder *
  5 + * ----------------------------------------------------------------------- *
  6 + * *
  7 + * This program is free software: you can redistribute it and/or modify *
  8 + * it under the terms of the GNU General Public License as published by *
  9 + * the Free Software Foundation, either version 3 of the License, or *
  10 + * (at your option) any later version. *
  11 + * *
  12 + * This program is distributed in the hope that it will be useful, *
  13 + * but WITHOUT ANY WARRANTY; without even the implied warranty of *
  14 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
  15 + * GNU General Public License for more details. *
  16 + * *
  17 + * You should have received a copy of the GNU General Public License *
  18 + * along with this program. If not, see <http://www.gnu.org/licenses/>. *
  19 + * *
  20 + ***************************************************************************/
  21 +/**
  22 + * @file ctools.hpp
  23 + * @brief ctools definitions
  24 + * @author Juergen Knoedlseder
  25 + */
  26 +
  27 +#ifndef CTOOLS_HPP
  28 +#define CTOOLS_HPP
  29 +
  30 +
  31 +/***************************************************************************
  32 + * Core services *
  33 + ***************************************************************************/
  34 +
  35 +/* __ Support functions __________________________________________________ */
  36 +#include "support.hpp"
  37 +
  38 +/* __ Base classes _______________________________________________________ */
  39 +#include "ctool.hpp"
  40 +#include "ctobservation.hpp"
  41 +#include "ctlikelihood.hpp"
  42 +
  43 +
  44 +/***************************************************************************
  45 + * ctools *
  46 + ***************************************************************************/
  47 +
  48 +/* __ Simulation tools ___________________________________________________ */
  49 +#include "ctobssim.hpp"
  50 +
  51 +/* __ Selection tools ____________________________________________________ */
  52 +#include "ctselect.hpp"
  53 +
  54 +/* __ Binning tools ______________________________________________________ */
  55 +#include "ctbin.hpp"
  56 +#include "ctbkgcube.hpp"
  57 +#include "ctcubemask.hpp"
  58 +#include "ctedispcube.hpp"
  59 +#include "ctexpcube.hpp"
  60 +#include "ctpsfcube.hpp"
  61 +
  62 +/* __ Imaging tools ______________________________________________________ */
  63 +#include "ctskymap.hpp"
  64 +
  65 +/* __ Spectral tools _____________________________________________________ */
  66 +
  67 +/* __ Timing tools _______________________________________________________ */
  68 +#include "ctphase.hpp"
  69 +#include "ctprob.hpp"
  70 +
  71 +/* __ Likelihood tools ___________________________________________________ */
  72 +#include "ctbutterfly.hpp"
  73 +#include "cterror.hpp"
  74 +#include "ctlike.hpp"
  75 +#include "cttsmap.hpp"
  76 +#include "ctulimit.hpp"
  77 +
  78 +/* __ Other tools ________________________________________________________ */
  79 +#include "ctmapcube.hpp"
  80 +#include "ctmodel.hpp"
  81 +
  82 +#endif /* CTOOLS_HPP */
... ...
src/ctphase/Makefile.am
  View file @803c48d
... ... @@ -28,6 +28,9 @@ bin_PROGRAMS = ctphase
28 28 # Sources
29 29 sources = ctphase.cpp ctphase.hpp
30 30  
  31 +# Headers
  32 +pkginclude_HEADERS = ctphase.hpp
  33 +
31 34 # Libtool library (only needed for python bindings)
32 35 noinst_LTLIBRARIES = libctphase.la
33 36 libctphase_la_SOURCES = $(sources)
... ...
src/ctprob/Makefile.am
  View file @803c48d
... ... @@ -28,6 +28,9 @@ bin_PROGRAMS = ctprob
28 28 # Sources
29 29 sources = ctprob.cpp ctprob.hpp
30 30  
  31 +# Headers
  32 +pkginclude_HEADERS = ctprob.hpp
  33 +
31 34 # Libtool library
32 35 noinst_LTLIBRARIES = libctprob.la
33 36 libctprob_la_SOURCES = $(sources)
... ...
src/ctpsfcube/Makefile.am
  View file @803c48d
1 1 #############################################################################
2 2 # Makefile.am for ctpsfcube tool #
3 3 # ------------------------------------------------------------------------- #
4   -# Copyright (C) 2016 Juergen Knoedlseder #
  4 +# Copyright (C) 2016-2017 Juergen Knoedlseder #
5 5 # ------------------------------------------------------------------------- #
6 6 # #
7 7 # This program is free software: you can redistribute it and/or modify #
... ... @@ -28,6 +28,9 @@ bin_PROGRAMS = ctpsfcube
28 28 # Sources
29 29 sources = ctpsfcube.cpp ctpsfcube.hpp
30 30  
  31 +# Headers
  32 +pkginclude_HEADERS = ctpsfcube.hpp
  33 +
31 34 # Libtool library
32 35 noinst_LTLIBRARIES = libctpsfcube.la
33 36 libctpsfcube_la_SOURCES = $(sources)
... ...
src/ctselect/Makefile.am
  View file @803c48d
1 1 #############################################################################
2 2 # Makefile.am for ctselect tool #
3 3 # ------------------------------------------------------------------------- #
4   -# Copyright (C) 2016 Juergen Knoedlseder #
  4 +# Copyright (C) 2016-2017 Juergen Knoedlseder #
5 5 # ------------------------------------------------------------------------- #
6 6 # #
7 7 # This program is free software: you can redistribute it and/or modify #
... ... @@ -28,6 +28,9 @@ bin_PROGRAMS = ctselect
28 28 # Sources
29 29 sources = ctselect.cpp ctselect.hpp
30 30  
  31 +# Headers
  32 +pkginclude_HEADERS = ctselect.hpp
  33 +
31 34 # Libtool library (only needed for python bindings)
32 35 noinst_LTLIBRARIES = libctselect.la
33 36 libctselect_la_SOURCES = $(sources)
... ...
src/ctskymap/Makefile.am
  View file @803c48d
1 1 #############################################################################
2 2 # Makefile.am for ctskymap tool #
3 3 # ------------------------------------------------------------------------- #
4   -# Copyright (C) 2016 Juergen Knoedlseder #
  4 +# Copyright (C) 2016-2017 Juergen Knoedlseder #
5 5 # ------------------------------------------------------------------------- #
6 6 # #
7 7 # This program is free software: you can redistribute it and/or modify #
... ... @@ -28,6 +28,9 @@ bin_PROGRAMS = ctskymap
28 28 # Sources
29 29 sources = ctskymap.cpp ctskymap.hpp
30 30  
  31 +# Headers
  32 +pkginclude_HEADERS = ctskymap.hpp
  33 +
31 34 # Libtool library
32 35 noinst_LTLIBRARIES = libctskymap.la
33 36 libctskymap_la_SOURCES = $(sources)
... ...
src/cttsmap/Makefile.am
  View file @803c48d
1 1 #############################################################################
2 2 # Makefile.am for cttsmap tool #
3 3 # ------------------------------------------------------------------------- #
4   -# Copyright (C) 2016 Juergen Knoedlseder #
  4 +# Copyright (C) 2016-2017 Juergen Knoedlseder #
5 5 # ------------------------------------------------------------------------- #
6 6 # #
7 7 # This program is free software: you can redistribute it and/or modify #
... ... @@ -28,6 +28,9 @@ bin_PROGRAMS = cttsmap
28 28 # Sources
29 29 sources = cttsmap.cpp cttsmap.hpp
30 30  
  31 +# Headers
  32 +pkginclude_HEADERS = cttsmap.hpp
  33 +
31 34 # Libtool library
32 35 noinst_LTLIBRARIES = libcttsmap.la
33 36 libcttsmap_la_SOURCES = $(sources)
... ...
src/ctulimit/Makefile.am
  View file @803c48d
1 1 #############################################################################
2 2 # Makefile.am for ctulimit tool #
3 3 # ------------------------------------------------------------------------- #
4   -# Copyright (C) 2016 Juergen Knoedlseder #
  4 +# Copyright (C) 2016-2017 Juergen Knoedlseder #
5 5 # ------------------------------------------------------------------------- #
6 6 # #
7 7 # This program is free software: you can redistribute it and/or modify #
... ... @@ -28,6 +28,9 @@ bin_PROGRAMS = ctulimit
28 28 # Sources
29 29 sources = ctulimit.cpp ctulimit.hpp
30 30  
  31 +# Headers
  32 +pkginclude_HEADERS = ctulimit.hpp
  33 +
31 34 # Libtool library
32 35 noinst_LTLIBRARIES = libctulimit.la
33 36 libctulimit_la_SOURCES = $(sources)
... ...
src/support/Makefile.am
  View file @803c48d
1 1 #############################################################################
2 2 # Makefile.am for ctool base classes #
3 3 # ------------------------------------------------------------------------- #
4   -# Copyright (C) 2016 Juergen Knoedlseder #
  4 +# Copyright (C) 2016-2017 Juergen Knoedlseder #
5 5 # ------------------------------------------------------------------------- #
6 6 # #
7 7 # This program is free software: you can redistribute it and/or modify #
... ... @@ -25,6 +25,12 @@ sources = support.cpp support.hpp \
25 25 ctobservation.cpp ctobservation.hpp \
26 26 ctlikelihood.cpp ctlikelihood.hpp
27 27  
  28 +# Headers
  29 +pkginclude_HEADERS = support.hpp \
  30 + ctool.hpp \
  31 + ctobservation.hpp \
  32 + ctlikelihood.hpp
  33 +
28 34 # Build libtool library
29 35 noinst_LTLIBRARIES = libsupport.la
30 36 libsupport_la_SOURCES = $(sources)
... ...