diff --git a/.gitignore b/.gitignore index 0b44613..23f8f1a 100644 --- a/.gitignore +++ b/.gitignore @@ -44,6 +44,7 @@ test-driver testconf.sh coverage-report-python.xml coverage-report-cxx.xml +ctools-* doc/html doc/man diff --git a/AUTHORS b/AUTHORS index 76ba740..1f8f45a 100644 --- a/AUTHORS +++ b/AUTHORS @@ -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) - diff --git a/README.md b/README.md index f29c028..680c7ff 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ 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/) diff --git a/configure.ac b/configure.ac index 8672514..b16543d 100644 --- a/configure.ac +++ b/configure.ac @@ -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) diff --git a/cscripts/Makefile.am b/cscripts/Makefile.am index e13bc4e..0ad3188 100644 --- a/cscripts/Makefile.am +++ b/cscripts/Makefile.am @@ -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; \ diff --git a/cscripts/cstsmapsplit.py b/cscripts/cstsmapsplit.py index b134593..db736b6 100755 --- a/cscripts/cstsmapsplit.py +++ b/cscripts/cstsmapsplit.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 diff --git a/ctools.pc.in b/ctools.pc.in index cc064fe..b126d13 100644 --- a/ctools.pc.in +++ b/ctools.pc.in @@ -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 diff --git a/doc/Doxyfile b/doc/Doxyfile index d8907da..b76f40f 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -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 diff --git a/doc/source/about.rst b/doc/source/about.rst index 3e36d30..fddd10c 100644 --- a/doc/source/about.rst +++ b/doc/source/about.rst @@ -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 `_) + S. Brau-Nogue, 2016, A&A, 593, A1 (`paper `_) in your paper and that you add the following acknowledgment: diff --git a/doc/source/conf.py b/doc/source/conf.py index 11c763e..040fba5 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -66,10 +66,10 @@ copyright = u'2014-2016, ctools developers' # 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. diff --git a/doc/source/download.rst b/doc/source/download.rst index b319501..40c0df2 100644 --- a/doc/source/download.rst +++ b/doc/source/download.rst @@ -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 `_ - `gammalib `_ - Mac OS X package + * - `1.2.0 `_ + - `1.2.0 `_ + - `ctools-1.2.0-macosx10.7.dmg `_ * - `1.1.0 `_ - `1.1.0 `_ - `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 `_ (Mac OS X 10.7+) -* `GammaLib `_ source code tarball -* `ctools `_ source code tarball +* `Mac OS X binary package `_ (Mac OS X 10.7+) +* `GammaLib `_ source code tarball +* `ctools `_ source code tarball Git repository diff --git a/doc/source/users/tutorials/1dc/getting_tools.rst b/doc/source/users/tutorials/1dc/getting_tools.rst index 8c6f325..8f93bde 100644 --- a/doc/source/users/tutorials/1dc/getting_tools.rst +++ b/doc/source/users/tutorials/1dc/getting_tools.rst @@ -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 `_ (Mac OS X 10.7+) +* `Mac OS X binary package `_ (Mac OS X 10.7+) * `GammaLib `_ source code tarball * `ctools `_ source code tarball diff --git a/doc/source/users/tutorials/1dc/howto_tsmap.rst b/doc/source/users/tutorials/1dc/howto_tsmap.rst index 12b093d..4637c7d 100644 --- a/doc/source/users/tutorials/1dc/howto_tsmap.rst +++ b/doc/source/users/tutorials/1dc/howto_tsmap.rst @@ -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 diff --git a/pyext/setup.py.in b/pyext/setup.py.in index af975fe..4ff8900 100644 --- a/pyext/setup.py.in +++ b/pyext/setup.py.in @@ -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 diff --git a/sonar-project.properties b/sonar-project.properties index f70b8fb..33c8898 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,7 +1,7 @@ # 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" diff --git a/test/Makefile.am b/test/Makefile.am index 5dc4f9e..c5d23fa 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -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