Commit 5f63711a authored by Emmanuel Bertin's avatar Emmanuel Bertin
Browse files

Added VOTABLE "version" attribute to XML output. 

Reverted minimization algorithm back to double precision (while keeping single precision for data and parameters in "bounded" space).
Added specific handling of "Jacobian calls" in model-fitting.
Sped up the resampling process in model-fitting.
Tuned up minimization algorithm in model-fitting.
Added shortcuts to the computation of the local PSF model. 
Fixed triggering issues with some model-fitting parameters (thanks to S.Serrano).
Removed CLASS_STAR_MODEL and DISK_PATTERN* measurement parameters.
Added automatic tracking of the PSF FWHM from the local PSF model if SEEING_FWHM is 0 for CLASS_STAR.
Fixed excessive WIN parameter computation time on large ring-shaped objects.
Fixed model-fitting issue with null half-light radii (thanks to S.Desai and B.Armstrong).
Fixed aperture display value error in FITS-LDAC catalogue header.
Removed redundant update_tab() calls in FITS library.
Fixed comment copy issue for slashes within strings in FITS library (thanks to F.Schuller).
Added check of PSF values; SExtractor will now exit in error in the case where all PSF components sum up to 0.
Replaced computation of model second moments and ellipticities with analytical estimates.
Improved the accuracy of peak and average model surface brightness estimates.
Fixed some compiler warnings.
Pushed version number to 2.11.7.
parent 523e3274

configure

+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.63 for sextractor 2.11.0.

# Generated by GNU Autoconf 2.63 for sextractor 2.11.7.

#

# Report bugs to <bertin@iap.fr>.

#
@@ -750,8 +750,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} 
# Identity of this package.

PACKAGE_NAME='sextractor'

PACKAGE_TARNAME='sextractor'

PACKAGE_VERSION='2.11.0'

PACKAGE_STRING='sextractor 2.11.0'

PACKAGE_VERSION='2.11.7'

PACKAGE_STRING='sextractor 2.11.7'

PACKAGE_BUGREPORT='bertin@iap.fr'









ac_unique_file="src/makeit.c"








@@ -1505,7 +1505,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.11.0 to adapt to many kinds of systems.









\`configure' configures sextractor 2.11.7 to adapt to many kinds of systems.

















Usage: $0 [OPTION]... [VAR=VALUE]...
















@@ -1575,7 +1575,7 @@ fi















if test -n "$ac_init_help"; then









  case $ac_init_help in









     short | recursive ) echo "Configuration of sextractor 2.11.0:";;









     short | recursive ) echo "Configuration of sextractor 2.11.7:";;









   esac









  cat <<\_ACEOF
















@@ -1706,7 +1706,7 @@ fi







test -n "$ac_init_help" && exit $ac_status









if $ac_init_version; then









  cat <<\_ACEOF









sextractor configure 2.11.0









sextractor configure 2.11.7









generated by GNU Autoconf 2.63

















Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,








@@ -1720,7 +1720,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.11.0, which was









It was created by sextractor $as_me 2.11.7, which was









generated by GNU Autoconf 2.63.  Invocation command line was

















  $ $0 $@








@@ -2423,7 +2423,7 @@ fi















# Define the identity of the package.









 PACKAGE='sextractor'









 VERSION='2.11.0'









 VERSION='2.11.7'

























cat >>confdefs.h <<_ACEOF








@@ -28535,7 +28535,7 @@ exec 6>&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.11.0, which was









This file was extended by sextractor $as_me 2.11.7, which was









generated by GNU Autoconf 2.63.  Invocation command line was

















  CONFIG_FILES    = $CONFIG_FILES








@@ -28598,7 +28598,7 @@ Report bugs to <bug-autoconf@gnu.org>."







_ACEOF









cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1









ac_cs_version="\\









sextractor config.status 2.11.0









sextractor config.status 2.11.7









configured by $0, generated by GNU Autoconf 2.63,









  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

































configure.ac



+2
−2






























Original line number
Diff line number
Diff line









# configure.in for SExtractor









# (C) E.Bertin 2002-2009









# (C) E.Bertin 2002-2010









# Process this file with autoconf to produce a configure script.









# First, disable the annoying config.cache









define([AC_CACHE_LOAD],)









define([AC_CACHE_SAVE],)



















# This is your standard Bertin source code...









AC_INIT(sextractor, 2.11.0, [bertin@iap.fr])









AC_INIT(sextractor, 2.11.7, [bertin@iap.fr])









AC_CONFIG_SRCDIR(src/makeit.c)









AC_CONFIG_AUX_DIR(autoconf)









AM_CONFIG_HEADER(config.h)
































man/sex.1



+1
−1






























Original line number
Diff line number
Diff line









.TH SEXTRACTOR "1" "February 2010" "SWarp 2.11.0" "User Commands"









.TH SEXTRACTOR "1" "July 2010" "SWarp 2.11.7" "User Commands"









.SH NAME









sex \- extract a source catalog from an astronomical FITS image









.SH SYNOPSIS
































src/analyse.c



+7
−1






























Original line number
Diff line number
Diff line







@@ -395,6 +395,11 @@ void	endobject(picstruct *field, picstruct *dfield, picstruct *wfield,







			analtime1;









   int			i,j, ix,iy,selecflag, newnumber,nsub;



















   if (prefs.psf_flag || prefs.prof_flag)









     thepsf->build_flag = 0;	/* Reset PSF building flag */









   if (prefs.dpsf_flag)









     ppsf->build_flag = 0;	/* Reset PSF building flag */



















  if (FLAG(obj2.analtime))









    analtime1 = counter_seconds();









  else








@@ -589,7 +594,8 @@ void	endobject(picstruct *field, picstruct *dfield, picstruct *wfield,







      {









       double	fac2, input[10], output, fwhm;



















      fwhm = prefs.seeing_fwhm;









      fwhm = (prefs.seeing_fwhm==0.0)? psf_fwhm(thepsf)*field->pixscale









				: prefs.seeing_fwhm;



















      fac2 = fwhm/field->pixscale;









      fac2 *= fac2;
































src/catout.c



+6
−4






























Original line number
Diff line number
Diff line







@@ -9,7 +9,7 @@







*









*	Contents:	functions for output of catalog data.









*









*	Last modify:	07/10/2009









*	Last modify:	08/07/2010









*









*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%









*/








@@ -193,6 +193,9 @@ void	updateparamflags()







			| FLAG(obj2.poserraw_prof);









  FLAG(obj2.poserrcxx_prof) |= FLAG(obj2.poserrcyy_prof)









			| FLAG(obj2.poserrcxy_prof);









  FLAG(obj2.poserrmx2_prof) |= FLAG(obj2.poserrmy2_prof)









			| FLAG(obj2.poserrmxy_prof)









			| FLAG(obj2.poserrmx2w_prof);









  FLAG(obj2.alpha1950_prof) |= FLAG(obj2.delta1950_prof)









			| FLAG(obj2.poserrtheta1950_prof);









  FLAG(obj2.alpha2000_prof) |= FLAG(obj2.delta2000_prof)








@@ -208,6 +211,7 @@ void	updateparamflags()







			| FLAG(obj2.xf_prof)









			| FLAG(obj2.poserra_prof)









			| FLAG(obj2.poserrcxx_prof)









			| FLAG(obj2.poserrmx2_prof)









			| FLAG(obj2.prof_concentration)









			| FLAG(obj2.prof_class_star);


















@@ -336,12 +340,10 @@ void	updateparamflags()







			| FLAG(obj2.prof_e1)









			| FLAG(obj2.prof_a) | FLAG(obj2.prof_cxx)









			| FLAG(obj2.prof_mx2w);









  FLAG(obj2.mumax_prof) |= FLAG(obj2.mueff_prof) | FLAG(obj2.mumean_prof);/*!*/









  FLAG(obj2.fluxmean_prof) |= FLAG(obj2.mumean_prof);









  FLAG(obj2.fluxeff_prof) |= FLAG(obj2.mueff_prof)









			| FLAG(obj2.fluxmean_prof);









  FLAG(obj2.peak_prof) |= FLAG(obj2.mumax_prof)









			| FLAG(obj2.fluxeff_prof);









  FLAG(obj2.peak_prof) |= FLAG(obj2.mumax_prof);



















  FLAG(obj2.prof_arms_flux) |= FLAG(obj2.prof_arms_fluxerr)









			| FLAG(obj2.prof_arms_mag)