Commit 42c34f54 authored by Emmanuel Bertin's avatar Emmanuel Bertin
Browse files

Fixed regression with FITS image extension numbering. 

Fixed issues with PSF image extension numbering.
Fixed crashes when calling FFT routines with the MKL library.
Pushed version number to 2.18.2.
parent e17e5974

configure

+10 −10
Original line number Original line Diff line number Diff line 
#! /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.68 for sextractor 2.18.1.

# Generated by GNU Autoconf 2.68 for sextractor 2.18.2.

#

#

# Report bugs to <bertin@iap.fr>.

# Report bugs to <bertin@iap.fr>.

#

#
@@ -570,8 +570,8 @@ MAKEFLAGS= 
# Identity of this package.

# Identity of this package.

PACKAGE_NAME='sextractor'

PACKAGE_NAME='sextractor'

PACKAGE_TARNAME='sextractor'

PACKAGE_TARNAME='sextractor'

PACKAGE_VERSION='2.18.1'

PACKAGE_VERSION='2.18.2'

PACKAGE_STRING='sextractor 2.18.1'

PACKAGE_STRING='sextractor 2.18.2'

PACKAGE_BUGREPORT='bertin@iap.fr'

PACKAGE_BUGREPORT='bertin@iap.fr'

PACKAGE_URL=''

PACKAGE_URL=''
@@ -1324,7 +1324,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.18.1 to adapt to many kinds of systems.

