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

Added FLUX_MAX_MODEL, FLUX_EFF_MODEL, FLUX_MEAN_MODEL, MU_MAX_MODEL,... 

Added FLUX_MAX_MODEL, FLUX_EFF_MODEL, FLUX_MEAN_MODEL, MU_MAX_MODEL, MU_EFF_MODEL and MU_MEAN_MODEL parameters (FLUX_MAX_MODEL estimator still somewhat inacurrate).
Added FLUX_MAX_SPHEROID, FLUX_EFF_SPHEROID, FLUX_MEAN_SPHEROID, MU_MAX_SPHEROID, MU_EFF_SPHEROID, MU_MEAN_SPHEROID parameters.
Added FLUX_MAX_DISK, FLUX_EFF_DISK, FLUX_MEAN_DISK, MU_MAX_DISK, MU_EFF_DISK and MU_MEAN_DISK parameters.
Changed the way total model fluxes and model moments are computed.
Pushed version number to 2.9.2.
parent 02f1bedb

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

# Generated by GNU Autoconf 2.63 for sextractor 2.9.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.9.1'

PACKAGE_STRING='sextractor 2.9.1'

PACKAGE_VERSION='2.9.2'

PACKAGE_STRING='sextractor 2.9.2'

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









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









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









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









sextractor configure 2.9.2









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









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









 VERSION='2.9.2'

























cat >>confdefs.h <<_ACEOF








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









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









generated by GNU Autoconf 2.63.  Invocation command line was

















  CONFIG_FILES    = $CONFIG_FILES








@@ -28352,7 +28352,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.1









sextractor config.status 2.9.2









configured by $0, generated by GNU Autoconf 2.63,









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

































configure.ac



+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.1, [bertin@iap.fr])









AC_INIT(sextractor, 2.9.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" "September 2009" "SWarp 2.9.1" "User Commands"









.TH SEXTRACTOR "1" "September 2009" "SWarp 2.9.2" "User Commands"









.SH NAME









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









.SH SYNOPSIS
































src/catout.c



+16
−5






























Original line number
Diff line number
Diff line







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







*









*	Contents:	functions for output of catalog data.









*









*	Last modify:	11/09/2009









*	Last modify:	16/09/2009









*









*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%









*/








@@ -219,7 +219,6 @@ void	updateparamflags()







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









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









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









  FLAG(obj2.prof_disk_peak) |= FLAG(obj2.prof_disk_mumax);









  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);








@@ -297,9 +296,11 @@ void	updateparamflags()







			| FLAG(obj2.prof_disk_aspecterrw)









			| FLAG(obj2.prof_disk_thetaerrw)









			| FLAG(obj2.prof_arms_scalew);









  FLAG(obj2.prof_disk_fluxmean) |= FLAG(obj2.prof_disk_mumean);









  FLAG(obj2.prof_disk_fluxeff) |= FLAG(obj2.prof_disk_mueff);









  FLAG(obj2.prof_disk_peak) |= FLAG(obj2.prof_disk_mumax)









				| FLAG(obj2.prof_disk_fluxeff);









				| FLAG(obj2.prof_disk_fluxeff)









				| FLAG(obj2.prof_disk_fluxmean);



















  FLAG(obj2.prof_spheroid_reffw) |= FLAG(obj2.prof_spheroid_aspectw)









			| FLAG(obj2.prof_spheroid_thetaw)








@@ -311,9 +312,11 @@ void	updateparamflags()







			| FLAG(obj2.prof_e1w) |FLAG(obj2.prof_e2w)









			| FLAG(obj2.prof_pol1w) |FLAG(obj2.prof_pol2w);



















  FLAG(obj2.prof_spheroid_fluxmean) |= FLAG(obj2.prof_spheroid_mumean);









  FLAG(obj2.prof_spheroid_fluxeff) |= FLAG(obj2.prof_spheroid_mueff);









  FLAG(obj2.prof_spheroid_peak) |= FLAG(obj2.prof_spheroid_mumax)









				| FLAG(obj2.prof_spheroid_fluxeff);









				| FLAG(obj2.prof_spheroid_fluxeff)









				| FLAG(obj2.prof_spheroid_fluxmean);



















  FLAG(obj2.prof_flagw) |= FLAG(obj2.prof_spheroid_reffw)









			| FLAG(obj2.prof_disk_scalew)








