Commit 0d21f9d7 authored by Emmanuel Bertin's avatar Emmanuel Bertin
Browse files

Added new ASSOCCOORD_TYPE configuration parameter for ASSOCiating detections... 

Added new ASSOCCOORD_TYPE configuration parameter for ASSOCiating detections either in PIXEL or WORLD coordinates.
Fixed sampling issues for Sersic, de Vaucouleurs and exponential model-fitting.
Version number pushed to 2.13.2.
parent 90385513

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

# Generated by GNU Autoconf 2.63 for sextractor 2.13.2.

#

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

PACKAGE_STRING='sextractor 2.13.1'

PACKAGE_VERSION='2.13.2'

PACKAGE_STRING='sextractor 2.13.2'

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









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









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









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









sextractor configure 2.13.2









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









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









 VERSION='2.13.2'

























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









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









sextractor config.status 2.13.2









configured by $0, generated by GNU Autoconf 2.63,









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

































configure.ac



+3
−3






























Original line number
Diff line number
Diff line







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







#









#	This file part of:	SExtractor









#









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









#	Copyright:		(C) 2002-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:		14/10/2010









#	Last modified:		24/01/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.1, [bertin@iap.fr])









AC_INIT(sextractor, 2.13.2, [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" "December 2010" "SExtractor 2.13.1" "User Commands"









.TH SEXTRACTOR "1" "January 2011" "SExtractor 2.13.2" "User Commands"









.SH NAME









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









.SH SYNOPSIS
































src/analyse.c



+1
−1






























Original line number
Diff line number
Diff line







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

















/* Association */









  if (prefs.assoc_flag)









    obj2->assoc_number = do_assoc(field, obj2->sposx, obj2->sposy);









    obj2->assoc_number = do_assoc(field, obj2->posx, obj2->posy);



















  if (prefs.assoc_flag && prefs.assocselec_type!=ASSOCSELEC_ALL)









    selecflag = (prefs.assocselec_type==ASSOCSELEC_MATCHED)?
































src/assoc.c



+29
−25






























Original line number
Diff line number
Diff line







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







*









*	This file part of:	SExtractor









*









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









*	Copyright:		(C) 1997-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:		12/01/2011









*









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


















@@ -39,6 +39,7 @@







#include	"globals.h"









#include	"prefs.h"









#include	"assoc.h"









#include	"fitswcs.h"



















/********************************* comp_assoc ********************************/









/*








@@ -46,10 +47,10 @@ Comparison function for sort_assoc().







*/









int	comp_assoc(const void *i1, const void *i2)









  {









   float	*f1,*f2;









   double	*f1,*f2;



















  f1 = (float *)i1 + 1;









  f2 = (float *)i2 + 1;









  f1 = (double *)i1 + 1;









  f2 = (double *)i2 + 1;









  if (*f1<*f2)









    return -1;









  else return (*f1==*f2)?0:1;








@@ -64,13 +65,13 @@ void  sort_assoc(picstruct *field, assocstruct *assoc)

















  {









   int		comp_assoc(const void *i1, const void *i2);









   float	*list, rad;









   double	*list, rad;









   int		i,j, step,nobj, *hash;



















  step = assoc->ncol;









  nobj = assoc->nobj;









  list = assoc->list;









  qsort(assoc->list, assoc->nobj, step*sizeof(float), comp_assoc);









  qsort(assoc->list, assoc->nobj, step*sizeof(double), comp_assoc);









/* Build the hash table that contains the first object in the sorted list */









/* which may be in reach from the current scanline */









  QMALLOC(assoc->hash, int, field->height);








@@ -94,13 +95,13 @@ void  sort_assoc(picstruct *field, assocstruct *assoc)







Read an assoc-list, and returns a pointer to the new assoc struct (or NULL if









no list was found).









*/









assocstruct  *load_assoc(char *filename)









assocstruct  *load_assoc(char *filename, wcsstruct *wcs)



















  {









   assocstruct	*assoc;









   FILE		*file;









   float	*list, val;









   char		str[MAXCHAR], str2[MAXCHAR], *sstr;









   double	*list, val;









   char		str[MAXCHARL], str2[MAXCHARL], *sstr;









   int		*data,









		i,ispoon,j,k,l, ncol, ndata, nlist, size,spoonsize,









		xindex,yindex,mindex;








@@ -114,7 +115,7 @@ assocstruct  *load_assoc(char *filename)







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









	= mindex = 0;









  NFPRINTF(OUTPUT, "Reading ASSOC input-list...");









  for (i=0; fgets(str, MAXCHAR, file);)









  for (i=0; fgets(str, MAXCHARL, file);)









    {









/*-- Examine current input line (discard empty and comment lines) */









    if (!*str || strchr("#\t\n",*str))








@@ -171,14 +172,14 @@ assocstruct  *load_assoc(char *filename)

















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









      QMALLOC(assoc, assocstruct, 1);









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









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









      spoonsize = ispoon*nlist;









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









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









      list = assoc->list;









      }









    else  if (!(i%ispoon))









      {









      QREALLOC(assoc->list, float, size += spoonsize);









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









      list = assoc->list + i*nlist;









      }


















@@ -192,7 +193,7 @@ assocstruct  *load_assoc(char *filename)







    *(list+2) = 0.0;









    for (sstr = str, j=0; j<ncol; j++)









      {









      val = (float)strtod(sstr, &sstr);









      val = (double)strtod(sstr, &sstr);









      if (j==xindex)









        *list = val;









      else if (j==yindex)








@@ -202,12 +203,14 @@ assocstruct  *load_assoc(char *filename)







      if ((k=data[j]))









        *(list+2+k) = val;









      }









    if (wcs)









      wcs_to_raw(wcs, list, list);









    list += nlist;









    }



















  fclose(file);









  free(data);









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









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









  assoc->nobj = i;









  assoc->radius = prefs.assoc_radius;









  assoc->ndata = ndata;








@@ -227,7 +230,9 @@ void	init_assoc(picstruct *field)







   assocstruct	*assoc;



















/* Load the assoc-list */









  if (!(assoc = field->assoc = load_assoc(prefs.assoc_name)))









  if (!(assoc = field->assoc = load_assoc(prefs.assoc_name,









				prefs.assoccoord_type==ASSOCCOORD_WORLD?









					field->wcs : NULL)))









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









	prefs.assoc_name);


















@@ -264,17 +269,16 @@ void	end_assoc(picstruct *field)







/*









Perform the association task for a source and return the number of IDs.









*/









int	do_assoc(picstruct *field, float x, float y)









int	do_assoc(picstruct *field, double x, double y)









  {









   assocstruct	*assoc;









   double	aver;









   float	dx,dy, dist, rad, rad2, comp, wparam,









   double	aver, dx,dy, dist, rad, rad2, comp, wparam,









		*list, *input, *data;









   int		h, step, i, flag, iy, nobj;



















  assoc = field->assoc;









/* Need to initialize the array */









  memset(assoc->data, 0, prefs.assoc_size*sizeof(float));









  memset(assoc->data, 0, prefs.assoc_size*sizeof(double));









  aver = 0.0;



















  if (prefs.assoc_type == ASSOC_MIN || prefs.assoc_type == ASSOC_NEAREST)








@@ -304,7 +308,7 @@ int	do_assoc(picstruct *field, float x, float y)







      input = list+3;









      if (prefs.assoc_type == ASSOC_FIRST)









        {









        memcpy(assoc->data, input, assoc->ndata*sizeof(float));









        memcpy(assoc->data, input, assoc->ndata*sizeof(double));









        return 1;









        }









      wparam = *(list+2);








@@ -314,7 +318,7 @@ int	do_assoc(picstruct *field, float x, float y)







        case ASSOC_NEAREST:









          if (dist<comp)









            {









            memcpy(data, input, assoc->ndata*sizeof(float));









            memcpy(data, input, assoc->ndata*sizeof(double));









            comp = dist;









            }









          break;








@@ -340,14 +344,14 @@ int	do_assoc(picstruct *field, float x, float y)







        case ASSOC_MIN:









          if (wparam<comp)









            {









            memcpy(data, input, assoc->ndata*sizeof(float));









            memcpy(data, input, assoc->ndata*sizeof(double));









            comp = wparam;









            }









          break;









        case ASSOC_MAX:









          if (wparam>comp)









            {









            memcpy(data, input, assoc->ndata*sizeof(float));









            memcpy(data, input, assoc->ndata*sizeof(double));









            comp = wparam;









            }









          break;