Commit 98adcc78 authored by Emmanuel Bertin's avatar Emmanuel Bertin
Browse files

Set XMODEL_IMAGE and YMODEL_IMAGE data types back to double precision (thanks to S.Desai).

Fixed various compilation warnings.
parent 8888bb8d
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
.TH SEXTRACTOR "1" "November 2009" "SWarp 2.9.9" "User Commands"
.TH SEXTRACTOR "1" "December 2009" "SWarp 2.9.9" "User Commands"
.SH NAME
.SH NAME
sex \- extract a source catalog from an astronomical FITS image
sex \- extract a source catalog from an astronomical FITS image
.SH SYNOPSIS
.SH SYNOPSIS
+3 −1
Original line number Original line Diff line number Diff line
@@ -9,7 +9,7 @@
*
*
*	Contents:	analyse(), endobject()...: measurements on detections.
*	Contents:	analyse(), endobject()...: measurements on detections.
*
*
*	Last modify:	01/10/2009
*	Last modify:	01/12/2009
*
*
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
*/
*/
@@ -397,6 +397,8 @@ void endobject(picstruct *field, picstruct *dfield, picstruct *wfield,


  if (FLAG(obj2.analtime))
  if (FLAG(obj2.analtime))
    analtime1 = counter_seconds();
    analtime1 = counter_seconds();
  else
    analtime1 = 0.0;		/* To avoid gcc -Wall warnings */


  obj = &objlist->obj[n];
  obj = &objlist->obj[n];


+3 −4
Original line number Original line Diff line number Diff line
@@ -9,7 +9,7 @@
*
*
*       Contents:       Routines dealing with float precision FFT.
*       Contents:       Routines dealing with float precision FFT.
*
*
*       Last modify:    17/11/2009
*       Last modify:    01/12/2009
*
*
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
*/
*/
@@ -133,12 +133,11 @@ 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	08/10/2009
VERSION	01/12/2009
 ***/
 ***/
void    fft_conv(float *data1, float *fdata2, int *size)
void    fft_conv(float *data1, float *fdata2, int *size)
  {
  {
   fftwf_complex	*fdata0;
   float		*fdata1p,*fdata2p,
   float		*fdata1p,*fdata2p,*data0,
			real,imag, fac;
			real,imag, fac;
   int			i, npix,npix2;
   int			i, npix,npix2;


+4 −4
Original line number Original line Diff line number Diff line
@@ -9,7 +9,7 @@
*
*
*	Contents:       Handle memory allocation for FITS bodies.
*	Contents:       Handle memory allocation for FITS bodies.
*
*
*	Last modify:	02/11/2009
*	Last modify:	19/11/2009
*
*
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
*/
*/
@@ -191,7 +191,7 @@ INPUT A pointer to the tab structure,
OUTPUT	-.
OUTPUT	-.
NOTES	.
NOTES	.
AUTHOR	E. Bertin (IAP)
AUTHOR	E. Bertin (IAP)
VERSION	02/11/2009
VERSION	19/11/2009
 ***/
 ***/
void	read_body(tabstruct *tab, PIXTYPE *ptr, size_t size)
void	read_body(tabstruct *tab, PIXTYPE *ptr, size_t size)
  {
  {
@@ -334,14 +334,14 @@ void read_body(tabstruct *tab, PIXTYPE *ptr, size_t size)
                llblank = (LONGLONG)tab->blank;
                llblank = (LONGLONG)tab->blank;
                for (i=spoonful; i--; bufdata += sizeof(LONGLONG))
                for (i=spoonful; i--; bufdata += sizeof(LONGLONG))
                  *(ptr++) = ((llval = *((LONGLONG *)bufdata)) == llblank)?
                  *(ptr++) = ((llval = *((LONGLONG *)bufdata)) == llblank)?
			-BIG : ival*bs + bz;
			-BIG : llval*bs + bz;
                }
                }
              else
              else
                {
                {
                llublank = (ULONGLONG)tab->blank;
                llublank = (ULONGLONG)tab->blank;
                for (i=spoonful; i--; bufdata += sizeof(ULONGLONG))
                for (i=spoonful; i--; bufdata += sizeof(ULONGLONG))
                  *(ptr++) = ((lluval = *((ULONGLONG *)bufdata)) == llublank)?
                  *(ptr++) = ((lluval = *((ULONGLONG *)bufdata)) == llublank)?
			-BIG : iuval*bs + bz;
			-BIG : lluval*bs + bz;
                }
                }
	      }
	      }
            else
            else
+4 −4
Original line number Original line Diff line number Diff line
@@ -9,7 +9,7 @@
*
*
*	Contents:	functions for converting LDAC FITS catalogs.
*	Contents:	functions for converting LDAC FITS catalogs.
*
*
*	Last modify:	02/11/2009
*	Last modify:	19/11/2009
*
*
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
*/
*/
@@ -133,14 +133,14 @@ INPUT Pointer to element to convert,
OUTPUT	-.
OUTPUT	-.
NOTES	ttypeconv does not yet handle arrays.
NOTES	ttypeconv does not yet handle arrays.
AUTHOR  E. Bertin (IAP)
AUTHOR  E. Bertin (IAP)
VERSION 02/11/2009
VERSION 19/11/2009
 ***/
 ***/


void	ttypeconv(void *ptrin, void *ptrout, t_type ttypein, t_type ttypeout)
void	ttypeconv(void *ptrin, void *ptrout, t_type ttypein, t_type ttypeout)


  {
  {
   union	{char tbyte; short tshort; int tlong; LONGLONG tlonglong;
//   union	{char tbyte; short tshort; int tlong; LONGLONG tlonglong;
		 float tfloat; double tdouble; char tstring;} ival;
//		 float tfloat; double tdouble; char tstring;} ival;


#ifdef HAVE_LONG_LONG_INT
#ifdef HAVE_LONG_LONG_INT
#define		OUTCONV(x, y)			\
#define		OUTCONV(x, y)			\
Loading