@@ -332,6 +335,12 @@ void	updateparamflags()







			| FLAG(obj2.prof_e1)









			| FLAG(obj2.prof_a) | FLAG(obj2.prof_cxx)









			| FLAG(obj2.prof_mx2w);









  FLAG(obj2.mumax_prof) |= FLAG(obj2.mueff_prof) | FLAG(obj2.mumean_prof);/*!*/









  FLAG(obj2.fluxmean_prof) |= FLAG(obj2.mumean_prof);









  FLAG(obj2.fluxeff_prof) |= FLAG(obj2.mueff_prof)









			| FLAG(obj2.fluxmean_prof);









  FLAG(obj2.peak_prof) |= FLAG(obj2.mumax_prof)









			| FLAG(obj2.fluxeff_prof);



















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









			| FLAG(obj2.prof_arms_mag)








@@ -371,6 +380,7 @@ void	updateparamflags()







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









			| FLAG(obj2.x_prof) | FLAG(obj2.y_prof)









			| FLAG(obj2.prof_mx2)









			| FLAG(obj2.peak_prof)









			| FLAG(obj2.prof_disk_flux)









			| FLAG(obj2.prof_spheroid_flux);


















@@ -494,7 +504,8 @@ void	updateparamflags()







			| FLAG(obj2.fwhmw)









			| FLAG(obj2.maxmu) | FLAG(obj2.threshmu)









			| FLAG(obj2.prof_spheroid_mumax)









			| FLAG(obj2.prof_disk_mumax);









			| FLAG(obj2.prof_disk_mumax)









			| FLAG(obj2.mumax_prof);



















/*------------------------------ Photometry ---------------------------------*/










































src/paramprofit.h



+32
−1






























Original line number
Diff line number
Diff line







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







*









*	Contents:	Model-fitting parameter list for catalog data.









*









*	Last modify:	13/09/2009









*	Last modify:	16/09/2009









*









*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%









*/








@@ -43,6 +43,25 @@







	&outobj2.magerr_prof, H_FLOAT, T_FLOAT, "%8.4f", "mag",









	"stat.error;phot.mag;stat.fit.param", "mag"},



















  {"FLUX_MAX_MODEL", "Peak model flux above background",









	&outobj2.peak_prof, H_FLOAT, T_FLOAT, "%12.7g", "count",









	"phot.flux.sb;stat.max;stat.fit.param", "ct"},









  {"FLUX_EFF_MODEL", "Effective model flux above background",









	&outobj2.fluxeff_prof, H_FLOAT, T_FLOAT, "%12.7g", "count",









	"phot.flux.sb;stat.fit.param", "ct"},









  {"FLUX_MEAN_MODEL", "Mean effective model flux above background",









	&outobj2.fluxmean_prof, H_FLOAT, T_FLOAT, "%12.7g", "count",









	"phot.flux.sb;stat.mean;stat.fit.param", "ct"},









  {"MU_MAX_MODEL", "Peak model surface brightness above background",









	&outobj2.mumax_prof, H_FLOAT, T_FLOAT, "%8.4f", "mag * arcsec**(-2)",









	"phot.mag.sb;stat.max;stat.fit.param", "mag.arcsec-2"},









  {"MU_EFF_MODEL", "Effective model surface brightness above background",









	&outobj2.mueff_prof, H_FLOAT, T_FLOAT, "%8.4f", "mag * arcsec**(-2)",









	"phot.mag.sb;stat.fit.param", "mag.arcsec-2"},









  {"MU_MEAN_MODEL", "Mean effective model surface brightness above background",









	&outobj2.mumean_prof, H_FLOAT, T_FLOAT, "%8.4f", "mag * arcsec**(-2)",









	"phot.mag.sb;stat.mean;stat.fit.param", "mag.arcsec-2"},



















  {"XMODEL_IMAGE", "X coordinate from model-fitting",









	&outobj2.x_prof, H_FLOAT, T_FLOAT, "%10.3f", "pixel",









	"pos.cartesian.x;stat.fit.param;instr.det;meta.main", "pix"},








