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

Fixed issue with MINIBACKGROUND and MINIBACK_RMS multi-extension check-images. 

Added new measurement parameters:
FLUXRATIO_POINTSOURCE :    Point-source flux-to-total ratio from fitting,
FLUXRATIOERR_POINTSOURCE : Uncertainty on point-source flux-to-total ratio,
FLUXRATIO_SPHEROID :       Spheroid flux-to-total ratio from fitting,
FLUXRATIOERR_SPHEROID :    Uncertainty on spheroid flux-to-total ratio,
FLUXRATIO_DISK :           Disk flux-to-total ratio from fitting, and
FLUXRATIOERR_DISK :        Uncertainty on disk flux-to-total ratio.
Pushed version number to 2.19.0
parent 66380127

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

# Generated by GNU Autoconf 2.69 for sextractor 2.19.0.

#

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

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

PACKAGE_NAME='sextractor'

PACKAGE_TARNAME='sextractor'

PACKAGE_VERSION='2.18.12'

PACKAGE_STRING='sextractor 2.18.12'

PACKAGE_VERSION='2.19.0'

PACKAGE_STRING='sextractor 2.19.0'

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

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

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

   esac

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

if $ac_init_version; then

  cat <<\_ACEOF

sextractor configure 2.18.12

sextractor configure 2.19.0

generated by GNU Autoconf 2.69



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

It was created by sextractor $as_me 2.19.0, which was

generated by GNU Autoconf 2.69.  Invocation command line was



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


# Define the identity of the package.

 PACKAGE='sextractor'

 VERSION='2.18.12'

 VERSION='2.19.0'





cat >>confdefs.h <<_ACEOF
@@ -15714,7 +15714,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.18.12, which was

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

generated by GNU Autoconf 2.69.  Invocation command line was



  CONFIG_FILES    = $CONFIG_FILES
@@ -15780,7 +15780,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.18.12

sextractor config.status 2.19.0

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:		06/06/2013

#	Last modified:		05/07/2013

#

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



# This is your standard Bertin source code...

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

AC_INIT(sextractor, 2.19.0, [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" "June 2013" "SExtractor 2.18.12" "User Commands"

.TH SEXTRACTOR "1" "July 2013" "SExtractor 2.19.0" "User Commands"

.SH NAME

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

.SH SYNOPSIS

src/catout.c

+26 −10
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
*

*	This file part of:	SExtractor

*

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

*	Copyright:		(C) 1993-2013 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:		08/12/2011

*	Last modified:		05/07/2013

*

*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -192,13 +192,6 @@ void updateparamflags() 
  FLAG(obj2.fluxcorerr_prof) |= FLAG(obj2.magcorerr_prof);

  FLAG(obj2.fluxcor_prof) |= FLAG(obj2.magcor_prof)

			| FLAG(obj2.fluxcorerr_prof);

  FLAG(obj2.fluxerr_prof) |= FLAG(obj2.magerr_prof)

			| FLAG(obj2.prof_concentrationerr)

			| FLAG(obj2.fluxcorerr_prof);

  FLAG(obj2.flux_prof) |= FLAG(obj2.mag_prof)

			| FLAG(obj2.fluxerr_prof)

			| FLAG(obj2.fluxcor_prof);





  FLAG(obj2.poserraw_prof) |= FLAG(obj2.poserrbw_prof);

  FLAG(obj2.poserrcxxw_prof) |= FLAG(obj2.poserrcyyw_prof)
@@ -240,21 +233,26 @@ void updateparamflags() 
			| FLAG(obj2.prof_class_star)

			| FLAG(obj2.fluxcor_prof);



  FLAG(obj2.prof_dirac_fluxratio) |= FLAG(obj2.prof_dirac_fluxratioerr);

  FLAG(obj2.prof_dirac_mag) |= FLAG(obj2.prof_dirac_magerr);

  FLAG(obj2.prof_spheroid_fluxratio) |= FLAG(obj2.prof_spheroid_fluxratioerr);

  FLAG(obj2.prof_spheroid_mag) |= FLAG(obj2.prof_spheroid_magerr);

  FLAG(obj2.prof_spheroid_reff) |= FLAG(obj2.prof_spheroid_refferr);

  FLAG(obj2.prof_spheroid_aspect) |= FLAG(obj2.prof_spheroid_aspecterr);

  FLAG(obj2.prof_spheroid_theta) |= FLAG(obj2.prof_spheroid_thetaerr);

  FLAG(obj2.prof_spheroid_sersicn) |= FLAG(obj2.prof_spheroid_sersicnerr);

  FLAG(obj2.prof_disk_fluxratio) |= FLAG(obj2.prof_disk_fluxratioerr);

  FLAG(obj2.prof_disk_mag) |= FLAG(obj2.prof_disk_magerr);

  FLAG(obj2.prof_disk_scale) |= FLAG(obj2.prof_disk_scaleerr);

  FLAG(obj2.prof_disk_aspect) |= FLAG(obj2.prof_disk_aspecterr);

  FLAG(obj2.prof_disk_inclination) |= FLAG(obj2.prof_disk_inclinationerr);

  FLAG(obj2.prof_disk_theta) |= FLAG(obj2.prof_disk_thetaerr);

  FLAG(obj2.prof_bar_fluxratio) |= FLAG(obj2.prof_bar_fluxratioerr);

  FLAG(obj2.prof_bar_mag) |= FLAG(obj2.prof_bar_magerr);

  FLAG(obj2.prof_bar_length) |= FLAG(obj2.prof_bar_lengtherr);

  FLAG(obj2.prof_bar_aspect) |= FLAG(obj2.prof_bar_aspecterr);

  FLAG(obj2.prof_bar_theta) |= FLAG(obj2.prof_bar_thetaerr);

  FLAG(obj2.prof_arms_fluxratio) |= FLAG(obj2.prof_arms_fluxratioerr);

  FLAG(obj2.prof_arms_mag) |= FLAG(obj2.prof_arms_magerr);

  FLAG(obj2.prof_e1errw) |= FLAG(obj2.prof_e2errw) | FLAG(obj2.prof_e12corrw);

  FLAG(obj2.prof_e1w) |= FLAG(obj2.prof_e2w) | FLAG(obj2.prof_e1errw);
@@ -379,6 +377,7 @@ void updateparamflags() 


  FLAG(obj2.prof_arms_flux) |= FLAG(obj2.prof_arms_fluxerr)

			| FLAG(obj2.prof_arms_mag)

			| FLAG(obj2.prof_arms_fluxratio)

			| FLAG(obj2.prof_arms_scalew)

			| FLAG(obj2.prof_arms_scale)

			| FLAG(obj2.prof_arms_posang)
@@ -388,6 +387,7 @@ void updateparamflags() 
  FLAG(obj2.prof_bar_theta) |= FLAG(obj2.prof_bar_lengthw);

  FLAG(obj2.prof_bar_flux) |= FLAG(obj2.prof_bar_fluxerr)

			| FLAG(obj2.prof_bar_mag)

			| FLAG(obj2.prof_bar_fluxratio)

			| FLAG(obj2.prof_bar_lengthw)

			| FLAG(obj2.prof_bar_length)

			| FLAG(obj2.prof_bar_aspect)
@@ -396,6 +396,7 @@ void updateparamflags() 
			| FLAG(obj2.prof_arms_flux);

  FLAG(obj2.prof_disk_flux) |= FLAG(obj2.prof_disk_fluxerr)

			| FLAG(obj2.prof_disk_mag)

			| FLAG(obj2.prof_disk_fluxratio)

			| FLAG(obj2.prof_disk_scalew)

			| FLAG(obj2.prof_disk_scale)

			| FLAG(obj2.prof_disk_aspect)
@@ -405,6 +406,7 @@ void updateparamflags() 
			| FLAG(obj2.prof_bar_flux);

  FLAG(obj2.prof_spheroid_flux) |= FLAG(obj2.prof_spheroid_fluxerr)

			| FLAG(obj2.prof_spheroid_mag)

			| FLAG(obj2.prof_spheroid_fluxratio)

			| FLAG(obj2.prof_spheroid_reffw)

			| FLAG(obj2.prof_spheroid_reff)

			| FLAG(obj2.prof_spheroid_aspect)
@@ -412,7 +414,8 @@ void updateparamflags() 
			| FLAG(obj2.prof_spheroid_sersicn)

			| FLAG(obj2.prof_spheroid_peak);

  FLAG(obj2.prof_dirac_flux) |= FLAG(obj2.prof_dirac_fluxerr)

			| FLAG(obj2.prof_dirac_mag);

			| FLAG(obj2.prof_dirac_mag)

			| FLAG(obj2.prof_dirac_fluxratio);

  FLAG(obj2.prof_offset_flux) |= FLAG(obj2.prof_offset_fluxerr);

  FLAG(obj2.fluxerr_dprof) |= FLAG(obj2.magerr_dprof);

  FLAG(obj2.flux_dprof) |= FLAG(obj2.mag_dprof)
@@ -421,6 +424,19 @@ void updateparamflags() 
			| FLAG(obj2.dprof_flag)

			| FLAG(obj2.dprof_niter)

			| FLAG(obj2.flux_dprof);



  FLAG(obj2.fluxerr_prof) |= FLAG(obj2.magerr_prof)

			| FLAG(obj2.prof_concentrationerr)

			| FLAG(obj2.fluxcorerr_prof)

			| FLAG(obj2.prof_arms_fluxratio)

			| FLAG(obj2.prof_bar_fluxratio)

			| FLAG(obj2.prof_disk_fluxratio)

			| FLAG(obj2.prof_spheroid_fluxratio)

			| FLAG(obj2.prof_dirac_fluxratio);

  FLAG(obj2.flux_prof) |= FLAG(obj2.mag_prof)

			| FLAG(obj2.fluxerr_prof)

			| FLAG(obj2.fluxcor_prof);



  prefs.prof_flag |= FLAG(obj2.prof_chi2) | FLAG(obj2.prof_niter)

			| FLAG(obj2.prof_vector) | FLAG(obj2.prof_errvector)

			| FLAG(obj2.prof_errmatrix)

src/check.c

+5 −8
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
*

*	This file part of:	SExtractor

*

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

*	Copyright:		(C) 1993-2013 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:		26/02/2013

*	Last modified:		05/07/2013

*

*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -661,7 +661,7 @@ void reendcheck(picstruct *field, checkstruct *check) 
    {

    case CHECK_MINIBACKGROUND:

    case CHECK_MINIBACKRMS:

      return;

      break;



    case CHECK_IDENTICAL:

    case CHECK_BACKGROUND:
@@ -671,7 +671,6 @@ void reendcheck(picstruct *field, checkstruct *check) 
      free(check->pix);

      free(check->line);

      check->line = NULL;

      pad_tab(cat, check->npix*sizeof(PIXTYPE));

      break;



    case CHECK_OBJECTS:
@@ -693,13 +692,11 @@ void reendcheck(picstruct *field, checkstruct *check) 
    case CHECK_OTHER:

      write_body(cat->tab, check->pix, check->npix);

      free(check->pix);

      pad_tab(cat, check->npix*sizeof(PIXTYPE));

      break;



    case CHECK_SEGMENTATION:

      write_ibody(cat->tab, check->pix, check->npix);

      free(check->pix);

      pad_tab(cat, check->npix*sizeof(FLAGTYPE));

      break;



    case CHECK_MASK:
@@ -711,7 +708,6 @@ void reendcheck(picstruct *field, checkstruct *check) 
        writecheck(check, &PIX(field, 0, y), field->width);

      free(check->line);

      check->line = NULL;

      pad_tab(cat, check->npix*sizeof(unsigned char));

      break;

      }
@@ -724,7 +720,6 @@ void reendcheck(picstruct *field, checkstruct *check) 
      free(check->pix);

      free(check->line);

      check->line = NULL;

      pad_tab(cat, check->npix*sizeof(PIXTYPE));

      break;

      }
@@ -732,6 +727,8 @@ void reendcheck(picstruct *field, checkstruct *check) 
      error(EXIT_FAILURE, "*Internal Error* in ", "endcheck()!");

    }



  pad_tab(cat, check->npix*sizeof(PIXTYPE));



  return;

  }