Skip to content
GitLab
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
Show whitespace changes
Inline Side-by-side
configure
View file @ 0b1bc817
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # 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>. # Report bugs to <bertin@iap.fr>.
# #
...@@ -750,8 +750,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} ...@@ -750,8 +750,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package. # Identity of this package.
PACKAGE_NAME='sextractor' PACKAGE_NAME='sextractor'
PACKAGE_TARNAME='sextractor' PACKAGE_TARNAME='sextractor'
PACKAGE_VERSION='2.9.1' PACKAGE_VERSION='2.9.2'
PACKAGE_STRING='sextractor 2.9.1' PACKAGE_STRING='sextractor 2.9.2'
PACKAGE_BUGREPORT='bertin@iap.fr' PACKAGE_BUGREPORT='bertin@iap.fr'
   
ac_unique_file="src/makeit.c" ac_unique_file="src/makeit.c"
...@@ -1505,7 +1505,7 @@ if test "$ac_init_help" = "long"; then ...@@ -1505,7 +1505,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # 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. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF 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]... Usage: $0 [OPTION]... [VAR=VALUE]...
   
...@@ -1575,7 +1575,7 @@ fi ...@@ -1575,7 +1575,7 @@ fi
   
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of sextractor 2.9.1:";; short | recursive ) echo "Configuration of sextractor 2.9.2:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
   
...@@ -1706,7 +1706,7 @@ fi ...@@ -1706,7 +1706,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
sextractor configure 2.9.1 sextractor configure 2.9.2
generated by GNU Autoconf 2.63 generated by GNU Autoconf 2.63
   
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
...@@ -1720,7 +1720,7 @@ cat >config.log <<_ACEOF ...@@ -1720,7 +1720,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. 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 generated by GNU Autoconf 2.63. Invocation command line was
   
$ $0 $@ $ $0 $@
...@@ -2423,7 +2423,7 @@ fi ...@@ -2423,7 +2423,7 @@ fi
   
# Define the identity of the package. # Define the identity of the package.
PACKAGE='sextractor' PACKAGE='sextractor'
VERSION='2.9.1' VERSION='2.9.2'
   
   
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
...@@ -28289,7 +28289,7 @@ exec 6>&1 ...@@ -28289,7 +28289,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" 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 generated by GNU Autoconf 2.63. Invocation command line was
   
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
...@@ -28352,7 +28352,7 @@ Report bugs to <bug-autoconf@gnu.org>." ...@@ -28352,7 +28352,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\ ac_cs_version="\\
sextractor config.status 2.9.1 sextractor config.status 2.9.2
configured by $0, generated by GNU Autoconf 2.63, configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
   
