Commit 67710149caaf24dec8df9946a33678390e70fac7
1 parent
82b4fc00
Update documentation
Showing
5 changed files
with
26 additions
and
19 deletions
doc/source/quickstart.rst
| @@ -8,7 +8,7 @@ GammaLib comes with a Python interface, and as first step you should | @@ -8,7 +8,7 @@ GammaLib comes with a Python interface, and as first step you should | ||
| 8 | verify that the Python interfaces workes correctly. You do this by | 8 | verify that the Python interfaces workes correctly. You do this by |
| 9 | typing:: | 9 | typing:: |
| 10 | 10 | ||
| 11 | - >>> from gammalib import * | 11 | + >>> import gammalib |
| 12 | 12 | ||
| 13 | If everything works fine you should just get a new Python prompt after | 13 | If everything works fine you should just get a new Python prompt after |
| 14 | importing GammaLib. If you get an error message, make sure that you've | 14 | importing GammaLib. If you get an error message, make sure that you've |
| @@ -22,7 +22,7 @@ up the environment as described | @@ -22,7 +22,7 @@ up the environment as described | ||
| 22 | 22 | ||
| 23 | Now try:: | 23 | Now try:: |
| 24 | 24 | ||
| 25 | - >>> models = GModels() | 25 | + >>> models = gammalib.GModels() |
| 26 | >>> print(models) | 26 | >>> print(models) |
| 27 | === GModels === | 27 | === GModels === |
| 28 | Number of models ..........: 0 | 28 | Number of models ..........: 0 |
| @@ -33,11 +33,11 @@ container. | @@ -33,11 +33,11 @@ container. | ||
| 33 | 33 | ||
| 34 | Now let's append a model to this container. For this, type:: | 34 | Now let's append a model to this container. For this, type:: |
| 35 | 35 | ||
| 36 | - >>> pos = GSkyDir() | 36 | + >>> pos = gammalib.GSkyDir() |
| 37 | >>> pos.radec_deg(83.6331, 22.0145) | 37 | >>> pos.radec_deg(83.6331, 22.0145) |
| 38 | - >>> spatial = GModelSpatialPointSource(pos) | ||
| 39 | - >>> spectral = GModelSpectralPlaw(1.0, -2.0, GEnergy(100, 'MeV')) | ||
| 40 | - >>> model = GModelSky(spatial, spectral) | 38 | + >>> spatial = gammalib.GModelSpatialPointSource(pos) |
| 39 | + >>> spectral = gammalib.GModelSpectralPlaw(1.0, -2.0, gammalib.GEnergy(100, 'MeV')) | ||
| 40 | + >>> model = gammalib.GModelSky(spatial, spectral) | ||
| 41 | >>> models.append(model) | 41 | >>> models.append(model) |
| 42 | >>> print(models) | 42 | >>> print(models) |
| 43 | === GModels === | 43 | === GModels === |
| @@ -101,7 +101,7 @@ typing:: | @@ -101,7 +101,7 @@ typing:: | ||
| 101 | 101 | ||
| 102 | and you can load it from an XML file in memory using:: | 102 | and you can load it from an XML file in memory using:: |
| 103 | 103 | ||
| 104 | - >>> new_models = GModels('test.xml') | 104 | + >>> new_models = gammalib.GModels('test.xml') |
| 105 | >>> print(new_models) | 105 | >>> print(new_models) |
| 106 | 106 | ||
| 107 | The last print command is to convince yourself that the models have been | 107 | The last print command is to convince yourself that the models have been |
doc/source/user_manual/getting.rst
| @@ -10,7 +10,7 @@ to compile and to install GammaLib. | @@ -10,7 +10,7 @@ to compile and to install GammaLib. | ||
| 10 | 10 | ||
| 11 | You will need the following to build the software: | 11 | You will need the following to build the software: |
| 12 | 12 | ||
| 13 | -- About 100 MB of free disk space. | 13 | +- About 200 MB of free disk space. |
| 14 | 14 | ||
| 15 | - An ANSI C++ compiler. We recommend building GammaLib with the GNU g++ | 15 | - An ANSI C++ compiler. We recommend building GammaLib with the GNU g++ |
| 16 | compiler. | 16 | compiler. |
| @@ -144,8 +144,8 @@ https://sourceforge.net/projects/gammalib/. The code can be downloaded | @@ -144,8 +144,8 @@ https://sourceforge.net/projects/gammalib/. The code can be downloaded | ||
| 144 | from this site by clicking on the download button. Alternatively, the | 144 | from this site by clicking on the download button. Alternatively, the |
| 145 | code can be downloaded and unpacked from the UNIX prompt using:: | 145 | code can be downloaded and unpacked from the UNIX prompt using:: |
| 146 | 146 | ||
| 147 | - $ wget --no-check-certificate https://downloads.sourceforge.net/project/gammalib/gammalib/gammalib-00-08-00.tar.gz | ||
| 148 | - $ tar xfz gammalib-00-08-00.tar.gz | 147 | + $ wget --no-check-certificate https://downloads.sourceforge.net/project/gammalib/gammalib/gammalib-00-10-00.tar.gz |
| 148 | + $ tar xfz gammalib-00-10-00.tar.gz | ||
| 149 | 149 | ||
| 150 | The GammaLib source code can also be cloned using git. This method is | 150 | The GammaLib source code can also be cloned using git. This method is |
| 151 | recommended if you plan to contribute to the development of the GammaLib | 151 | recommended if you plan to contribute to the development of the GammaLib |
| @@ -201,17 +201,20 @@ follows:: | @@ -201,17 +201,20 @@ follows:: | ||
| 201 | * FITS I/O support (yes) /usr/local/gamma/lib /usr/local/gamma/include | 201 | * FITS I/O support (yes) /usr/local/gamma/lib /usr/local/gamma/include |
| 202 | * Readline support (yes) | 202 | * Readline support (yes) |
| 203 | * Ncurses support (yes) | 203 | * Ncurses support (yes) |
| 204 | + * Make Python binding (yes) use swig for updates | ||
| 204 | * Python (yes) | 205 | * Python (yes) |
| 205 | * Python.h (yes) | 206 | * Python.h (yes) |
| 207 | + * Python wrappers (yes) | ||
| 206 | * swig (yes) | 208 | * swig (yes) |
| 207 | - * Make Python bindings (yes) | ||
| 208 | * Multiwavelength interface (yes) | 209 | * Multiwavelength interface (yes) |
| 209 | * Fermi-LAT interface (yes) | 210 | * Fermi-LAT interface (yes) |
| 210 | * CTA interface (yes) | 211 | * CTA interface (yes) |
| 211 | - * Doxygen (yes) /usr/local/bin/doxygen | 212 | + * COMPTEL interface (yes) |
| 213 | + * Doxygen (yes) /opt/local/bin/doxygen | ||
| 212 | * Perform NaN/Inf checks (yes) (default) | 214 | * Perform NaN/Inf checks (yes) (default) |
| 213 | * Perform range checking (yes) (default) | 215 | * Perform range checking (yes) (default) |
| 214 | * Optimize memory usage (yes) (default) | 216 | * Optimize memory usage (yes) (default) |
| 217 | + * Enable OpenMP (yes) (default) | ||
| 215 | - Compile in debug code (no) (default) | 218 | - Compile in debug code (no) (default) |
| 216 | - Enable code for profiling (no) (default) | 219 | - Enable code for profiling (no) (default) |
| 217 | 220 | ||
| @@ -409,7 +412,7 @@ instrument dependent modules are enabled), you should see the following | @@ -409,7 +412,7 @@ instrument dependent modules are enabled), you should see the following | ||
| 409 | message in your terminal:: | 412 | message in your terminal:: |
| 410 | 413 | ||
| 411 | =================== | 414 | =================== |
| 412 | - All 19 tests passed | 415 | + All 20 tests passed |
| 413 | =================== | 416 | =================== |
| 414 | 417 | ||
| 415 | (Note that the exact number of tests that is conducted depends on the | 418 | (Note that the exact number of tests that is conducted depends on the |
doc/source/user_manual/introduction.rst
| @@ -37,7 +37,7 @@ version 3. The latest source code can be downloaded from | @@ -37,7 +37,7 @@ version 3. The latest source code can be downloaded from | ||
| 37 | https://sourceforge.net/projects/gammalib/ which also provides bug | 37 | https://sourceforge.net/projects/gammalib/ which also provides bug |
| 38 | trackers and mailing lists. Further information and documentation on | 38 | trackers and mailing lists. Further information and documentation on |
| 39 | GammaLib can be found on http://gammalib.sourceforge.net/. The present document | 39 | GammaLib can be found on http://gammalib.sourceforge.net/. The present document |
| 40 | -applies to GammaLib version 0.8. | 40 | +applies to GammaLib version 0.10. |
| 41 | 41 | ||
| 42 | GammaLib is designed to compile on any POSIX compliant platform. So far, | 42 | GammaLib is designed to compile on any POSIX compliant platform. So far, |
| 43 | GammaLib has been successfully compiled and tested on Mac OS X, OpenBSD, OpenSolaris | 43 | GammaLib has been successfully compiled and tested on Mac OS X, OpenBSD, OpenSolaris |
| @@ -91,7 +91,7 @@ correspond to the folders in the source code distribution): | @@ -91,7 +91,7 @@ correspond to the folders in the source code distribution): | ||
| 91 | 91 | ||
| 92 | GammaLib can be used as C++ application program interface (API) or as a Python | 92 | GammaLib can be used as C++ application program interface (API) or as a Python |
| 93 | module (provided that Python is installed on your system). The GammaLib Python | 93 | module (provided that Python is installed on your system). The GammaLib Python |
| 94 | -bindings were built using `swig <http://www.swig.org/>`_ version 2.0.8, and are | 94 | +bindings were built using `swig <http://www.swig.org/>`_ version 3.0.2, and are |
| 95 | shipped together with the source code. This enables using all | 95 | shipped together with the source code. This enables using all |
| 96 | GammaLib functionalities from within Python. | 96 | GammaLib functionalities from within Python. |
| 97 | 97 |
doc/source/user_manual/modules/uml_vo.png
doc/source/user_manual/modules/vo.rst
| @@ -7,15 +7,19 @@ Overview | @@ -7,15 +7,19 @@ Overview | ||
| 7 | ~~~~~~~~ | 7 | ~~~~~~~~ |
| 8 | 8 | ||
| 9 | The VO module provides classes that interface GammaLib to the Virtual | 9 | The VO module provides classes that interface GammaLib to the Virtual |
| 10 | -Observatory infrastructure. So far the module contains :doxy:`GVOClient` | ||
| 11 | -as only class, which implements a client for the Virtual Observatory. | 10 | +Observatory infrastructure. So far the module contains the :doxy:`GVOClient` |
| 11 | +and the :doxy:`GVOHub` classes. :doxy:`GVOClient` implements a | ||
| 12 | +Virtual Observatory client while :doxy:`GVOHub` implement a hub for | ||
| 13 | +inter-client communication. | ||
| 14 | +If a client needs to connect to a Hub and no Hub is currently running | ||
| 15 | +on the system, the client will launch it's own Hub. | ||
| 12 | 16 | ||
| 13 | -:ref:`fig_uml_vo` present an overview over the C++ classes of the VO | 17 | +:ref:`fig_uml_vo` presents an overview over the C++ classes of the VO |
| 14 | module and their relations. | 18 | module and their relations. |
| 15 | 19 | ||
| 16 | .. _fig_uml_vo: | 20 | .. _fig_uml_vo: |
| 17 | 21 | ||
| 18 | .. figure:: uml_vo.png | 22 | .. figure:: uml_vo.png |
| 19 | - :width: 17% | 23 | + :width: 30% |
| 20 | 24 | ||
| 21 | VO module | 25 | VO module |