merged with SExFIGI branch

man/sex.1

-.TH SEXTRACTOR "1" "October 2006" "SWarp 2.5.0" "User Commands"
+.TH SEXTRACTOR "1" "November 2008" "SWarp 2.8.2" "User Commands"
 .SH NAME
 sex \- extract a source catalog from an astronomical FITS image
 .SH SYNOPSIS

sextractor-tpx.spec.in

@@ -20,7 +20,7 @@ SExtractor stands for ``Source Extractor'': a software for making catalog of sou
 %setup -q
 
 %build
-./configure --prefix=$RPM_BUILD_ROOT/usr/local/ --mandir=$RPM_BUILD_ROOT/usr/local/man/ --enable-static
+./configure --prefix=$RPM_BUILD_ROOT/usr/local/ --mandir=$RPM_BUILD_ROOT/usr/local/man/ --with-xsl_url=file:///usr/local/share/@PACKAGE_NAME@/sextractor.xsl --enable-static
 
 make
 
@@ -35,6 +35,7 @@ rm -rf $RPM_BUILD_ROOT
 /usr/local/bin/sex
 /usr/local/man/man1/sex.1
 /usr/local/man/manx/sex.x
+/usr/local/share/@PACKAGE_NAME@
 %doc AUTHORS BUGS ChangeLog COPYING HISTORY INSTALL README THANKS doc/README.DOC doc/sextractor.ps
 
 %changelog

sextractor.spec.in

@@ -8,10 +8,12 @@ Version: %{version}
 Release: %{release}
 Source0: ftp://ftp.iap.fr/pub/from_users/bertin/sextractor/%{name}-%{version}.tar.gz
 URL: http://terapix.iap.fr/soft/%{name}
-License: LGPL
+License: GPLv3+
 Group: Sciences/Astronomy
 BuildRoot: %{_tmppath}/%{name}-buildroot
-Prefix: %{_prefix}
+BuildRequires: pkgconfig
+BuildRequires: fftw-devel >= 3.1
+BuildRequires: atlas-devel >= 3.6.0
 
 %description
 SExtractor stands for ``Source Extractor'': a software for making catalog of sources from astronomical images.
@@ -20,26 +22,28 @@ SExtractor stands for ``Source Extractor'': a software for making catalog of sou
 %setup -q
 
 %build
-if test "$GCCFLAGS"; then
-./configure --enable-static --prefix=$RPM_BUILD_ROOT/usr/local/ --mandir=$RPM_BUILD_ROOT/usr/local/man/
-make CFLAGS="$GCCFLAGS"
+if test "$USE_ICC"; then
+%configure --enable-icc
 else
-./configure --prefix=$RPM_BUILD_ROOT/usr/local/ --mandir=$RPM_BUILD_ROOT/usr/local/man/
-make
+%configure
 fi
+make %{?_smp_mflags}
 
 %install
-make install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-/usr/local/bin/sex
-/usr/local/man/man1/sex.1
-/usr/local/man/manx/sex.x
 %doc AUTHORS BUGS ChangeLog COPYING HISTORY INSTALL README THANKS doc/README.DOC doc/sextractor.pdf
+%{_bindir}/sex
+%{_bindir}/ldactoasc
+%{_mandir}/man1/sex.1*
+%{_mandir}/manx/sex.x*
+%{_datadir}/@PACKAGE_NAME@
 
 %changelog
 * @DATE2@ @PACKAGER@ <@PACKAGE_BUGREPORT@>

src/Makefile.am

 # Program Makefile for SEx
-# Copyright (C) 2004-2006 Emmanuel Bertin.
-SUBDIRS			= fits wcs
-bin_PROGRAMS		= sex
+# Copyright (C) 2004-2008 Emmanuel Bertin.
+SUBDIRS			= fits levmar 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 field.c filter.c \
-			  flag.c graph.c growth.c image.c interpolate.c \
-			  main.c makeit.c manobjlist.c misc.c neurro.c pc.c \
-			  photom.c plist.c poly.c prefs.c psf.c readimage.c \
-			  refine.c retina.c scan.c som.c weight.c winpos.c \
-			  xml.c \
+			  check.c clean.c extract.c fft.c field.c filter.c \
+			  fitswcs.c flag.c graph.c growth.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 field.h filter.h flag.h \
-			  globals.h growth.h image.h interpolate.h key.h \
-			  neurro.h param.h photom.h plist.h poly.h prefs.h \
-			  preflist.h psf.h retina.h sexhead1.h sexhead.h \
-			  sexheadsc.h som.h types.h weight.h winpos.h xml.h
-AM_CPPFLAGS		= -DXSL_URL=\"file://$(pkgdatadir)/${PACKAGE_NAME}.xsl\"
-sex_LDADD		= $(top_builddir)/src/fits/libfits.a $(top_builddir)/src/wcs/libwcs_c.a
+			  define.h extract.h fft.h field.h filter.h fitswcs.h \
+			  flag.h globals.h growth.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
+ldactoasc_SOURCES 	= ldactoasc.c ldactoasc.h
+sex_LDADD		= $(top_builddir)/src/fits/libfits.a \
+			  $(top_builddir)/src/wcs/libwcs_c.a \
+			  $(top_builddir)/src/levmar/liblevmar.a 
+ldactoasc_LDADD		= $(top_builddir)/src/fits/libfits.a
 DATE=`date +"%Y-%m-%d"`
+

src/assoc.h

@@ -9,13 +9,13 @@
 *
 *	Contents:	Include file for assoc.c.
 *
-*	Last modify:	25/06/97
+*	Last modify:	14/10/2007
 *
 *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 */
 
 
-#define		ASSOC_BUFINC	65536	/* Assoc buffer increment (bytes) */
+#define		ASSOC_BUFINC	131072	/* Assoc buffer increment (bytes) */
 
 /*--------------------------------- typedefs --------------------------------*/
 

src/check.h

@@ -9,7 +9,7 @@
 *
 *	Contents:	handling of "check-images".
 *
-*	Last modify:	15/12/2002
+*	Last modify:	18/09/2008
 *
 *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 */
@@ -23,7 +23,7 @@ typedef struct structcheck
   char		*fitshead;		/* ptr to check-image FITS header */
   int		fitsheadsize;		/* size of check-image FITS header */
   void		*pix;			/* ptr to check-image pixmap */
-  int		width, height;		/* size of check-image */
+  int		width, height, depth;	/* size of check-image */
   size_t	npix;			/* number of pixels in check-image */
   int		y;			/* current line in check-image */
   PIXTYPE	overlay;		/* intensity of the overlayed plots */

src/clean.c

@@ -10,7 +10,7 @@
 *	Contents:	functions that remove spurious detections from the
 *			catalog
 *
-*	Last modify:	15/02/2005
+*	Last modify:	20/06/2007
 *
 *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 */
@@ -250,15 +250,6 @@ void	mergeobject(objstruct *objslave,objstruct *objmaster)
           *pix = colormaster;
     }
 
-  if (FLAG(obj.flux_prof))
-    {
-    objmaster->flux_prof = (objmaster->flux_prof*objmaster->fdflux
-			+ objslave->flux_prof*objslave->fdflux)
-			/ (objmaster->fdflux + objslave->fdflux);
-    objmaster->fluxerr_prof = (objmaster->fluxerr_prof*objmaster->fdflux
-			+ objslave->fluxerr_prof*objslave->fdflux)
-			/ (objmaster->fdflux + objslave->fdflux);
-    }
   objmaster->fdnpix += objslave->fdnpix;
   objmaster->dnpix += objslave->dnpix;
   objmaster->fdflux += objslave->fdflux;