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

Fixed PCi_j WCS keyword parsing issue (thanks to O.Fors for reporting this issue). 

Fixed issue with magnitudes when used as PSF model parameters (thanks to A.Donnarumma for reporting this issue).
Added ID_PARENT catalog parameter to identify the common parent of deblended sources (thanks to R.McMahon for the suggestion).
Introduced regularization of Sersic model ellipticities based on AMALGAm prescriptions for the Great3 challenge (see Mandelbaum et al. 2015).
Fixed error in ecliptic coordinate computations (thanks to H.Bouy for reporting this issue).
Added support for differential geometry maps, with new DGEO_TYPE and DGEO_IMAGE configuration keywords and new DGEOX/Y_IMAGE and DGEOX/YWIN_IMAGE measurement parameters.
Added differential geometry map correction to model-fitting.
Added VIGNET_DGEOX and VIGNET_DGEOY differential geometry map cutouts in catalogs (for use in PSFEx).
Added support for PSF model dependencies in ASSOC vectors.
Fixed issue with single-line background meshes.
Fixed positional offsets of large galaxy models on MODELS and -MODELS check-images.
Pushed version number to 2.23.1.
parent eedbf805

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

# Generated by GNU Autoconf 2.69 for sextractor 2.23.1.

#

# 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.5'

PACKAGE_STRING='sextractor 2.19.5'

PACKAGE_VERSION='2.23.1'

PACKAGE_STRING='sextractor 2.23.1'

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

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

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

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

sextractor configure 2.23.1

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

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

 VERSION='2.23.1'





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

This file was extended by sextractor $as_me 2.23.1, 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.5

sextractor config.status 2.23.1

configured by $0, generated by GNU Autoconf 2.69,

  with options \\"\$ac_cs_config\\"

configure.ac

+3 −3
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#

#	This file part of:	SExtractor

#

#	Copyright:		(C) 2002-2013 Emmanuel Bertin -- IAP/CNRS/UPMC

#	Copyright:		(C) 2002-2016 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/12/2013

#	Last modified:		08/03/2016

#

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



# This is your standard Bertin source code...

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

AC_INIT(sextractor, 2.23.1, [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" "December 2013" "SExtractor 2.19.5" "User Commands"

.TH SEXTRACTOR "1" "March 2016" "SExtractor 2.23.1" "User Commands"

.SH NAME

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

.SH SYNOPSIS

src/Makefile.am

+11 −11
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#

#	This file part of:	SExtractor

#

#	Copyright:		(C) 2002-2013 Emmanuel Bertin -- IAP/CNRS/UPMC

#	Copyright:		(C) 2002-2015 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:		03/04/2013

#	Last modified:		02/12/2015

#

#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -37,16 +37,16 @@ SUBDIRS = fits $(LEVDIR) wcs 
bin_PROGRAMS		= sex ldactoasc

check_PROGRAMS		= sex

sex_SOURCES		= analyse.c assoc.c astrom.c back.c bpro.c catout.c \

			  check.c clean.c extract.c $(FFTSOURCE) field.c \

			  filter.c fitswcs.c flag.c graph.c growth.c header.c \

			  image.c interpolate.c main.c makeit.c manobjlist.c \

			  misc.c neurro.c $(PATTERNSOURCE) pc.c photom.c \

			  plist.c prefs.c $(PROFITSOURCE) psf.c readimage.c \

			  refine.c retina.c scan.c som.c weight.c winpos.c \

			  xml.c \

			  check.c clean.c dgeo.c extract.c $(FFTSOURCE) \

			  field.c filter.c fitswcs.c flag.c graph.c growth.c \

			  header.c image.c interpolate.c main.c makeit.c \

			  manobjlist.c misc.c neurro.c $(PATTERNSOURCE) pc.c \

			  photom.c plist.c prefs.c $(PROFITSOURCE) psf.c \

			  readimage.c refine.c retina.c scan.c som.c weight.c \

			  winpos.c xml.c \

			  assoc.h astrom.h back.h bpro.h check.h clean.h \

			  define.h extract.h fft.h field.h filter.h fitswcs.h \

			  flag.h globals.h growth.h header.h image.h \

			  define.h dgeo.h extract.h fft.h field.h filter.h \

			  fitswcs.h flag.h globals.h growth.h header.h image.h \

			  interpolate.h key.h neurro.h param.h paramprofit.h \

			  pattern.h photom.h plist.h prefs.h preflist.h \

			  profit.h psf.h retina.h sexhead1.h sexhead.h \

src/Makefile.in

+31 −28
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#

#	This file part of:	SExtractor

#

#	Copyright:		(C) 2002-2013 Emmanuel Bertin -- IAP/CNRS/UPMC

#	Copyright:		(C) 2002-2015 Emmanuel Bertin -- IAP/CNRS/UPMC

#

#	License:		GNU General Public License

#
@@ -38,7 +38,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/04/2013

#	Last modified:		02/12/2015

#

#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -103,32 +103,34 @@ am_ldactoasc_OBJECTS = ldactoasc.$(OBJEXT) 
ldactoasc_OBJECTS = $(am_ldactoasc_OBJECTS)

ldactoasc_DEPENDENCIES = $(srcdir)/fits/libfits.a

am__sex_SOURCES_DIST = analyse.c assoc.c astrom.c back.c bpro.c \

	catout.c check.c clean.c extract.c fft.c field.c filter.c \

	fitswcs.c flag.c graph.c growth.c header.c image.c \

	catout.c check.c clean.c dgeo.c extract.c fft.c field.c \

	filter.c fitswcs.c flag.c graph.c growth.c header.c image.c \

	interpolate.c main.c makeit.c manobjlist.c misc.c neurro.c \

	pattern.c pc.c photom.c plist.c prefs.c profit.c psf.c \

	readimage.c refine.c retina.c scan.c som.c weight.c winpos.c \

	xml.c assoc.h astrom.h back.h bpro.h check.h clean.h define.h \

	extract.h fft.h field.h filter.h fitswcs.h flag.h globals.h \

	growth.h header.h image.h interpolate.h key.h neurro.h param.h \

	paramprofit.h pattern.h photom.h plist.h prefs.h preflist.h \

	profit.h psf.h retina.h sexhead1.h sexhead.h sexheadsc.h som.h \

	threads.h types.h wcscelsys.h weight.h winpos.h xml.h

	dgeo.h extract.h fft.h field.h filter.h fitswcs.h flag.h \

	globals.h growth.h header.h image.h interpolate.h key.h \

	neurro.h param.h paramprofit.h pattern.h photom.h plist.h \

	prefs.h preflist.h profit.h psf.h retina.h sexhead1.h \

	sexhead.h sexheadsc.h som.h threads.h types.h wcscelsys.h \

	weight.h winpos.h xml.h

@USE_MODEL_TRUE@am__objects_1 = fft.$(OBJEXT)

@USE_MODEL_TRUE@am__objects_2 = pattern.$(OBJEXT)

@USE_MODEL_TRUE@am__objects_3 = profit.$(OBJEXT)

am_sex_OBJECTS = analyse.$(OBJEXT) assoc.$(OBJEXT) astrom.$(OBJEXT) \

	back.$(OBJEXT) bpro.$(OBJEXT) catout.$(OBJEXT) check.$(OBJEXT) \

	clean.$(OBJEXT) extract.$(OBJEXT) $(am__objects_1) \

	field.$(OBJEXT) filter.$(OBJEXT) fitswcs.$(OBJEXT) \

	flag.$(OBJEXT) graph.$(OBJEXT) growth.$(OBJEXT) \

	header.$(OBJEXT) image.$(OBJEXT) interpolate.$(OBJEXT) \

	main.$(OBJEXT) makeit.$(OBJEXT) manobjlist.$(OBJEXT) \

	misc.$(OBJEXT) neurro.$(OBJEXT) $(am__objects_2) pc.$(OBJEXT) \

	photom.$(OBJEXT) plist.$(OBJEXT) prefs.$(OBJEXT) \

	$(am__objects_3) psf.$(OBJEXT) readimage.$(OBJEXT) \

	refine.$(OBJEXT) retina.$(OBJEXT) scan.$(OBJEXT) som.$(OBJEXT) \

	weight.$(OBJEXT) winpos.$(OBJEXT) xml.$(OBJEXT)

	clean.$(OBJEXT) dgeo.$(OBJEXT) extract.$(OBJEXT) \

	$(am__objects_1) field.$(OBJEXT) filter.$(OBJEXT) \

	fitswcs.$(OBJEXT) flag.$(OBJEXT) graph.$(OBJEXT) \

	growth.$(OBJEXT) header.$(OBJEXT) image.$(OBJEXT) \

	interpolate.$(OBJEXT) main.$(OBJEXT) makeit.$(OBJEXT) \

	manobjlist.$(OBJEXT) misc.$(OBJEXT) neurro.$(OBJEXT) \

	$(am__objects_2) pc.$(OBJEXT) photom.$(OBJEXT) plist.$(OBJEXT) \

	prefs.$(OBJEXT) $(am__objects_3) psf.$(OBJEXT) \

	readimage.$(OBJEXT) refine.$(OBJEXT) retina.$(OBJEXT) \

	scan.$(OBJEXT) som.$(OBJEXT) weight.$(OBJEXT) winpos.$(OBJEXT) \

	xml.$(OBJEXT)

sex_OBJECTS = $(am_sex_OBJECTS)

sex_DEPENDENCIES = $(srcdir)/fits/libfits.a $(srcdir)/wcs/libwcs_c.a \

	$(LEVLIB)
@@ -334,16 +336,16 @@ top_srcdir = @top_srcdir@ 
@USE_MODEL_TRUE@LEVDIR = levmar

SUBDIRS = fits $(LEVDIR) wcs

sex_SOURCES = analyse.c assoc.c astrom.c back.c bpro.c catout.c \

			  check.c clean.c extract.c $(FFTSOURCE) field.c \

			  filter.c fitswcs.c flag.c graph.c growth.c header.c \

			  image.c interpolate.c main.c makeit.c manobjlist.c \

			  misc.c neurro.c $(PATTERNSOURCE) pc.c photom.c \

			  plist.c prefs.c $(PROFITSOURCE) psf.c readimage.c \

			  refine.c retina.c scan.c som.c weight.c winpos.c \

			  xml.c \

			  check.c clean.c dgeo.c extract.c $(FFTSOURCE) \

			  field.c filter.c fitswcs.c flag.c graph.c growth.c \

			  header.c image.c interpolate.c main.c makeit.c \

			  manobjlist.c misc.c neurro.c $(PATTERNSOURCE) pc.c \

			  photom.c plist.c prefs.c $(PROFITSOURCE) psf.c \

			  readimage.c refine.c retina.c scan.c som.c weight.c \

			  winpos.c xml.c \

			  assoc.h astrom.h back.h bpro.h check.h clean.h \

			  define.h extract.h fft.h field.h filter.h fitswcs.h \

			  flag.h globals.h growth.h header.h image.h \

			  define.h dgeo.h extract.h fft.h field.h filter.h \

			  fitswcs.h flag.h globals.h growth.h header.h image.h \

			  interpolate.h key.h neurro.h param.h paramprofit.h \

			  pattern.h photom.h plist.h prefs.h preflist.h \

			  profit.h psf.h retina.h sexhead1.h sexhead.h \
@@ -467,6 +469,7 @@ distclean-compile: 
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/catout.Po@am__quote@

@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check.Po@am__quote@

@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clean.Po@am__quote@

@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dgeo.Po@am__quote@

@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/extract.Po@am__quote@

@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fft.Po@am__quote@

@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/field.Po@am__quote@