From 601d807bc5af7385dbc95bb2f6c9cb45cf3364a8 Mon Sep 17 00:00:00 2001 From: Emmanuel Bertin Date: Wed, 21 Jun 2017 10:35:46 +0200 Subject: [PATCH] Fixed issue with using the ILP64 model instead of LP64 in the MKL. Fixed tests. --- configure.ac | 6 +++--- doc/src/conf.py | 8 ++++---- man/sex.1 | 2 +- tests/Makefile.am | 6 +++--- tests/default.conv | 5 ----- tests/default.param | 10 +++++----- tests/gauss_4.0_7x7.conv | 9 +++++++++ tests/{efigi1.test => modelfit.test} | 0 8 files changed, 25 insertions(+), 21 deletions(-) delete mode 100644 tests/default.conv create mode 100644 tests/gauss_4.0_7x7.conv rename tests/{efigi1.test => modelfit.test} (100%) diff --git a/configure.ac b/configure.ac index 13c3d58..de3d8ff 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ # You should have received a copy of the GNU General Public License # along with SExtractor. If not, see . # -# Last modified: 20/06/2017 +# Last modified: 21/06/2017 # #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -31,7 +31,7 @@ define([AC_CACHE_LOAD],) define([AC_CACHE_SAVE],) # This is your standard Bertin source code... -AC_INIT(SExtractor, 2.24.1,[astromatic@astromatic.net], +AC_INIT(SExtractor, 2.24.2,[astromatic@astromatic.net], sextractor, [http://astromatic.net/software/sextractor]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR(autoconf) @@ -244,7 +244,7 @@ if test "$enable_model_fitting" != "no"; then ############ handle the INTEL MKL library (FFTW + LAPACKe) ########### if test "$enable_mkl" = "yes"; then convlibs="${srcdir}/wcs/libwcs_c.a,${srcdir}/levmar/liblevmar.a" - ACX_MKL($with_mkl_dir,yes,$enable_best_link,$convlibs) + ACX_MKL($with_mkl_dir,,$enable_best_link,$convlibs) if test "$MKL_WARN" == ""; then AC_MSG_RESULT([yes]) else diff --git a/doc/src/conf.py b/doc/src/conf.py index 713572b..1ac38b0 100644 --- a/doc/src/conf.py +++ b/doc/src/conf.py @@ -67,9 +67,9 @@ author = u'E. Bertin' # built documents. # # The short X.Y version. -version = '2.24.0' +version = '2.24.2' # The full version, including alpha/beta/rc tags. -release = '2.24.0' +release = '2.24.2' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -81,7 +81,7 @@ language = None # There are two options for replacing |today|: either, you set today to some # non-false value, then it is used: # -today = 'Tue Jun 20 2017' +today = 'Wed Jun 21 2017' # # Else, today_fmt is used as the format for a strftime call. # @@ -144,7 +144,7 @@ html_theme_path = [sphinx_rtd_theme.get_html_theme_path()] # The name for this set of Sphinx documents. # " v documentation" by default. # -# html_title = u'SExtractor v2.24.0' +# html_title = u'SExtractor v2.24.2' # A shorter title for the navigation bar. Default is the same as html_title. # diff --git a/man/sex.1 b/man/sex.1 index 47ef4a4..4cc3436 100644 --- a/man/sex.1 +++ b/man/sex.1 @@ -1,4 +1,4 @@ -.TH SEXTRACTOR "1" "June 2017" "SExtractor 2.24.0" "User Commands" +.TH SEXTRACTOR "1" "June 2017" "SExtractor 2.24.2" "User Commands" .SH NAME sex \- extract a source catalogue from an astronomical FITS image .SH SYNOPSIS diff --git a/tests/Makefile.am b/tests/Makefile.am index 4686bc4..2b1a112 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,8 +1,8 @@ # Test Makefile for SExtractor -# Copyright (C) 2007 Emmanuel Bertin. -TESTS = efigi1.test +# Copyright (C) 2007-2017 Emmanuel Bertin. +TESTS = modelfit.test EXTRA_DIST = galaxies.fits galaxies.weight.fits \ default.psf default.sex default.param \ - default.conv efigi1.test + gauss_4.0_7x7.conv modelfit.test distclean-local: -rm *.cat *.xml diff --git a/tests/default.conv b/tests/default.conv deleted file mode 100644 index 2590b9c..0000000 --- a/tests/default.conv +++ /dev/null @@ -1,5 +0,0 @@ -CONV NORM -# 3x3 ``all-ground'' convolution mask with FWHM = 2 pixels. -1 2 1 -2 4 2 -1 2 1 diff --git a/tests/default.param b/tests/default.param index 2253a09..fc87e04 100644 --- a/tests/default.param +++ b/tests/default.param @@ -3,14 +3,14 @@ X_IMAGE Y_IMAGE XWIN_IMAGE YWIN_IMAGE -#XMODEL_IMAGE -#YMODEL_IMAGE +XMODEL_IMAGE +YMODEL_IMAGE MAG_AUTO -#MAG_MODEL +MAG_MODEL FLUX_RADIUS FLAGS FLAGS_WIN NITER_WIN -#SPREAD_MODEL -#SPREADERR_MODEL +SPREAD_MODEL +SPREADERR_MODEL ID_PARENT diff --git a/tests/gauss_4.0_7x7.conv b/tests/gauss_4.0_7x7.conv new file mode 100644 index 0000000..001efd0 --- /dev/null +++ b/tests/gauss_4.0_7x7.conv @@ -0,0 +1,9 @@ +CONV NORM +# 7x7 convolution mask of a gaussian PSF with FWHM = 4.0 pixels. +0.047454 0.109799 0.181612 0.214776 0.181612 0.109799 0.047454 +0.109799 0.254053 0.420215 0.496950 0.420215 0.254053 0.109799 +0.181612 0.420215 0.695055 0.821978 0.695055 0.420215 0.181612 +0.214776 0.496950 0.821978 0.972079 0.821978 0.496950 0.214776 +0.181612 0.420215 0.695055 0.821978 0.695055 0.420215 0.181612 +0.109799 0.254053 0.420215 0.496950 0.420215 0.254053 0.109799 +0.047454 0.109799 0.181612 0.214776 0.181612 0.109799 0.047454 diff --git a/tests/efigi1.test b/tests/modelfit.test similarity index 100% rename from tests/efigi1.test rename to tests/modelfit.test -- GitLab