Karim Sabri / ctools

Commit 16640f6ad5c8ad61b7361fdde9f33c136c0dbf6e

Authored by Jürgen Knödlseder
2 parents 116c83a9 88dd060b

Merge branch 'bugfix-1.7.3' into release

Inline Side-by-side
Showing 29 changed files with 88 additions and 62 deletions
ChangeLog
  View file @16640f6
  1 +2020-12-02
  2 +
  3 + * Bug fix version 1.7.3 released
  4 + ================================
  5 +
  6 + Import matplotlib first in example scripts (#3423)
  7 +
  8 +
1 9 2020-10-15
2 10  
3 11 * Bug fix version 1.7.2 released
... ...
1   -New Features and Important Changes in ctools 1.7.2
  1 +New Features and Important Changes in ctools 1.7.3
2 2  
3   -15 October 2020
  3 +2 December 2020
4 4  
5 5  
6 6 Introduction
... ...
README.md
  View file @16640f6
1 1 ctools information
2 2 ==================
3   -* Version: 1.7.2 (15 October 2020)
4   -* GammaLib dependency: 1.7.2
  3 +* Version: 1.7.3 (15 October 2020)
  4 +* GammaLib dependency: 1.7.3
5 5  
6 6 [![Build Status](https://cta-jenkins.irap.omp.eu/buildStatus/icon?job=ctools-integrate-os)](https://cta-jenkins.irap.omp.eu/job/ctools-integrate-os/)
7 7  
... ...
configure.ac
  View file @16640f6
... ... @@ -28,7 +28,7 @@
28 28 #############################################################################
29 29 # Initialisation #
30 30 #############################################################################
31   -AC_INIT([ctools], [1.7.2], [jurgen.knodlseder@irap.omp.eu], [ctools])
  31 +AC_INIT([ctools], [1.7.3], [jurgen.knodlseder@irap.omp.eu], [ctools])
32 32 AC_CONFIG_SRCDIR([src/ctselect/ctselect.cpp])
33 33 AC_CONFIG_MACRO_DIR([m4])
34 34 #AM_INIT_AUTOMAKE([gnu no-dependencies foreign])
... ...
doc/Doxyfile
  View file @16640f6
... ... @@ -32,7 +32,7 @@ PROJECT_NAME = ctools
32 32 # This could be handy for archiving the generated documentation or
33 33 # if some version control system is used.
34 34  
35   -PROJECT_NUMBER = 1.7.2
  35 +PROJECT_NUMBER = 1.7.3
36 36  
37 37 # Using the PROJECT_BRIEF tag one can provide an optional one line description
38 38 # for a project that appears at the top of each page and should give viewer
... ...
doc/source/admin/download.rst
  View file @16640f6
... ... @@ -3,7 +3,7 @@
3 3 Download
4 4 ========
5 5  
6   -The latest ctools release is ``ctools-1.7.2`` (15 October 2020).
  6 +The latest ctools release is ``ctools-1.7.3`` (2 December 2020).
7 7  
8 8 Below a table of ctools releases. Please read the :ref:`sec_release` to
9 9 learn more about new features and corrected bugs in a given release.
... ... @@ -23,6 +23,9 @@ learn more about new features and corrected bugs in a given release.
23 23 * - ctools
24 24 - gammalib
25 25 - Mac OS X (10.7+) binary disk image
  26 + * - `1.7.3 <http://cta.irap.omp.eu/ctools/releases/ctools/ctools-1.7.3.tar.gz>`_
  27 + - `1.7.3 <http://cta.irap.omp.eu/ctools/releases/gammalib/gammalib-1.7.3.tar.gz>`_
  28 + - `ctools-1.7.3-macosx10.7.dmg <http://cta.irap.omp.eu/ctools/releases/ctools/ctools-1.7.3-macosx10.7.dmg>`_
26 29 * - `1.7.2 <http://cta.irap.omp.eu/ctools/releases/ctools/ctools-1.7.2.tar.gz>`_
27 30 - `1.7.2 <http://cta.irap.omp.eu/ctools/releases/gammalib/gammalib-1.7.2.tar.gz>`_
28 31 - `ctools-1.7.2-macosx10.7.dmg <http://cta.irap.omp.eu/ctools/releases/ctools/ctools-1.7.2-macosx10.7.dmg>`_
... ...
doc/source/admin/release_history/1.7.3.rst 0 → 100644
  View file @16640f6
  1 +.. _1.7.3:
  2 +
  3 +ctools 1.7.3 release (2 December 2020)
  4 +======================================
  5 +
  6 +Overview
  7 +--------
  8 +
  9 +ctools 1.7.3 is a bug fix release for ctools release 1.7.
  10 +
  11 +The following bugs were fixed:
  12 +
  13 +* [`3423 <https://cta-redmine.irap.omp.eu/issues/3423>`_] -
  14 + Import matplotlib first in example scripts
... ...
doc/source/admin/release_history/index.rst
  View file @16640f6
... ... @@ -6,6 +6,7 @@ Release History
6 6 .. toctree::
7 7 :maxdepth: 1
8 8  
  9 + ctools 1.7.3 <1.7.3>
9 10 ctools 1.7.2 <1.7.2>
10 11 ctools 1.7.1 <1.7.1>
11 12 ctools 1.7 <1.7>
... ...
doc/source/conf.py
  View file @16640f6
... ... @@ -80,7 +80,7 @@ copyright = u&#39;2014-2019, ctools developers&#39;
80 80 version = '1.7'
81 81  
82 82 # The full version, including alpha/beta/rc tags.
83   -release = '1.7.2'
  83 +release = '1.7.3'
84 84  
85 85 # The language for content autogenerated by Sphinx. Refer to documentation
86 86 # for a list of supported languages.
... ...
examples/show_butterfly.py
  View file @16640f6
... ... @@ -2,7 +2,7 @@
2 2 # ==========================================================================
3 3 # Shows butterfly diagram created with ctbutterfly
4 4 #
5   -# Copyright (C) 2014-2019 Michael Mayer
  5 +# Copyright (C) 2014-2020 Michael Mayer
6 6 #
7 7 # This program is free software: you can redistribute it and/or modify
8 8 # it under the terms of the GNU General Public License as published by
... ... @@ -19,8 +19,6 @@
19 19 #
20 20 # ==========================================================================
21 21 import sys
22   -import gammalib
23   -import cscripts
24 22 try:
25 23 import matplotlib.pyplot as plt
26 24 plt.figure()
... ... @@ -28,6 +26,8 @@ try:
28 26 except (ImportError, RuntimeError):
29 27 print('This script needs the "matplotlib" module')
30 28 sys.exit()
  29 +import gammalib
  30 +import cscripts
31 31  
32 32  
33 33 # ======================================== #
... ...
examples/show_irf.py
  View file @16640f6
... ... @@ -2,7 +2,7 @@
2 2 # ==========================================================================
3 3 # Display Instrument Response Function
4 4 #
5   -# Copyright (C) 2017-2018 Juergen Knoedlseder
  5 +# Copyright (C) 2017-2020 Juergen Knoedlseder
6 6 #
7 7 # This program is free software: you can redistribute it and/or modify
8 8 # it under the terms of the GNU General Public License as published by
... ... @@ -20,8 +20,6 @@
20 20 # ==========================================================================
21 21 import sys
22 22 import math
23   -import gammalib
24   -import cscripts
25 23 try:
26 24 import matplotlib.pyplot as plt
27 25 from matplotlib import ticker
... ... @@ -31,6 +29,8 @@ try:
31 29 except (ImportError, RuntimeError):
32 30 print('This script needs the "matplotlib" module')
33 31 sys.exit()
  32 +import gammalib
  33 +import cscripts
34 34  
35 35  
36 36 # ========= #
... ...
examples/show_lightcurve.py
  View file @16640f6
... ... @@ -2,7 +2,7 @@
2 2 # ==========================================================================
3 3 # Display lightcurve generated by cslightcrv
4 4 #
5   -# Copyright (C) 2017 Juergen Knoedlseder
  5 +# Copyright (C) 2017-2020 Juergen Knoedlseder
6 6 #
7 7 # This program is free software: you can redistribute it and/or modify
8 8 # it under the terms of the GNU General Public License as published by
... ... @@ -19,8 +19,6 @@
19 19 #
20 20 # ==========================================================================
21 21 import sys
22   -import gammalib
23   -import cscripts
24 22 try:
25 23 import matplotlib.pyplot as plt
26 24 plt.figure()
... ... @@ -28,6 +26,8 @@ try:
28 26 except (ImportError, RuntimeError):
29 27 print('This script needs the "matplotlib" module')
30 28 sys.exit()
  29 +import gammalib
  30 +import cscripts
31 31  
32 32  
33 33 # =============== #
... ...
examples/show_model.py
  View file @16640f6
... ... @@ -2,7 +2,7 @@
2 2 # ==========================================================================
3 3 # Shows the photon spectrum of a model
4 4 #
5   -# Copyright (C) 2015-2016 Juergen Knoedlseder
  5 +# Copyright (C) 2015-2020 Juergen Knoedlseder
6 6 #
7 7 # This program is free software: you can redistribute it and/or modify
8 8 # it under the terms of the GNU General Public License as published by
... ... @@ -19,8 +19,6 @@
19 19 #
20 20 # ==========================================================================
21 21 import sys
22   -import gammalib
23   -import cscripts
24 22 try:
25 23 import matplotlib.pyplot as plt
26 24 plt.figure()
... ... @@ -28,6 +26,8 @@ try:
28 26 except (ImportError, RuntimeError):
29 27 print('This script needs the "matplotlib" module')
30 28 sys.exit()
  29 +import gammalib
  30 +import cscripts
31 31  
32 32  
33 33 # ======================= #
... ...
examples/show_obs.py
  View file @16640f6
... ... @@ -2,7 +2,7 @@
2 2 # ==========================================================================
3 3 # Display summary of observation definition XML file
4 4 #
5   -# Copyright (C) 2016 Michael Mayer
  5 +# Copyright (C) 2016-2020 Michael Mayer
6 6 #
7 7 # This program is free software: you can redistribute it and/or modify
8 8 # it under the terms of the GNU General Public License as published by
... ... @@ -19,8 +19,6 @@
19 19 #
20 20 # ==========================================================================
21 21 import sys
22   -import gammalib
23   -import cscripts
24 22 try:
25 23 import matplotlib.pyplot as plt
26 24 plt.figure()
... ... @@ -28,6 +26,8 @@ try:
28 26 except (ImportError, RuntimeError):
29 27 print('This script needs the "matplotlib" module')
30 28 sys.exit()
  29 +import gammalib
  30 +import cscripts
31 31  
32 32  
33 33 # ==================== #
... ...
examples/show_pha.py
  View file @16640f6
... ... @@ -2,7 +2,7 @@
2 2 # ==========================================================================
3 3 # Show a spectrum in PHA format
4 4 #
5   -# Copyright (C) 2013-2016 Juergen Knoedlseder
  5 +# Copyright (C) 2013-2020 Juergen Knoedlseder
6 6 #
7 7 # This program is free software: you can redistribute it and/or modify
8 8 # it under the terms of the GNU General Public License as published by
... ... @@ -20,8 +20,6 @@
20 20 # ==========================================================================
21 21 import sys
22 22 import math
23   -import gammalib
24   -import cscripts
25 23 try:
26 24 import matplotlib.pyplot as plt
27 25 plt.figure()
... ... @@ -29,6 +27,8 @@ try:
29 27 except (ImportError, RuntimeError):
30 28 print('This script needs the "matplotlib" module')
31 29 sys.exit()
  30 +import gammalib
  31 +import cscripts
32 32  
33 33  
34 34 # ================= #
... ...
examples/show_phases.py
  View file @16640f6
... ... @@ -2,7 +2,7 @@
2 2 # ==========================================================================
3 3 # Display phase information from event list
4 4 #
5   -# Copyright (C) 2017 Juergen Knoedlseder
  5 +# Copyright (C) 2017-2020 Juergen Knoedlseder
6 6 #
7 7 # This program is free software: you can redistribute it and/or modify
8 8 # it under the terms of the GNU General Public License as published by
... ... @@ -19,8 +19,6 @@
19 19 #
20 20 # ==========================================================================
21 21 import sys
22   -import gammalib
23   -import cscripts
24 22 try:
25 23 import matplotlib.pyplot as plt
26 24 plt.figure()
... ... @@ -28,6 +26,8 @@ try:
28 26 except (ImportError, RuntimeError):
29 27 print('This script needs the "matplotlib" module')
30 28 sys.exit()
  29 +import gammalib
  30 +import cscripts
31 31  
32 32  
33 33 # =========== #
... ...
examples/show_pointings.py
  View file @16640f6
... ... @@ -2,7 +2,7 @@
2 2 # ==========================================================================
3 3 # Display pointings in observation definition XML file
4 4 #
5   -# Copyright (C) 2017 Juergen Knoedlseder
  5 +# Copyright (C) 2017-2020 Juergen Knoedlseder
6 6 #
7 7 # This program is free software: you can redistribute it and/or modify
8 8 # it under the terms of the GNU General Public License as published by
... ... @@ -19,8 +19,6 @@
19 19 #
20 20 # ==========================================================================
21 21 import sys
22   -import gammalib
23   -import cscripts
24 22 try:
25 23 import matplotlib.pyplot as plt
26 24 plt.figure()
... ... @@ -28,6 +26,8 @@ try:
28 26 except (ImportError, RuntimeError):
29 27 print('This script needs the "matplotlib" module')
30 28 sys.exit()
  29 +import gammalib
  30 +import cscripts
31 31  
32 32  
33 33 # =============================== #
... ...
examples/show_pull_evolution.py
  View file @16640f6
... ... @@ -2,7 +2,7 @@
2 2 # ==========================================================================
3 3 # Shows the evolution of the mean and rms pull
4 4 #
5   -# Copyright (C) 2015-2017 Juergen Knoedlseder
  5 +# Copyright (C) 2015-2020 Juergen Knoedlseder
6 6 #
7 7 # This program is free software: you can redistribute it and/or modify
8 8 # it under the terms of the GNU General Public License as published by
... ... @@ -19,7 +19,6 @@
19 19 #
20 20 # ==========================================================================
21 21 import sys
22   -import cscripts
23 22 try:
24 23 import matplotlib.pyplot as plt
25 24 plt.figure()
... ... @@ -32,6 +31,7 @@ try:
32 31 except ImportError:
33 32 print('This script needs the "numpy" module')
34 33 sys.exit()
  34 +import cscripts
35 35  
36 36  
37 37 # =================== #
... ...
examples/show_pull_histogram.py
  View file @16640f6
... ... @@ -2,7 +2,7 @@
2 2 # ==========================================================================
3 3 # Shows the pull histogram
4 4 #
5   -# Copyright (C) 2011-2017 Juergen Knoedlseder
  5 +# Copyright (C) 2011-2020 Juergen Knoedlseder
6 6 #
7 7 # This program is free software: you can redistribute it and/or modify
8 8 # it under the terms of the GNU General Public License as published by
... ... @@ -19,7 +19,6 @@
19 19 #
20 20 # ==========================================================================
21 21 import sys
22   -import cscripts
23 22 try:
24 23 import matplotlib.pyplot as plt
25 24 plt.figure()
... ... @@ -32,6 +31,7 @@ try:
32 31 except ImportError:
33 32 print('This script needs the "numpy" module')
34 33 sys.exit()
  34 +import cscripts
35 35  
36 36  
37 37 # =================== #
... ...
examples/show_residuals.py
  View file @16640f6
... ... @@ -2,7 +2,7 @@
2 2 # ==========================================================================
3 3 # Display residuals generated by csresspec
4 4 #
5   -# Copyright (C) 2017-2019 Luigi Tibaldo
  5 +# Copyright (C) 2017-2020 Luigi Tibaldo
6 6 #
7 7 # This program is free software: you can redistribute it and/or modify
8 8 # it under the terms of the GNU General Public License as published by
... ... @@ -20,8 +20,6 @@
20 20 # ==========================================================================
21 21 import sys
22 22 import math
23   -import gammalib
24   -import cscripts
25 23 try:
26 24 import matplotlib.pyplot as plt
27 25 plt.figure()
... ... @@ -29,6 +27,8 @@ try:
29 27 except (ImportError, RuntimeError):
30 28 print('This script needs the "matplotlib" module')
31 29 sys.exit()
  30 +import gammalib
  31 +import cscripts
32 32  
33 33  
34 34 # ======================= #
... ...
examples/show_response.py
  View file @16640f6
... ... @@ -2,7 +2,7 @@
2 2 # ==========================================================================
3 3 # Shows one or several CTA response functions.
4 4 #
5   -# Copyright (C) 2014-2017 Juergen Knoedlseder
  5 +# Copyright (C) 2014-2020 Juergen Knoedlseder
6 6 #
7 7 # This program is free software: you can redistribute it and/or modify
8 8 # it under the terms of the GNU General Public License as published by
... ... @@ -20,8 +20,6 @@
20 20 # ==========================================================================
21 21 import sys
22 22 import math
23   -import gammalib
24   -import cscripts
25 23 try:
26 24 import matplotlib.pyplot as plt
27 25 plt.figure()
... ... @@ -29,6 +27,8 @@ try:
29 27 except (ImportError, RuntimeError):
30 28 print('This script needs the "matplotlib" module')
31 29 sys.exit()
  30 +import gammalib
  31 +import cscripts
32 32  
33 33  
34 34 # ================================== #
... ...
examples/show_rmf.py
  View file @16640f6
... ... @@ -2,7 +2,7 @@
2 2 # ==========================================================================
3 3 # Display Redistribution Matrix File
4 4 #
5   -# Copyright (C) 2018-2019 Juergen Knoedlseder
  5 +# Copyright (C) 2018-2020 Juergen Knoedlseder
6 6 #
7 7 # This program is free software: you can redistribute it and/or modify
8 8 # it under the terms of the GNU General Public License as published by
... ... @@ -19,8 +19,6 @@
19 19 #
20 20 # ==========================================================================
21 21 import sys
22   -import gammalib
23   -import cscripts
24 22 try:
25 23 import matplotlib.pyplot as plt
26 24 plt.figure()
... ... @@ -28,6 +26,8 @@ try:
28 26 except (ImportError, RuntimeError):
29 27 print('This script needs the "matplotlib" module')
30 28 sys.exit()
  29 +import gammalib
  30 +import cscripts
31 31  
32 32  
33 33 # ======== #
... ...
examples/show_sensitivity.py
  View file @16640f6
... ... @@ -2,7 +2,7 @@
2 2 # ==========================================================================
3 3 # Display differential sensitivity plot generated by cssens
4 4 #
5   -# Copyright (C) 2015-2017 Juergen Knoedlseder
  5 +# Copyright (C) 2015-2020 Juergen Knoedlseder
6 6 #
7 7 # This program is free software: you can redistribute it and/or modify
8 8 # it under the terms of the GNU General Public License as published by
... ... @@ -20,8 +20,6 @@
20 20 # ==========================================================================
21 21 import sys
22 22 import math
23   -import gammalib
24   -import cscripts
25 23 try:
26 24 import matplotlib.pyplot as plt
27 25 plt.figure()
... ... @@ -29,6 +27,8 @@ try:
29 27 except (ImportError, RuntimeError):
30 28 print('This script needs the "matplotlib" module')
31 29 sys.exit()
  30 +import gammalib
  31 +import cscripts
32 32  
33 33  
34 34 # ===================== #
... ...
examples/show_significance_distribution.py
  View file @16640f6
... ... @@ -2,7 +2,7 @@
2 2 # ==========================================================================
3 3 # Shows the distribution of significances in a given significance map.
4 4 #
5   -# Copyright (C) 2018-2019 Andreas Specovius
  5 +# Copyright (C) 2018-2020 Andreas Specovius
6 6 #
7 7 # This program is free software: you can redistribute it and/or modify
8 8 # it under the terms of the GNU General Public License as published by
... ... @@ -46,8 +46,6 @@
46 46 # ==========================================================================
47 47 import sys
48 48 import math
49   -import gammalib
50   -import cscripts
51 49 try:
52 50 import matplotlib.pyplot as plt
53 51 plt.figure()
... ... @@ -60,6 +58,8 @@ try:
60 58 except ImportError:
61 59 print('This script needs the "numpy" module')
62 60 sys.exit()
  61 +import gammalib
  62 +import cscripts
63 63  
64 64  
65 65 # ======================= #
... ...
examples/show_spectrum.py
  View file @16640f6
... ... @@ -19,8 +19,6 @@
19 19 #
20 20 # ==========================================================================
21 21 import sys
22   -import gammalib
23   -import cscripts
24 22 try:
25 23 import matplotlib.pyplot as plt
26 24 plt.figure()
... ... @@ -33,6 +31,8 @@ try:
33 31 except ImportError:
34 32 print('This script needs the "numpy" module')
35 33 sys.exit()
  34 +import gammalib
  35 +import cscripts
36 36  
37 37  
38 38 # ===================================== #
... ...
examples/show_ts_distribution.py
  View file @16640f6
... ... @@ -2,7 +2,7 @@
2 2 # ==========================================================================
3 3 # Display TS distribution generated by cstsdist
4 4 #
5   -# Copyright (C) 2011-2017 Jurgen Knodlseder
  5 +# Copyright (C) 2011-2020 Jurgen Knodlseder
6 6 #
7 7 # This program is free software: you can redistribute it and/or modify
8 8 # it under the terms of the GNU General Public License as published by
... ... @@ -21,7 +21,6 @@
21 21 import sys
22 22 import csv
23 23 import math
24   -import cscripts
25 24 try:
26 25 import matplotlib.pyplot as plt
27 26 plt.figure()
... ... @@ -34,6 +33,7 @@ try:
34 33 except ImportError:
35 34 print('This script needs the "numpy" module')
36 35 sys.exit()
  36 +import cscripts
37 37  
38 38  
39 39 # ==================== #
... ...
examples/show_variability_evolution.py
  View file @16640f6
... ... @@ -2,7 +2,7 @@
2 2 # ==========================================================================
3 3 # Shows source variability evolution created with ctfindvar
4 4 #
5   -# Copyright (C) 2018 Simon Bonnefoy
  5 +# Copyright (C) 2018-2020 Simon Bonnefoy
6 6 #
7 7 # This program is free software: you can redistribute it and/or modify
8 8 # it under the terms of the GNU General Public License as published by
... ... @@ -19,8 +19,6 @@
19 19 #
20 20 # ==========================================================================
21 21 import sys
22   -import gammalib
23   -import cscripts
24 22 try:
25 23 import matplotlib.pyplot as plt
26 24 plt.figure()
... ... @@ -28,6 +26,8 @@ try:
28 26 except (ImportError, RuntimeError):
29 27 print('This script needs the "matplotlib" module')
30 28 sys.exit()
  29 +import gammalib
  30 +import cscripts
31 31  
32 32  
33 33 # ========================== #
... ...
examples/show_viscube.py
  View file @16640f6
... ... @@ -2,7 +2,7 @@
2 2 # ==========================================================================
3 3 # Show visibility cube
4 4 #
5   -# Copyright (C) 2019 Juergen Knoedlseder
  5 +# Copyright (C) 2019-2020 Juergen Knoedlseder
6 6 #
7 7 # This program is free software: you can redistribute it and/or modify
8 8 # it under the terms of the GNU General Public License as published by
... ... @@ -19,8 +19,6 @@
19 19 #
20 20 # ==========================================================================
21 21 import sys
22   -import gammalib
23   -import cscripts
24 22 try:
25 23 import matplotlib.pyplot as plt
26 24 plt.figure()
... ... @@ -28,6 +26,8 @@ try:
28 26 except (ImportError, RuntimeError):
29 27 print('This script needs the "matplotlib" module')
30 28 sys.exit()
  29 +import gammalib
  30 +import cscripts
31 31  
32 32  
33 33 # =========================== #
... ...
sonar-project.properties
  View file @16640f6
1 1 # Required metadata
2 2 sonar.projectKey=ctools
3 3 sonar.projectName=ctools
4   -sonar.projectVersion=1.7.2
  4 +sonar.projectVersion=1.7.3
5 5  
6 6 # Description
7 7 sonar.projectDescription="Cherenkov Telescope Array Science Analysis Software"
... ...