Commit 1755ca24 authored by Emmanuel Bertin's avatar Emmanuel Bertin
Browse files

Fixed potential issues in ASSOCCOORD_TYPE WORLD mode. 

Fixed triggering of model surface brightness measurement.
Added new FLUX_DETMODEL,FLUXERR_DETMODEL, MAG_DETMODEL,MAGERR_DETMODEL, FLAGS_DE
TMODEL and CHI2_DETMODEL measurement parameters that apply on the measurement im
age a model fitted on the detection image (two PSF models required); these new p
arameters are meant for measuring faint galaxy colors.
Improved displayed info for memory allocation failures.
Increased default maximum number of threads set by configure to 1024.
Updated Copyright display line (2012).
Added support for "TPV" WCS projection.
Pushed version number to 2.16.0.
parent c3d4de93

acx_urbi_resolve_dir.m4

+3 −3
Original line number Original line Diff line number Diff line
@@ -7,7 +7,7 @@ dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
dnl

dnl

dnl	This file part of:	AstrOmatic software

dnl	This file part of:	AstrOmatic software

dnl

dnl

dnl	Copyrights:		(C) 2007-2010 Emmanuel Bertin -- IAP/CNRS/UPMC

dnl	Copyrights:		(C) 2007-2011 Emmanuel Bertin -- IAP/CNRS/UPMC

dnl				(C) 2007 Akim Demaille (original version)

dnl				(C) 2007 Akim Demaille (original version)

dnl

dnl

dnl	License:		GPL

dnl	License:		GPL
@@ -24,7 +24,7 @@ dnl You should have received a copy of the GNU General Public License 
dnl	along with AstrOmatic software.

dnl	along with AstrOmatic software.

dnl	If not, see <http://www.gnu.org/licenses/>.

dnl	If not, see <http://www.gnu.org/licenses/>.

dnl

dnl

dnl	Last modified:		09/10/2010

dnl	Last modified:		27/12/2011

dnl

dnl

dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

dnl

dnl
@@ -55,7 +55,7 @@ urbi_resolve_dir () 
  while true

  while true

  do

  do

    eval ac_$0_res="$ac_$0_dir"

    eval ac_$0_res="$ac_$0_dir"

    if test x"$ac_$0_dir" == x"$ac_$0_res"; then

    if test x"$ac_$0_dir" = x"$ac_$0_res"; then

      break

      break

    fi

    fi

    ac_$0_dir=$ac_$0_res

    ac_$0_dir=$ac_$0_res

configure

+11 −11
Original line number Original line Diff line number Diff line 
#! /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.7.

# Generated by GNU Autoconf 2.68 for sextractor 2.16.0.

#

#

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

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

#

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

PACKAGE_VERSION='2.16.0'

PACKAGE_STRING='sextractor 2.14.7'

PACKAGE_STRING='sextractor 2.16.0'

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






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




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


















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




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


















@@ -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.7:";;




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








   esac




   esac








  cat <<\_ACEOF




  cat <<\_ACEOF


















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




sextractor configure 2.16.0








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






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




It was created by sextractor $as_me 2.16.0, 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
















# Define the identity of the package.




# Define the identity of the package.








 PACKAGE='sextractor'




 PACKAGE='sextractor'








 VERSION='2.14.7'




 VERSION='2.16.0'




























cat >>confdefs.h <<_ACEOF




cat >>confdefs.h <<_ACEOF








@@ -20664,7 +20664,7 @@ urbi_resolve_dir ()






  while true




  while true








  do




  do








    eval ac_URBI_RESOLVE_DIR_PREPARE_res="$ac_URBI_RESOLVE_DIR_PREPARE_dir"




    eval ac_URBI_RESOLVE_DIR_PREPARE_res="$ac_URBI_RESOLVE_DIR_PREPARE_dir"








    if test x"$ac_URBI_RESOLVE_DIR_PREPARE_dir" == x"$ac_URBI_RESOLVE_DIR_PREPARE_res"; then




    if test x"$ac_URBI_RESOLVE_DIR_PREPARE_dir" = x"$ac_URBI_RESOLVE_DIR_PREPARE_res"; then








      break




      break








    fi




    fi








    ac_URBI_RESOLVE_DIR_PREPARE_dir=$ac_URBI_RESOLVE_DIR_PREPARE_res




    ac_URBI_RESOLVE_DIR_PREPARE_dir=$ac_URBI_RESOLVE_DIR_PREPARE_res








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




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






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