......
configure.ac
View file @ 0b1bc817
...@@ -6,7 +6,7 @@ define([AC_CACHE_LOAD],) ...@@ -6,7 +6,7 @@ define([AC_CACHE_LOAD],)
define([AC_CACHE_SAVE],) define([AC_CACHE_SAVE],)
# This is your standard Bertin source code... # 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_SRCDIR(src/makeit.c)
AC_CONFIG_AUX_DIR(autoconf) AC_CONFIG_AUX_DIR(autoconf)
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
......
man/sex.1
View file @ 0b1bc817
.TH SEXTRACTOR "1" "September 2009" "SWarp 2.9.1" "User Commands" .TH SEXTRACTOR "1" "September 2009" "SWarp 2.9.2" "User Commands"
.SH NAME .SH NAME
sex \- extract a source catalog from an astronomical FITS image sex \- extract a source catalog from an astronomical FITS image
.SH SYNOPSIS .SH SYNOPSIS
......
src/catout.c
View file @ 0b1bc817
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
* *
* Contents: functions for output of catalog data. * Contents: functions for output of catalog data.
* *
* Last modify: 11/09/2009 * Last modify: 16/09/2009
* *
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
*/ */
...@@ -219,7 +219,6 @@ void updateparamflags() ...@@ -219,7 +219,6 @@ void updateparamflags()
FLAG(obj2.prof_spheroid_theta) |= FLAG(obj2.prof_spheroid_thetaerr); FLAG(obj2.prof_spheroid_theta) |= FLAG(obj2.prof_spheroid_thetaerr);
FLAG(obj2.prof_spheroid_sersicn) |= FLAG(obj2.prof_spheroid_sersicnerr); FLAG(obj2.prof_spheroid_sersicn) |= FLAG(obj2.prof_spheroid_sersicnerr);
FLAG(obj2.prof_disk_mag) |= FLAG(obj2.prof_disk_magerr); 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_scale) |= FLAG(obj2.prof_disk_scaleerr);
FLAG(obj2.prof_disk_aspect) |= FLAG(obj2.prof_disk_aspecterr); FLAG(obj2.prof_disk_aspect) |= FLAG(obj2.prof_disk_aspecterr);
FLAG(obj2.prof_disk_inclination) |= FLAG(obj2.prof_disk_inclinationerr); FLAG(obj2.prof_disk_inclination) |= FLAG(obj2.prof_disk_inclinationerr);
...@@ -297,9 +296,11 @@ void updateparamflags() ...@@ -297,9 +296,11 @@ void updateparamflags()
| FLAG(obj2.prof_disk_aspecterrw) | FLAG(obj2.prof_disk_aspecterrw)
| FLAG(obj2.prof_disk_thetaerrw) | FLAG(obj2.prof_disk_thetaerrw)
| FLAG(obj2.prof_arms_scalew); | 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_fluxeff) |= FLAG(obj2.prof_disk_mueff);
FLAG(obj2.prof_disk_peak) |= FLAG(obj2.prof_disk_mumax) 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_reffw) |= FLAG(obj2.prof_spheroid_aspectw)
| FLAG(obj2.prof_spheroid_thetaw) | FLAG(obj2.prof_spheroid_thetaw)
...@@ -311,9 +312,11 @@ void updateparamflags() ...@@ -311,9 +312,11 @@ void updateparamflags()
| FLAG(obj2.prof_e1w) |FLAG(obj2.prof_e2w) | FLAG(obj2.prof_e1w) |FLAG(obj2.prof_e2w)
| FLAG(obj2.prof_pol1w) |FLAG(obj2.prof_pol2w); | 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_fluxeff) |= FLAG(obj2.prof_spheroid_mueff);
FLAG(obj2.prof_spheroid_peak) |= FLAG(obj2.prof_spheroid_mumax) 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_flagw) |= FLAG(obj2.prof_spheroid_reffw)
| FLAG(obj2.prof_disk_scalew) | FLAG(obj2.prof_disk_scalew)
...@@ -332,6 +335,12 @@ void updateparamflags() ...@@ -332,6 +335,12 @@ void updateparamflags()
| FLAG(obj2.prof_e1) | FLAG(obj2.prof_e1)
| FLAG(obj2.prof_a) | FLAG(obj2.prof_cxx) | FLAG(obj2.prof_a) | FLAG(obj2.prof_cxx)
| FLAG(obj2.prof_mx2w); | 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_flux) |= FLAG(obj2.prof_arms_fluxerr)
| FLAG(obj2.prof_arms_mag) | FLAG(obj2.prof_arms_mag)
...@@ -371,6 +380,7 @@ void updateparamflags() ...@@ -371,6 +380,7 @@ void updateparamflags()
| FLAG(obj2.prof_vector) | FLAG(obj2.prof_errvector) | FLAG(obj2.prof_vector) | FLAG(obj2.prof_errvector)
| FLAG(obj2.x_prof) | FLAG(obj2.y_prof) | FLAG(obj2.x_prof) | FLAG(obj2.y_prof)
| FLAG(obj2.prof_mx2) | FLAG(obj2.prof_mx2)
| FLAG(obj2.peak_prof)
| FLAG(obj2.prof_disk_flux) | FLAG(obj2.prof_disk_flux)
| FLAG(obj2.prof_spheroid_flux); | FLAG(obj2.prof_spheroid_flux);
...@@ -494,7 +504,8 @@ void updateparamflags() ...@@ -494,7 +504,8 @@ void updateparamflags()
| FLAG(obj2.fwhmw) | FLAG(obj2.fwhmw)
| FLAG(obj2.maxmu) | FLAG(obj2.threshmu) | FLAG(obj2.maxmu) | FLAG(obj2.threshmu)
| FLAG(obj2.prof_spheroid_mumax) | FLAG(obj2.prof_spheroid_mumax)
| FLAG(obj2.prof_disk_mumax); | FLAG(obj2.prof_disk_mumax)
| FLAG(obj2.mumax_prof);
/*------------------------------ Photometry ---------------------------------*/ /*------------------------------ Photometry ---------------------------------*/
......
src/paramprofit.h
View file @ 0b1bc817
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
* *
* Contents: Model-fitting parameter list for catalog data. * Contents: Model-fitting parameter list for catalog data.
* *
* Last modify: 13/09/2009 * Last modify: 16/09/2009
* *
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
*/ */
...@@ -43,6 +43,25 @@ ...@@ -43,6 +43,25 @@
&outobj2.magerr_prof, H_FLOAT, T_FLOAT, "%8.4f", "mag", &outobj2.magerr_prof, H_FLOAT, T_FLOAT, "%8.4f", "mag",
"stat.error;phot.mag;stat.fit.param", "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", {"XMODEL_IMAGE", "X coordinate from model-fitting",
&outobj2.x_prof, H_FLOAT, T_FLOAT, "%10.3f", "pixel", &outobj2.x_prof, H_FLOAT, T_FLOAT, "%10.3f", "pixel",
"pos.cartesian.x;stat.fit.param;instr.det;meta.main", "pix"}, "pos.cartesian.x;stat.fit.param;instr.det;meta.main", "pix"},
...@@ -275,12 +294,18 @@ ...@@ -275,12 +294,18 @@
{"FLUX_EFF_SPHEROID", "Effective spheroid flux above background", {"FLUX_EFF_SPHEROID", "Effective spheroid flux above background",
&outobj2.prof_spheroid_fluxeff, H_FLOAT, T_FLOAT, "%12.7g", "count", &outobj2.prof_spheroid_fluxeff, H_FLOAT, T_FLOAT, "%12.7g", "count",
"phot.flux.sb;stat.fit.param", "ct"}, "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", {"MU_MAX_SPHEROID", "Peak spheroid surface brightness above background",
&outobj2.prof_spheroid_mumax, H_FLOAT, T_FLOAT, "%8.4f", "mag * arcsec**(-2)", &outobj2.prof_spheroid_mumax, H_FLOAT, T_FLOAT, "%8.4f", "mag * arcsec**(-2)",
"phot.mag.sb;stat.max;stat.fit.param", "mag.arcsec-2"}, "phot.mag.sb;stat.max;stat.fit.param", "mag.arcsec-2"},
{"MU_EFF_SPHEROID", "Effective spheroid surface brightness above background", {"MU_EFF_SPHEROID", "Effective spheroid surface brightness above background",
&outobj2.prof_spheroid_mueff, H_FLOAT, T_FLOAT, "%8.4f", "mag * arcsec**(-2)", &outobj2.prof_spheroid_mueff, H_FLOAT, T_FLOAT, "%8.4f", "mag * arcsec**(-2)",
"phot.mag.sb;stat.fit.param", "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", {"SPHEROID_REFF_IMAGE", "Spheroid effective radius from fitting",
&outobj2.prof_spheroid_reff, H_FLOAT, T_FLOAT, "%10.4f", "pixel", &outobj2.prof_spheroid_reff, H_FLOAT, T_FLOAT, "%10.4f", "pixel",
"src.morph.scLength;stat.fit.param;instr.det", "pix"}, "src.morph.scLength;stat.fit.param;instr.det", "pix"},
...@@ -351,12 +376,18 @@ ...@@ -351,12 +376,18 @@
{"FLUX_EFF_DISK", "Effective disk flux above background", {"FLUX_EFF_DISK", "Effective disk flux above background",
&outobj2.prof_disk_fluxeff, H_FLOAT, T_FLOAT, "%12.7g", "count", &outobj2.prof_disk_fluxeff, H_FLOAT, T_FLOAT, "%12.7g", "count",
"phot.flux.sb;stat.fit.param", "ct"}, "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", {"MU_MAX_DISK", "Peak disk surface brightness above background",
&outobj2.prof_disk_mumax, H_FLOAT, T_FLOAT, "%8.4f", "mag * arcsec**(-2)", &outobj2.prof_disk_mumax, H_FLOAT, T_FLOAT, "%8.4f", "mag * arcsec**(-2)",
"phot.mag.sb;stat.max;stat.fit.param", "mag.arcsec-2"}, "phot.mag.sb;stat.max;stat.fit.param", "mag.arcsec-2"},
{"MU_EFF_DISK", "Effective disk surface brightness above background", {"MU_EFF_DISK", "Effective disk surface brightness above background",
&outobj2.prof_disk_mueff, H_FLOAT, T_FLOAT, "%8.4f", "mag * arcsec**(-2)", &outobj2.prof_disk_mueff, H_FLOAT, T_FLOAT, "%8.4f", "mag * arcsec**(-2)",
"phot.mag.sb;stat.fit.param", "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", {"DISK_SCALE_IMAGE", "Disk scalelength from fitting",
&outobj2.prof_disk_scale, H_FLOAT, T_FLOAT, "%10.4f", "pixel", &outobj2.prof_disk_scale, H_FLOAT, T_FLOAT, "%10.4f", "pixel",
"src.morph.scLength;stat.fit.param;instr.det", "pix"}, "src.morph.scLength;stat.fit.param;instr.det", "pix"},
......
src/photom.c
View file @ 0b1bc817
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
* *
* Contents: Compute magnitudes and other photometrical parameters. * Contents: Compute magnitudes and other photometrical parameters.
* *
* Last modify: 11/09/2009 * Last modify: 16/09/2009
* *
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
*/ */
...@@ -875,6 +875,30 @@ void computemags(picstruct *field, objstruct *obj) ...@@ -875,6 +875,30 @@ void computemags(picstruct *field, objstruct *obj)
1.086*obj2->fluxerr_prof/obj2->flux_prof 1.086*obj2->fluxerr_prof/obj2->flux_prof
:99.0; :99.0;
if (FLAG(obj2.mumax_prof))
obj2->mumax_prof = obj2->peak_prof > 0.0 ?
-2.5*log10((obj2->peak_prof)
/ (prefs.pixel_scale? field->pixscale*field->pixscale
: obj2->pixscale2 * 3600.0*3600.0))
+ prefs.mag_zeropoint
: 99.0;
if (FLAG(obj2.mueff_prof))
obj2->mueff_prof = obj2->fluxeff_prof > 0.0 ?
-2.5*log10((obj2->fluxeff_prof)
/ (prefs.pixel_scale? field->pixscale*field->pixscale
: obj2->pixscale2 * 3600.0*3600.0))
+ prefs.mag_zeropoint
: 99.0;
if (FLAG(obj2.mumean_prof))
obj2->mumean_prof = obj2->fluxmean_prof > 0.0 ?
-2.5*log10((obj2->fluxmean_prof)
/ (prefs.pixel_scale? field->pixscale*field->pixscale
: obj2->pixscale2 * 3600.0*3600.0))
+ prefs.mag_zeropoint
: 99.0;
if (FLAG(obj2.prof_spheroid_mag)) if (FLAG(obj2.prof_spheroid_mag))
obj2->prof_spheroid_mag = obj2->prof_spheroid_flux>0.0? obj2->prof_spheroid_mag = obj2->prof_spheroid_flux>0.0?
-2.5*log10(obj2->prof_spheroid_flux) -2.5*log10(obj2->prof_spheroid_flux)
...@@ -897,6 +921,14 @@ void computemags(picstruct *field, objstruct *obj) ...@@ -897,6 +921,14 @@ void computemags(picstruct *field, objstruct *obj)
+ prefs.mag_zeropoint + prefs.mag_zeropoint
: 99.0; : 99.0;
if (FLAG(obj2.prof_spheroid_mumean))
obj2->prof_spheroid_mumean = obj2->prof_spheroid_fluxmean > 0.0 ?
-2.5*log10((obj2->prof_spheroid_fluxmean)
/ (prefs.pixel_scale? field->pixscale*field->pixscale
: obj2->pixscale2 * 3600.0*3600.0))
+ prefs.mag_zeropoint
: 99.0;
if (FLAG(obj2.prof_spheroid_magerr)) if (FLAG(obj2.prof_spheroid_magerr))
obj2->prof_spheroid_magerr = obj2->prof_spheroid_flux>0.0? obj2->prof_spheroid_magerr = obj2->prof_spheroid_flux>0.0?
1.086*obj2->prof_spheroid_fluxerr 1.086*obj2->prof_spheroid_fluxerr
...@@ -930,6 +962,14 @@ void computemags(picstruct *field, objstruct *obj) ...@@ -930,6 +962,14 @@ void computemags(picstruct *field, objstruct *obj)
+ prefs.mag_zeropoint + prefs.mag_zeropoint
: 99.0; : 99.0;
if (FLAG(obj2.prof_disk_mumean))
obj2->prof_disk_mumean = obj2->prof_disk_fluxmean > 0.0 ?
-2.5*log10((obj2->prof_disk_fluxmean)
/ (prefs.pixel_scale? field->pixscale*field->pixscale
: obj2->pixscale2 * 3600.0*3600.0))
+ prefs.mag_zeropoint
: 99.0;
if (FLAG(obj2.prof_bar_mag)) if (FLAG(obj2.prof_bar_mag))
obj2->prof_bar_mag = obj2->prof_bar_flux>0.0? obj2->prof_bar_mag = obj2->prof_bar_flux>0.0?
-2.5*log10(obj2->prof_bar_flux) -2.5*log10(obj2->prof_bar_flux)
......
src/profit.c
View file @ 0b1bc817
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
* *
* Contents: Fit an arbitrary profile combination to a detection. * Contents: Fit an arbitrary profile combination to a detection.
* *
* Last modify: 13/09/2009 * Last modify: 20/09/2009
* *
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
*/ */
...@@ -39,7 +39,8 @@ ...@@ -39,7 +39,8 @@
#include "psf.h" #include "psf.h"
#include "profit.h" #include "profit.h"
static double prof_gamma(double x); static double prof_gammainc(double x, double a),
prof_gamma(double x);
static float prof_interpolate(profstruct *prof, float *posin); static float prof_interpolate(profstruct *prof, float *posin);
static float interpolate_pix(float *posin, float *pix, int *naxisn, static float interpolate_pix(float *posin, float *pix, int *naxisn,
interpenum interptype); interpenum interptype);
...@@ -118,6 +119,7 @@ profitstruct *profit_init(psfstruct *psf) ...@@ -118,6 +119,7 @@ profitstruct *profit_init(psfstruct *psf)
QMALLOC(profit->covar, float, profit->nparam*profit->nparam); QMALLOC(profit->covar, float, profit->nparam*profit->nparam);
profit->nprof = nprof; profit->nprof = nprof;
profit->fluxfac = 1.0; /* Default */
return profit; return profit;
} }
...@@ -161,17 +163,18 @@ OUTPUT Pointer to an allocated fit structure (containing details about the ...@@ -161,17 +163,18 @@ OUTPUT Pointer to an allocated fit structure (containing details about the
fit). fit).
NOTES It is a modified version of the lm_minimize() of lmfit. NOTES It is a modified version of the lm_minimize() of lmfit.
AUTHOR E. Bertin (IAP) AUTHOR E. Bertin (IAP)
VERSION 11/09/2009 VERSION 21/09/2009
***/ ***/
void profit_fit(profitstruct *profit, void profit_fit(profitstruct *profit,
picstruct *field, picstruct *wfield, picstruct *field, picstruct *wfield,
objstruct *obj, obj2struct *obj2) objstruct *obj, obj2struct *obj2)
{ {
profitstruct pprofit; profitstruct pprofit;
profitstruct hdprofit;
patternstruct *pattern; patternstruct *pattern;
psfstruct *psf; psfstruct *psf;
checkstruct *check; checkstruct *check;
double emx2,emy2,emxy, a , cp,sp, k, n; double emx2,emy2,emxy, a , cp,sp, cn, bn, n;
float psf_fwhm, dchi2, err; float psf_fwhm, dchi2, err;
int i,j,p, nparam, ncomp, nprof; int i,j,p, nparam, ncomp, nprof;
...@@ -294,6 +297,7 @@ void profit_fit(profitstruct *profit, ...@@ -294,6 +297,7 @@ void profit_fit(profitstruct *profit,
addcheck(check, profit->lmodpix, profit->objnaxisn[0],profit->objnaxisn[1], addcheck(check, profit->lmodpix, profit->objnaxisn[0],profit->objnaxisn[1],
profit->ix,profit->iy, 1.0); profit->ix,profit->iy, 1.0);
} }
/* Fill measurement parameters */ /* Fill measurement parameters */
if (FLAG(obj2.prof_vector)) if (FLAG(obj2.prof_vector))
{ {
...@@ -385,17 +389,49 @@ void profit_fit(profitstruct *profit, ...@@ -385,17 +389,49 @@ void profit_fit(profitstruct *profit,
} }
} }
/* Do measurements on the rasterised model (shear and surface brightnesses) */
if (FLAG(obj2.prof_mx2)) if (FLAG(obj2.prof_mx2) || FLAG(obj2.peak_prof))
{ {
memset(profit->modpix, 0, float scalefac, imsizefac, flux, lost, sum, lostfluxfrac;
profit->modnaxisn[0]*profit->modnaxisn[1]*sizeof(float));
/*-- Allocate "high-definition" rasters only to make measurements */
hdprofit.modnaxisn[0] = hdprofit.modnaxisn[1] = PROFIT_HIDEFRES;
/*-- Find best image size factor from fitting results */
imsizefac = 2.0*profit_minradius(profit, PROFIT_REFFFAC)/profit->pixstep
/ (float)profit->modnaxisn[0];
if (imsizefac<0.01)
imsizefac = 0.01;
else if (imsizefac>100.0)
imsizefac = 100.0;
scalefac = (float)hdprofit.modnaxisn[0] / (float)profit->modnaxisn[0]
/ imsizefac;
hdprofit.pixstep = profit->pixstep / scalefac;
hdprofit.fluxfac = scalefac*scalefac;
QCALLOC(hdprofit.modpix, float,
hdprofit.modnaxisn[0]*hdprofit.modnaxisn[1]*sizeof(float));
QCALLOC(hdprofit.pmodpix, float,
hdprofit.modnaxisn[0]*hdprofit.modnaxisn[1]*sizeof(float));
lost = sum = 0.0;
for (p=0; p<profit->nprof; p++) for (p=0; p<profit->nprof; p++)
prof_add(profit->prof[p], profit); {
profit_moments(profit); sum += (flux = prof_add(profit->prof[p], &hdprofit));
lost += flux*profit->prof[p]->lostfluxfrac;
}
lostfluxfrac = sum > 0.0? lost / sum : 0.0;
if (FLAG(obj2.prof_mx2))
profit_moments(&hdprofit, obj2);
if (FLAG(obj2.peak_prof))
profit_surface(&hdprofit, obj2, lostfluxfrac);
/*-- Free rasters */
free(hdprofit.modpix);
free(hdprofit.pmodpix);
} }
/* Bulge */ /* Spheroid */
if (FLAG(obj2.prof_spheroid_flux)) if (FLAG(obj2.prof_spheroid_flux))
{ {
obj2->prof_spheroid_flux = *profit->paramlist[PARAM_SPHEROID_FLUX]; obj2->prof_spheroid_flux = *profit->paramlist[PARAM_SPHEROID_FLUX];
...@@ -422,16 +458,19 @@ void profit_fit(profitstruct *profit, ...@@ -422,16 +458,19 @@ void profit_fit(profitstruct *profit,
if (FLAG(obj2.prof_spheroid_peak)) if (FLAG(obj2.prof_spheroid_peak))
{ {
n = obj2->prof_spheroid_sersicn; n = obj2->prof_spheroid_sersicn;
k = 2.0*n - 1.0/3.0 + 4.0/(405.0*n) + 46.0/(25515.0*n*n) bn = 2.0*n - 1.0/3.0 + 4.0/(405.0*n) + 46.0/(25515.0*n*n)
+ 131.0/(1148175*n*n*n); /* Ciotti & Bertin 1999 */ + 131.0/(1148175*n*n*n); /* Ciotti & Bertin 1999 */
cn = n * prof_gamma(2.0*n) * pow(bn, -2.0*n);
obj2->prof_spheroid_peak = obj2->prof_spheroid_reff>0.0? obj2->prof_spheroid_peak = obj2->prof_spheroid_reff>0.0?
obj2->prof_spheroid_flux * pow(k, 2.0*n) obj2->prof_spheroid_flux * profit->pixstep*profit->pixstep
/ (2.0 * PI * obj2->prof_spheroid_sersicn / (2.0 * PI * cn
* obj2->prof_spheroid_reff*obj2->prof_spheroid_reff * obj2->prof_spheroid_reff*obj2->prof_spheroid_reff
* obj2->prof_spheroid_aspect * prof_gamma(2.0*n)) * obj2->prof_spheroid_aspect)
: 0.0; : 0.0;
if (FLAG(obj2.prof_spheroid_fluxeff)) if (FLAG(obj2.prof_spheroid_fluxeff))
obj2->prof_spheroid_fluxeff = obj2->prof_spheroid_peak * exp(-k); obj2->prof_spheroid_fluxeff = obj2->prof_spheroid_peak * exp(-bn);
if (FLAG(obj2.prof_spheroid_fluxmean))
obj2->prof_spheroid_fluxmean = obj2->prof_spheroid_peak * cn;
} }
} }
...@@ -464,12 +503,14 @@ void profit_fit(profitstruct *profit, ...@@ -464,12 +503,14 @@ void profit_fit(profitstruct *profit,
if (FLAG(obj2.prof_disk_peak)) if (FLAG(obj2.prof_disk_peak))
{ {
obj2->prof_disk_peak = obj2->prof_disk_scale>0.0? obj2->prof_disk_peak = obj2->prof_disk_scale>0.0?
obj2->prof_disk_flux obj2->prof_disk_flux * profit->pixstep*profit->pixstep
/ (2.0 * PI * obj2->prof_disk_scale*obj2->prof_disk_scale / (2.0 * PI * obj2->prof_disk_scale*obj2->prof_disk_scale
* obj2->prof_disk_aspect) * obj2->prof_disk_aspect)
: 0.0; : 0.0;
if (FLAG(obj2.prof_disk_fluxeff)) if (FLAG(obj2.prof_disk_fluxeff))
obj2->prof_disk_fluxeff = obj2->prof_disk_peak * 0.186682; obj2->prof_disk_fluxeff = obj2->prof_disk_peak * 0.186682; /* e^-(b_n)*/
if (FLAG(obj2.prof_disk_fluxmean))
obj2->prof_disk_fluxmean = obj2->prof_disk_peak * 0.355007;/* b_n^(-2)*/
} }
/* Disk pattern */ /* Disk pattern */
...@@ -559,6 +600,7 @@ void profit_fit(profitstruct *profit, ...@@ -559,6 +600,7 @@ void profit_fit(profitstruct *profit,
} }
} }
/* Star/galaxy classification */
if (FLAG(obj2.prof_class_star)) if (FLAG(obj2.prof_class_star))
{ {
pprofit = *profit; pprofit = *profit;
...@@ -606,9 +648,67 @@ void profit_fit(profitstruct *profit, ...@@ -606,9 +648,67 @@ void profit_fit(profitstruct *profit,
return; return;
} }
/****i* prof_gammainc *********************************************************
PROTO double prof_gammainc(double x, double a)
PURPOSE Returns the incomplete Gamma function (from Num. Recipes in C, p.216).
INPUT A double,
upper integration limit.
OUTPUT Incomplete Gamma function.
NOTES -.
AUTHOR E. Bertin (IAP)
VERSION 18/09/009
*/
static double prof_gammainc (double x, double a)
{
double b,c,d,h, xn,xp, del,sum;
int i;
if (a < 0.0 || x <= 0.0)
return 0.0;
if (a < (x+1.0))
{
/*-- Use the series representation */
xp = x;
del = sum = 1.0/x;
for (i=100;i--;) /* Iterate to convergence */
{
sum += (del *= a/(++xp));
if (fabs(del) < fabs(sum)*3e-7)
return sum*exp(-a+x*log(a)) / prof_gamma(x);
}
}
else
{
/*-- Use the continued fraction representation and take its complement */
b = a + 1.0 - x;
c = 1e30;
h = d = 1.0/b;
for (i=1; i<=100; i++) /* Iterate to convergence */
{
xn = -i*(i-x);
b += 2.0;
if (fabs(d=xn*d+b) < 1e-30)
d = 1e-30;
if (fabs(c=b+xn/c) < 1e-30)
c = 1e-30;
del= c * (d = 1.0/d);
h *= del;
if (fabs(del-1.0) < 3e-7)
return 1.0 - exp(-a+x*log(a))*h / prof_gamma(x);
}
}
error(EXIT_FAILURE, "*Error*: out of bounds in ",
"prof_gammainc()");
return 0.0;
}
/****i* prof_gamma ************************************************************ /****i* prof_gamma ************************************************************
PROTO double prof_gammaln(double xx) PROTO double prof_gamma(double xx)
PURPOSE Returns the Gamma function (from Num. Recipes in C, p.168). PURPOSE Returns the Gamma function (from Num. Recipes in C, p.213).
INPUT A double. INPUT A double.
OUTPUT Gamma function. OUTPUT Gamma function.
NOTES -. NOTES -.
...@@ -633,6 +733,51 @@ static double prof_gamma(double xx) ...@@ -633,6 +733,51 @@ static double prof_gamma(double xx)
} }
/****** profit_minradius ******************************************************
PROTO float profit_minradius(profitstruct *profit, float refffac)
PURPOSE Returns the minimum disk radius that guarantees that each and
every model component fits within some margin in that disk.
INPUT Profit structure pointer,
margin in units of (r/r_eff)^(1/n)).
OUTPUT Radius (in pixels).
NOTES -.
AUTHOR E. Bertin (IAP)
VERSION 21/09/009
*/
float profit_minradius(profitstruct *profit, float refffac)
{
double r,reff,rmax;
int p;
rmax = reff = 0.0;
for (p=0; p<profit->nprof; p++)
{
switch (profit->prof[p]->code)
{
case PROF_SERSIC:
reff = *profit->paramlist[PARAM_SPHEROID_REFF];
break;
case PROF_DEVAUCOULEURS:
reff = *profit->paramlist[PARAM_SPHEROID_REFF];
break;
case PROF_EXPONENTIAL:
reff = *profit->paramlist[PARAM_DISK_SCALE]*1.67835;
break;
default:
error(EXIT_FAILURE, "*Internal Error*: Unknown profile parameter in ",
"profit_minradius()");
break;
}
r = reff*(double)refffac;
if (r>rmax)
rmax = r;
}
return (float)rmax;
}
/****** profit_psf ************************************************************ /****** profit_psf ************************************************************
PROTO void profit_psf(profitstruct *profit) PROTO void profit_psf(profitstruct *profit)
PURPOSE Build the local PSF at a given resolution. PURPOSE Build the local PSF at a given resolution.
...@@ -696,30 +841,6 @@ void profit_psf(profitstruct *profit) ...@@ -696,30 +841,6 @@ void profit_psf(profitstruct *profit)
} }
/****** profit_findinit *******************************************************
PROTO void profit_findinit(profitstruct *profit)
PURPOSE Find a suitable set of initialisation parameters
INPUT Pointer to the profit structure involved in the fit.
OUTPUT -.
NOTES -.
AUTHOR E. Bertin (IAP)
VERSION 16/04/2008
***/
void profit_findinit(profitstruct *profit)
{
int p;
for (p=0; p<profit->nprof; p++)
switch (profit->prof[p]->code)
{
default:
break;
}
return;
}
/****** profit_minimize ******************************************************* /****** profit_minimize *******************************************************
PROTO void profit_minimize(profitstruct *profit) PROTO void profit_minimize(profitstruct *profit)
PURPOSE Provide a function returning residuals to lmfit. PURPOSE Provide a function returning residuals to lmfit.
...@@ -866,8 +987,9 @@ float *profit_residuals(profitstruct *profit, picstruct *field, ...@@ -866,8 +987,9 @@ float *profit_residuals(profitstruct *profit, picstruct *field,
*profit->prof[0]->flux); *profit->prof[0]->flux);
else else
{ {
profit->flux = 0.0;
for (p=0; p<profit->nprof; p++) for (p=0; p<profit->nprof; p++)
prof_add(profit->prof[p], profit); profit->flux += prof_add(profit->prof[p], profit);
profit_convolve(profit, profit->modpix); profit_convolve(profit, profit->modpix);
profit_resample(profit, profit->modpix, profit->lmodpix, 1.0); profit_resample(profit, profit->modpix, profit->lmodpix, 1.0);
} }
...@@ -991,8 +1113,6 @@ void profit_resample(profitstruct *profit, float *inpix, PIXTYPE *outpix, ...@@ -991,8 +1113,6 @@ void profit_resample(profitstruct *profit, float *inpix, PIXTYPE *outpix,
posout[d] = 1.0; posout[d] = 1.0;
} }
profit->flux = flux;
return; return;
} }
...@@ -1381,25 +1501,22 @@ float profit_spiralindex(profitstruct *profit) ...@@ -1381,25 +1501,22 @@ float profit_spiralindex(profitstruct *profit)
/****** profit_moments **************************************************** /****** profit_moments ****************************************************
PROTO void profit_moments(profitstruct *profit) PROTO void profit_moments(profitstruct *profit, obj2struct *obj2)
PURPOSE Compute the 2nd order moments from the unconvolved object model. PURPOSE Compute the 2nd order moments from the unconvolved object model.
INPUT Profile-fitting structure. INPUT Profile-fitting structure,
Pointer to obj2 structure.
OUTPUT -. OUTPUT -.
NOTES -. NOTES -.
AUTHOR E. Bertin (IAP) AUTHOR E. Bertin (IAP)
VERSION 13/09/2009 VERSION 17/09/2009
***/ ***/
void profit_moments(profitstruct *profit) void profit_moments(profitstruct *profit, obj2struct *obj2)
{ {
objstruct *obj;
obj2struct *obj2;
double mx,my, sum, mx2,my2,mxy, den, temp,temp2,pmx2,theta; double mx,my, sum, mx2,my2,mxy, den, temp,temp2,pmx2,theta;
float *pix, float *pix,
hw,hh, x,y, xstart, val, r2max; hw,hh, x,y, xstart, val, r2max;
int ix,iy; int ix,iy;
obj = profit->obj;
obj2 = profit->obj2;
hw = (float)(profit->modnaxisn[0]/2); hw = (float)(profit->modnaxisn[0]/2);
hh = (float)(profit->modnaxisn[1]/2); hh = (float)(profit->modnaxisn[1]/2);
r2max = hw<hh? hw*hw : hh*hh; r2max = hw<hh? hw*hw : hh*hh;
...@@ -1484,6 +1601,78 @@ void profit_moments(profitstruct *profit) ...@@ -1484,6 +1601,78 @@ void profit_moments(profitstruct *profit)
} }
/****** profit_surface ****************************************************
PROTO void profit_surface(profitstruct *profit, obj2struct *obj2,
double lostfluxfrac)
PURPOSE Compute surface brightnesses from the unconvolved object model.
INPUT Pointer to the profile-fitting structure,
Pointer to obj2 structure,
Fraction of total flux lost in model.
OUTPUT -.
NOTES -.
AUTHOR E. Bertin (IAP)
VERSION 21/09/2009
***/
void profit_surface(profitstruct *profit, obj2struct *obj2,
double lostfluxfrac)
{
double dsum,dhsum,dsumoff, dhval, frac, seff;
float *spix, *spixt;
int i, npix, neff;
npix = profit->modnaxisn[0]*profit->modnaxisn[1];
/* Sort model pixel values */
spix = NULL; /* to avoid gcc -Wall warnings */
QMEMCPY(profit->modpix, spix, float, npix);
hmedian(spix, npix);
obj2->peak_prof = spix[npix-1];
if (FLAG(obj2.fluxeff_prof))
{
/*-- Build a cumulative distribution */
dsum = 0.0;
spixt = spix;
for (i=npix; i--;)
dsum += (double)*(spixt++);
/*-- Find matching surface brightness */
if (lostfluxfrac > 1.0)
lostfluxfrac = 0.0;
dhsum = 0.5 * dsum / (1.0-lostfluxfrac);
dsum = lostfluxfrac * dsum / (1.0-lostfluxfrac);
neff = 0;
spixt = spix;
for (i=npix; i--;)
if ((dsum += (double)*(spixt++)) >= dhsum)
{
neff = i;
break;
}
dhval = (double)*(spixt-1);
seff = neff;
dsumoff = 0.0;
if (spixt>=spix+2)
if (dhval > 0.0 && (frac = (dsum - dhsum) / dhval) < 1.0)
{
seff += frac;
dsumoff = frac*dhval;
dhval = dsumoff + (1.0 - frac)*(double)*(spixt-2);
}
obj2->fluxeff_prof = dhval;
if (FLAG(obj2.fluxmean_prof))
{
dsum = dsumoff;
for (i=neff; i--;)
dsum += (double)*(spixt++);
obj2->fluxmean_prof = seff > 0.0? dsum / seff : 0.0;
}
}
free(spix);
return;
}
/****** profit_addparam ******************************************************* /****** profit_addparam *******************************************************
PROTO void profit_addparam(profitstruct *profit, paramenum paramindex, PROTO void profit_addparam(profitstruct *profit, paramenum paramindex,
float **param) float **param)
...@@ -1583,7 +1772,7 @@ void profit_resetparam(profitstruct *profit, paramenum paramtype) ...@@ -1583,7 +1772,7 @@ void profit_resetparam(profitstruct *profit, paramenum paramtype)
break; break;
case PARAM_DISK_SCALE: /* From scalelength to Re */ case PARAM_DISK_SCALE: /* From scalelength to Re */
param = obj2->hl_radius/1.67835*sqrt(obj->a/obj->b); param = obj2->hl_radius/1.67835*sqrt(obj->a/obj->b);
parammin = param / 4.0; parammin = 0.1;
parammax = param * 4.0; parammax = param * 4.0;
break; break;
case PARAM_DISK_ASPECT: case PARAM_DISK_ASPECT:
...@@ -2064,29 +2253,30 @@ void prof_end(profstruct *prof) ...@@ -2064,29 +2253,30 @@ void prof_end(profstruct *prof)
/****** prof_add ************************************************************** /****** prof_add **************************************************************
PROTO void prof_add(profstruct *prof, profitstruct *profit) PROTO float prof_add(profstruct *prof, profitstruct *profit)
PURPOSE Add a model profile to an image. PURPOSE Add a model profile to an image.
INPUT Profile structure, INPUT Profile structure,
profile-fitting structure. profile-fitting structure.
OUTPUT -. OUTPUT Corrected flux contribution.
NOTES -. NOTES -.
AUTHOR E. Bertin (IAP) AUTHOR E. Bertin (IAP)
VERSION 07/09/2009 VERSION 21/09/2009
***/ ***/
void prof_add(profstruct *prof, profitstruct *profit) float prof_add(profstruct *prof, profitstruct *profit)
{ {
double xscale, yscale, saspect, ctheta,stheta, flux, scaling, n; double xscale, yscale, saspect, ctheta,stheta, flux, scaling, bn, n;
float posin[PROFIT_MAXEXTRA], posout[2], dnaxisn[2], float posin[PROFIT_MAXEXTRA], posout[2], dnaxisn[2],
*pixin, *pixout, *pixin, *pixout,
fluxfac, amp,cd11,cd12,cd21,cd22, dcd11,dcd21, dx1,dx2, fluxfac, amp,cd11,cd12,cd21,cd22, dcd11,dcd21, dx1,dx2,
x1,x10,x2, x1cin,x2cin, x1cout,x2cout, x1,x10,x2, x1cin,x2cin, x1cout,x2cout, x1max,x2max,
x1in,x2in, odx, ostep, x1in,x2in, odx, ostep,
k, hinvn, x1t,x2t, ca,sa, u,umin, k, hinvn, x1t,x2t, ca,sa, u,umin,
armamp,arm2amp, armrdphidr, armrdphidrvar, posang, armamp,arm2amp, armrdphidr, armrdphidrvar, posang,
width, invwidth2, width, invwidth2,
r,r2,rmin,r2min, r2minxin,r2minxout, rmax, r2max, invr2xdif, r,r2,rmin, r2minxin,r2minxout, rmax, r2max,
val, theta, thresh, ra,rb; r2max1, r2max2, r2min, invr2xdif,
int npix, noversamp, val, theta, thresh, ra,rb,rao, num;
int npix, noversamp, threshflag,
d,e,i, ix1,ix2, idx1,idx2; d,e,i, ix1,ix2, idx1,idx2;
npix = profit->modnaxisn[0]*profit->modnaxisn[1]; npix = profit->modnaxisn[0]*profit->modnaxisn[1];
...@@ -2097,7 +2287,8 @@ void prof_add(profstruct *prof, profitstruct *profit) ...@@ -2097,7 +2287,8 @@ void prof_add(profstruct *prof, profitstruct *profit)
pixout = profit->modpix; pixout = profit->modpix;
for (i=npix; i--;) for (i=npix; i--;)
*(pixout++) += amp; *(pixout++) += amp;
return; prof->lostfluxfrac = 0.0;
return 0.0;
} }
scaling = profit->pixstep / prof->typscale; scaling = profit->pixstep / prof->typscale;
...@@ -2116,20 +2307,28 @@ void prof_add(profstruct *prof, profitstruct *profit) ...@@ -2116,20 +2307,28 @@ void prof_add(profstruct *prof, profitstruct *profit)
cd12 = (float)(xscale*stheta); cd12 = (float)(xscale*stheta);
cd21 = (float)(-yscale*stheta); cd21 = (float)(-yscale*stheta);
cd22 = (float)(yscale*ctheta); cd22 = (float)(yscale*ctheta);
}
dx1 = 0.0; /* Shifting operations have been moved to profit_resample() */ dx1 = 0.0; /* Shifting operations have been moved to profit_resample() */
dx2 = 0.0; /* Shifting operations have been moved to profit_resample() */ dx2 = 0.0; /* Shifting operations have been moved to profit_resample() */
x1cout = (float)(profit->modnaxisn[0]/2); x1cout = (float)(profit->modnaxisn[0]/2);
x2cout = (float)(profit->modnaxisn[1]/2); x2cout = (float)(profit->modnaxisn[1]/2);
/*-- Compute the largest r^2 that fits in the frame */
num = cd11*cd22-cd12*cd21;
x1max = x1cout - 1.0;
x2max = x2cout - 1.0;
r2max1 = x1max*x1max*fabs(num*num / (cd12*cd12+cd22*cd22));
r2max2 = x2max*x2max*fabs(num*num / (cd11*cd11+cd21*cd21));
r2max = r2max1 < r2max2? r2max1 : r2max2;
}
switch(prof->code) switch(prof->code)
{ {
case PROF_SERSIC: case PROF_SERSIC:
n = fabs(*prof->extra[0]); n = fabs(*prof->extra[0]);
k = (float)(1.0/3.0 - 2.0*n - 4.0/(405.0*n) - 46.0/(25515.0*n*n) bn = 2.0*n - 1.0/3.0 + 4.0/(405.0*n) + 46.0/(25515.0*n*n)
- 131.0/(1148175*n*n*n)); /* Ciotti & Bertin 1999 */ + 131.0/(1148175*n*n*n); /* Ciotti & Bertin 1999 */
k = -bn;
hinvn = 0.5/n; hinvn = 0.5/n;
/*---- The consequence of sampling on flux is compensated by PSF normalisation*/ /*---- The consequence of sampling on flux is compensated by PSF normalisation*/
x10 = -x1cout - dx1; x10 = -x1cout - dx1;
...@@ -2143,6 +2342,11 @@ void prof_add(profstruct *prof, profitstruct *profit) ...@@ -2143,6 +2342,11 @@ void prof_add(profstruct *prof, profitstruct *profit)
x1in = cd12*x2 + cd11*x1; x1in = cd12*x2 + cd11*x1;
x2in = cd22*x2 + cd21*x1; x2in = cd22*x2 + cd21*x1;
ra = x1in*x1in+x2in*x2in; ra = x1in*x1in+x2in*x2in;
if (ra>r2max)
{
*(pixin++) = 0.0;
continue;
}
val = expf(k*expf(logf(ra)*hinvn)); val = expf(k*expf(logf(ra)*hinvn));
noversamp = (int)(val*PROFIT_OVERSAMP+0.1); noversamp = (int)(val*PROFIT_OVERSAMP+0.1);
if (noversamp < 2) if (noversamp < 2)
...@@ -2161,8 +2365,8 @@ void prof_add(profstruct *prof, profitstruct *profit) ...@@ -2161,8 +2365,8 @@ void prof_add(profstruct *prof, profitstruct *profit)
x2in = cd22*(x2+odx) + cd21*x1t; x2in = cd22*(x2+odx) + cd21*x1t;
for (idx1=noversamp; idx1--;) for (idx1=noversamp; idx1--;)
{ {
ra = x1in*x1in+x2in*x2in; rao = x1in*x1in+x2in*x2in;
val += expf(k*PROFIT_POWF(ra,hinvn)); val += expf(k*PROFIT_POWF(rao,hinvn));
x1in += dcd11; x1in += dcd11;
x2in += dcd21; x2in += dcd21;
} }
...@@ -2171,6 +2375,8 @@ void prof_add(profstruct *prof, profitstruct *profit) ...@@ -2171,6 +2375,8 @@ void prof_add(profstruct *prof, profitstruct *profit)
} }
} }
} }
prof->lostfluxfrac = 1.0 - prof_gammainc(2.0*n, bn*pow(r2max, hinvn));
threshflag = 0;
break; break;
case PROF_DEVAUCOULEURS: case PROF_DEVAUCOULEURS:
/*---- The consequence of sampling on flux is compensated by PSF normalisation*/ /*---- The consequence of sampling on flux is compensated by PSF normalisation*/
...@@ -2185,7 +2391,12 @@ void prof_add(profstruct *prof, profitstruct *profit) ...@@ -2185,7 +2391,12 @@ void prof_add(profstruct *prof, profitstruct *profit)
x1in = cd12*x2 + cd11*x1; x1in = cd12*x2 + cd11*x1;
x2in = cd22*x2 + cd21*x1; x2in = cd22*x2 + cd21*x1;
ra = x1in*x1in+x2in*x2in; ra = x1in*x1in+x2in*x2in;
val = expf(-7.6692f*PROFIT_POWF(ra,0.125)); if (ra>r2max)
{
*(pixin++) = 0.0;
continue;
}
val = expf(-7.66924944f*PROFIT_POWF(ra,0.125));
noversamp = (int)(sqrt(val)*PROFIT_OVERSAMP+0.1); noversamp = (int)(sqrt(val)*PROFIT_OVERSAMP+0.1);
if (noversamp < 2) if (noversamp < 2)
*(pixin++) = val; *(pixin++) = val;
...@@ -2204,7 +2415,7 @@ void prof_add(profstruct *prof, profitstruct *profit) ...@@ -2204,7 +2415,7 @@ void prof_add(profstruct *prof, profitstruct *profit)
for (idx1=noversamp; idx1--;) for (idx1=noversamp; idx1--;)
{ {
ra = x1in*x1in+x2in*x2in; ra = x1in*x1in+x2in*x2in;
val += expf(-7.6692f*PROFIT_POWF(ra,0.125)); val += expf(-7.66924944f*PROFIT_POWF(ra,0.125));
x1in += dcd11; x1in += dcd11;
x2in += dcd21; x2in += dcd21;
} }
...@@ -2213,22 +2424,57 @@ void prof_add(profstruct *prof, profitstruct *profit) ...@@ -2213,22 +2424,57 @@ void prof_add(profstruct *prof, profitstruct *profit)
} }
} }
} }
prof->lostfluxfrac = 1.0-prof_gammainc(8.0, 7.66924944*pow(r2max, 0.125));
threshflag = 0;
break; break;
case PROF_EXPONENTIAL: case PROF_EXPONENTIAL:
x1 = -x1cout - dx1; x10 = -x1cout - dx1;
x2 = -x2cout - dx2; x2 = -x2cout - dx2;
pixin = profit->pmodpix; pixin = profit->pmodpix;
for (ix2=profit->modnaxisn[1]; ix2--; x2+=1.0) for (ix2=profit->modnaxisn[1]; ix2--; x2+=1.0)
{
x1 = x10;
for (ix1=profit->modnaxisn[0]; ix1--; x1+=1.0)
{ {
x1in = cd12*x2 + cd11*x1; x1in = cd12*x2 + cd11*x1;
x2in = cd22*x2 + cd21*x1; x2in = cd22*x2 + cd21*x1;
for (ix1=profit->modnaxisn[0]; ix1--;) ra = x1in*x1in+x2in*x2in;
if (ra>r2max)
{
*(pixin++) = 0.0;
continue;
}
val = expf(-sqrtf(ra));
noversamp = (int)(val*sqrt(PROFIT_OVERSAMP)+0.1);
if (noversamp < 2)
*(pixin++) = val;
else
{
ostep = 1.0/noversamp;
dcd11 = cd11*ostep;
dcd21 = cd21*ostep;
odx = 0.5*(ostep-1.0);
x1t = x1+odx;
val = 0.0;
for (idx2=noversamp; idx2--; odx+=ostep)
{ {
*(pixin++) = exp(-sqrt(x1in*x1in+x2in*x2in)); x1in = cd12*(x2+odx) + cd11*x1t;
x1in += cd11; x2in = cd22*(x2+odx) + cd21*x1t;
x2in += cd21; for (idx1=noversamp; idx1--;)
{
ra = x1in*x1in+x2in*x2in;
val += expf(-sqrtf(ra));
x1in += dcd11;
x2in += dcd21;
}
}
*(pixin++) = val*ostep*ostep;
}
} }
} }
rmax = sqrt(r2max);
prof->lostfluxfrac = (1.0 + rmax)*exp(-rmax);
threshflag = 0;
break; break;
case PROF_ARMS: case PROF_ARMS:
r2min = *prof->featstart**prof->featstart; r2min = *prof->featstart**prof->featstart;
...@@ -2278,6 +2524,8 @@ width = 3.0; ...@@ -2278,6 +2524,8 @@ width = 3.0;
x2t += cd21; x2t += cd21;
} }
} }
prof->lostfluxfrac = 0.0;
threshflag = 1;
break; break;
case PROF_BAR: case PROF_BAR:
r2min = *prof->featstart**prof->featstart; r2min = *prof->featstart**prof->featstart;
...@@ -2315,6 +2563,8 @@ width = 3.0; ...@@ -2315,6 +2563,8 @@ width = 3.0;
x2t += cd21; x2t += cd21;
} }
} }
prof->lostfluxfrac = 0.0;
threshflag = 1;
break; break;
case PROF_INRING: case PROF_INRING:
rmin = *prof->featstart; rmin = *prof->featstart;
...@@ -2348,6 +2598,8 @@ width = 3.0; ...@@ -2348,6 +2598,8 @@ width = 3.0;
x2t += cd21; x2t += cd21;
} }
} }
prof->lostfluxfrac = 0.0;
threshflag = 1;
break; break;
case PROF_OUTRING: case PROF_OUTRING:
rmin = *prof->featstart; rmin = *prof->featstart;
...@@ -2379,12 +2631,16 @@ width = 3.0; ...@@ -2379,12 +2631,16 @@ width = 3.0;
x2t += cd21; x2t += cd21;
} }
} }
prof->lostfluxfrac = 0.0;
threshflag = 1;
break; break;
case PROF_DIRAC: case PROF_DIRAC:
memset(profit->pmodpix, 0, memset(profit->pmodpix, 0,
profit->modnaxisn[0]*profit->modnaxisn[1]*sizeof(float)); profit->modnaxisn[0]*profit->modnaxisn[1]*sizeof(float));
profit->pmodpix[profit->modnaxisn[0]/2 profit->pmodpix[profit->modnaxisn[0]/2
+ (profit->modnaxisn[1]/2)*profit->modnaxisn[0]] = 1.0; + (profit->modnaxisn[1]/2)*profit->modnaxisn[0]] = 1.0;
prof->lostfluxfrac = 0.0;
threshflag = 0;
break; break;
default: default:
/*---- Tabulated profile: remap each pixel */ /*---- Tabulated profile: remap each pixel */
...@@ -2432,11 +2688,16 @@ width = 3.0; ...@@ -2432,11 +2688,16 @@ width = 3.0;
else else
posout[d] = 1.0; posout[d] = 1.0;
} }
prof->lostfluxfrac = 0.0;
threshflag = 1;
break; break;
} }
/* Now find truncation threshold */ /* For complex profiles, threshold to the brightest pixel value at border */
/* Find the shortest distance to a vignet border */ if (threshflag)
{
/*-- Now find truncation threshold */
/*-- Find the shortest distance to a vignet border */
rmax = x1cout; rmax = x1cout;
if (rmax > (r = x2cout)) if (rmax > (r = x2cout))
rmax = r; rmax = r;
...@@ -2447,7 +2708,7 @@ width = 3.0; ...@@ -2447,7 +2708,7 @@ width = 3.0;
rmin = rmax - 1.0; rmin = rmax - 1.0;
r2min = rmin*rmin; r2min = rmin*rmin;
/* Find best threshold (the max around the circle with radius rmax */ /*-- Find best threshold (the max around the circle with radius rmax */
dx2 = -x2cout; dx2 = -x2cout;
pixin = profit->pmodpix; pixin = profit->pmodpix;
thresh = -BIG; thresh = -BIG;
...@@ -2459,7 +2720,7 @@ width = 3.0; ...@@ -2459,7 +2720,7 @@ width = 3.0;
thresh = val; thresh = val;
} }
/* Threshold and measure the flux */ /*-- Threshold and measure the flux */
flux = 0.0; flux = 0.0;
pixin = profit->pmodpix; pixin = profit->pmodpix;
for (i=npix; i--; pixin++) for (i=npix; i--; pixin++)
...@@ -2467,16 +2728,28 @@ width = 3.0; ...@@ -2467,16 +2728,28 @@ width = 3.0;
flux += (double)*pixin; flux += (double)*pixin;
else else
*pixin = 0.0; *pixin = 0.0;
}
else
{
flux = 0.0;
pixin = profit->pmodpix;
for (i=npix; i--;)
flux += (double)*(pixin++);
}
if (prof->lostfluxfrac < 1.0)
flux /= (1.0 - prof->lostfluxfrac);
/* Correct final flux */ /* Correct final flux */
fluxfac = fabs(flux)>0.0? *prof->flux / flux : 1.0; fluxfac = profit->fluxfac ;
prof->fluxfac = fluxfac; fluxfac *= fabs(flux)>0.0? *prof->flux / flux : 1.0;
// prof->fluxfac = fluxfac;
pixin = profit->pmodpix; pixin = profit->pmodpix;
pixout = profit->modpix; pixout = profit->modpix;
for (i=npix; i--;) for (i=npix; i--;)
*(pixout++) += fluxfac * *(pixin++); *(pixout++) += fluxfac * *(pixin++);
return; return *prof->flux;
} }
......
src/profit.h
View file @ 0b1bc817
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
* *
* Contents: Include file for profit.c. * Contents: Include file for profit.c.
* *
* Last modify: 07/09/2009 * Last modify: 21/09/2009
* *
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
*/ */
...@@ -29,8 +29,10 @@ ...@@ -29,8 +29,10 @@
/*----------------------------- Internal constants --------------------------*/ /*----------------------------- Internal constants --------------------------*/
#define PROFIT_MAXITER 1000 /* Max. nb of iterations in profile fitting */ #define PROFIT_MAXITER 1000 /* Max. nb of iterations in profile fitting */
#define PROFIT_OVERSAMP 5 /* Max. profile oversamp. factor on each axis */
#define PROFIT_MAXPROF 8 /* Max. nb of profile components */ #define PROFIT_MAXPROF 8 /* Max. nb of profile components */
#define PROFIT_OVERSAMP 15 /* Max. profile oversamp. factor on each axis */
#define PROFIT_HIDEFRES 201 /* Resolution of the high def. model raster */
#define PROFIT_REFFFAC 6.0 /* Factor in r_eff for measurement radius*/
#define PROFIT_DYNPARAM 10.0 /* Dynamic compression param. in sigma units */ #define PROFIT_DYNPARAM 10.0 /* Dynamic compression param. in sigma units */
#define PROFIT_BARXFADE 0.1 /* Fract. of bar length crossfaded with arms */ #define PROFIT_BARXFADE 0.1 /* Fract. of bar length crossfaded with arms */
#define PROFIT_MAXEXTRA 2 /* Max. nb of extra free params of profiles */ #define PROFIT_MAXEXTRA 2 /* Max. nb of extra free params of profiles */
...@@ -75,6 +77,7 @@ typedef struct ...@@ -75,6 +77,7 @@ typedef struct
int naxisn[3]; /* Pixmap size for each axis */ int naxisn[3]; /* Pixmap size for each axis */
float typscale; /* Typical scale in prof pixels */ float typscale; /* Typical scale in prof pixels */
float fluxfac; /* Flux normalisation factor */ float fluxfac; /* Flux normalisation factor */
float lostfluxfrac; /* Lost flux fraction */
/* Generic presentation parameters */ /* Generic presentation parameters */
float *flux; /* Integrated flux */ float *flux; /* Integrated flux */
float *x[2]; /* Coordinate vector */ float *x[2]; /* Coordinate vector */
...@@ -117,6 +120,7 @@ typedef struct ...@@ -117,6 +120,7 @@ typedef struct
int nprof; /* Number of profiles to consider */ int nprof; /* Number of profiles to consider */
struct psf *psf; /* PSF */ struct psf *psf; /* PSF */
float pixstep; /* Model/PSF sampling step */ float pixstep; /* Model/PSF sampling step */
float fluxfac; /* Model flux scaling factor */
float *psfdft; /* Compressed Fourier Transform of the PSF */ float *psfdft; /* Compressed Fourier Transform of the PSF */
float *psfpix; /* Full res. pixmap of the PSF */ float *psfpix; /* Full res. pixmap of the PSF */
float *modpix; /* Full res. pixmap of the complete model */ float *modpix; /* Full res. pixmap of the complete model */
...@@ -147,6 +151,8 @@ float *profit_compresi(profitstruct *profit, float dynparam, ...@@ -147,6 +151,8 @@ float *profit_compresi(profitstruct *profit, float dynparam,
*profit_residuals(profitstruct *profit, picstruct *field, *profit_residuals(profitstruct *profit, picstruct *field,
picstruct *wfield, float dynparam, picstruct *wfield, float dynparam,
float *param, float *resi), float *param, float *resi),
prof_add(profstruct *prof, profitstruct *profit),
profit_minradius(profitstruct *profit, float refffac),
profit_spiralindex(profitstruct *profit); profit_spiralindex(profitstruct *profit);
int profit_copyobjpix(profitstruct *profit, picstruct *field, int profit_copyobjpix(profitstruct *profit, picstruct *field,
...@@ -155,8 +161,7 @@ int profit_copyobjpix(profitstruct *profit, picstruct *field, ...@@ -155,8 +161,7 @@ int profit_copyobjpix(profitstruct *profit, picstruct *field,
profit_setparam(profitstruct *profit, paramenum paramtype, profit_setparam(profitstruct *profit, paramenum paramtype,
float param, float parammin, float parammax); float param, float parammin, float parammax);
void prof_add(profstruct *prof, profitstruct *profit), void prof_end(profstruct *prof),
prof_end(profstruct *prof),
profit_addparam(profitstruct *profit, paramenum paramindex, profit_addparam(profitstruct *profit, paramenum paramindex,
float **param), float **param),
profit_boundtounbound(profitstruct *profit, float *param), profit_boundtounbound(profitstruct *profit, float *param),
...@@ -169,7 +174,7 @@ void prof_add(profstruct *prof, profitstruct *profit), ...@@ -169,7 +174,7 @@ void prof_add(profstruct *prof, profitstruct *profit),
profit_evaluate(float *par, float *fvec, int m, int n, profit_evaluate(float *par, float *fvec, int m, int n,
void *adata), void *adata),
profit_makedft(profitstruct *profit), profit_makedft(profitstruct *profit),
profit_moments(profitstruct *profit), profit_moments(profitstruct *profit, obj2struct *obj2),
profit_printout(int n_par, float* par, int m_dat, float* fvec, profit_printout(int n_par, float* par, int m_dat, float* fvec,
void *data, int iflag, int iter, int nfev ), void *data, int iflag, int iter, int nfev ),
profit_psf(profitstruct *profit), profit_psf(profitstruct *profit),
...@@ -177,6 +182,8 @@ void prof_add(profstruct *prof, profitstruct *profit), ...@@ -177,6 +182,8 @@ void prof_add(profstruct *prof, profitstruct *profit),
PIXTYPE *outpix, float factor), PIXTYPE *outpix, float factor),
profit_resetparam(profitstruct *profit, paramenum paramtype), profit_resetparam(profitstruct *profit, paramenum paramtype),
profit_resetparams(profitstruct *profit), profit_resetparams(profitstruct *profit),
profit_surface(profitstruct *profit, obj2struct *obj2,
double lostfluxfrac),
profit_unboundtobound(profitstruct *profit, float *param); profit_unboundtobound(profitstruct *profit, float *param);
#endif #endif
src/types.h
View file @ 0b1bc817
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
* *
* Contents: global type definitions. * Contents: global type definitions.
* *
* Last modify: 13/09/2009 * Last modify: 16/09/2009
* *
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
*/ */
...@@ -305,8 +305,8 @@ typedef struct ...@@ -305,8 +305,8 @@ typedef struct
float mag_galfit; /* Galaxy tot. mag from fit */ float mag_galfit; /* Galaxy tot. mag from fit */
float magerr_galfit; /* RMS error on galfit mag */ float magerr_galfit; /* RMS error on galfit mag */
/* ---- Profile-fitting */ /* ---- Profile-fitting */
float *prof_vector; /* Profile parameters */ float *prof_vector; /* Model parameters */
float *prof_errvector; /* Profile parameter errors */ float *prof_errvector; /* Model parameter errors */
float prof_chi2; /* Reduced chi2 */ float prof_chi2; /* Reduced chi2 */
BYTE prof_flag; /* Model-fitting flags */ BYTE prof_flag; /* Model-fitting flags */
BYTE prof_flagw; /* Model-fitting WORLD flag */ BYTE prof_flagw; /* Model-fitting WORLD flag */
...@@ -315,6 +315,12 @@ typedef struct ...@@ -315,6 +315,12 @@ typedef struct
float fluxerr_prof; /* RMS error on model flux */ float fluxerr_prof; /* RMS error on model flux */
float mag_prof; /* Mag from model-fitting */ float mag_prof; /* Mag from model-fitting */
float magerr_prof; /* RMS mag from model-fitting */ float magerr_prof; /* RMS mag from model-fitting */
float peak_prof; /* Model peak flux */
float fluxeff_prof; /* Effective model flux */
float fluxmean_prof; /* Mean effective model flux */
float mumax_prof; /* Model peak surf. bri. */
float mueff_prof; /* Model effective surf. bri. */
float mumean_prof; /* Mean model effective SB */
float x_prof, y_prof; /* Coords from model-fitting*/ float x_prof, y_prof; /* Coords from model-fitting*/
double xf_prof, yf_prof; /* FOCAL coordinates */ double xf_prof, yf_prof; /* FOCAL coordinates */
double xw_prof, yw_prof; /* WORLD coords */ double xw_prof, yw_prof; /* WORLD coords */
...@@ -362,10 +368,12 @@ typedef struct ...@@ -362,10 +368,12 @@ typedef struct
float prof_spheroid_fluxerr; /* RMS error */ float prof_spheroid_fluxerr; /* RMS error */
float prof_spheroid_peak; /* Spheroid peak flux */ float prof_spheroid_peak; /* Spheroid peak flux */
float prof_spheroid_fluxeff; /* Spheroid effective flux */ float prof_spheroid_fluxeff; /* Spheroid effective flux */
float prof_spheroid_fluxmean; /* Spheroid mean effect. flux */
float prof_spheroid_mag; /* Spheroid "total" mag */ float prof_spheroid_mag; /* Spheroid "total" mag */
float prof_spheroid_magerr; /* RMS error */ float prof_spheroid_magerr; /* RMS error */
float prof_spheroid_mumax; /* Spehroid peak surf. brigh.*/ float prof_spheroid_mumax; /* Spehroid peak surf. brigh.*/
float prof_spheroid_mueff; /* Spheroid effect. surf. bri.*/ float prof_spheroid_mueff; /* Spheroid effect. surf. bri.*/
float prof_spheroid_mumean; /* Spheroid mean eff. su. bri.*/
float prof_spheroid_reff; /* Spheroid effective radius */ float prof_spheroid_reff; /* Spheroid effective radius */
float prof_spheroid_refferr; /* RMS error */ float prof_spheroid_refferr; /* RMS error */
float prof_spheroid_reffw; /* WORLD spheroid eff. radius */ float prof_spheroid_reffw; /* WORLD spheroid eff. radius */
...@@ -387,10 +395,12 @@ typedef struct ...@@ -387,10 +395,12 @@ typedef struct
float prof_disk_fluxerr; /* RMS error */ float prof_disk_fluxerr; /* RMS error */
float prof_disk_peak; /* Disk peak flux */ float prof_disk_peak; /* Disk peak flux */
float prof_disk_fluxeff; /* Disk effective flux */ float prof_disk_fluxeff; /* Disk effective flux */
float prof_disk_fluxmean; /* Disk mean effective flux */
float prof_disk_mag; /* Disk "total" mag */ float prof_disk_mag; /* Disk "total" mag */
float prof_disk_magerr; /* RMS error */ float prof_disk_magerr; /* RMS error */
float prof_disk_mumax; /* Disk peak surf. brightness */ float prof_disk_mumax; /* Disk peak surf. brightness */
float prof_disk_mueff; /* Disk effective surf. bri. */ float prof_disk_mueff; /* Disk effective surf. bri. */
float prof_disk_mumean; /* Disk mean eff. surf. bri. */
float prof_disk_scale; /* Disk scale length */ float prof_disk_scale; /* Disk scale length */
float prof_disk_scaleerr; /* RMS error */ float prof_disk_scaleerr; /* RMS error */
float prof_disk_scalew; /* WORLD disk scale length */ float prof_disk_scalew; /* WORLD disk scale length */
......
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