Maria Isabel Bernardos / ctools

Commit 76cc5636bd62730c3b6be94b65c66bf3934a16bd

Authored by Jürgen Knödlseder
2 parents e02d04ad 1ac4f6cf

Merge branch 'devel' into integration

Inline Side-by-side
Showing 16 changed files with 28 additions and 25 deletions
.gitignore
  View file @76cc563
... ... @@ -44,6 +44,7 @@ test-driver
44 44 testconf.sh
45 45 coverage-report-python.xml
46 46 coverage-report-cxx.xml
  47 +ctools-*
47 48  
48 49 doc/html
49 50 doc/man
... ...
... ... @@ -14,4 +14,3 @@ Stefan Ohm (stefan.ohm81@gmail.com)
14 14 David Sanchez (david.sanchez@lapp.in2p3.fr)
15 15 Hubert Siejkowski (h.siejkowski@cyfronet.pl)
16 16 Alexander Ziegler (alexander.ziegler@fau.de)
17   -
... ...
README.md
  View file @76cc563
1 1 ctools information
2 2 ==================
3   -* Version: 1.2.0.dev1 (12 August 2016)
  3 +* Version: 1.3.0.dev1 (12 August 2016)
4 4 * Author: Juergen Knoedlseder (jurgen.knodlseder@irap.omp.eu)
5   -* GammaLib dependency: 1.2.0.dev1
  5 +* GammaLib dependency: 1.3.0.dev1
6 6  
7 7 [![Build Status](https://cta-jenkins.irap.omp.eu/buildStatus/icon?job=ctools-integrate-os)](https://cta-jenkins.irap.omp.eu/job/ctools-integrate-os/)
8 8  
... ...
configure.ac
  View file @76cc563
... ... @@ -28,7 +28,7 @@
28 28 #############################################################################
29 29 # Initialisation #
30 30 #############################################################################
31   -AC_INIT([ctools], [1.2.0.dev1], [jurgen.knodlseder@irap.omp.eu], [ctools])
  31 +AC_INIT([ctools], [1.3.0.dev1], [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])
... ... @@ -54,7 +54,7 @@ AC_CONFIG_HEADER([config.h])
54 54 # 5. If any interfaces have been removed or changed since the last public #
55 55 # release, then set age to 0. #
56 56 #############################################################################
57   -CTOOLS_LT_VERSION="2:0:0"
  57 +CTOOLS_LT_VERSION="3:0:0"
58 58 AC_SUBST(CTOOLS_LT_VERSION)
59 59  
60 60  
... ...
cscripts/Makefile.am
  View file @76cc563
... ... @@ -241,7 +241,7 @@ uninstall-hook:
241 241  
242 242 # Files to be removed in build directory
243 243 clean-local:
244   - @if test '@srcdir@' != '@builddir@'; then \
  244 + @if test '@top_srcdir@' != '@top_builddir@'; then \
245 245 rm -rf $(top_builddir)/cscripts/cs*.py; \
246 246 rm -rf $(top_builddir)/cscripts/obsutils.py; \
247 247 rm -rf $(top_builddir)/cscripts/modutils.py; \
... ...
cscripts/cstsmapsplit.py
  View file @76cc563
... ... @@ -286,9 +286,7 @@ class cstsmapsplit(ctools.cscript):
286 286 f.close()
287 287  
288 288 # Make file executable
289   - mode = os.stat(filename).st_mode
290   - mode |= (mode & 0o444) >> 2 # copy R bits to X
291   - os.chmod(filename, mode)
  289 + os.system('chmod +x %s' % filename)
292 290  
293 291 # Return
294 292 return
... ...
ctools.pc.in
  View file @76cc563
... ... @@ -6,9 +6,9 @@ includedir=${prefix}/include
6 6 Name: ctools
7 7 Description: CTA science analysis tools
8 8 URL: http://cta.irap.omp.eu/ctools
9   -Version: 1.2.0.dev1
  9 +Version: 1.3.0.dev1
10 10 Requires:
11   -Requires.private: gammalib >= 1.2.0.dev1
  11 +Requires.private: gammalib >= 1.3.0.dev1
12 12 Conflicts:
13 13 Cflags: -I${includedir}/ctools @OPENMP_CXXFLAGS@
14 14 Libs: -L${libdir} -lctools
... ...
doc/Doxyfile
  View file @76cc563
... ... @@ -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.2.0.dev1
  35 +PROJECT_NUMBER = 1.3.0.dev1
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/about.rst
  View file @76cc563
... ... @@ -43,7 +43,7 @@ to include the formal reference
43 43 J. Knoedlseder, M. Mayer, C. Deil, J.-B. Cayrou, E. Owen, N. Kelley-Hoskins,
44 44 C.-C. Lu, R. Buehler, F. Forest, T. Louge, H. Siejkowski, K. Kosack,
45 45 L. Gerard, A. Schulz, P. Martin, D. Sanchez, S. Ohm, T. Hassan, and
46   - S. Brau-Nogue, 2016, A&A, in press (`arXiv:1606.00393 <http://arxiv.org/abs/1606.00393>`_)
  46 + S. Brau-Nogue, 2016, A&A, 593, A1 (`paper <http://www.aanda.org/articles/aa/pdf/2016/09/aa28822-16.pdf>`_)
47 47  
48 48 in your paper and that you add the following acknowledgment:
49 49  
... ...
doc/source/conf.py
  View file @76cc563
... ... @@ -66,10 +66,10 @@ copyright = u&#39;2014-2016, ctools developers&#39;
66 66 # built documents.
67 67 #
68 68 # The short X.Y version.
69   -version = '1.2'
  69 +version = '1.3'
70 70  
71 71 # The full version, including alpha/beta/rc tags.
72   -release = '1.2.0.dev1'
  72 +release = '1.3.0.dev1'
73 73  
74 74 # The language for content autogenerated by Sphinx. Refer to documentation
75 75 # for a list of supported languages.
... ...
doc/source/download.rst
  View file @76cc563
... ... @@ -13,7 +13,7 @@ bugs.
13 13 Releases
14 14 --------
15 15  
16   -The latest ctools release is ``ctools-1.1.0`` (24 July 2016).
  16 +The latest ctools release is ``ctools-1.2.0`` (3 March 2017).
17 17  
18 18 Below a table of ctools releases. Please note that at this stage of the
19 19 project there is a strict link between the ctools and gammalib versions.
... ... @@ -28,6 +28,9 @@ gammalib.
28 28 * - `ctools <http://cta.irap.omp.eu/ctools/releases/ctools/ChangeLog>`_
29 29 - `gammalib <http://cta.irap.omp.eu/ctools/releases/gammalib/ChangeLog>`_
30 30 - Mac OS X package
  31 + * - `1.2.0 <http://cta.irap.omp.eu/ctools/releases/ctools/ctools-1.2.0.tar.gz>`_
  32 + - `1.2.0 <http://cta.irap.omp.eu/ctools/releases/gammalib/gammalib-1.2.0.tar.gz>`_
  33 + - `ctools-1.2.0-macosx10.7.dmg <http://cta.irap.omp.eu/ctools/releases/ctools/ctools-1.2.0-macosx10.7.dmg>`_
31 34 * - `1.1.0 <http://cta.irap.omp.eu/ctools/releases/ctools/ctools-1.1.0.tar.gz>`_
32 35 - `1.1.0 <http://cta.irap.omp.eu/ctools/releases/gammalib/gammalib-1.1.0.tar.gz>`_
33 36 - `ctools-1.1.0-macosx10.3.dmg <http://cta.irap.omp.eu/ctools/releases/ctools/ctools-1.1.0-macosx10.3.dmg>`_
... ... @@ -87,13 +90,13 @@ gammalib.
87 90 Development release
88 91 -------------------
89 92  
90   -The current ctools development release is ``ctools-1.2.0.dev1``.
  93 +The current ctools development release is ``ctools-1.3.0.dev1``.
91 94 This release reflects the status of the current ``devel`` branch of
92 95 the ctools git repository.
93 96  
94   -* `Mac OS X binary package <http://cta.irap.omp.eu/ctools/releases/ctools/ctools-1.2.0.dev1-macosx10.7.dmg>`_ (Mac OS X 10.7+)
95   -* `GammaLib <http://cta.irap.omp.eu/ctools/releases/gammalib/gammalib-1.2.0.dev1.tar.gz>`_ source code tarball
96   -* `ctools <http://cta.irap.omp.eu/ctools/releases/ctools/ctools-1.2.0.dev1.tar.gz>`_ source code tarball
  97 +* `Mac OS X binary package <http://cta.irap.omp.eu/ctools/releases/ctools/ctools-1.3.0.dev1-macosx10.7.dmg>`_ (Mac OS X 10.7+)
  98 +* `GammaLib <http://cta.irap.omp.eu/ctools/releases/gammalib/gammalib-1.3.0.dev1.tar.gz>`_ source code tarball
  99 +* `ctools <http://cta.irap.omp.eu/ctools/releases/ctools/ctools-1.3.0.dev1.tar.gz>`_ source code tarball
97 100  
98 101  
99 102 Git repository
... ...
doc/source/users/tutorials/1dc/getting_tools.rst
  View file @76cc563
... ... @@ -11,7 +11,7 @@ The reference version for the pre-release of the data is ``ctools-1.2.0``.
11 11 the source code for both packages or use a pre-compiled binary package for
12 12 Mac OS X that includes all necessary code:
13 13  
14   -* `Mac OS X binary package <http://cta.irap.omp.eu/ctools/releases/ctools/ctools-1.2.0.macosx10.7.dmg>`_ (Mac OS X 10.7+)
  14 +* `Mac OS X binary package <http://cta.irap.omp.eu/ctools/releases/ctools/ctools-1.2.0-macosx10.7.dmg>`_ (Mac OS X 10.7+)
15 15 * `GammaLib <http://cta.irap.omp.eu/ctools/releases/gammalib/gammalib-1.2.0.tar.gz>`_ source code tarball
16 16 * `ctools <http://cta.irap.omp.eu/ctools/releases/ctools/ctools-1.2.0.tar.gz>`_ source code tarball
17 17  
... ...
doc/source/users/tutorials/1dc/howto_tsmap.rst
  View file @76cc563
... ... @@ -77,7 +77,7 @@ The figure below shows the resulting Test Statistic map.
77 77 Size of the Y axis in pixels [200] 10
78 78 Test source name [Crab] Src001
79 79 Output Test Statistic map file [tsmap.fits] tsmap_split.fits
80   - Number of TS map bins per task [5]
  80 + Number of TS map bins per task [5] 10
81 81 Compute null hypothesis first? [yes]
82 82 ASCII file containing all commands [commands.dat] tsmap_commands.dat
83 83  
... ...
pyext/setup.py.in
  View file @76cc563
... ... @@ -141,8 +141,8 @@ if is_build:
141 141 if '@BUILD_WRAPPERS_FALSE@' != '#':
142 142 py_file = pkg_name+'/tools.py'
143 143 cpp_file = pkg_name+'/tools_wrap.cpp'
144   - os.system('cp %s %s' % ('@srcdir@/'+cpp_file, '@builddir@/'+cpp_file))
145   - os.system('cp %s %s' % ('@srcdir@/'+py_file, '@builddir@/'+py_file))
  144 + os.system('cp %s %s' % ('@top_srcdir@/pyext/'+cpp_file, '@top_builddir@/pyext/'+cpp_file))
  145 + os.system('cp %s %s' % ('@top_srcdir@/pyext/'+py_file, '@top_builddir@/pyext/'+py_file))
146 146  
147 147 # In case that the build directory is different from the source directory
148 148 # then copy all cscripts and parfiles from the source directory to the
... ...
sonar-project.properties
  View file @76cc563
1 1 # Required metadata
2 2 sonar.projectKey=ctools
3 3 sonar.projectName=ctools
4   -sonar.projectVersion=1.2.0.dev1
  4 +sonar.projectVersion=1.3.0.dev1
5 5  
6 6 # Description
7 7 sonar.projectDescription="Cherenkov Telescope Array Science Analysis Software"
... ...
test/Makefile.am
  View file @76cc563
... ... @@ -49,6 +49,8 @@ all-local:
49 49  
50 50 # Files to be removed in build directory
51 51 clean-local:
  52 + rm -rf $(top_builddir)/test/*.pyc
  53 + rm -rf $(top_builddir)/test/__pycache__
52 54 rm -rf $(top_builddir)/test/*.fits
53 55 rm -rf $(top_builddir)/test/*.log
54 56 rm -rf $(top_builddir)/test/*.xml
... ...