@@ -275,12 +294,18 @@







  {"FLUX_EFF_SPHEROID", "Effective spheroid flux above background",









	&outobj2.prof_spheroid_fluxeff, H_FLOAT, T_FLOAT, "%12.7g", "count",









	"phot.flux.sb;stat.fit.param", "ct"},









  {"FLUX_MEAN_SPHEROID", "Mean effective spheroid flux above background",









	&outobj2.prof_spheroid_fluxmean, H_FLOAT, T_FLOAT, "%12.7g", "count",









	"phot.flux.sb;stat.mean;stat.fit.param", "ct"},









  {"MU_MAX_SPHEROID", "Peak spheroid surface brightness above background",









	&outobj2.prof_spheroid_mumax, H_FLOAT, T_FLOAT, "%8.4f", "mag * arcsec**(-2)",









	"phot.mag.sb;stat.max;stat.fit.param", "mag.arcsec-2"},









  {"MU_EFF_SPHEROID", "Effective spheroid surface brightness above background",









	&outobj2.prof_spheroid_mueff, H_FLOAT, T_FLOAT, "%8.4f", "mag * arcsec**(-2)",









	"phot.mag.sb;stat.fit.param", "mag.arcsec-2"},









  {"MU_MEAN_SPHEROID", "Mean effective spheroid surface brightness above background",









	&outobj2.prof_spheroid_mumean, H_FLOAT, T_FLOAT, "%8.4f", "mag * arcsec**(-2)",









	"phot.mag.sb;stat.mean;stat.fit.param", "mag.arcsec-2"},









  {"SPHEROID_REFF_IMAGE", "Spheroid effective radius from fitting",









	&outobj2.prof_spheroid_reff, H_FLOAT, T_FLOAT, "%10.4f", "pixel",









	"src.morph.scLength;stat.fit.param;instr.det", "pix"},








@@ -351,12 +376,18 @@







  {"FLUX_EFF_DISK", "Effective disk flux above background",









	&outobj2.prof_disk_fluxeff, H_FLOAT, T_FLOAT, "%12.7g", "count",









	"phot.flux.sb;stat.fit.param", "ct"},









  {"FLUX_MEAN_DISK", "Mean effective disk flux above background",









	&outobj2.prof_disk_fluxmean, H_FLOAT, T_FLOAT, "%12.7g", "count",









	"phot.flux.sb;stat.mean;stat.fit.param", "ct"},









  {"MU_MAX_DISK", "Peak disk surface brightness above background",









	&outobj2.prof_disk_mumax, H_FLOAT, T_FLOAT, "%8.4f", "mag * arcsec**(-2)",









	"phot.mag.sb;stat.max;stat.fit.param", "mag.arcsec-2"},









  {"MU_EFF_DISK", "Effective disk surface brightness above background",









	&outobj2.prof_disk_mueff, H_FLOAT, T_FLOAT, "%8.4f", "mag * arcsec**(-2)",









	"phot.mag.sb;stat.fit.param", "mag.arcsec-2"},









  {"MU_MEAN_DISK", "Mean effective disk surface brightness above background",









	&outobj2.prof_disk_mumean, H_FLOAT, T_FLOAT, "%8.4f", "mag * arcsec**(-2)",









	"phot.mag.sb;stat.mean;stat.fit.param", "mag.arcsec-2"},









  {"DISK_SCALE_IMAGE", "Disk scalelength from fitting",









	&outobj2.prof_disk_scale, H_FLOAT, T_FLOAT, "%10.4f", "pixel",









	"src.morph.scLength;stat.fit.param;instr.det", "pix"},