Skip to content
GitLab
Commit 532d120d authored by Emmanuel Bertin's avatar Emmanuel Bertin
Browse files

Fixed missing test for sincosf() that prevented the code to compile on MacOS (thanks to C.Aspin). 

Added support for RADESYS WCS keyword (non-standard RADECSYS still supported).
Fixed display precision issues with SPREAD_MODEL.
Pushed version number to 2.14.4.
parent 4e303eea
Show whitespace changes
Inline Side-by-side
configure
View file @ 532d120d
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for sextractor 2.14.2. # Generated by GNU Autoconf 2.68 for sextractor 2.14.4.
# #
# Report bugs to <bertin@iap.fr>. # Report bugs to <bertin@iap.fr>.
# #
...@@ -714,8 +714,8 @@ MAKEFLAGS= ...@@ -714,8 +714,8 @@ MAKEFLAGS=
# Identity of this package. # Identity of this package.
PACKAGE_NAME='sextractor' PACKAGE_NAME='sextractor'
PACKAGE_TARNAME='sextractor' PACKAGE_TARNAME='sextractor'
PACKAGE_VERSION='2.14.2' PACKAGE_VERSION='2.14.4'
PACKAGE_STRING='sextractor 2.14.2' PACKAGE_STRING='sextractor 2.14.4'
PACKAGE_BUGREPORT='bertin@iap.fr' PACKAGE_BUGREPORT='bertin@iap.fr'
PACKAGE_URL='' PACKAGE_URL=''
   
