Fixed regression involving SPREAD_MODEL and SPREADERR_MODEL (Thanks Shantanu for reporting). (9a5020d1) · Commits · csst-pipeline / msc / sextractor

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.13.6.
		# Generated by GNU Autoconf 2.63 for sextractor 2.14.1.
		#
		# 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.13.6'
		PACKAGE_STRING='sextractor 2.13.6'
		PACKAGE_VERSION='2.14.1'
		PACKAGE_STRING='sextractor 2.14.1'
		PACKAGE_BUGREPORT='bertin@iap.fr'

		ac_unique_file="src/makeit.c"
		@@ -1508,7 +1508,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.13.6 to adapt to many kinds of systems.
		\`configure' configures sextractor 2.14.1 to adapt to many kinds of systems.

		Usage: $0 [OPTION]... [VAR=VALUE]...

		@@ -1578,7 +1578,7 @@ fi

		if test -n "$ac_init_help"; then
		case $ac_init_help in
		short \| recursive ) echo "Configuration of sextractor 2.13.6:";;
		short \| recursive ) echo "Configuration of sextractor 2.14.1:";;
		esac
		cat <<\_ACEOF

		@@ -1711,7 +1711,7 @@ fi
		test -n "$ac_init_help" && exit $ac_status
		if $ac_init_version; then
		cat <<\_ACEOF
		sextractor configure 2.13.6
		sextractor configure 2.14.1
		generated by GNU Autoconf 2.63

		Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
		@@ -1725,7 +1725,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.13.6, which was
		It was created by sextractor $as_me 2.14.1, which was
		generated by GNU Autoconf 2.63. Invocation command line was

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

		# Define the identity of the package.
		PACKAGE='sextractor'
		VERSION='2.13.6'
		VERSION='2.14.1'


		cat >>confdefs.h <<_ACEOF
		@@ -28593,7 +28593,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.13.6, which was
		This file was extended by sextractor $as_me 2.14.1, which was
		generated by GNU Autoconf 2.63. Invocation command line was

		CONFIG_FILES = $CONFIG_FILES
		@@ -28656,7 +28656,7 @@ Report bugs to <bug-autoconf@gnu.org>."
		_ACEOF
		cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1
		ac_cs_version="\\
		sextractor config.status 2.13.6
		sextractor config.status 2.14.1
		configured by $0, generated by GNU Autoconf 2.63,
		with options \\"`$as_echo "$ac_configure_args" \| sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

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: 03/05/2011
		# Last modified: 31/05/2011
		#
		#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

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

		# This is your standard Bertin source code...
		AC_INIT(sextractor, 2.13.6, [bertin@iap.fr])
		AC_INIT(sextractor, 2.14.1, [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" "May 2011" "SExtractor 2.13.6" "User Commands"
		.TH SEXTRACTOR "1" "May 2011" "SExtractor 2.14.1" "User Commands"
		.SH NAME
		sex \- extract a source catalogue from an astronomical FITS image
		.SH SYNOPSIS

src/analyse.c

+15 −6

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@
		*
		* This file part of: SExtractor
		*
		* Copyright: (C) 1993-2010 Emmanuel Bertin -- IAP/CNRS/UPMC
		* Copyright: (C) 1993-2011 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: 14/10/2010
		* Last modified: 19/05/2011
		*
		%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%/

		@@ -514,7 +514,8 @@ void endobject(picstruct field, picstruct dfield, picstruct *wfield,
		\|\| FLAG(obj2.poserrmx2w_psf)
		\|\| FLAG(obj2.poserrmx2w_prof)
		\|\| FLAG(obj2.prof_flagw)
		\|\| ((!prefs.pixel_scale) && FLAG(obj2.area_flagw)))
		\|\| ((!prefs.pixel_scale) && FLAG(obj2.area_flagw))
		\|\| ((!prefs.pixel_scale) && FLAG(obj2.fwhmw_psf)))
		{
		rawpos[0] = obj2->posx;
		rawpos[1] = obj2->posy;
		@@ -606,14 +607,22 @@ void endobject(picstruct field, picstruct dfield, picstruct *wfield,
		check->overlay, obj->flag&OBJ_CROWDED);
		}

		/* ---- Star/Galaxy classification */
		/* ---------------------- Star/Galaxy classification -----------------------*/
		if (FLAG(obj2.fwhm_psf) \|\| (FLAG(obj2.sprob) && prefs.seeing_fwhm==0.0))
		{
		obj2->fwhm_psf = (prefs.seeing_fwhm==0.0)?
		psf_fwhm(thepsf)*field->pixscale
		: prefs.seeing_fwhm;
		if (FLAG(obj2.fwhmw_psf))
		obj2->fwhmw_psf = obj2->fwhm_psf * (prefs.pixel_scale?
		field->pixscale/3600.0 : sqrt(obj2->pixscale2));
		}

		if (FLAG(obj2.sprob))
		{
		double fac2, input[10], output, fwhm;

		fwhm = (prefs.seeing_fwhm==0.0)? psf_fwhm(thepsf)*field->pixscale
		: prefs.seeing_fwhm;
		fwhm = (prefs.seeing_fwhm==0.0)? obj2->fwhm_psf : prefs.seeing_fwhm;

		fac2 = fwhm/field->pixscale;
		fac2 *= fac2;

src/catout.c

+2 −1

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: 12/04/2011
		* Last modified: 19/05/2011
		*
		%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%/

		@@ -588,6 +588,7 @@ void updateparamflags()
		VECFLAG(obj.imaflag) \|= VECFLAG(obj.imanflag);

		/------------------------------ PSF-fitting --------------------------------/
		FLAG(obj2.fwhm_psf) \|= FLAG(obj2.fwhmw_psf);
		FLAG(obj2.poserraw_psf) \|= FLAG(obj2.poserrbw_psf);
		FLAG(obj2.poserrcxxw_psf) \|= FLAG(obj2.poserrcyyw_psf)
		\| FLAG(obj2.poserrcxyw_psf);