Commit 31f8a20e authored by Emmanuel Bertin's avatar Emmanuel Bertin
Browse files

Fixed sporadic occurences of NaN in SPREADERR_MODEL and ERRBMODEL_IMAGE.

Updated WCS library to the latest version.
Pushed version number to 2.16.2.
parent 1755ca24
Loading
Loading
Loading
Loading
+10 −10
Original line number Diff line number Diff line
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for sextractor 2.16.0.
# Generated by GNU Autoconf 2.68 for sextractor 2.16.2.
#
# Report bugs to <bertin@iap.fr>.
#
@@ -714,8 +714,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='sextractor'
PACKAGE_TARNAME='sextractor'
PACKAGE_VERSION='2.16.0'
PACKAGE_STRING='sextractor 2.16.0'
PACKAGE_VERSION='2.16.2'
PACKAGE_STRING='sextractor 2.16.2'
PACKAGE_BUGREPORT='bertin@iap.fr'
PACKAGE_URL=''
@@ -1465,7 +1465,7 @@ if test "$ac_init_help" = "long"; then
  # 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.
  cat <<_ACEOF
\`configure' configures sextractor 2.16.0 to adapt to many kinds of systems.
\`configure' configures sextractor 2.16.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1535,7 +1535,7 @@ fi
if test -n "$ac_init_help"; then
  case $ac_init_help in
     short | recursive ) echo "Configuration of sextractor 2.16.0:";;
     short | recursive ) echo "Configuration of sextractor 2.16.2:";;
   esac
  cat <<\_ACEOF
@@ -1668,7 +1668,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
  cat <<\_ACEOF
sextractor configure 2.16.0
sextractor configure 2.16.2
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2296,7 +2296,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by sextractor $as_me 2.16.0, which was
It was created by sextractor $as_me 2.16.2, which was
generated by GNU Autoconf 2.68.  Invocation command line was
  $ $0 $@
@@ -2972,7 +2972,7 @@ fi
# Define the identity of the package.
 PACKAGE='sextractor'
 VERSION='2.16.0'
 VERSION='2.16.2'
cat >>confdefs.h <<_ACEOF
@@ -23325,7 +23325,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by sextractor $as_me 2.16.0, which was
This file was extended by sextractor $as_me 2.16.2, which was
generated by GNU Autoconf 2.68.  Invocation command line was
  CONFIG_FILES    = $CONFIG_FILES
@@ -23391,7 +23391,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
sextractor config.status 2.16.0
sextractor config.status 2.16.2
configured by $0, generated by GNU Autoconf 2.68,
  with options \\"\$ac_cs_config\\"
+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@
#	You should have received a copy of the GNU General Public License
#	along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
#
#	Last modified:		12/04/2012
#	Last modified:		01/06/2012
#
#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

@@ -31,7 +31,7 @@ define([AC_CACHE_LOAD],)
define([AC_CACHE_SAVE],)

# This is your standard Bertin source code...
AC_INIT(sextractor, 2.16.0, [bertin@iap.fr])
AC_INIT(sextractor, 2.16.2, [bertin@iap.fr])
AC_CONFIG_SRCDIR(src/makeit.c)
AC_CONFIG_AUX_DIR(autoconf)
AM_CONFIG_HEADER(config.h)
+1 −1
Original line number Diff line number Diff line
.TH SEXTRACTOR "1" "April 2012" "SExtractor 2.16.0" "User Commands"
.TH SEXTRACTOR "1" "June 2012" "SExtractor 2.16.2" "User Commands"
.SH NAME
sex \- extract a source catalogue from an astronomical FITS image
.SH SYNOPSIS
+3 −2
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ INPUT tab structure.
OUTPUT	-.
NOTES	-.
AUTHOR	E. Bertin (IAP)
VERSION	30/07/2010
VERSION	22/07/2011
 ***/
wcsstruct	*read_wcs(tabstruct *tab)

@@ -479,6 +479,7 @@ wcsstruct *read_wcs(tabstruct *tab)

    FITSREADF(buf, "EPOCH", wcs->epoch, 2000.0);
    FITSREADF(buf, "EQUINOX", wcs->equinox, wcs->epoch);
    if (fitsread(buf, "RADESYS", str, H_STRING,T_STRING) != RETURN_OK)
      FITSREADS(buf, "RADECSYS", str,
	wcs->equinox >= 2000.0? "ICRS" : (wcs->equinox<1984.0? "FK4" : "FK5"));
    if (!strcmp(str, "ICRS"))
+5 −4
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@
*
*	This file part of:	SExtractor
*
*	Copyright:		(C) 1993-2011 Emmanuel Bertin -- IAP/CNRS/UPMC
*	Copyright:		(C) 1993-2012 Emmanuel Bertin -- IAP/CNRS/UPMC
*
*	License:		GNU General Public License
*
@@ -22,7 +22,7 @@
*	You should have received a copy of the GNU General Public License
*	along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
*
*	Last modified:		02/11/2011
*	Last modified:		18/04/2012
*
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/

@@ -491,7 +491,8 @@ void useprefs()
		|| FLAG(obj2.xw_prof) || FLAG(obj2.poserrmx2w_prof)
		|| FLAG(obj2.poserr_mx2w) || FLAG(obj2.winposerr_mx2w)
		|| FLAG(obj2.area_flagw) || FLAG(obj2.prof_flagw)
		|| FLAG(obj2.fwhmw_psf);
		|| FLAG(obj2.fwhmw_psf)
		|| (FLAG(obj2.sprob) && prefs.pixel_scale == 0.0);

/* Default astrometric settings */
  strcpy(prefs.coosys, "ICRS");
@@ -625,7 +626,7 @@ void useprefs()
    prefs.dpsf_flag = 1;

/*-------------------------- Tracking the PSF FWHM --------------------------*/
  if (prefs.seeing_fwhm == 0 && FLAG(obj2.sprob) || FLAG(obj2.fwhm_psf))
  if (prefs.seeing_fwhm == 0 && (FLAG(obj2.sprob) || FLAG(obj2.fwhm_psf)))
    prefs.psf_flag = 1;

/*-------------------------- Pattern-fitting -------------------------------*/
Loading