Skip to content
GitLab
Commit 08af7335 authored by Emmanuel Bertin's avatar Emmanuel Bertin
Browse files

Fixed issue with adaptive CLASS_STAR in dual image mode (thanks to N.Sevilla). 

Pushed version number to 2.12.3.
parent 1d1c9331
Show whitespace changes
Inline Side-by-side
configure
View file @ 08af7335
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.63 for sextractor 2.12.2.
# Generated by GNU Autoconf 2.63 for sextractor 2.12.3.
#
# 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.12.2'
PACKAGE_STRING='sextractor 2.12.2'
PACKAGE_VERSION='2.12.3'
PACKAGE_STRING='sextractor 2.12.3'
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.12.2 to adapt to many kinds of systems.
\`configure' configures sextractor 2.12.3 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.12.2:";;
short | recursive ) echo "Configuration of sextractor 2.12.3:";;
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.12.2
sextractor configure 2.12.3
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.12.2, which was
It was created by sextractor $as_me 2.12.3, 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.12.2'
VERSION='2.12.3'
 
 
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.12.2, which was
This file was extended by sextractor $as_me 2.12.3, 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.12.2
sextractor config.status 2.12.3
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
......
configure.ac
View file @ 08af7335
......@@ -6,7 +6,7 @@ define([AC_CACHE_LOAD],)
define([AC_CACHE_SAVE],)
# This is your standard Bertin source code...
AC_INIT(sextractor, 2.12.2, [bertin@iap.fr])
AC_INIT(sextractor, 2.12.3, [bertin@iap.fr])
AC_CONFIG_SRCDIR(src/makeit.c)
AC_CONFIG_AUX_DIR(autoconf)
AM_CONFIG_HEADER(config.h)
......
man/sex.1
View file @ 08af7335
.TH SEXTRACTOR "1" "September 2010" "SWarp 2.12.2" "User Commands"
.TH SEXTRACTOR "1" "September 2010" "SWarp 2.12.3" "User Commands"
.SH NAME
sex \- extract a source catalog from an astronomical FITS image
.SH SYNOPSIS
......
src/analyse.c
View file @ 08af7335
......@@ -9,7 +9,7 @@
*
* Contents: analyse(), endobject()...: measurements on detections.
*
* Last modify: 23/08/2010
* Last modify: 28/09/2010
*
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
*/
......@@ -93,9 +93,9 @@ void examineiso(picstruct *field, picstruct *dfield, objstruct *obj,
pospeakflag, minarea, gainflag;
double tv,sigtv, ngamma,
esum, emx2,emy2,emxy, err,gain,backnoise2,dbacknoise2,
xm,ym, x,y,var,var2;
xm,ym, x,y,var,var2, threshfac;
float *heap,*heapt,*heapj,*heapk, swap;
PIXTYPE pix, cdpix, tpix, peak,cdpeak, thresh,dthresh;
PIXTYPE pix, cdpix, tpix, peak,cdpeak, thresh,dthresh,minthresh;
static PIXTYPE threshs[NISO];
......@@ -149,6 +149,8 @@ void examineiso(picstruct *field, picstruct *dfield, objstruct *obj,
peak = -BIG;
cdpeak = -BIG;
thresh = field->thresh;
minthresh = (PLISTEXIST(var))? BIG : thresh;
threshfac = field->backsig > 0.0 ? field->thresh / field->backsig : 1.0;
dthresh = dfield->dthresh;
area = 0;
for (pixt=pixel+obj->firstpix; pixt>=pixel; pixt=pixel+PLIST(pixt,nextpix))
......@@ -165,7 +167,13 @@ void examineiso(picstruct *field, picstruct *dfield, objstruct *obj,
obj->peaky = PLIST(pixt,y) + 1;
}
if (PLISTEXIST(var))
{
var = PLISTPIX(pixt, var);
thresh = threshfac*sqrt(var);
if (thresh < minthresh)
minthresh = thresh;
}
if (photoflag)
{
pix = exp(pix/ngamma);
......@@ -178,7 +186,6 @@ void examineiso(picstruct *field, picstruct *dfield, objstruct *obj,
var2 += pix/gain*var/backnoise2;
sigtv += var2;
if (pix>thresh)
area++;
tv += pix;
......@@ -283,8 +290,7 @@ void examineiso(picstruct *field, picstruct *dfield, objstruct *obj,
obj->flux = tv;
obj->fluxerr = sigtv;
obj->peak = peak;
obj->thresh -= obj->dbkg;
obj->thresh = minthresh - obj->dbkg;
obj->peak -= obj->dbkg;
/* Initialize isophotal thresholds so as to sample optimally the full profile*/
......
src/profit.c
View file @ 08af7335
......@@ -229,9 +229,9 @@ void profit_fit(profitstruct *profit,
profit->ix = (int)(obj->mx + 0.49999);/* internal convention: 1st pix = 0 */
profit->iy = (int)(obj->my + 0.49999);/* internal convention: 1st pix = 0 */
psf_fwhm = psf->masksize[0]*psf->pixstep;
profit->objnaxisn[0] = (((int)((obj->xmax-obj->xmin+1) + psf_fwhm + 0.499)
profit->objnaxisn[0] = (((int)(obj2->hl_radius*6.0 + psf_fwhm + 0.499)
*1.2)/2)*2 + 1;
profit->objnaxisn[1] = (((int)((obj->ymax-obj->ymin+1) + psf_fwhm + 0.499)
profit->objnaxisn[1] = (((int)(obj2->hl_radius*6.0 + psf_fwhm + 0.499)
*1.2)/2)*2 + 1;
if (profit->objnaxisn[1]<profit->objnaxisn[0])
profit->objnaxisn[1] = profit->objnaxisn[0];
......
src/scan.c
View file @ 08af7335
......@@ -10,7 +10,7 @@
* Contents: functions for extraction of connected pixels from
* a pixmap.
*
* Last modify: 21/01/2010
* Last modify: 28/09/2010
*
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
*/
......@@ -48,7 +48,7 @@ INPUT Measurement field pointer,
OUTPUT -.
NOTES -.
AUTHOR E. Bertin (IAP)
VERSION 01/12/2009
VERSION 28/09/2010
***/
void scanimage(picstruct *field, picstruct *dfield, picstruct **pffield,
int nffield, picstruct *wfield, picstruct *dwfield)
......@@ -101,7 +101,7 @@ void scanimage(picstruct *field, picstruct *dfield, picstruct **pffield,
w = cfield->width;
h = cfield->height;
objlist.dthresh = cfield->dthresh;
objlist.thresh = cfield->thresh;
objlist.thresh = field->thresh;
cfield->yblank = 1;
field->y = field->stripy = 0;
field->ymin = field->stripylim = 0;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment