Merge branch 'release' into integration

# Conflicts: # Makefile.am # README.md # configure.ac # ctools.pc.in # dev/conda.recipe/meta.yaml.in # doc/Doxyfile # doc/source/conf.py # sonar-project.properties

Merge branch 'release' into integration
# Conflicts: # Makefile.am # README.md # configure.ac # ctools.pc.in # dev/conda.recipe/meta.yaml.in # doc/Doxyfile # doc/source/conf.py # sonar-project.properties
Jürgen Knödlseder
2 parents bca8b3d8 c385c948
Showing 11 changed files with 118 additions and 73 deletions
Makefile.am
ctools.pc.in
dev/00-ctools-deactivate.sh
dev/01-ctools-activate.sh
dev/conda.recipe/meta.yaml.in
doc/source/admin/download.rst
doc/source/admin/release_history/1.4.3.rst
doc/source/admin/release_history/index.rst
doc/source/users/tutorials/1dc/data_organisation.rst
doc/source/users/tutorials/1dc/getting_data.rst
doc/source/users/tutorials/1dc/getting_tools.rst
@@ -33,9 +33,9 @@ pkgconfig_DATA = ctools.pc
  
 # Conda activate directory
 condaactivatedir = $(sysconfdir)/conda/activate.d
-condaactivate_DATA = dev/ctools-activate.sh
+condaactivate_DATA = dev/01-ctools-activate.sh
 condadeactivatedir = $(sysconfdir)/conda/deactivate.d
-condadeactivate_DATA = dev/ctools-deactivate.sh
+condadeactivate_DATA = dev/00-ctools-deactivate.sh
  
 # Manual pages to install
 man_MANS = 
@@ -54,7 +54,7 @@ docdir = ${datadir}/doc/${PACKAGE}
 EXTRA_DIST = README.md \
              doc/Doxyfile doc/source \
              dev/testreport.py \
-             dev/ctools-activate.sh dev/ctools-deactivate.sh \
+             dev/01-ctools-activate.sh dev/00-ctools-deactivate.sh \
              dev/conda.recipe/build.sh \
              dev/conda.recipe/conda_build_config.yaml \
              dev/conda.recipe/meta.yaml.in
@@ -8,7 +8,7 @@ Description: CTA science analysis tools
 URL: http://cta.irap.omp.eu/ctools
 Version: @VERSION@
 Requires: 
-Requires.private: gammalib >= 1.5.0.dev1
+Requires.private: gammalib == 1.5.0.dev1
 Conflicts: 
 Cflags: -I${includedir}/ctools @OPENMP_CXXFLAGS@
 Libs: -L${libdir} -lctools
+#!/bin/sh
+
+unset CTOOLS
+unset CALDB
+#!/bin/sh
+
+export CTOOLS=${CONDA_PREFIX}
+source ${CTOOLS}/bin/ctools-init.sh
+unset PYTHONPATH
 package:
   name: ctools
   version: "@VERSION@"
-  
  
 source:
   fn: ctools-@VERSION@.tar.gz
   url: http://cta.irap.omp.eu/ctools/releases/ctools/ctools-@VERSION@.tar.gz
   #md5: a2751da55f7b97d48db57156e8096792
-  
+
 build:
   number: 1 
   binary_relocation: True
   detect_binary_files_with_prefix: True
-      
+
 requirements:
   build:
     - python  
     - setuptools
     - swig
-    - gammalib >=1.5.0.dev1
+    - gammalib ==1.5.0.dev1
   run:
     - python
-    - gammalib >=1.5.0.dev1
+    - gammalib ==1.5.0.dev1
  
 about:
   home: http://cta.irap.omp.eu/ctools
@@ -13,7 +13,7 @@ bugs.
 Releases
 --------
  
-The latest ctools release is ``ctools-1.4.2`` (22 August 2017).
+The latest ctools release is ``ctools-1.4.3`` (31 October 2017).
  
 Below a table of ctools releases. Please read the :ref:`sec_release` to
 learn more about new features and corrected bugs in a given release.
@@ -31,6 +31,9 @@ learn more about new features and corrected bugs in a given release.
    * - ctools
      - gammalib
      - Mac OS X package
+   * - `1.4.3 <http://cta.irap.omp.eu/ctools/releases/ctools/ctools-1.4.3.tar.gz>`_
+     - `1.4.3 <http://cta.irap.omp.eu/ctools/releases/gammalib/gammalib-1.4.3.tar.gz>`_
+     - `ctools-1.4.3-macosx10.7.dmg <http://cta.irap.omp.eu/ctools/releases/ctools/ctools-1.4.3-macosx10.7.dmg>`_
    * - `1.4.2 <http://cta.irap.omp.eu/ctools/releases/ctools/ctools-1.4.2.tar.gz>`_
      - `1.4.2 <http://cta.irap.omp.eu/ctools/releases/gammalib/gammalib-1.4.2.tar.gz>`_
      - `ctools-1.4.2-macosx10.7.dmg <http://cta.irap.omp.eu/ctools/releases/ctools/ctools-1.4.2-macosx10.7.dmg>`_
+.. _1.4.3:
+
+ctools 1.4.3 release (31 October 2017)
+======================================
+
+Overview
+--------
+
+ctools 1.4.3 is a bug fix for ctools release 1.4.
+
+Except of a change in the documentation the code is identical to release 1.4.
@@ -20,6 +20,7 @@ Bug fix releases:
 .. toctree::
    :maxdepth: 1
  
+   ctools 1.4.3 <1.4.3>
    ctools 1.4.2 <1.4.2>
    ctools 1.4.1 <1.4.1>
    ctools 1.3.1 <1.3.1>
@@ -134,44 +134,44 @@ have been simulated (see figure below).
    :align: center
  
    *Header of an event list*
-
-
-.. warning::
-   Only the following header keywords in the ``EVENTS`` table have meaningful
-   values:
-
-   * ``DSTYPx`` - Data sub-space type
-   * ``DSUNIx`` - Data sub-space unit
-   * ``DSVALx`` - Data sub-space value
-   * ``DSREFx`` - Data sub-space reference
-   * ``NDSKEYS`` - Number of data sub-space keys
-   * ``NMCIDS`` - Number of Monte Carlo identifiers
-   * ``MIDxxxxx`` - Monte Carlo identifier
-   * ``MMNxxxxx`` - Model name for Monte Carlo identifier
-   * ``OBS_ID`` - Observation identifier
-   * ``DATE_OBS`` - start date of observation (UTC)
-   * ``TIME_OBS`` - start time of observation (UTC)
-   * ``DATE_END`` - end date of observation (UTC)
-   * ``TIME_END`` - end time of observation (UTC)
-   * ``TSTART`` - start time of observation, counted from time reference (s)
-   * ``TSTOP`` - stop time of observation, counted from time reference (s)
-   * ``MJDREFI`` - integer part of time reference MJD (days)
-   * ``MJDREFF`` - fractional part of time reference MJD (days)
-   * ``TIMEUNIT`` - time unit
-   * ``TIMESYS`` - time system
-   * ``TIMEREF`` - time reference
-   * ``TELAPSE`` - elapsed time (s)
-   * ``ONTIME`` - exposure time (s)
-   * ``LIVETIME`` - livetime (s)
-   * ``DEADC`` - deadtime correction factor, livetime / exposure time
-   * ``TIMEDEL`` - time resolution
-   * ``RA_PNT`` - Right Ascension of pointing direction (deg)
-   * ``DEC_PNT`` - Declination of pointing direction (deg)
-   * ``RADECSYS`` - Coordinate system
-   * ``EQUINOX`` - Coordinate epoch
-
-   All remaining header keywords have arbitrary values and should not be
-   used for the analysis.
+..
+
+  .. warning::
+     Only the following header keywords in the ``EVENTS`` table have meaningful
+     values:
+
+     * ``DSTYPx`` - Data sub-space type
+     * ``DSUNIx`` - Data sub-space unit
+     * ``DSVALx`` - Data sub-space value
+     * ``DSREFx`` - Data sub-space reference
+     * ``NDSKEYS`` - Number of data sub-space keys
+     * ``NMCIDS`` - Number of Monte Carlo identifiers
+     * ``MIDxxxxx`` - Monte Carlo identifier
+     * ``MMNxxxxx`` - Model name for Monte Carlo identifier
+     * ``OBS_ID`` - Observation identifier
+     * ``DATE_OBS`` - start date of observation (UTC)
+     * ``TIME_OBS`` - start time of observation (UTC)
+     * ``DATE_END`` - end date of observation (UTC)
+     * ``TIME_END`` - end time of observation (UTC)
+     * ``TSTART`` - start time of observation, counted from time reference (s)
+     * ``TSTOP`` - stop time of observation, counted from time reference (s)
+     * ``MJDREFI`` - integer part of time reference MJD (days)
+     * ``MJDREFF`` - fractional part of time reference MJD (days)
+     * ``TIMEUNIT`` - time unit
+     * ``TIMESYS`` - time system
+     * ``TIMEREF`` - time reference
+     * ``TELAPSE`` - elapsed time (s)
+     * ``ONTIME`` - exposure time (s)
+     * ``LIVETIME`` - livetime (s)
+     * ``DEADC`` - deadtime correction factor, livetime / exposure time
+     * ``TIMEDEL`` - time resolution
+     * ``RA_PNT`` - Right Ascension of pointing direction (deg)
+     * ``DEC_PNT`` - Declination of pointing direction (deg)
+     * ``RADECSYS`` - Coordinate system
+     * ``EQUINOX`` - Coordinate epoch
+
+     All remaining header keywords have arbitrary values and should not be
+     used for the analysis.
  
 Each row of the ``EVENTS`` table corresponds to a single event.
 Each event is characterised by
@@ -203,10 +203,11 @@ An example of an ``EVENTS`` table is shown below.
    :align: center
  
    *Content of an event list*
+..
  
-.. warning::
-   The time stamps in the ``TIME`` column are **not** necessarily in ascending
-   order.
+  .. warning::
+     The time stamps in the ``TIME`` column are **not** necessarily in ascending
+     order.
  
  
 Observation Definition Files
@@ -234,10 +235,10 @@ identical.
 The other files in the folder are ASCII and FITS files containing spectral,
 temporal and spatial information that was used in the simulations.
  
-.. warning::
-   The ASCII and FITS files should always reside in the same folder as the
-   :ref:`model definition XML files <glossary_moddef>`
-   since the latter reference the former.
+  .. warning::
+     The ASCII and FITS files should always reside in the same folder as the
+     :ref:`model definition XML files <glossary_moddef>`
+     since the latter reference the former.
  
  
  
@@ -36,11 +36,31 @@ line by typing:
    $ wget https://owncloud.cta-observatory.org/remote.php/webdav/1dc/agn.tar.gz --user=<user> --ask-password
    $ wget https://owncloud.cta-observatory.org/remote.php/webdav/1dc/caldb.tar.gz --user=<user> --ask-password
    $ wget https://owncloud.cta-observatory.org/remote.php/webdav/1dc/models.tar.gz --user=<user> --ask-password
+..
  
-.. warning::
-   ``<user>`` needs to be replaced by your CTA user name.
-   Don't type the ``$`` symbol. It indicates that a command should be typed
-   on the command line of your terminal.
+  .. warning::
+     ``<user>`` needs to be replaced by your CTA user name.
+     Don't type the ``$`` symbol. It indicates that a command should be typed
+     on the command line of your terminal.
+
+  .. note::
+     You may need to add the ``--no-check-certificate`` option to download the
+     files using ``wget``.
+
+  .. note::
+     In case you encounter the following error message
+
+
+     .. code-block:: bash
+
+        HTTP request sent, awaiting response... 401 Unauthorized
+        Authentication selected: Basic realm="ownCloud"
+        Reusing existing connection to owncloud.cta-observatory.org:443.
+        HTTP request sent, awaiting response... 404 Not Found
+        2017-06-06 14:43:33 ERROR 404: Not Found.
+
+     or any other problems with the download, please contact
+     sstober@cta-observatory.org.
  
 To make sure that you have the relevant files you may check the MD5 checksums
 after downloading by typing for example
@@ -94,11 +114,12 @@ Before continuing, please set the following environment variables:
  
    $ export CTADATA=$PWD/1dc
    $ export CALDB=$CTADATA/caldb
-
-.. note::
-   You may consider adding the ``CTADATA`` and ``CALDB`` environment variables
-   to your ``.bashrc`` file (or equivalent) so that your analysis environment
-   for the
-   :ref:`first CTA Data Challenge <glossary_1dc>`
-   is always setup correctly.
+..
+
+  .. note::
+     You may consider adding the ``CTADATA`` and ``CALDB`` environment variables
+     to your ``.bashrc`` file (or equivalent) so that your analysis environment
+     for the
+     :ref:`first CTA Data Challenge <glossary_1dc>`
+     is always setup correctly.
  
@@ -27,13 +27,13 @@ After downloading, configure GammaLib and ctools as follows:
 Have a look at :ref:`getting the ctools <sec_install>` if you need more
 information about the installation and configuration process.
  
-.. note::
-   You may consider adding the ``GAMMALIB`` and ``CTOOLS`` environment variables
-   as well as the sourcing of the configuration scripts to your ``.bashrc`` file
-   (or equivalent) so that your analysis environment
-   for the
-   :ref:`first CTA Data Challenge <glossary_1dc>`
-   is always setup correctly.
+  .. note::
+     You may consider adding the ``GAMMALIB`` and ``CTOOLS`` environment variables
+     as well as the sourcing of the configuration scripts to your ``.bashrc`` file
+     (or equivalent) so that your analysis environment
+     for the
+     :ref:`first CTA Data Challenge <glossary_1dc>`
+     is always setup correctly.