\`configure' configures sextractor 2.18.2 to adapt to many kinds of systems.





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

Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1394,7 +1394,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.18.1:";;

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

   esac

   esac

  cat <<\_ACEOF

  cat <<\_ACEOF
@@ -1524,7 +1524,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.18.1

sextractor configure 2.18.2

generated by GNU Autoconf 2.68

generated by GNU Autoconf 2.68





Copyright (C) 2010 Free Software Foundation, Inc.

Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1947,7 +1947,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.18.1, which was

It was created by sextractor $as_me 2.18.2, which was

generated by GNU Autoconf 2.68.  Invocation command line was

generated by GNU Autoconf 2.68.  Invocation command line was





  $ $0 $@

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




# Define the identity of the package.

# Define the identity of the package.

 PACKAGE='sextractor'

 PACKAGE='sextractor'

 VERSION='2.18.1'

 VERSION='2.18.2'









cat >>confdefs.h <<_ACEOF

cat >>confdefs.h <<_ACEOF
@@ -15512,7 +15512,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=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.18.1, which was

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

generated by GNU Autoconf 2.68.  Invocation command line was

generated by GNU Autoconf 2.68.  Invocation command line was





  CONFIG_FILES    = $CONFIG_FILES

  CONFIG_FILES    = $CONFIG_FILES
@@ -15578,7 +15578,7 @@ _ACEOF 
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

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

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

ac_cs_version="\\

ac_cs_version="\\

sextractor config.status 2.18.1

sextractor config.status 2.18.2

configured by $0, generated by GNU Autoconf 2.68,

configured by $0, generated by GNU Autoconf 2.68,

  with options \\"\$ac_cs_config\\"

  with options \\"\$ac_cs_config\\"

configure.ac

+1 −1
Original line number Original line Diff line number Diff line
@@ -31,7 +31,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.18.1, [bertin@iap.fr])

AC_INIT(sextractor, 2.18.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)

AC_CONFIG_HEADERS(config.h)

AC_CONFIG_HEADERS(config.h)

man/sex.1

+1 −1
Original line number Original line Diff line number Diff line 
.TH SEXTRACTOR "1" "July 2012" "SExtractor 2.18.1" "User Commands"

.TH SEXTRACTOR "1" "July 2012" "SExtractor 2.18.2" "User Commands"

.SH NAME

.SH NAME

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

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

.SH SYNOPSIS

.SH SYNOPSIS

src/fft.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -22,7 +22,7 @@ 
*	You should have received a copy of the GNU General Public License

*	You should have received a copy of the GNU General Public License

*	along with SExtractor. If not, see <http://www.gnu.org/licenses/>.

*	along with SExtractor. If not, see <http://www.gnu.org/licenses/>.

*

*

*	Last modified:		09/07/2012

*	Last modified:		12/07/2012

*

*

*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/

*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -120,7 +120,7 @@ void fft_reset(void) 
 {

 {

  if (fplan)

  if (fplan)

    {

    {

    QFFTWFREE(fdata1);

    QFFTWF_FREE(fdata1);

    fftwf_destroy_plan(fplan);

    fftwf_destroy_plan(fplan);

    }

    }

  if (bplan)

  if (bplan)
@@ -141,7 +141,7 @@ OUTPUT -. 
NOTES	For data1 and fdata2, memory must be allocated for

NOTES	For data1 and fdata2, memory must be allocated for

	size[0]* ... * 2*(size[naxis-1]/2+1) floats (padding required).

	size[0]* ... * 2*(size[naxis-1]/2+1) floats (padding required).

AUTHOR	E. Bertin (IAP)

AUTHOR	E. Bertin (IAP)

VERSION	09/07/2012

VERSION	12/07/2012

 ***/

 ***/

void    fft_conv(float *data1, float *fdata2, int *size)

void    fft_conv(float *data1, float *fdata2, int *size)

  {

  {
@@ -156,7 +156,7 @@ void fft_conv(float *data1, float *fdata2, int *size) 
/* Forward FFT "in place" for data1 */

/* Forward FFT "in place" for data1 */

  if (!fplan)

  if (!fplan)

    {

    {

    QFFTWMALLOC(fdata1, fftwf_complex, npix2);

    QFFTWF_MALLOC(fdata1, fftwf_complex, npix2);

    fplan = fftwf_plan_dft_r2c_2d(size[1], size[0], data1,

    fplan = fftwf_plan_dft_r2c_2d(size[1], size[0], data1,

        (fftwf_complex *)fdata1, FFTW_ESTIMATE);

        (fftwf_complex *)fdata1, FFTW_ESTIMATE);

    }

    }
@@ -196,7 +196,7 @@ INPUT ptr to the image, 
OUTPUT	Pointer to the compressed, memory-allocated Fourier transform.

OUTPUT	Pointer to the compressed, memory-allocated Fourier transform.

NOTES	Input data may end up corrupted.

NOTES	Input data may end up corrupted.

AUTHOR	E. Bertin (IAP)

AUTHOR	E. Bertin (IAP)

VERSION	08/10/2009

VERSION	12/07/2012

 ***/

 ***/

float	*fft_rtf(float *data, int *size)

float	*fft_rtf(float *data, int *size)

  {

  {
@@ -208,7 +208,7 @@ float *fft_rtf(float *data, int *size) 
  npix2 = ((size[0]/2) + 1) * size[1];

  npix2 = ((size[0]/2) + 1) * size[1];





/* Forward FFT "in place" for data1 */

/* Forward FFT "in place" for data1 */

  QFFTWMALLOC(fdata, fftwf_complex, npix2);

  QFFTWF_MALLOC(fdata, fftwf_complex, npix2);

  plan = fftwf_plan_dft_r2c_2d(size[1], size[0], data, fdata, FFTW_ESTIMATE);

  plan = fftwf_plan_dft_r2c_2d(size[1], size[0], data, fdata, FFTW_ESTIMATE);

  fftwf_execute(plan);

  fftwf_execute(plan);

  fftwf_destroy_plan(plan);

  fftwf_destroy_plan(plan);

src/fft.h

+4 −3
Original line number Original line Diff line number Diff line
@@ -22,7 +22,7 @@ 
*	You should have received a copy of the GNU General Public License

*	You should have received a copy of the GNU General Public License

*	along with SExtractor. If not, see <http://www.gnu.org/licenses/>.

*	along with SExtractor. If not, see <http://www.gnu.org/licenses/>.

*

*

*	Last modified:		09/07/2012

*	Last modified:		12/07/2012

*

*

*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/

*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -33,11 +33,12 @@ 
/*---------------------------- Internal constants ---------------------------*/

/*---------------------------- Internal constants ---------------------------*/





/*------------------------------- Other Macros ------------------------------*/

/*------------------------------- Other Macros ------------------------------*/

#define	QFFTWMALLOC(ptr, typ, nel) \

#define	QFFTWF_MALLOC(ptr, typ, nel) \

		{if (!(ptr = (typ *)fftwf_malloc((size_t)(nel)*sizeof(typ)))) \

		{if (!(ptr = (typ *)fftwf_malloc((size_t)(nel)*sizeof(typ)))) \

		  error(EXIT_FAILURE, "Not enough memory for ", \

		  error(EXIT_FAILURE, "Not enough memory for ", \

			#ptr " (" #nel " elements) !");;}

			#ptr " (" #nel " elements) !");;}

#define	QFFTWFREE(ptr)	fftwf_free(ptr)

#define	QFFTWF_FREE(ptr) \

		{fftwf_free(ptr); ptr=NULL;}





/*--------------------------- structure definitions -------------------------*/

/*--------------------------- structure definitions -------------------------*/