Commit 58ff67a4638e569565fb76ed9a5bf0a404711227
1 parent
03beaad9
update for version 0.4.0
Showing
5 changed files
with
67 additions
and
32 deletions
ChangeLog
| 1 | -2011-10-06 Juergen Knoedlseder <knodlseder@cesr.fr> | 1 | +2011-10-20 Juergen Knoedlseder <knodlseder@cesr.fr> |
| 2 | 2 | ||
| 3 | * Version 0.3.0 released | 3 | * Version 0.3.0 released |
| 4 | ======================== | 4 | ======================== |
| 5 | 5 | ||
| 6 | Renamed to ctools | 6 | Renamed to ctools |
| 7 | + Add configure options for Mac OSX universal builds | ||
| 8 | + Remove automake dependency tracking | ||
| 7 | 9 | ||
| 8 | 10 | ||
| 9 | 2011-10-03 Juergen Knoedlseder <knodlseder@cesr.fr> | 11 | 2011-10-03 Juergen Knoedlseder <knodlseder@cesr.fr> |
NEWS
| 1 | -New Features and Important Changes in ctools 00-03-00 | 1 | +New Features and Important Changes in ctools 00-04-00 |
| 2 | 2 | ||
| 3 | Author(s) : Juergen Knoedlseder | 3 | Author(s) : Juergen Knoedlseder |
| 4 | 4 | ||
| 5 | -October 6, 2011 | 5 | +October 20, 2011 |
| 6 | 6 | ||
| 7 | 7 | ||
| 8 | 1. Introduction | 8 | 1. Introduction |
| 9 | --------------- | 9 | --------------- |
| 10 | This document briefly summarizes executable by executable the most important changes made since the last release of ctools. | 10 | This document briefly summarizes executable by executable the most important changes made since the last release of ctools. |
| 11 | 11 | ||
| 12 | - | ||
| 13 | 2. Configuration | 12 | 2. Configuration |
| 14 | ----------------- | 13 | ----------------- |
| 15 | -Renamed package from ctatools to ctools | 14 | +The configure options --enable-universalsdk and --with-universal-archs |
| 15 | +have been added to control building of universal libraries. This is | ||
| 16 | +particularily required if the installed Python architecture differs from | ||
| 17 | +the default architecture created by the compiler. | ||
| 16 | 18 | ||
| 19 | +Remove automake dependency tracking as this conflicts with Mac OS X | ||
| 20 | +universal builds. | ||
| 17 | 21 | ||
| 18 | 3. Python interface | 22 | 3. Python interface |
| 19 | ------------------- | 23 | ------------------- |
| 20 | None | 24 | None |
| 21 | 25 | ||
| 22 | - | ||
| 23 | 4. ctobssim - CTA observation simulation | 26 | 4. ctobssim - CTA observation simulation |
| 24 | ---------------------------------------- | 27 | ---------------------------------------- |
| 25 | None | 28 | None |
| 26 | 29 | ||
| 27 | - | ||
| 28 | 5. ctselect - CTA event selection | 30 | 5. ctselect - CTA event selection |
| 29 | --------------------------------- | 31 | --------------------------------- |
| 30 | None | 32 | None |
| 31 | 33 | ||
| 32 | - | ||
| 33 | 6. ctbin - CTA event binning | 34 | 6. ctbin - CTA event binning |
| 34 | ---------------------------- | 35 | ---------------------------- |
| 35 | None | 36 | None |
| 36 | 37 | ||
| 37 | - | ||
| 38 | 7. ctlike - CTA maximum likelihood fitting | 38 | 7. ctlike - CTA maximum likelihood fitting |
| 39 | ------------------------------------------ | 39 | ------------------------------------------ |
| 40 | None | 40 | None |
| 41 | 41 | ||
| 42 | +8. ctskymap - CTA sky mapping | ||
| 43 | +----------------------------- | ||
| 44 | +New executable. | ||
| 42 | 45 | ||
| 43 | -8. Examples | 46 | +9. Examples |
| 44 | ----------- | 47 | ----------- |
| 45 | None | 48 | None |
| 46 | 49 | ||
| 47 | - | ||
| 48 | -9. Scripts | ||
| 49 | ----------- | 50 | +10. Scripts |
| 51 | +----------- | ||
| 50 | None | 52 | None |
| 51 | 53 | ||
| 52 | -10. caldb | 54 | +11. caldb |
| 53 | --------- | 55 | --------- |
| 54 | None | 56 | None |
| 55 | 57 | ||
| 56 | - | ||
| 57 | -11. models | 58 | +12. models |
| 58 | ---------- | 59 | ---------- |
| 59 | None | 60 | None |
README
| 1 | ctools information | 1 | ctools information |
| 2 | ================== | 2 | ================== |
| 3 | -Version: 00-03-05 (October 6, 2011) | 3 | +Version: 00-04-00 (October 20, 2011) |
| 4 | Author: Juergen Knodlseder (knodlseder@cesr.fr) | 4 | Author: Juergen Knodlseder (knodlseder@cesr.fr) |
| 5 | -GammaLib dependency: 00-04-11 | 5 | +GammaLib dependency: 00-05-00 |
| 6 | 6 | ||
| 7 | 7 | ||
| 8 | License information | 8 | License information |
| @@ -38,6 +38,7 @@ The following tools are so far available: | @@ -38,6 +38,7 @@ The following tools are so far available: | ||
| 38 | ctselect - event selection | 38 | ctselect - event selection |
| 39 | ctbin - event binning | 39 | ctbin - event binning |
| 40 | ctlike - maximum likelihood model fitting | 40 | ctlike - maximum likelihood model fitting |
| 41 | + ctskymap - CTA sky mapping tool | ||
| 41 | 42 | ||
| 42 | 43 | ||
| 43 | Web sites | 44 | Web sites |
| @@ -96,19 +97,50 @@ The file INSTALL details more about using configure. Also try | @@ -96,19 +97,50 @@ The file INSTALL details more about using configure. Also try | ||
| 96 | 97 | ||
| 97 | Macintosh OS X Installation | 98 | Macintosh OS X Installation |
| 98 | ============================ | 99 | ============================ |
| 99 | -ctools are known to work on various flavors of OS X. Follow the Unix | ||
| 100 | -installation instructions above. | 100 | +ctools is known to work on various flavors of OS X. To cope with |
| 101 | +different system versions and architectures, there are two Mac | ||
| 102 | +specific configure options: | ||
| 101 | 103 | ||
| 102 | -In some cases, install problems have been reported with mixed | ||
| 103 | -architectures (i386, ppc, x86_64), so you may configure and build | ||
| 104 | -as follows to enable building a bundle for various architectures: | 104 | + % ./configure --enable-universalsdk[=PATH] |
| 105 | 105 | ||
| 106 | - % export CXXFLAGS="-arch ppc -arch i386 -arch x86_64" | ||
| 107 | - % export LDFLAGS="-arch ppc -arch i386 -arch x86_64" | ||
| 108 | - % ./configure | ||
| 109 | - % make | ||
| 110 | - % make check | ||
| 111 | - % make install | 106 | +creates a universal build of ctools. The optional argument specifies |
| 107 | +which OSX SDK should be used to perform the build. This defaults to | ||
| 108 | +"/Developer/SDKs/MacOSX.10.4u.sdk". Specify "/" when building on a 10.5 | ||
| 109 | +system or higher, especially when building 64-bit code. | ||
| 110 | + | ||
| 111 | + % ./configure --with-univeral-archs=VALUE | ||
| 112 | + | ||
| 113 | +specifies the kind of universal build that should be created. Possible | ||
| 114 | +values are: "32-bit", "3-way", "intel" or "all". By default, a "32-bit" | ||
| 115 | +build will be made. This option is only valid when | ||
| 116 | +"--enable-universalsdk" is specified. | ||
| 117 | + | ||
| 118 | +These options are in particular needed if your Python architecture differs | ||
| 119 | +from the default architecture of your system. To examine the Python | ||
| 120 | +architecture you may type: | ||
| 121 | + | ||
| 122 | + % file `which python` | ||
| 123 | + | ||
| 124 | +which will return the architectures that are compiled in the Mach-0 | ||
| 125 | +executable: | ||
| 126 | + | ||
| 127 | + i386 32-bit intel | ||
| 128 | + ppc 32-bit powerpc | ||
| 129 | + ppc64 64-bit powerpc | ||
| 130 | + x86_64 64-bit intel | ||
| 131 | + | ||
| 132 | +If Python is 32-bit (ppc, i386) but the compiler produces by default | ||
| 133 | +64-bit code (ppc64, x86_64), the Python module will not work. Using | ||
| 134 | + | ||
| 135 | + % ./configure --enable-universalsdk=/ | ||
| 136 | + | ||
| 137 | +will force a universal 32-bit build which creates code for ppc and | ||
| 138 | +i386. If on the other hand Python is 64-bit (ppc64, x86_64) but the | ||
| 139 | +compiler produces by default 32-bit code (ppc, i386), the option | ||
| 140 | + | ||
| 141 | + % ./configure --enable-universalsdk=/ --with-univeral-archs=3-way | ||
| 142 | + | ||
| 143 | +will generate a universal build which contains 32-bit and 64-bit code. | ||
| 112 | 144 | ||
| 113 | 145 | ||
| 114 | Solaris Installation | 146 | Solaris Installation |
configure.ac
| @@ -29,7 +29,7 @@ | @@ -29,7 +29,7 @@ | ||
| 29 | ############################################################################# | 29 | ############################################################################# |
| 30 | # Initialisation # | 30 | # Initialisation # |
| 31 | ############################################################################# | 31 | ############################################################################# |
| 32 | -AC_INIT([ctools], [0.3.0], [knodlseder@cesr.fr], [ctools]) | 32 | +AC_INIT([ctools], [0.4.0], [knodlseder@cesr.fr], [ctools]) |
| 33 | AC_CONFIG_SRCDIR([src/ctselect/ctselect.cpp]) | 33 | AC_CONFIG_SRCDIR([src/ctselect/ctselect.cpp]) |
| 34 | AC_CONFIG_MACRO_DIR([m4]) | 34 | AC_CONFIG_MACRO_DIR([m4]) |
| 35 | AM_INIT_AUTOMAKE([gnu no-dependencies]) | 35 | AM_INIT_AUTOMAKE([gnu no-dependencies]) |
ctools.pc.in
| @@ -6,9 +6,9 @@ includedir=${prefix}/include | @@ -6,9 +6,9 @@ includedir=${prefix}/include | ||
| 6 | Name: ctools | 6 | Name: ctools |
| 7 | Description: CTA science analysis tools | 7 | Description: CTA science analysis tools |
| 8 | URL: http://cta.irap.omp.eu/ctools | 8 | URL: http://cta.irap.omp.eu/ctools |
| 9 | -Version: 0.2.5 | 9 | +Version: 0.4.0 |
| 10 | Requires: | 10 | Requires: |
| 11 | -Requires.private: GammaLib >= 0.4.11 | 11 | +Requires.private: GammaLib >= 0.5.0 |
| 12 | Conflicts: | 12 | Conflicts: |
| 13 | Cflags: -I${includedir}/ctools | 13 | Cflags: -I${includedir}/ctools |
| 14 | Libs: -L${libdir} -lctools | 14 | Libs: -L${libdir} -lctools |