Merge branch 'master' into integration

# Conflicts: # README.md # configure.ac # ctools.pc.in # doc/Doxyfile # doc/source/conf.py # sonar-project.properties

Merge branch 'master' into integration
# Conflicts: # README.md # configure.ac # ctools.pc.in # doc/Doxyfile # doc/source/conf.py # sonar-project.properties
Jürgen Knödlseder
2 parents 13c1d2ab ab827750
Showing 8 changed files with 101 additions and 36 deletions
doc/source/admin/download.rst
doc/source/admin/release_history/1.4.1.rst
doc/source/admin/release_history/1.4.2.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
doc/source/users/tutorials/1dc/scope.rst
@@ -13,7 +13,7 @@ bugs.
 Releases
 --------
-The latest ctools release is ``ctools-1.4.0`` (1 August 2017).
+The latest ctools release is ``ctools-1.4.2`` (22 August 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,12 @@ learn more about new features and corrected bugs in a given release.
    * - ctools
      - gammalib
      - Mac OS X package
+   * - `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.1 <http://cta.irap.omp.eu/ctools/releases/ctools/ctools-1.4.1.tar.gz>`_
+     - `1.4.1 <http://cta.irap.omp.eu/ctools/releases/gammalib/gammalib-1.4.1.tar.gz>`_
+     - `ctools-1.4.1-macosx10.7.dmg <http://cta.irap.omp.eu/ctools/releases/ctools/ctools-1.4.1-macosx10.7.dmg>`_
    * - `1.4.0 <http://cta.irap.omp.eu/ctools/releases/ctools/ctools-1.4.0.tar.gz>`_
      - `1.4.0 <http://cta.irap.omp.eu/ctools/releases/gammalib/gammalib-1.4.0.tar.gz>`_
      - `ctools-1.4.0-macosx10.7.dmg <http://cta.irap.omp.eu/ctools/releases/ctools/ctools-1.4.0-macosx10.7.dmg>`_
+.. _1.4.1:
+
+ctools 1.4.1 release (22 August 2017)
+=====================================
+
+Overview
+--------
+
+ctools 1.4.1 is a bug fix for ctools release 1.4.
+
+Except of a change in the documentation the code is identical to release 1.4.
+.. _1.4.2:
+
+ctools 1.4.2 release (24 August 2017)
+=====================================
+
+Overview
+--------
+
+ctools 1.4.2 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,8 @@ Bug fix releases:
 .. toctree::
    :maxdepth: 1
+   ctools 1.4.2 <1.4.2>
+   ctools 1.4.1 <1.4.1>
    ctools 1.3.1 <1.3.1>
    ctools 1.2.1 <1.2.1>
    ctools 1.0.1 <1.0.1>
@@ -17,6 +17,10 @@ The content of the ``1dc`` folder should be as follows:
    caldb/data/cta/1dc/caldb.indx
    caldb/data/cta/1dc/bcf
    ...
+   data/baseline/agn
+   data/baseline/agn/agn_baseline_510000.fits
+   data/baseline/agn/agn_baseline_510001.fits
+   ...
    data/
    data/baseline/
    data/baseline/egal
@@ -32,11 +36,13 @@ The content of the ``1dc`` folder should be as follows:
    data/baseline/gps/gps_baseline_110001.fits
    ...
    models/
+   models/models_agn.xml
    models/models_egal.xml
    models/models_gc.xml
    models/models_gps.xml
    ...
    obs/
+   obs/obs_agn_baseline.xml
    obs/obs_egal_baseline.xml
    obs/obs_gc_baseline.xml
    obs/obs_gps_baseline.xml
@@ -75,29 +81,30 @@ and that were stored into FITS files.
 Event data are split into :ref:`observations <glossary_obs>` with a fixed
 pointing direction (observations are also known as runs).
 The duration of an observation is 25 minutes for the Extragalactic Survey
-and 30 minutes for the Galactic Plane and Centre surveys.
-The properties of the event data for all three surveys are summarised in the
+and 30 minutes for the Galactic Plane and Centre surveys and the AGN monitoring
+program.
+The properties of the event data for all simulations are summarised in the
 table below:
-   +-----------------------------------+---------------------+---------------------+---------------------+
-   | Parameter                         |       GPS           |        GC           |         EGAL        |
-   +===================================+=====================+=====================+=====================+
-   | Number of observations            |                3270 |                1671 |                1271 |
-   +-----------------------------------+---------------------+---------------------+---------------------+
-   | Duration of each observation      |              1800 s |              1800 s |              1500 s |
-   +-----------------------------------+---------------------+---------------------+---------------------+
-   | Deadtime fraction                 |                  2% |                  2% |                  2% |
-   +-----------------------------------+---------------------+---------------------+---------------------+
-   | Total exposure time of simulation |              1635 h |             835.5 h |            529.58 h |
-   +-----------------------------------+---------------------+---------------------+---------------------+
-   | Simulated event energies          |    30 GeV - 160 TeV |    30 GeV - 160 TeV |    30 GeV - 160 TeV |
-   +-----------------------------------+---------------------+---------------------+---------------------+
-   | Maximum off-axis angle            |               5 deg |               5 deg |               5 deg |
-   +-----------------------------------+---------------------+---------------------+---------------------+
-   | Start date of observations        | 2021-01-01T11:58:51 | 2021-01-01T11:58:51 | 2021-01-01T11:58:51 |
-   +-----------------------------------+---------------------+---------------------+---------------------+
-   | End date of observations          | 2021-04-18T18:52:51 | 2021-03-29T21:32:51 | 2021-02-25T14:38:51 |
-   +-----------------------------------+---------------------+---------------------+---------------------+
+   +-----------------------------------+------------------+------------------+------------------+-----------------+
+   | Parameter                         |        GPS       |         GC       |      EGAL        |       AGN       |
+   +===================================+==================+==================+==================+=================+
+   | Number of observations            |             3270 |             1671 |             1271 |            1920 |
+   +-----------------------------------+------------------+------------------+------------------+-----------------+
+   | Duration of each observation      |           1800 s |           1800 s |           1500 s |          1800 s |
+   +-----------------------------------+------------------+------------------+------------------+-----------------+
+   | Deadtime fraction                 |               2% |               2% |               2% |              2% |
+   +-----------------------------------+------------------+------------------+------------------+-----------------+
+   | Total exposure time of simulation |           1635 h |          835.5 h |         529.58 h |        960.00 h |
+   +-----------------------------------+------------------+------------------+------------------+-----------------+
+   | Simulated event energies          | 30 GeV - 160 TeV | 30 GeV - 160 TeV | 30 GeV - 160 TeV | 30 GeV - 50 TeV |
+   +-----------------------------------+------------------+------------------+------------------+-----------------+
+   | Maximum off-axis angle            |            5 deg |            5 deg |            5 deg |           5 deg |
+   +-----------------------------------+------------------+------------------+------------------+-----------------+
+   | Start date of observations        |       2021-01-01 |       2021-01-01 |       2021-01-01 |      2021-01-01 |
+   +-----------------------------------+------------------+------------------+------------------+-----------------+
+   | End date of observations          |       2021-04-18 |       2021-03-29 |       2021-02-25 |      2022-07-09 |
+   +-----------------------------------+------------------+------------------+------------------+-----------------+
 Each event file contains the events for an
@@ -205,8 +212,8 @@ An example of an ``EVENTS`` table is shown below.
 Observation Definition Files
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-The files ``obs_egal_baseline.xml``, ``obs_gc_baseline.xml``, and
-``obs_gps_baseline.xml`` are so called
+The files ``obs_agn_baseline.xml``, ``obs_egal_baseline.xml``,
+``obs_gc_baseline.xml``, and ``obs_gps_baseline.xml`` are so called
 :ref:`observation definition files <glossary_obsdef>`
 containing the information (or metadata) of a list of observations.
 The file is a plain ASCII files in XML format that can be inspected and
@@ -218,11 +225,11 @@ Models
 The ``models`` folder contains the definitions of all source and background
 models that were used for simulating the data.
-The files ``models_egal.xml``, ``models_gc.xml`` and ``models_gps.xml`` are
-so called
+The files ``models_agn.xml``, ``models_egal.xml``, ``models_gc.xml`` and
+``models_gps.xml`` are so called
 :ref:`model definition files <glossary_moddef>`
 collecting the definition of all model components used for the three surveys.
-Since the same sky model was used for all surveys the three files are
+Since the same sky model was used for all surveys the four files are
 identical.
 The other files in the folder are ASCII and FITS files containing spectral,
 temporal and spatial information that was used in the simulations.
@@ -10,7 +10,7 @@ data are available on the
 You need your usual CTA credentials to download the data.
 The release contains simulated data for the Galactic Plane Survey, the
-Galactic Centre Survey and the Extragalactic Survey,
+Galactic Centre Survey, the Extragalactic Survey and the AGN monitoring program,
 :ref:`instrument response functions (IRFs) <glossary_irf>`, and the
 :ref:`model definition files <glossary_moddef>`
 that were used for the simulation.
@@ -21,6 +21,7 @@ by clicking on the following links:
 * `Galactic Plane Survey <https://owncloud.cta-observatory.org/remote.php/webdav/1dc/gps.tar.gz>`_ (8.3 GB)
 * `Galactic Centre Survey <https://owncloud.cta-observatory.org/remote.php/webdav/1dc/gc.tar.gz>`_ (4.4 GB)
 * `Extragalactic Survey <https://owncloud.cta-observatory.org/remote.php/webdav/1dc/egal.tar.gz>`_ (2.5 GB)
+* `AGN monitoring program <https://owncloud.cta-observatory.org/remote.php/webdav/1dc/agn.tar.gz>`_ (4.7 GB)
 * `Instrument Response Functions <https://owncloud.cta-observatory.org/remote.php/webdav/1dc/caldb.tar.gz>`_ (1.2 MB)
 * `Sky and background models <https://owncloud.cta-observatory.org/remote.php/webdav/1dc/models.tar.gz>`_ (0.9 GB)
@@ -32,6 +33,7 @@ line by typing:
    $ wget https://owncloud.cta-observatory.org/remote.php/webdav/1dc/gps.tar.gz --user=<user> --ask-password
    $ wget https://owncloud.cta-observatory.org/remote.php/webdav/1dc/gc.tar.gz --user=<user> --ask-password
    $ wget https://owncloud.cta-observatory.org/remote.php/webdav/1dc/egal.tar.gz --user=<user> --ask-password
+   $ 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
@@ -40,13 +42,38 @@ line by typing:
    Don't type the ``$`` symbol. It indicates that a command should be typed
    on the command line of your terminal.
-After downloading, uncompress the files at any place by typing
+To make sure that you have the relevant files you may check the MD5 checksums
+after downloading by typing for example
+
+.. code-block:: bash
+
+   $ md5 gps.tar.gz
+
+on Mac OS X or
+
+.. code-block:: bash
+
+   $ md5sum gps.tar.gz
+
+on Linux. Below the expected results:
+
+.. code-block:: bash
+
+   gps.tar.gz         c7129c71e911920f82273270c9d7c818
+   gc.tar.gz          07aa46bb2d67cd64fa4685078643b043
+   egal.tar.gz        4ea5f2ff8312b700dcc133a89d9fd096
+   agn.tar.gz         cef82d6772bd123cd9c6949aeede9d71
+   caldb.tar.gz       ce718128e1b2fe19c4b8dc79b688d113
+   models.tar.gz      87662cf53a2988522f485cad984d8810
+
+Now uncompress the files at any place by typing
 .. code-block:: bash
    $ tar xfvz gps.tar.gz
    $ tar xfvz gc.tar.gz
    $ tar xfvz egal.tar.gz
+   $ tar xfvz agn.tar.gz
    $ tar xfvz caldb.tar.gz
    $ tar xfvz models.tar.gz
@@ -6,14 +6,14 @@ Getting the analysis tools
 We recommend that you use ctools to analyse the data from the
 :ref:`first CTA Data Challenge <glossary_1dc>`.
-The reference version for the Data Challenge is ``ctools-1.4.0``.
-``ctools-1.4.0`` depends on ``gammalib-1.4.0``. You may either download
+The reference version for the Data Challenge is ``ctools-1.4.2``.
+``ctools-1.4.2`` depends on ``gammalib-1.4.2``. You may either download
 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.4.0-macosx10.7.dmg>`_ (Mac OS X 10.7+)
-* `GammaLib <http://cta.irap.omp.eu/ctools/releases/gammalib/gammalib-1.4.0.tar.gz>`_ source code tarball
-* `ctools <http://cta.irap.omp.eu/ctools/releases/ctools/ctools-1.4.0.tar.gz>`_ source code tarball
+* `Mac OS X binary package <http://cta.irap.omp.eu/ctools/releases/ctools/ctools-1.4.2-macosx10.7.dmg>`_ (Mac OS X 10.7+)
+* `GammaLib <http://cta.irap.omp.eu/ctools/releases/gammalib/gammalib-1.4.2.tar.gz>`_ source code tarball
+* `ctools <http://cta.irap.omp.eu/ctools/releases/ctools/ctools-1.4.2.tar.gz>`_ source code tarball
 After downloading, configure GammaLib and ctools as follows:
@@ -38,15 +38,16 @@ conditions; only zenith angles of 20 degrees and 40 degrees were
 simulated.
 Data are provided for the baseline arrays.
-Three Key Science Projects (KSPs) were simulated using realistic pointing
+Four Key Science Projects (KSPs) were simulated using realistic pointing
 patterns as defined in the CTA Science Case document:
 * the Galactic Plane Scan (GPS)
 * the Galactic Centre Survey (GC)
 * the Extragalactic Survey (EGAL)
+* an AGN monitoring program (AGN)
 The source model used for the simulations is distributed together with the
 data to the CTA Consortium Science Working Groups, so that analysis results
 can be compared to the Monte Carlo truth. The same source model was used for
-the simulation of all three surveys.
+all simulations.