Commit e23322b4 authored by Emmanuel Bertin's avatar Emmanuel Bertin
Browse files

Fixed positional offsets of large galaxy models on MODELS and -MODELS check-ima\ 

ges.
Pushed version number to 2.19.4.
parent d397d721

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.69 for sextractor 2.19.3.

# Generated by GNU Autoconf 2.69 for sextractor 2.19.4.

#

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

#
@@ -590,8 +590,8 @@ MAKEFLAGS= 
# Identity of this package.

PACKAGE_NAME='sextractor'

PACKAGE_TARNAME='sextractor'

PACKAGE_VERSION='2.19.3'

PACKAGE_STRING='sextractor 2.19.3'

PACKAGE_VERSION='2.19.4'

PACKAGE_STRING='sextractor 2.19.4'

PACKAGE_BUGREPORT='bertin@iap.fr'

PACKAGE_URL=''
@@ -1345,7 +1345,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.19.3 to adapt to many kinds of systems.

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



Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1415,7 +1415,7 @@ fi 


if test -n "$ac_init_help"; then

  case $ac_init_help in

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

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

   esac

  cat <<\_ACEOF
@@ -1548,7 +1548,7 @@ fi 
test -n "$ac_init_help" && exit $ac_status

if $ac_init_version; then

  cat <<\_ACEOF

sextractor configure 2.19.3

sextractor configure 2.19.4

generated by GNU Autoconf 2.69



Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1971,7 +1971,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.19.3, which was

It was created by sextractor $as_me 2.19.4, which was

generated by GNU Autoconf 2.69.  Invocation command line was



  $ $0 $@
@@ -2785,7 +2785,7 @@ fi 


# Define the identity of the package.

 PACKAGE='sextractor'

 VERSION='2.19.3'

 VERSION='2.19.4'





cat >>confdefs.h <<_ACEOF
@@ -15697,7 +15697,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=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.19.3, which was

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

generated by GNU Autoconf 2.69.  Invocation command line was



  CONFIG_FILES    = $CONFIG_FILES
@@ -15763,7 +15763,7 @@ _ACEOF 
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

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

ac_cs_version="\\

sextractor config.status 2.19.3

sextractor config.status 2.19.4

configured by $0, generated by GNU Autoconf 2.69,

  with options \\"\$ac_cs_config\\"

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:		12/09/2013

#	Last modified:		24/09/2013

#

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



# This is your standard Bertin source code...

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

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

AC_CONFIG_SRCDIR(src/makeit.c)

AC_CONFIG_AUX_DIR(autoconf)

AC_CONFIG_HEADERS(config.h)

man/sex.1

+1 −1
Original line number Diff line number Diff line 
.TH SEXTRACTOR "1" "September 2013" "SExtractor 2.19.3" "User Commands"

.TH SEXTRACTOR "1" "September 2013" "SExtractor 2.19.4" "User Commands"

.SH NAME

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

.SH SYNOPSIS

src/check.c

+13 −18
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:		05/07/2013

*	Last modified:		23/09/2013

*

*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -102,66 +102,61 @@ INPUT Pointer to the check-image, 
	thumbnail height,

	thumbnail center x coordinate,

	thumbnail center y coordinate,

	zoom factor,

	inverse zoom factor,

	flux scaling factor.

OUTPUT	-.

NOTES	Outside boundaries are taken into account.

AUTHOR	E. Bertin (IAP)

VERSION	26/02/2013

VERSION	23/09/2013

 ***/

