Commit 54bca520 authored by Emmanuel Bertin's avatar Emmanuel Bertin
Browse files

Fixed FLUX_HYBRID and MAG_HYBRID centering issues. 

Added 2nd order moments measurements of the convolved model.
Fixed issues introduced in a recent updates with check-images.
Implemented new algorithms for SPREAD_MODEL and SPREADERR_MODEL (no optimization yet and the scaling is still variable however).
Added experimental SNR_WIN measurement parameter.
Fixed crash with empty ASSOC lists.
Pushed version number to 2.13.6.
parent 1b0fb5bd

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

# Generated by GNU Autoconf 2.63 for sextractor 2.13.6.

#

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

PACKAGE_STRING='sextractor 2.13.2'

PACKAGE_VERSION='2.13.6'

PACKAGE_STRING='sextractor 2.13.6'

PACKAGE_BUGREPORT='bertin@iap.fr'









ac_unique_file="src/makeit.c"








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









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

















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
















@@ -1578,7 +1578,7 @@ fi















if test -n "$ac_init_help"; then









  case $ac_init_help in









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









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









   esac









  cat <<\_ACEOF
















@@ -1711,7 +1711,7 @@ fi







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









if $ac_init_version; then









  cat <<\_ACEOF









sextractor configure 2.13.2









sextractor configure 2.13.6









generated by GNU Autoconf 2.63

















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








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









It was created by sextractor $as_me 2.13.6, which was









generated by GNU Autoconf 2.63.  Invocation command line was

















  $ $0 $@








@@ -2428,7 +2428,7 @@ fi















# Define the identity of the package.









 PACKAGE='sextractor'









 VERSION='2.13.2'









 VERSION='2.13.6'

























cat >>confdefs.h <<_ACEOF








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









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









generated by GNU Autoconf 2.63.  Invocation command line was

















  CONFIG_FILES    = $CONFIG_FILES








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







_ACEOF









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









ac_cs_version="\\









sextractor config.status 2.13.2









sextractor config.status 2.13.6









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







@@ -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:		24/01/2011









#	Last modified:		03/05/2011









#









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


















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







define([AC_CACHE_SAVE],)



















# This is your standard Bertin source code...









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









AC_INIT(sextractor, 2.13.6, [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" "March 2011" "SExtractor 2.13.2" "User Commands"









.TH SEXTRACTOR "1" "May 2011" "SExtractor 2.13.6" "User Commands"









.SH NAME









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









.SH SYNOPSIS
































src/assoc.c



+14
−8






























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/01/2011









*	Last modified:		04/05/2011









*









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


















@@ -109,7 +109,7 @@ assocstruct  *load_assoc(char *filename, wcsstruct *wcs)







  if (!(file = fopen(filename, "r")))









    return NULL;



















  assoc = NULL;				/* To avoid gcc -Wall warnings */









  QCALLOC(assoc, assocstruct, 1);









  list  = NULL;				/* To avoid gcc -Wall warnings */









  data  = NULL;				/* To avoid gcc -Wall warnings */









  ispoon = ncol = ndata = nlist = size = spoonsize = xindex = yindex








@@ -170,8 +170,7 @@ assocstruct  *load_assoc(char *filename, wcsstruct *wcs)

















      nlist = ndata+3;



















/*---- Allocate memory for the ASSOC struct and the filtered list */









      QMALLOC(assoc, assocstruct, 1);









/*---- Allocate memory for the filtered list */









      ispoon = ASSOC_BUFINC/(nlist*sizeof(double));









      spoonsize = ispoon*nlist;









      QMALLOC(assoc->list, double, size = spoonsize);








@@ -210,11 +209,15 @@ assocstruct  *load_assoc(char *filename, wcsstruct *wcs)

















  fclose(file);









  free(data);









  QREALLOC(assoc->list, double, i*nlist);



















  assoc->nobj = i;









  if (i>0)









    {









    QREALLOC(assoc->list, double, i*nlist);









    assoc->radius = prefs.assoc_radius;









    assoc->ndata = ndata;









    assoc->ncol = nlist;









    }



















  return assoc;









  }








@@ -236,6 +239,9 @@ void	init_assoc(picstruct *field)







    error(EXIT_FAILURE, "*Error*: Assoc-list file not found: ",









	prefs.assoc_name);



















  if (assoc->nobj==0)









    warning(prefs.assoc_name, " ASSOC input-list is empty");



















/* Sort the assoc-list by y coordinates, and build the hash table */









  sort_assoc(field, assoc);










































src/back.c



+16
−7






























Original line number
Diff line number
Diff line







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







*









*	This file part of:	SExtractor









*









*	Copyright:		(C) 1993-2010 Emmanuel Bertin -- IAP/CNRS/UPMC









*	Copyright:		(C) 1993-2011 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:		11/10/2010









*	Last modified:		23/03/2011









*









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


















@@ -60,7 +60,7 @@ void	makeback(picstruct *field, picstruct *wfield, int wscale_flag)







		w,bw, bh, nx,ny,nb,









		lflag, nr;









   float	*ratio,*ratiop, *weight, *sigma,









		sratio;









		sratio, sigfac;



















/* If the weight-map is not an external one, no stats are needed for it */









  if (wfield && wfield->flags&(INTERP_FIELD|BACKRMS_FIELD))








@@ -294,7 +294,7 @@ void	makeback(picstruct *field, picstruct *wfield, int wscale_flag)







    filterback(wfield);



















/* Compute normalization for variance- or weight-maps*/









  if (wfield && wscale_flag && wfield->flags&(VAR_FIELD|WEIGHT_FIELD))









  if (wfield && wfield->flags&(VAR_FIELD|WEIGHT_FIELD))









    {      









    nr = 0;









    QMALLOC(ratio, float, wfield->nback);








@@ -308,18 +308,27 @@ void	makeback(picstruct *field, picstruct *wfield, int wscale_flag)







        *(ratiop++) = sratio;









        nr++;









        }









    wfield->sigfac = fqmedian(ratio, nr);









    sigfac = fqmedian(ratio, nr);









    for (i=0; i<nr && ratio[i]<=0.0; i++);









    if (i<nr)









      wfield->sigfac = fqmedian(ratio+i, nr-i);









      sigfac = fqmedian(ratio+i, nr-i);









    else









      {









      warning("Null or negative global weighting factor:","defaulted to 1");









      wfield->sigfac = 1.0;









      sigfac = 1.0;









      } 









    free(ratio);



















    if (wscale_flag)









      wfield->sigfac = sigfac;









    else









      {









      wfield->sigfac = 1.0;









      field->backsig /= sigfac;









      }









    }





























/* Compute 2nd derivatives along the y-direction */









  NFPRINTF(OUTPUT, "Computing background d-map");









  free(field->dback);