Refactored management of aspect ratios in model-fitting.

Pushed version number to 2.19.5.

configure

 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for sextractor 2.19.4.
+# Generated by GNU Autoconf 2.69 for sextractor 2.19.5.
 #
 # Report bugs to <bertin@iap.fr>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='sextractor'
 PACKAGE_TARNAME='sextractor'
-PACKAGE_VERSION='2.19.4'
-PACKAGE_STRING='sextractor 2.19.4'
+PACKAGE_VERSION='2.19.5'
+PACKAGE_STRING='sextractor 2.19.5'
 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.19.4 to adapt to many kinds of systems.
+\`configure' configures sextractor 2.19.5 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.19.4:";;
+     short | recursive ) echo "Configuration of sextractor 2.19.5:";;
    esac
   cat <<\_ACEOF
 
@@ -1548,7 +1548,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-sextractor configure 2.19.4
+sextractor configure 2.19.5
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1971,7 +1971,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.19.4, which was
+It was created by sextractor $as_me 2.19.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2785,7 +2785,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='sextractor'
- VERSION='2.19.4'
+ VERSION='2.19.5'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -15697,7 +15697,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.19.4, which was
+This file was extended by sextractor $as_me 2.19.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15763,7 +15763,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.19.4
+sextractor config.status 2.19.5
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -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:		24/09/2013
+#	Last modified:		14/12/2013
 #
 #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -31,7 +31,7 @@ define([AC_CACHE_LOAD],)
 define([AC_CACHE_SAVE],)
 
 # This is your standard Bertin source code...
-AC_INIT(sextractor, 2.19.4, [bertin@iap.fr])
+AC_INIT(sextractor, 2.19.5, [bertin@iap.fr])
 AC_CONFIG_SRCDIR(src/makeit.c)
 AC_CONFIG_AUX_DIR(autoconf)
 AC_CONFIG_HEADERS(config.h)

man/sex.1

-.TH SEXTRACTOR "1" "September 2013" "SExtractor 2.19.4" "User Commands"
+.TH SEXTRACTOR "1" "December 2013" "SExtractor 2.19.5" "User Commands"
 .SH NAME
 sex \- extract a source catalogue from an astronomical FITS image
 .SH SYNOPSIS

src/param.h

@@ -7,7 +7,7 @@
 *
 *	This file part of:	SExtractor
 *
-*	Copyright:		(C) 1993-2011 Emmanuel Bertin -- IAP/CNRS/UPMC
+*	Copyright:		(C) 1993-2014 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/06/2011
+*	Last modified:		17/02/2014
 *
 *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
@@ -633,7 +633,7 @@ keystruct	objkey[] = {
 	&outobj2.winpos_niter, H_INT, T_SHORT, "%3d", "",
 	"meta.number", ""},
 
-  {"MU_THRESHOLD", "Detection threshold above background",
+  {"MU_THRESHOLD", "Analysis threshold above background",
 	&outobj2.threshmu, H_FLOAT, T_FLOAT, "%8.4f", "mag * arcsec**(-2)",
 	"instr.sensitivity;phot.mag.sb", "mag.arcsec-2"},
   {"MU_MAX", "Peak surface brightness above background",

src/profit.c

@@ -626,15 +626,6 @@ profit->niter = profit_minimize(profit, PROFIT_MAXITER);
 /* Spheroid */
   if (FLAG(obj2.prof_spheroid_flux))
     {
-    if ((aspect = *profit->paramlist[PARAM_SPHEROID_ASPECT]) > 1.0)
-      {
-      *profit->paramlist[PARAM_SPHEROID_REFF] *= aspect;
-      profit->paramerr[profit->paramindex[PARAM_SPHEROID_REFF]] *= aspect;
-      profit->paramerr[profit->paramindex[PARAM_SPHEROID_ASPECT]]
-			/= (aspect*aspect);
-      *profit->paramlist[PARAM_SPHEROID_ASPECT] = 1.0 / aspect;
-      *profit->paramlist[PARAM_SPHEROID_POSANG] += 90.0;
-      }
     obj2->prof_spheroid_flux = *profit->paramlist[PARAM_SPHEROID_FLUX];
     obj2->prof_spheroid_fluxerr =
 		profit->paramerr[profit->paramindex[PARAM_SPHEROID_FLUX]];
@@ -648,6 +639,14 @@ profit->niter = profit_minimize(profit, PROFIT_MAXITER);
 			fmod_m90_p90(*profit->paramlist[PARAM_SPHEROID_POSANG]);
     obj2->prof_spheroid_thetaerr = 
 		profit->paramerr[profit->paramindex[PARAM_SPHEROID_POSANG]];
+    if ((aspect = obj2->prof_spheroid_aspect) > 1.0)
+      {
+      obj2->prof_spheroid_aspect = 1.0 / aspect;
+      obj2->prof_spheroid_aspecterr /= (aspect*aspect);
+      obj2->prof_spheroid_reff *= aspect;
+      obj2->prof_spheroid_refferr *= aspect;
+      obj2->prof_spheroid_theta = fmod_m90_p90(obj2->prof_spheroid_theta+90.0);
+      }
     if (FLAG(obj2.prof_spheroid_sersicn))
       {
       obj2->prof_spheroid_sersicn = *profit->paramlist[PARAM_SPHEROID_SERSICN];
@@ -696,15 +695,6 @@ profit->niter = profit_minimize(profit, PROFIT_MAXITER);
 /* Disk */
   if (FLAG(obj2.prof_disk_flux))
     {
-    if ((aspect = *profit->paramlist[PARAM_DISK_ASPECT]) > 1.0)
-      {
-      *profit->paramlist[PARAM_DISK_SCALE] *= aspect;
-      profit->paramerr[profit->paramindex[PARAM_DISK_SCALE]] *= aspect;
-      profit->paramerr[profit->paramindex[PARAM_DISK_ASPECT]]
-			/= (aspect*aspect);
-      *profit->paramlist[PARAM_DISK_ASPECT] = 1.0 / aspect;
-      *profit->paramlist[PARAM_DISK_POSANG] += 90.0;
-      }
     obj2->prof_disk_flux = *profit->paramlist[PARAM_DISK_FLUX];
     obj2->prof_disk_fluxerr =
 		profit->paramerr[profit->paramindex[PARAM_DISK_FLUX]];
@@ -717,6 +707,14 @@ profit->niter = profit_minimize(profit, PROFIT_MAXITER);
     obj2->prof_disk_theta = fmod_m90_p90(*profit->paramlist[PARAM_DISK_POSANG]);
     obj2->prof_disk_thetaerr =
 		profit->paramerr[profit->paramindex[PARAM_DISK_POSANG]];
+    if ((aspect = obj2->prof_disk_aspect) > 1.0)
+      {
+      obj2->prof_disk_aspect = 1.0 / aspect;
+      obj2->prof_disk_aspecterr /= (aspect*aspect);
+      obj2->prof_disk_scale *= aspect;
+      obj2->prof_disk_scaleerr *= aspect;
+      obj2->prof_disk_theta = fmod_m90_p90(obj2->prof_spheroid_theta+90.0);
+      }
     if (FLAG(obj2.prof_disk_inclination))
       {
       obj2->prof_disk_inclination = acos(obj2->prof_disk_aspect) / DEG;