void	addcheck_resample(checkstruct *check, float *thumb, int w, int h,

			int ix, int iy, float step2, float amplitude)

			int ix, int iy, float step1, float amplitude)

  {

   float	interpm[CHECKINTERPW*CHECKINTERPW],

		*pix2, *mask,*maskt,*pix12, *pixin,*pixin0, *pixout,*pixout0,

		xc1,xc2,yc1,yc2, xs1,ys1, x1,y1, x,y, dxm,dym, val, norm, dx,dy;

		xs1,ys1, x1,y1, x,y, dxm,dym, val, norm, step2;

   int		i,j,k,n,t, *start,*startt, *nmask,*nmaskt,

		ixs2,iys2, ix2,iy2, dix2,diy2, nx2,ny2, iys1a, ny1, hmw,hmh,

		ixs,iys, ix1,iy1, w2,h2;



  step2 = 1.0/step1;

  pix2 = check->pix;

  w2 = check->width;

  h2 = check->height;

  dx = 0.5*(1.0 - step2);

  dy = 0.5*(1.0 - step2);



  xc1 = (float)(w/2);	/* Im1 center x-coord*/

  xc2 = (float)ix;	/* Im2 center x-coord*/

  xs1 = xc1 + dx - xc2*step2;	/* Im1 start x-coord */



  xs1 = -0.5 - ((float)ix - (int)(w*step1)/2 - 0.5)*step2; /* Im1 start coord */

  if ((int)xs1 >= w)

    return;

  ixs2 = 0;			/* Int part of Im2 start x-coord */

  if (xs1<0.0)

    {

    dix2 = (int)(1-xs1/step2);

    dix2 = (int)(1-xs1*step1);

/*-- Simply leave here if the images do not overlap in x */

    if (dix2 >= w2)

      return;

    ixs2 += dix2;

    xs1 += dix2*step2;

    }

  nx2 = (int)((w-1-xs1)/step2+1);/* nb of interpolated Im2 pixels along x */

  nx2 = (int)((w-1-xs1)*step1+1);/* nb of interpolated Im2 pixels along x */

  if (nx2>(ix2=w2-ixs2))

    nx2 = ix2;

  if (nx2<=0)

    return;

  yc1 = (float)(h/2);	/* Im1 center y-coord */

  yc2 = (float)iy;	/* Im2 center y-coord */

  ys1 = yc1 + dy - yc2*step2;	/* Im1 start y-coord */



  ys1 = -0.5 - ((float)iy - (int)(h*step1)/2 - 0.5)*step2; /* Im1 start coord */

  if ((int)ys1 >= h)

    return;

  iys2 = 0;			/* Int part of Im2 start y-coord */

  if (ys1<0.0)

    {

    diy2 = (int)(1-ys1/step2);

    diy2 = (int)(1-ys1*step1);

/*-- Simply leave here if the images do not overlap in y */

    if (diy2 >= h2)

      return;

    iys2 += diy2;

    ys1 += diy2*step2;

    }

  ny2 = (int)((h-1-ys1)/step2+1);/* nb of interpolated Im2 pixels along y */

  ny2 = (int)((h-1-ys1)*step1+1);/* nb of interpolated Im2 pixels along y */

  if (ny2>(iy2=h2-iys2))

    ny2 = iy2;

  if (ny2<=0)

src/profit.c

+8 −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:		17/07/2013

*	Last modified:		23/09/2013

*

*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -168,7 +168,7 @@ OUTPUT Pointer to an allocated fit structure (containing details about the 
	fit).

NOTES	It is a modified version of the lm_minimize() of lmfit.

AUTHOR	E. Bertin (IAP)

VERSION	05/07/2013

VERSION	23/09/2013

 ***/

void	profit_fit(profitstruct *profit,

		picstruct *field, picstruct *wfield,
@@ -365,7 +365,7 @@ profit->niter = profit_minimize(profit, PROFIT_MAXITER); 
    if (profit->subsamp>1.0)

      addcheck_resample(check, profit->lmodpix,

		profit->objnaxisn[0],profit->objnaxisn[1],

		profit->ix,profit->iy, 1.0/profit->subsamp,

		profit->ix,profit->iy, profit->subsamp,

		1.0/(profit->subsamp*profit->subsamp));

    else

      addcheck(check, profit->lmodpix,
@@ -379,7 +379,7 @@ profit->niter = profit_minimize(profit, PROFIT_MAXITER); 
    if (profit->subsamp>1.0)

      addcheck_resample(check, profit->lmodpix,

		profit->objnaxisn[0],profit->objnaxisn[1],

		profit->ix,profit->iy, 1.0/profit->subsamp,

		profit->ix,profit->iy, profit->subsamp,

		-1.0/(profit->subsamp*profit->subsamp));

    else

      addcheck(check, profit->lmodpix,
@@ -400,7 +400,7 @@ profit->niter = profit_minimize(profit, PROFIT_MAXITER); 
    if (profit->subsamp>1.0)

      addcheck_resample(check, profit->lmodpix,

		profit->objnaxisn[0],profit->objnaxisn[1],

		profit->ix,profit->iy, 1.0/profit->subsamp,

		profit->ix,profit->iy, profit->subsamp,

		1.0/(profit->subsamp*profit->subsamp));

    else

      addcheck(check, profit->lmodpix,
@@ -421,7 +421,7 @@ profit->niter = profit_minimize(profit, PROFIT_MAXITER); 
    if (profit->subsamp>1.0)

      addcheck_resample(check, profit->lmodpix,

		profit->objnaxisn[0],profit->objnaxisn[1],

		profit->ix,profit->iy, 1.0/profit->subsamp,

		profit->ix,profit->iy, profit->subsamp,

		-1.0/(profit->subsamp*profit->subsamp));

    else

      addcheck(check, profit->lmodpix,
@@ -442,7 +442,7 @@ profit->niter = profit_minimize(profit, PROFIT_MAXITER); 
    if (profit->subsamp>1.0)

      addcheck_resample(check, profit->lmodpix,

		profit->objnaxisn[0],profit->objnaxisn[1],

		profit->ix,profit->iy, 1.0/profit->subsamp,

		profit->ix,profit->iy, profit->subsamp,

		1.0/(profit->subsamp*profit->subsamp));

    else

      addcheck(check, profit->lmodpix,
@@ -463,7 +463,7 @@ profit->niter = profit_minimize(profit, PROFIT_MAXITER); 
    if (profit->subsamp>1.0)

      addcheck_resample(check, profit->lmodpix,

		profit->objnaxisn[0],profit->objnaxisn[1],

		profit->ix,profit->iy, 1.0/profit->subsamp,

		profit->ix,profit->iy, profit->subsamp,

		-1.0/(profit->subsamp*profit->subsamp));

    else

      addcheck(check, profit->lmodpix,