...@@ -1465,7 +1465,7 @@ if test "$ac_init_help" = "long"; then ...@@ -1465,7 +1465,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures sextractor 2.14.2 to adapt to many kinds of systems. \`configure' configures sextractor 2.14.4 to adapt to many kinds of systems.
   
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
   
...@@ -1535,7 +1535,7 @@ fi ...@@ -1535,7 +1535,7 @@ fi
   
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of sextractor 2.14.2:";; short | recursive ) echo "Configuration of sextractor 2.14.4:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
   
...@@ -1668,7 +1668,7 @@ fi ...@@ -1668,7 +1668,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
sextractor configure 2.14.2 sextractor configure 2.14.4
generated by GNU Autoconf 2.68 generated by GNU Autoconf 2.68
   
Copyright (C) 2010 Free Software Foundation, Inc. Copyright (C) 2010 Free Software Foundation, Inc.
...@@ -2296,7 +2296,7 @@ cat >config.log <<_ACEOF ...@@ -2296,7 +2296,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
   
It was created by sextractor $as_me 2.14.2, which was It was created by sextractor $as_me 2.14.4, which was
generated by GNU Autoconf 2.68. Invocation command line was generated by GNU Autoconf 2.68. Invocation command line was
   
$ $0 $@ $ $0 $@
...@@ -2972,7 +2972,7 @@ fi ...@@ -2972,7 +2972,7 @@ fi
   
# Define the identity of the package. # Define the identity of the package.
PACKAGE='sextractor' PACKAGE='sextractor'
VERSION='2.14.2' VERSION='2.14.4'
   
   
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
...@@ -23325,7 +23325,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ...@@ -23325,7 +23325,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by sextractor $as_me 2.14.2, which was This file was extended by sextractor $as_me 2.14.4, which was
generated by GNU Autoconf 2.68. Invocation command line was generated by GNU Autoconf 2.68. Invocation command line was
   
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
...@@ -23391,7 +23391,7 @@ _ACEOF ...@@ -23391,7 +23391,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\ ac_cs_version="\\
sextractor config.status 2.14.2 sextractor config.status 2.14.4
configured by $0, generated by GNU Autoconf 2.68, configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\" with options \\"\$ac_cs_config\\"
   
......
configure.ac
View file @ 532d120d
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SExtractor. If not, see <http://www.gnu.org/licenses/>. # along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
# #
# Last modified: 01/07/2011 # Last modified: 09/07/2011
# #
#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
...@@ -31,7 +31,7 @@ define([AC_CACHE_LOAD],) ...@@ -31,7 +31,7 @@ define([AC_CACHE_LOAD],)
define([AC_CACHE_SAVE],) define([AC_CACHE_SAVE],)
# This is your standard Bertin source code... # This is your standard Bertin source code...
AC_INIT(sextractor, 2.14.2, [bertin@iap.fr]) AC_INIT(sextractor, 2.14.4, [bertin@iap.fr])
AC_CONFIG_SRCDIR(src/makeit.c) AC_CONFIG_SRCDIR(src/makeit.c)
AC_CONFIG_AUX_DIR(autoconf) AC_CONFIG_AUX_DIR(autoconf)
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
......
man/sex.1
View file @ 532d120d
.TH SEXTRACTOR "1" "July 2011" "SExtractor 2.14.2" "User Commands" .TH SEXTRACTOR "1" "July 2011" "SExtractor 2.14.4" "User Commands"
.SH NAME .SH NAME
sex \- extract a source catalogue from an astronomical FITS image sex \- extract a source catalogue from an astronomical FITS image
.SH SYNOPSIS .SH SYNOPSIS
......
src/fitswcs.c
View file @ 532d120d
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* This file part of: AstrOmatic software * This file part of: AstrOmatic software
* *
* Copyright: (C) 1993-2010 Emmanuel Bertin -- IAP/CNRS/UPMC * Copyright: (C) 1993-2011 Emmanuel Bertin -- IAP/CNRS/UPMC
* *
* License: GNU General Public License * License: GNU General Public License
* *
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
* along with AstrOmatic software. * along with AstrOmatic software.
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
* *
* Last modified: 10/10/2010 * Last modified: 22/07/2011
* *
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
...@@ -328,7 +328,7 @@ INPUT tab structure. ...@@ -328,7 +328,7 @@ INPUT tab structure.
OUTPUT -. OUTPUT -.
NOTES -. NOTES -.
AUTHOR E. Bertin (IAP) AUTHOR E. Bertin (IAP)
VERSION 30/07/2010 VERSION 22/07/2011
***/ ***/
wcsstruct *read_wcs(tabstruct *tab) wcsstruct *read_wcs(tabstruct *tab)
...@@ -479,6 +479,7 @@ wcsstruct *read_wcs(tabstruct *tab) ...@@ -479,6 +479,7 @@ wcsstruct *read_wcs(tabstruct *tab)
FITSREADF(buf, "EPOCH", wcs->epoch, 2000.0); FITSREADF(buf, "EPOCH", wcs->epoch, 2000.0);
FITSREADF(buf, "EQUINOX", wcs->equinox, wcs->epoch); FITSREADF(buf, "EQUINOX", wcs->equinox, wcs->epoch);
if (fitsread(buf, "RADESYS", str, H_STRING,T_STRING) != RETURN_OK)
FITSREADS(buf, "RADECSYS", str, FITSREADS(buf, "RADECSYS", str,
wcs->equinox >= 2000.0? "ICRS" : (wcs->equinox<1984.0? "FK4" : "FK5")); wcs->equinox >= 2000.0? "ICRS" : (wcs->equinox<1984.0? "FK4" : "FK5"));
if (!strcmp(str, "ICRS")) if (!strcmp(str, "ICRS"))
......
src/paramprofit.h
View file @ 532d120d
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with SExtractor. If not, see <http://www.gnu.org/licenses/>. * along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
* *
* Last modified: 07/04/2011 * Last modified: 09/07/2011
* *
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
...@@ -333,10 +333,10 @@ ...@@ -333,10 +333,10 @@
"pos.posAng;stat.fit", "deg"}, "pos.posAng;stat.fit", "deg"},
{"SPREAD_MODEL", "Spread parameter from model-fitting", {"SPREAD_MODEL", "Spread parameter from model-fitting",
&outobj2.prof_concentration, H_FLOAT, T_FLOAT, "%8.5f", "", &outobj2.prof_concentration, H_FLOAT, T_FLOAT, "%11.5g", "",
"src.morph.param", ""}, "src.morph.param", ""},
{"SPREADERR_MODEL", "Spread parameter error from model-fitting", {"SPREADERR_MODEL", "Spread parameter error from model-fitting",
&outobj2.prof_concentrationerr, H_FLOAT, T_FLOAT, "%8.5f", "", &outobj2.prof_concentrationerr, H_FLOAT, T_FLOAT, "%11.5g", "",
"src.morph.param", ""}, "src.morph.param", ""},
{"NOISEAREA_MODEL", "Equivalent noise area of the fitted model", {"NOISEAREA_MODEL", "Equivalent noise area of the fitted model",
......
src/profit.c
View file @ 532d120d
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with SExtractor. If not, see <http://www.gnu.org/licenses/>. * along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
* *
* Last modified: 31/05/2011 * Last modified: 25/07/2011
* *
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
...@@ -3614,7 +3614,7 @@ INPUT Profile-fitting structure, ...@@ -3614,7 +3614,7 @@ INPUT Profile-fitting structure,
OUTPUT Total (asymptotic) flux contribution. OUTPUT Total (asymptotic) flux contribution.
NOTES -. NOTES -.
AUTHOR E. Bertin (IAP) AUTHOR E. Bertin (IAP)
VERSION 11/03/2011 VERSION 25/07/2011
***/ ***/
float prof_add(profitstruct *profit, profstruct *prof, int extfluxfac_flag) float prof_add(profitstruct *profit, profstruct *prof, int extfluxfac_flag)
{ {
...@@ -3796,9 +3796,14 @@ float prof_add(profitstruct *profit, profstruct *prof, int extfluxfac_flag) ...@@ -3796,9 +3796,14 @@ float prof_add(profitstruct *profit, profstruct *prof, int extfluxfac_flag)
ang = 0.0; ang = 0.0;
for (a=0; a<nang; a++) for (a=0; a<nang; a++)
{ {
sincosf(ang, &dca, &dsa); #ifdef HAVE_SINCOS
ddx1[a] = a11*dca+a12*dsa; sincosf(ang, &dsa, &dca);
ddx2[a] = a21*dca+a22*dsa; #else
dsa = sinf(ang);
dca = cosf(ang);
#endif
ddx1[a] = a11*dsa+a12*dca;
ddx2[a] = a21*dsa+a22*dca;
ang += angstep; ang += angstep;
} }
r = DEXPF(-4.0); r = DEXPF(-4.0);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment