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

Added new NLOWWEIGHT_ISO and NLOWDWEIGHT_ISO parameters that count the number...

Added new NLOWWEIGHT_ISO and NLOWDWEIGHT_ISO parameters that count the number of bad pixels within the measured isophotal footprint, and within one pixel of the detected isophotal footprint, respectively.
FLAGS_WEIGHT is now working without crashing.
Pushed version number to 2.9.3.
parent 1d1d4318
Loading
Loading
Loading
Loading
+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.9.2.
# Generated by GNU Autoconf 2.63 for sextractor 2.9.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.9.2'
PACKAGE_STRING='sextractor 2.9.2'
PACKAGE_VERSION='2.9.3'
PACKAGE_STRING='sextractor 2.9.3'
PACKAGE_BUGREPORT='bertin@iap.fr'
ac_unique_file="src/makeit.c"
@@ -1505,7 +1505,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.9.2 to adapt to many kinds of systems.
\`configure' configures sextractor 2.9.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1575,7 +1575,7 @@ fi
if test -n "$ac_init_help"; then
  case $ac_init_help in
     short | recursive ) echo "Configuration of sextractor 2.9.2:";;
     short | recursive ) echo "Configuration of sextractor 2.9.3:";;
   esac
  cat <<\_ACEOF
@@ -1706,7 +1706,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
  cat <<\_ACEOF
sextractor configure 2.9.2
sextractor configure 2.9.3
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1720,7 +1720,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.9.2, which was
It was created by sextractor $as_me 2.9.3, which was
generated by GNU Autoconf 2.63.  Invocation command line was
  $ $0 $@
@@ -2423,7 +2423,7 @@ fi
# Define the identity of the package.
 PACKAGE='sextractor'
 VERSION='2.9.2'
 VERSION='2.9.3'
cat >>confdefs.h <<_ACEOF
@@ -28290,7 +28290,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.9.2, which was
This file was extended by sextractor $as_me 2.9.3, which was
generated by GNU Autoconf 2.63.  Invocation command line was
  CONFIG_FILES    = $CONFIG_FILES
@@ -28353,7 +28353,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
sextractor config.status 2.9.2
sextractor config.status 2.9.3
configured by $0, generated by GNU Autoconf 2.63,
  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ define([AC_CACHE_LOAD],)
define([AC_CACHE_SAVE],)

# This is your standard Bertin source code...
AC_INIT(sextractor, 2.9.2, [bertin@iap.fr])
AC_INIT(sextractor, 2.9.3, [bertin@iap.fr])
AC_CONFIG_SRCDIR(src/makeit.c)
AC_CONFIG_AUX_DIR(autoconf)
AM_CONFIG_HEADER(config.h)
+1 −1
Original line number Diff line number Diff line
.TH SEXTRACTOR "1" "September 2009" "SWarp 2.9.2" "User Commands"
.TH SEXTRACTOR "1" "October 2009" "SWarp 2.9.3" "User Commands"
.SH NAME
sex \- extract a source catalog from an astronomical FITS image
.SH SYNOPSIS
+6 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@
*
*	Contents:	analyse(), endobject()...: measurements on detections.
*
*	Last modify:	24/09/2009
*	Last modify:	01/10/2009
*
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
*/
@@ -40,6 +40,7 @@
#include	"profit.h"
#include	"retina.h"
#include	"som.h"
#include	"weight.h"
#include	"winpos.h"

static obj2struct	*obj2 = &outobj2;
@@ -63,7 +64,6 @@ void analyse(picstruct *field, picstruct *dfield, int objnb,

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


/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
/* Put here your calls to custom functions related to isophotal measurements.
Ex:
@@ -234,6 +234,10 @@ void examineiso(picstruct *field, picstruct *dfield, objstruct *obj,
  if (PLISTEXIST(flag))
    getflags(obj, pixel);

/* Flag and count pixels with a low weight */
  if (PLISTEXIST(wflag))
    weight_count(obj, pixel);

  if (cleanflag)
    {
    obj->mthresh = *heap;
+3 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@
*
*	Contents:	functions for output of catalog data.
*
*	Last modify:	29/09/2009
*	Last modify:	01/10/2009
*
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
*/
@@ -599,6 +599,8 @@ void updateparamflags()
  for (i=0; i<NISO; i++)
    FLAG(obj.iso[0]) |= FLAG(obj.iso[i]);

  FLAG(obj.wflag) |= FLAG(obj.nzwpix) | FLAG(obj.nzdwpix);

  return; 
  }

Loading