Merge branch 'devel' into integration

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