Commit 601d807b authored by Emmanuel Bertin's avatar Emmanuel Bertin
Browse files

Fixed issue with using the ILP64 model instead of LP64 in the MKL.

Fixed tests.
Showing with 25 additions and 21 deletions
+25 -21
...@@ -22,7 +22,7 @@ ...@@ -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: 20/06/2017 # Last modified: 21/06/2017
# #
#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
...@@ -31,7 +31,7 @@ define([AC_CACHE_LOAD],) ...@@ -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.24.1,[astromatic@astromatic.net], AC_INIT(SExtractor, 2.24.2,[astromatic@astromatic.net],
sextractor, [http://astromatic.net/software/sextractor]) sextractor, [http://astromatic.net/software/sextractor])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR(autoconf) AC_CONFIG_AUX_DIR(autoconf)
...@@ -244,7 +244,7 @@ if test "$enable_model_fitting" != "no"; then ...@@ -244,7 +244,7 @@ if test "$enable_model_fitting" != "no"; then
############ handle the INTEL MKL library (FFTW + LAPACKe) ########### ############ handle the INTEL MKL library (FFTW + LAPACKe) ###########
if test "$enable_mkl" = "yes"; then if test "$enable_mkl" = "yes"; then
convlibs="${srcdir}/wcs/libwcs_c.a,${srcdir}/levmar/liblevmar.a" 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 if test "$MKL_WARN" == ""; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
else else
......
...@@ -67,9 +67,9 @@ author = u'E. Bertin' ...@@ -67,9 +67,9 @@ author = u'E. Bertin'
# built documents. # built documents.
# #
# The short X.Y version. # The short X.Y version.
version = '2.24.0' version = '2.24.2'
# The full version, including alpha/beta/rc tags. # 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 # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.
...@@ -81,7 +81,7 @@ language = None ...@@ -81,7 +81,7 @@ language = None
# There are two options for replacing |today|: either, you set today to some # There are two options for replacing |today|: either, you set today to some
# non-false value, then it is used: # 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. # 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()] ...@@ -144,7 +144,7 @@ html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
# The name for this set of Sphinx documents. # The name for this set of Sphinx documents.
# "<project> v<release> documentation" by default. # "<project> v<release> 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. # A shorter title for the navigation bar. Default is the same as html_title.
# #
......
.TH SEXTRACTOR "1" "June 2017" "SExtractor 2.24.0" "User Commands" .TH SEXTRACTOR "1" "June 2017" "SExtractor 2.24.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
......
# Test Makefile for SExtractor # Test Makefile for SExtractor
# Copyright (C) 2007 Emmanuel Bertin. # Copyright (C) 2007-2017 Emmanuel Bertin.
TESTS = efigi1.test TESTS = modelfit.test
EXTRA_DIST = galaxies.fits galaxies.weight.fits \ EXTRA_DIST = galaxies.fits galaxies.weight.fits \
default.psf default.sex default.param \ default.psf default.sex default.param \
default.conv efigi1.test gauss_4.0_7x7.conv modelfit.test
distclean-local: distclean-local:
-rm *.cat *.xml -rm *.cat *.xml
CONV NORM
# 3x3 ``all-ground'' convolution mask with FWHM = 2 pixels.
1 2 1
2 4 2
1 2 1
...@@ -3,14 +3,14 @@ X_IMAGE ...@@ -3,14 +3,14 @@ X_IMAGE
Y_IMAGE Y_IMAGE
XWIN_IMAGE XWIN_IMAGE
YWIN_IMAGE YWIN_IMAGE
#XMODEL_IMAGE XMODEL_IMAGE
#YMODEL_IMAGE YMODEL_IMAGE
MAG_AUTO MAG_AUTO
#MAG_MODEL MAG_MODEL
FLUX_RADIUS FLUX_RADIUS
FLAGS FLAGS
FLAGS_WIN FLAGS_WIN
NITER_WIN NITER_WIN
#SPREAD_MODEL SPREAD_MODEL
#SPREADERR_MODEL SPREADERR_MODEL
ID_PARENT ID_PARENT
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
File moved
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment