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

merged with SExFIGI branch

parent 5ae55cd0
Loading
Loading
Loading
Loading
+58 −1
Original line number Original line Diff line number Diff line
@@ -9,11 +9,68 @@
*
*
*       Contents:       log of changes made to the SExtractor source
*       Contents:       log of changes made to the SExtractor source
*
*
*       Last modify:    14/07/2006
*       Last modify:    17/01/2007
*
*
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
*/
*/


------------------------------------------------------------------------
r380 | bertin | 2007-01-17 17:52:49 +0100 (Wed, 17 Jan 2007) | 3 lines

Added options for compiling with icc (Intel compiler).
Pushed version number to 2.5.1.

------------------------------------------------------------------------
r365 | bertin | 2006-11-09 18:39:27 +0100 (Thu, 09 Nov 2006) | 2 lines

Undo previous changes (wrong repository!!).

------------------------------------------------------------------------
r364 | bertin | 2006-11-09 17:58:18 +0100 (Thu, 09 Nov 2006) | 2 lines

Added lmfit routines by Joachim Wuttke in the form of a library.

------------------------------------------------------------------------
r358 | bertin | 2006-10-29 21:04:25 +0100 (Sun, 29 Oct 2006) | 5 lines

Updated FITS library to the latest version.
Fixed some UCDs in output parameters.
Applied patch by Sergio Pascual for configuring the path to the XSL file.
Updated the BUGS section.

------------------------------------------------------------------------
r327 | bertin | 2006-08-16 18:06:49 +0200 (Wed, 16 Aug 2006) | 2 lines

Discard NaN pixels in non-weighted background measurements (as in SWarp).

------------------------------------------------------------------------
r305 | baillard | 2006-07-19 15:28:15 +0200 (Wed, 19 Jul 2006) | 2 lines

Change name

------------------------------------------------------------------------
r303 | baillard | 2006-07-19 15:05:48 +0200 (Wed, 19 Jul 2006) | 2 lines

Change names

------------------------------------------------------------------------
r295 | baillard | 2006-07-18 13:54:43 +0200 (Tue, 18 Jul 2006) | 2 lines

Move sextractor to public repository

------------------------------------------------------------------------
r290 | bertin | 2006-07-17 19:56:12 +0200 (Mon, 17 Jul 2006) | 4 lines

Doc: keyword list updated.
ChangeLog updated.
Back-propagated destructive byte-swapping bugfix in FITS library.

------------------------------------------------------------------------
r289 | bertin | 2006-07-14 20:25:09 +0200 (Fri, 14 Jul 2006) | 3 lines

Removed warnings in psf.c (P.Delorme's edits) using brute-force.
Switched ChangeLog to SVN format.

------------------------------------------------------------------------
------------------------------------------------------------------------
r288 | bertin | 2006-07-14 20:13:39 +0200 (Fri, 14 Jul 2006) | 8 lines
r288 | bertin | 2006-07-14 20:13:39 +0200 (Fri, 14 Jul 2006) | 8 lines


+4 −0
Original line number Original line Diff line number Diff line
Dec 07: 2.7
	- FITS I/O and astrometry layers updated (same as SWarp and SCAMP)
	- Support for model-fitting

Jul 06: 2.5
Jul 06: 2.5
        - Support for VOTable catalogs and metadata in output.
        - Support for VOTable catalogs and metadata in output.


+53 −14
Original line number Original line Diff line number Diff line
# Main Makefile for SExtractor
# Main Makefile for SExtractor
# Copyright (C) 2002-2005 Emmanuel Bertin.
# Copyright (C) 2002-2008 Emmanuel Bertin.
AUTOMAKE_OPTIONS	= foreign no-dependencies
AUTOMAKE_OPTIONS	= foreign no-dependencies
SUBDIRS			= man src
SUBDIRS			= man src tests
dist_pkgdata_DATA	= xsl/sextractor.xsl
EXTRA_DIST		= config doc AUTHORS BUGS ChangeLog COPYING HISTORY \
EXTRA_DIST		= config doc AUTHORS BUGS ChangeLog COPYING HISTORY \
			  INSTALL README THANKS \
			  INSTALL README THANKS \
			  acx_prog_cc_optim.m4
			  acx_atlas.m4 acx_prog_cc_optim.m4 \
RPM_ROOTDIR		= /usr/src/RPM
			  acx_urbi_resolve_dir.m4
RPM_ROOTDIR		= `rpmbuild --nobuild -E %_topdir`
RPM_SRCDIR		= $(RPM_ROOTDIR)/SOURCES
RPM_SRCDIR		= $(RPM_ROOTDIR)/SOURCES
dist-hook:
	rm -rf `find $(distdir) -name .svn`

rpm:	dist
rpm:	dist
	cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)
	cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)
	rpmbuild -ba --clean $(PACKAGE_NAME).spec $(PACKAGE_NAME)-mp.spec
	rpmbuild -ba --clean --nodeps $(PACKAGE_NAME).spec

rpm-icc:	dist
	cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)
	USE_ICC="1" rpmbuild -ba --clean --nodeps $(PACKAGE_NAME).spec


rpm-opteron:	dist
rpm-opteron:	dist
	cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)
	cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)
	GCCFLAGS="-O -g -funroll-loops -fomit-frame-pointer -Wall \
	TPXCC="gcc" TPXFLAGS="-O -g -funroll-loops -fomit-frame-pointer -Wall \
		-march=opteron" rpmbuild -ba --target=x86_64 \
		-march=opteron" \
		--clean $(PACKAGE_NAME).spec                                                             
		TPXLDFLAGS="-static -shared-libgcc" \
		TPXLIBS="-lfftw3 -llapack -lcblas -latlas -lm" \
		rpmbuild -ba --target=x86_64 --clean $(PACKAGE_NAME).spec


rpm-athlon:	dist
rpm-athlon:	dist
	cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)
	cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)
	GCCFLAGS="-O -g -funroll-loops -fomit-frame-pointer -Wall -m32 \
	TPXCC="gcc" TPXFLAGS="-O -g -funroll-loops -fomit-frame-pointer -Wall \
		-march=i686 -msse -mfpmath=sse -mtune=athlon" rpmbuild \
		-m32 -march=i686 -msse -mfpmath=sse -mtune=athlon" \
		-ba --target=i686 --clean $(PACKAGE_NAME).spec
		TPXLDFLAGS="-static -shared-libgcc" \
		TPXLIBS="-L/usr/lib/ -lm -L/usr/local/lib/ -lfftw3 \
		-llapack -lcblas -latlas -lm" \
		rpmbuild -ba --target=i686 --clean $(PACKAGE_NAME).spec

rpm-opteron-icc:	dist
	cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)
	TPXCC="icc" TPXFLAGS="-O3 -g -axWPT -ip -unroll" \
		TPXLDFLAGS="-static -shared-libgcc" \
		TPXLIBS="-lfftw3 -llapack -lcblas -latlas -lm" \
		rpmbuild -ba --target=x86_64 --clean --nodeps $(PACKAGE_NAME).spec

rpm-athlon-icc:	dist
	cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)
		TPXCC="icc32" TPXFLAGS="-O3 -g -axKWNPT -ip -unroll" \
		TPXLDFLAGS="-static -shared-libgcc" \
		TPXLIBS="-L/usr/local/lib/ -L/usr/lib/ -lfftw3 \
		-llapack -lcblas -latlas -lm" \
		rpmbuild -ba --target=i686 --clean $(PACKAGE_NAME).spec

athlon:
athlon:
	$(MAKE) CFLAGS="-O -g -funroll-loops -fomit-frame-pointer -Wall -m32 -march=i686 -msse -mfpmath=sse -mtune=athlon" LIBS="-lm"
	$(MAKE) CFLAGS="-O -g -pthread -funroll-loops -fomit-frame-pointer \
		-Wall -m32 -march=i686 -msse -mfpmath=sse -mtune=athlon" \
		LIBS="-L/usr/lib/ -lpthread -lm -L/usr/local/lib/ \
		-lfftw3 -lfftw3_threads \
		-llapack -lcblas -latlas -lm"

pentium-icc:
	$(MAKE) CC="icc32" CFLAGS="-O3 -axKWNPT -ip -unroll -pthread" \
		LIBS="-L/usr/lib/ -lpthread -lm -L/usr/local/lib/ -llapack \
		-lcblas -latlas -lfftw3 -lfftw3_threads"


debug:
icc:
	$(MAKE) CFLAGS="-O3 -funroll-loops -fomit-frame-pointer -Wall -m32 -g"
	$(MAKE) CC="icc" CFLAGS="-O3 -g -axWPT -ip -unroll -pthread"
+233 −92

File changed.

Preview size limit exceeded, changes collapsed.

+5 −20
Original line number Original line Diff line number Diff line
@@ -8,25 +8,10 @@ input image is a MEF.
- The (main) default config file can be dumped by typing "sex -d". Secondary
- The (main) default config file can be dumped by typing "sex -d". Secondary
configuration files like default.param are still needed, though.
configuration files like default.param are still needed, though.


In case of problems, questions or suggestions related to the software,
The SExtractor homepage is
please don't hesitate to send a mail (preferably in english) to the
http://terapix.iap.fr/soft/sextractor
official mailing list:
In case of problems, questions or suggestions related to the software, please
sextractor@iap.fr
refer to the TERAPIX forum:
These questions and answers to them are posted on the Web at:
http://terapix.iap.fr/forum/
http://terapix.iap.fr/soft/sextractor/
In any case you can still reach me at bertin@iap.fr. I cannot garantee
that I will reply immediately, but I will try for sure to provide
an answer.
-----------
Notes:
- A version "sextractor-2.3.1_lanl" of SExtractor is available on
SourceForge thanks to Mark Galassi and Dan Starr:
http://sourceforge.net/projects/sextractor/
It is a reconditioned version of SExtractor 2.2.2. The LanL and the TERAPIX
(present one) versions follow two different development branches.
- Benne Holwerda <holwerda@stsci.edu> has written a SExtractor handbook and a
GUI which can be found in the doc/ subdirectory or at
http://www-int.stsci.edu/~holwerda/OldHomepage/se.html



					Emmanuel Bertin.
					Emmanuel Bertin.
Loading