Commit 3959d99d authored by Emmanuel Bertin's avatar Emmanuel Bertin
Browse files

Fixed detection threshold missing in XML metadata output. 

Fixed TFORM error message in fitshead.c (thanks to S.Guieu).
Fixed model-fitting error variance/covariance issue (bug in matrix inversion).
Added ELLIP1ERRMODEL_IMAGE, ELLIP2ERRMODEL_IMAGE, ELLIPCORRMODEL_IMAGE,
POLAR1ERRMODEL_IMAGE, POLAR2ERRMODEL_IMAGE, POLARCORRMODEL_IMAGE (more testing is needed and WORLD versions are not yet functional).
Narrowed the tolerance constraint for stopping windowed centering iterations.
Fixed incorrect reading of the DATE-OBS FITS keyword when EPOCH and MJD-OBS are missing.
Pushed version number to 2.11.11.
parent eaabc69f

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.8.

# Generated by GNU Autoconf 2.63 for sextractor 2.11.11.

#

# 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.8'

PACKAGE_STRING='sextractor 2.11.8'

PACKAGE_VERSION='2.11.11'

PACKAGE_STRING='sextractor 2.11.11'

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.8 to adapt to many kinds of systems.









\`configure' configures sextractor 2.11.11 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.8:";;









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









   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.8









sextractor configure 2.11.11









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.8, which was









It was created by sextractor $as_me 2.11.11, 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.8'









 VERSION='2.11.11'

























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.8, which was









This file was extended by sextractor $as_me 2.11.11, 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.8









sextractor config.status 2.11.11









configured by $0, generated by GNU Autoconf 2.63,









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

































configure.ac



+1
−1






























Original line number
Diff line number
Diff line







@@ -6,7 +6,7 @@ define([AC_CACHE_LOAD],)







define([AC_CACHE_SAVE],)



















# This is your standard Bertin source code...









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









AC_INIT(sextractor, 2.11.11, [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" "July 2010" "SWarp 2.11.8" "User Commands"









.TH SEXTRACTOR "1" "August 2010" "SWarp 2.11.11" "User Commands"









.SH NAME









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









.SH SYNOPSIS
































src/astrom.c



+12
−4






























Original line number
Diff line number
Diff line







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







*









*	Contents:	Astrometrical computations.









*









*	Last modify:	15/12/2009









*	Last modify:	03/08/2010









*









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









*/








@@ -1093,12 +1093,21 @@ void	astrom_profshapeparam(picstruct *field, objstruct *obj)







      obj2->prof_cxyw = (float)(-2*xym/temp);









      }









  









    if (FLAG(obj2.prof_e1w))









    if (FLAG(obj2.prof_pol1w))









      {









      if (xm2+ym2 > 1.0/BIG)









        {









        obj2->prof_pol1w = (xm2 - ym2) / (xm2+ym2);









        obj2->prof_pol2w = 2.0*xym / (xm2 + ym2);









        }









      else









        obj2->prof_pol1w = obj2->prof_pol2w = 0.0;









      }



















    if (FLAG(obj2.prof_e1w))









      {









      if (xm2+ym2 > 1.0/BIG)









        {









        temp = xm2*ym2-xym*xym;









        if (temp>=0.0)









          temp = xm2+ym2+2.0*sqrt(temp);








@@ -1108,8 +1117,7 @@ void	astrom_profshapeparam(picstruct *field, objstruct *obj)







        obj2->prof_e2w = 2.0*xym / temp;









        }









      else









        obj2->prof_pol1w = obj2->prof_pol2w









	= obj2->prof_e1w = obj2->prof_e2w = 0.0;









        obj2->prof_e1w = obj2->prof_e2w = 0.0;









      }









    }










































src/catout.c



+12
−11






























Original line number
Diff line number
Diff line







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







*









*	Contents:	functions for output of catalog data.









*









*	Last modify:	12/07/2010









*	Last modify:	03/08/2010









*









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









*/








@@ -233,8 +233,8 @@ void	updateparamflags()







  FLAG(obj2.prof_bar_aspect) |= FLAG(obj2.prof_bar_aspecterr);









  FLAG(obj2.prof_bar_theta) |= FLAG(obj2.prof_bar_thetaerr);









  FLAG(obj2.prof_arms_mag) |= FLAG(obj2.prof_arms_magerr);









  FLAG(obj2.prof_e1w) |= FLAG(obj2.prof_e2w)









			| FLAG(obj2.prof_pol1w) | FLAG(obj2.prof_pol2w);









  FLAG(obj2.prof_e1w) |= FLAG(obj2.prof_e2w);









  FLAG(obj2.prof_pol1w) |= FLAG(obj2.prof_pol2w);









  FLAG(obj2.prof_aw) |= FLAG(obj2.prof_bw);









  FLAG(obj2.prof_cxxw) |= FLAG(obj2.prof_cyyw) | FLAG(obj2.prof_cxyw);









  FLAG(obj2.prof_thetas) |= FLAG(obj2.prof_theta1950)








@@ -245,7 +245,7 @@ void	updateparamflags()







			| FLAG(obj2.prof_mxyw)









			| FLAG(obj2.prof_thetaw) | FLAG(obj2.prof_aw)









			| FLAG(obj2.prof_cxxw)









			| FLAG(obj2.prof_e1w);









			| FLAG(obj2.prof_e1w) | FLAG(obj2.prof_pol1w);



















  FLAG(obj2.dtheta1950) |= FLAG(obj2.prof_theta1950)









			| FLAG(obj2.prof_spheroid_theta1950)








@@ -313,10 +313,6 @@ void	updateparamflags()







			| FLAG(obj2.prof_spheroid_aspecterrw)









			| FLAG(obj2.prof_spheroid_thetaerrw);



















 FLAG(obj2.prof_mx2w) |= FLAG(obj2.prof_my2w) | FLAG(obj2.prof_mxyw)









			| FLAG(obj2.prof_e1w) |FLAG(obj2.prof_e2w)









			| FLAG(obj2.prof_pol1w) |FLAG(obj2.prof_pol2w);



















  FLAG(obj2.prof_spheroid_fluxmean) |= FLAG(obj2.prof_spheroid_mumean);









  FLAG(obj2.prof_spheroid_fluxeff) |= FLAG(obj2.prof_spheroid_mueff);









  FLAG(obj2.prof_spheroid_peak) |= FLAG(obj2.prof_spheroid_mumax)








@@ -329,15 +325,20 @@ void	updateparamflags()







			| FLAG(obj2.prof_arms_scalew)









			| FLAG(obj2.prof_mx2w);



















  FLAG(obj2.proferr_e1) |= FLAG(obj2.proferr_e2) | FLAG(obj2.profcorr_e12);









			









  FLAG(obj2.prof_e1) |= FLAG(obj2.prof_e2)









			| FLAG(obj2.prof_pol1) | FLAG(obj2.prof_pol2)









			| FLAG(obj2.prof_e1w);









			| FLAG(obj2.proferr_e1) | FLAG(obj2.prof_e1w);









  FLAG(obj2.proferr_pol1) |= FLAG(obj2.proferr_pol2)









			| FLAG(obj2.profcorr_pol12);









  FLAG(obj2.prof_pol1) |= FLAG(obj2.prof_pol2)









			| FLAG(obj2.proferr_pol1) | FLAG(obj2.prof_pol1w);









  FLAG(obj2.prof_a) |= FLAG(obj2.prof_b) | FLAG(obj2.prof_theta)









			| FLAG(obj2.prof_aw);









  FLAG(obj2.prof_cxx) |= FLAG(obj2.prof_cyy)









			| FLAG(obj2.prof_cxy) | FLAG(obj2.prof_cxxw);









  FLAG(obj2.prof_mx2) |= FLAG(obj2.prof_my2) | FLAG(obj2.prof_mxy)









			| FLAG(obj2.prof_e1)









			| FLAG(obj2.prof_e1) | FLAG(obj2.prof_pol1)









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









			| FLAG(obj2.prof_mx2w);









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