sextractor config.status 2.16.0








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



+3
−3






























Original line number
Original line
Diff line number
Diff line







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






#




#








#	This file part of:	SExtractor




#	This file part of:	SExtractor








#




#








#	Copyright:		(C) 2002-2011 Emmanuel Bertin -- IAP/CNRS/UPMC




#	Copyright:		(C) 2002-2012 Emmanuel Bertin -- IAP/CNRS/UPMC








#




#








#	License:		GNU General Public License




#	License:		GNU General Public License








#




#








@@ -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:		06/09/2011




#	Last modified:		12/04/2012








#




#








#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%




#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%






















@@ -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.7, [bertin@iap.fr])




AC_INIT(sextractor, 2.16.0, [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



+1
−1






























Original line number
Original line
Diff line number
Diff line








.TH SEXTRACTOR "1" "October 2011" "SExtractor 2.14.7" "User Commands"




.TH SEXTRACTOR "1" "April 2012" "SExtractor 2.16.0" "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/analyse.c



+8
−4






























Original line number
Original line
Diff line number
Diff line







@@ -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:		19/05/2011




*	Last modified:		02/11/2011








*




*








*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/




*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/






















@@ -56,7 +56,7 @@






#include	"winpos.h"




#include	"winpos.h"






















static obj2struct	*obj2 = &outobj2;




static obj2struct	*obj2 = &outobj2;








extern profitstruct	*theprofit;




extern profitstruct	*theprofit,*thedprofit;






















/********************************* analyse ***********************************/




/********************************* analyse ***********************************/








void  analyse(picstruct *field, picstruct *dfield, int objnb,




void  analyse(picstruct *field, picstruct *dfield, int objnb,








@@ -73,6 +73,7 @@ void  analyse(picstruct *field, picstruct *dfield, int objnb,






    localback(field, obj);




    localback(field, obj);








  else




  else








    obj->sigbkg = field->backsig;




    obj->sigbkg = field->backsig;










  obj->dsigbkg = dfield? dfield->backsig : field->backsig;






















  examineiso(field, dfield, obj, objlist->plist);




  examineiso(field, dfield, obj, objlist->plist);






















@@ -416,7 +417,7 @@ void	endobject(picstruct *field, picstruct *dfield, picstruct *wfield,






   if (prefs.psf_flag)




   if (prefs.psf_flag)








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




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








   if (prefs.dpsf_flag)




   if (prefs.dpsf_flag)








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




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






















  if (FLAG(obj2.analtime))




  if (FLAG(obj2.analtime))








    analtime1 = counter_seconds();




    analtime1 = counter_seconds();








@@ -701,7 +702,7 @@ void	endobject(picstruct *field, picstruct *dfield, picstruct *wfield,






    if (prefs.psffit_flag)




    if (prefs.psffit_flag)








      {




      {








      if (prefs.dpsffit_flag)




      if (prefs.dpsffit_flag)








        double_psf_fit(ppsf, field, wfield, obj, thepsf, dfield, dwfield);




        double_psf_fit(thepsf, field, wfield, obj, thedpsf, dfield, dwfield);








      else




      else








        psf_fit(thepsf, field, wfield, obj);




        psf_fit(thepsf, field, wfield, obj);








      obj2->npsf = thepsfit->npsf;




      obj2->npsf = thepsfit->npsf;








@@ -724,6 +725,9 @@ void	endobject(picstruct *field, picstruct *dfield, picstruct *wfield,






/*---- Express position error parameters in the FOCAL or WORLD frame */




/*---- Express position error parameters in the FOCAL or WORLD frame */








      if (FLAG(obj2.poserrmx2w_prof))




      if (FLAG(obj2.poserrmx2w_prof))








        astrom_proferrparam(field, obj);




        astrom_proferrparam(field, obj);










      if (prefs.dprof_flag)










        profit_dfit(theprofit, thedprofit, field, dfield, wfield, dwfield, obj,










		obj2);








      }




      }








#endif




#endif








/*--- Express everything in magnitude units */




/*--- Express everything in magnitude units */