From 7c4a165632c6d835ce346fe5d72ec748e7136030 Mon Sep 17 00:00:00 2001 From: Emmanuel Bertin Date: Mon, 11 Oct 2010 16:14:04 +0000 Subject: [PATCH] Moved the whole package back to GPL. Added more complete headers to all files. Clarified licensing issues. Updated FITS library. Updated configuration files. Added configuration files to the list of data that get installed in ${prefix}/share/sextractor. Added background offset and point-source model components: FLUX_BACKOFFSET,FLUXERR_BACKOFFSET,FLUX_POINTSOURCE,FLUXERR_POINTSOURCE,MAG_POINTSOURCE,MAGERR_POINTSOURCE. Tweaked model-fitting convergence parameters. Fixed catalogue source ordering/number issue in dual-image mode. Pushed version number to 2.13.0. --- AUTHORS | 3 +- BUGS | 7 +- COPYRIGHT | 41 ++-- ChangeLog | 520 +++++++++++++++++++++++++++++++++++---- HISTORY | 49 ++-- INSTALL | 11 - Makefile.am | 38 ++- Makefile.in | 39 ++- README | 15 +- THANKS | 43 +++- acx_atlas.m4 | 39 ++- acx_fftw.m4 | 37 ++- acx_prog_cc_optim.m4 | 39 ++- acx_urbi_resolve_dir.m4 | 40 ++- config/default.param | 524 ++++++++++++++++++++++++++++++---------- config/default.sex | 46 +++- configure | 22 +- configure.ac | 33 ++- doc/README.DOC | 9 +- man/sex.1 | 35 +-- man/sex.1.in | 35 +-- sextractor.spec.in | 36 ++- src/Makefile.am | 32 ++- src/Makefile.in | 33 ++- src/analyse.c | 38 ++- src/assoc.c | 35 ++- src/assoc.h | 36 ++- src/astrom.c | 40 ++- src/astrom.h | 36 ++- src/back.c | 50 ++-- src/back.h | 36 ++- src/bpro.c | 35 ++- src/bpro.h | 37 ++- src/catout.c | 47 +++- src/check.c | 34 ++- src/check.h | 34 ++- src/clean.c | 37 ++- src/clean.h | 37 ++- src/define.h | 42 +++- src/extract.c | 37 ++- src/extract.h | 37 ++- src/fft.c | 32 ++- src/fft.h | 34 ++- src/field.c | 36 ++- src/field.h | 36 ++- src/filter.c | 38 ++- src/filter.h | 37 ++- src/fits/Makefile.am | 33 ++- src/fits/Makefile.in | 34 ++- src/fits/fitsbody.c | 39 ++- src/fits/fitscat.c | 41 +++- src/fits/fitscat.h | 35 ++- src/fits/fitscat_defs.h | 35 ++- src/fits/fitscheck.c | 35 ++- src/fits/fitscleanup.c | 35 ++- src/fits/fitsconv.c | 35 ++- src/fits/fitshead.c | 35 ++- src/fits/fitskey.c | 39 ++- src/fits/fitsmisc.c | 37 ++- src/fits/fitsread.c | 35 ++- src/fits/fitstab.c | 35 ++- src/fits/fitsutil.c | 39 ++- src/fits/fitswrite.c | 35 ++- src/fitswcs.c | 78 ++++-- src/fitswcs.h | 36 ++- src/flag.c | 35 ++- src/flag.h | 35 ++- src/globals.h | 38 ++- src/graph.c | 36 ++- src/growth.c | 36 ++- src/growth.h | 36 ++- src/header.c | 34 ++- src/header.h | 34 ++- src/image.c | 36 ++- src/image.h | 36 ++- src/interpolate.c | 34 ++- src/interpolate.h | 34 ++- src/key.h | 37 ++- src/ldactoasc.c | 32 ++- src/ldactoasc.h | 34 ++- src/levmar/misc_core.c | 4 +- src/main.c | 42 +++- src/makeit.c | 34 ++- src/manobjlist.c | 36 ++- src/misc.c | 107 ++++---- src/neurro.c | 36 ++- src/neurro.h | 36 ++- src/param.h | 34 ++- src/paramprofit.h | 45 +++- src/pattern.c | 34 ++- src/pattern.h | 34 ++- src/pc.c | 34 ++- src/photom.c | 48 +++- src/photom.h | 36 ++- src/plist.c | 36 ++- src/plist.h | 36 ++- src/preflist.h | 37 ++- src/prefs.c | 36 ++- src/prefs.h | 37 ++- src/profit.c | 201 +++++++++------ src/profit.h | 42 +++- src/psf.c | 35 ++- src/psf.h | 35 ++- src/readimage.c | 34 ++- src/refine.c | 40 ++- src/retina.c | 36 ++- src/retina.h | 37 ++- src/scan.c | 37 ++- src/sexhead.h | 34 ++- src/sexhead1.h | 35 ++- src/sexheadsc.h | 33 ++- src/som.c | 36 ++- src/som.h | 36 ++- src/threads.h | 35 ++- src/types.h | 40 ++- src/wcs/LICENSE | 481 ++++++++++++++++++++++++++++++++++++ src/wcs/Makefile.am | 37 ++- src/wcs/Makefile.in | 39 ++- src/wcs/cel.c | 32 +++ src/wcs/cel.h | 32 +++ src/wcs/lin.c | 32 +++ src/wcs/lin.h | 32 +++ src/wcs/poly.c | 440 ++++----------------------------- src/wcs/poly.h | 40 +-- src/wcs/proj.c | 32 +++ src/wcs/proj.h | 32 +++ src/wcs/sph.c | 32 +++ src/wcs/sph.h | 32 +++ src/wcs/tnx.c | 32 ++- src/wcs/tnx.h | 32 ++- src/wcs/wcs.c | 32 +++ src/wcs/wcs.h | 32 +++ src/wcs/wcstrig.c | 32 +++ src/wcs/wcstrig.h | 32 +++ src/wcscelsys.h | 47 +++- src/weight.c | 33 ++- src/weight.h | 33 ++- src/winpos.c | 34 ++- src/winpos.h | 34 ++- src/xml.c | 34 ++- src/xml.h | 34 ++- xsl/sextractor.xsl | 32 ++- 142 files changed, 5192 insertions(+), 1867 deletions(-) create mode 100644 src/wcs/LICENSE diff --git a/AUTHORS b/AUTHORS index 69b269a..8009aa1 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1 +1,2 @@ -Emmanuel Bertin : SExtractor code and FITS library +Emmanuel Bertin : SExtractor code + diff --git a/BUGS b/BUGS index 910ce4f..ae7a792 100644 --- a/BUGS +++ b/BUGS @@ -1,9 +1,4 @@ -V2.5 (2006-07-14) -COOSYS epoch and system are not set to the proper values in ASCII_VOTABLE -catalogs. -Unexpected crashes are experienced when working with extremely large images -(10+Gpixels). This was not the case with earlier versions (ca. 1999). -V2.3 (2002-12-17) ASSOC options do not work properly with MEF images (this is not really a bug). Emmanuel Bertin + diff --git a/COPYRIGHT b/COPYRIGHT index 2432373..8b1edc6 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,28 +1,15 @@ -Copyright (c) 1995-2009 Emmanuel Bertin IAP-CNRS/Univ,P.&M.Curie - -This software is governed by the CeCILL license under French law and -abiding by the rules of distribution of free software. You can use, -modify and/ or redistribute the software under the terms of the CeCILL -license as circulated by CEA, CNRS and INRIA at the following URL -"http://www.cecill.info". - -As a counterpart to the access to the source code and rights to copy, -modify and redistribute granted by the license, users are provided only -with a limited warranty and the software's author, the holder of the -economic rights, and the successive licensors have only limited -liability. - -In this respect, the user's attention is drawn to the risks associated -with loading, using, modifying and/or developing or reproducing the -software by the user in light of its specific status of free software, -that may mean that it is complicated to manipulate, and that also -therefore means that it is reserved for developers and experienced -professionals having in-depth computer knowledge. Users are therefore -encouraged to load and test the software's suitability as regards their -requirements in conditions enabling the security of their systems and/or -data to be ensured and, more generally, to use and operate it in the -same conditions as regards security. - -The fact that you are presently reading this means that you have had -knowledge of the CeCILL license and that you accept its terms. +Copyright 1994-2010 IAP-CNRS / Universite P.&M.Curie + +Author: Emmanuel Bertin + +SExtractor is free software: you can redistribute it and/or +modify it under the terms of the GNU General Public License as +published by the Free Software Foundation, either version 3 of the +License, or (at your option) any later version. +SExtractor is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. +You should have received a copy of the GNU General Public License +along with SExtractor. If not, see . diff --git a/ChangeLog b/ChangeLog index 3c7607d..9b23b3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,78 +1,485 @@ -/* - ChangeLog +# +# ChangeLog +# +#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +# +# This file part of: SExtractor +# +# Copyright: (C) 1997-2010 IAP/CNRS/UPMC +# +# Author: Emmanuel Bertin (IAP) +# +# License: GNU General Public License +# +# SExtractor is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# SExtractor is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# You should have received a copy of the GNU General Public License +# along with SExtractor. If not, see . +# +# Last modified: 11/10/2010 +# +#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -* -* Part of: SExtractor -* -* Author: E. BERTIN (IAP) -* -* Contents: log of changes made to the SExtractor source -* -* Last modify: 17/01/2007 -* -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +------------------------------------------------------------------------ +r231 | bertin | 2010-09-29 17:11:15 +0200 (Wed, 29 Sep 2010) | 3 lines + +Fixed issue with adaptive CLASS_STAR in dual image mode (thanks to N.Sevilla). +Pushed version number to 2.12.3. ------------------------------------------------------------------------ -r380 | bertin | 2007-01-17 17:52:49 +0100 (Wed, 17 Jan 2007) | 3 lines +r230 | bertin | 2010-09-22 17:54:49 +0200 (Wed, 22 Sep 2010) | 2 lines -Added options for compiling with icc (Intel compiler). -Pushed version number to 2.5.1. +Allowed SEEING_FWHM to be 0 if no PSF is available and CLASS_STAR is not in the +parameter list. ------------------------------------------------------------------------ -r365 | bertin | 2006-11-09 18:39:27 +0100 (Thu, 09 Nov 2006) | 2 lines +r229 | bertin | 2010-09-13 11:05:21 +0200 (Mon, 13 Sep 2010) | 6 lines -Undo previous changes (wrong repository!!). +Removed singular matrix warnings in LevMar solver calls. +Changed the management of tolerances in Hessian inversion SVD. +Pushed Lanczos interpolator to 4th order in PSF and model-fitting. +Normalized the interpolating function so that the DC component gain is 1. +Pushed version number 2.12.2. ------------------------------------------------------------------------ -r364 | bertin | 2006-11-09 17:58:18 +0100 (Thu, 09 Nov 2006) | 2 lines +r228 | bertin | 2010-08-26 16:30:26 +0200 (Thu, 26 Aug 2010) | 5 lines -Added lmfit routines by Joachim Wuttke in the form of a library. +Fixed model-fitting issue with empty images in dual-image mode (thanks to +V. de Lapparent for reporting). +Updated LevMar to version 2.5. +Updated URLs in various places. +Pushed version number to 2.12.1. ------------------------------------------------------------------------ -r358 | bertin | 2006-10-29 21:04:25 +0100 (Sun, 29 Oct 2006) | 5 lines +r227 | bertin | 2010-08-23 15:17:00 +0200 (Mon, 23 Aug 2010) | 3 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. +Added --disable-model-fitting configure option to turn-off model-fitting +features and to allow compiling SExtractor without requiring the ATLAS and +FFTW libraries. +Version number pushed to 2.12.0. ------------------------------------------------------------------------ -r327 | bertin | 2006-08-16 18:06:49 +0200 (Wed, 16 Aug 2006) | 2 lines +r226 | bertin | 2010-08-20 18:32:32 +0200 (Fri, 20 Aug 2010) | 2 lines -Discard NaN pixels in non-weighted background measurements (as in SWarp). +Added POLAR1ERRMODEL_WORLD,POLAR2ERRMODEL_WORLD,POLARCORRMODEL_WORLD, +ELLIP1ERRMODEL_WORLD,ELLIP2ERRMODEL_WORLD and ELLIPCORRMODEL_WORLD measurement +parameters. + +------------------------------------------------------------------------ +r225 | bertin | 2010-08-08 19:34:14 +0200 (Sun, 08 Aug 2010) | 9 lines + +Fixed detection threshold missing in XML metadata output. +Fixed TFORM error message in fitshead.c (thanks to S.Guieu). +Fixed model-fitting error variance/covariance issue (bug in matrix inversion). +Added ELLIP1ERRMODEL_IMAGE, ELLIP2ERRMODEL_IMAGE, ELLIPCORRMODEL_IMAGE, +POLAR1ERRMODEL_IMAGE, POLAR2ERRMODEL_IMAGE, POLARCORRMODEL_IMAGE (more testing +is needed and WORLD versions are not yet functional). +Narrowed the tolerance constraint for stopping windowed centering iterations. +Fixed incorrect reading of the DATE-OBS FITS keyword when EPOCH and MJD-OBS are missing. +Pushed version number to 2.11.11. + +------------------------------------------------------------------------ +r224 | bertin | 2010-07-16 11:05:40 +0200 (Fri, 16 Jul 2010) | 5 lines + +Fixed WINdowed position error estimates that were underestimated by a factor 2 +(thanks to G.Bernstein). +Fixed FLUXERR_WIN triggering issue. +Optimized WIN parameter computations. +Pushed version number to 2.11.8. + +------------------------------------------------------------------------ +r221 | bertin | 2010-07-09 16:41:51 +0200 (Fri, 09 Jul 2010) | 20 lines + +Added VOTABLE "version" attribute to XML output. +Reverted minimization algorithm back to double precision (while keeping single +precision for data and parameters in "bounded" space). +Added specific handling of "Jacobian calls" in model-fitting. +Sped up the resampling process in model-fitting. +Tuned up minimization algorithm in model-fitting. +Added shortcuts to the computation of the local PSF model. +Fixed triggering issues with some model-fitting parameters (thanks to +S.Serrano). +Removed CLASS_STAR_MODEL and DISK_PATTERN* measurement parameters. +Added automatic tracking of the PSF FWHM from the local PSF model if +SEEING_FWHM is 0 for CLASS_STAR. +Fixed excessive WIN parameter computation time on large ring-shaped objects. +Fixed model-fitting issue with null half-light radii (thanks to S.Desai and +B.Armstrong). +Fixed aperture display value error in FITS-LDAC catalogue header. +Removed redundant update_tab() calls in FITS library. +Fixed comment copy issue for slashes within strings in FITS library (thanks to +F.Schuller). +Added check of PSF values; SExtractor will now exit in error in the case where +all PSF components sum up to 0. +Replaced computation of model second moments and ellipticities with analytical +estimates. +Improved the accuracy of peak and average model surface brightness estimates. +Fixed some compiler warnings. +Pushed version number to 2.11.7. + +------------------------------------------------------------------------ +r220 | bertin | 2010-02-05 14:17:20 +0100 (Fri, 05 Feb 2010) | 5 lines + +Added reading of .head ASCII headers (suggestion from M.Monnerville and +P.Hudelot). +Improved real-time display. +Fixed various issues with XSLT in double image mode. +Pushed version number to 2.11.0. + +------------------------------------------------------------------------ +r219 | bertin | 2010-01-21 14:38:14 +0100 (Thu, 21 Jan 2010) | 3 lines + +Added the DETECT_MAXAREA (advanced) configuration keyword (as suggested by +V.Terron). +Improved processing time display. + +------------------------------------------------------------------------ +r218 | bertin | 2009-12-16 01:02:21 +0100 (Wed, 16 Dec 2009) | 9 lines + +Fixed world coordinates in PSF-fitting. +Fixed error ellipse measurements in PSF-fitting (but works only for PSF_NMAX=1 +currently). +Simplified PSF parameter handling (removed PSFDISPLAY_TYPE configuration +option). +Simplified triggering of local north axis computation. +Allowed model axis ratios to exceed 1 to facilitate convergence. +Fixed alignment bug for symmetric models. +Restricted maximum allowed range for model coordinates. +Pushed version number to 2.10.0. + +------------------------------------------------------------------------ +r217 | bertin | 2009-12-01 14:46:19 +0100 (Tue, 01 Dec 2009) | 3 lines + +Set XMODEL_IMAGE and YMODEL_IMAGE data types back to double precision (thanks +to S.Desai). +Fixed various compilation warnings. + +------------------------------------------------------------------------ +r216 | bertin | 2009-11-18 17:45:26 +0100 (Wed, 18 Nov 2009) | 4 lines + +Fixed issue with FFTW configure for custom library paths. +Fixed compilation warnings in pattern.c and lm.h. +Pushed version number to 2.9.9. + +------------------------------------------------------------------------ +r215 | bertin | 2009-11-02 17:25:36 +0100 (Mon, 02 Nov 2009) | 3 lines + +Fixed typos introduced in the 2.4 LevMar custom update. +Added support for 64 bit binary table elements in FITS library (thanks to J.P. +McFarland). + +------------------------------------------------------------------------ +r214 | bertin | 2009-10-22 21:36:54 +0200 (Thu, 22 Oct 2009) | 4 lines + +Fixed issue with SVD on some objects. +Updated the LevMar library to V2.4. +Pushed version number to 2.9.7. + +------------------------------------------------------------------------ +r213 | bertin | 2009-10-19 17:10:20 +0200 (Mon, 19 Oct 2009) | 4 lines + +Fixed MODELS check-image. +Fixed X/YMODEL_WORLD issue. +Increased CLEANing margin for model-fitting. + +------------------------------------------------------------------------ +r212 | bertin | 2009-10-09 18:21:18 +0200 (Fri, 09 Oct 2009) | 5 lines + +Improved the quality of model resampling for subsampled objects. +Implemented a more consistent model size and flux scaling scheme for subsampled +objects. +Fixed Sersic model generation bug. +Pushed version number to 2.9.6. ------------------------------------------------------------------------ -r305 | baillard | 2006-07-19 15:28:15 +0200 (Wed, 19 Jul 2006) | 2 lines +r211 | bertin | 2009-10-08 23:34:46 +0200 (Thu, 08 Oct 2009) | 6 lines -Change name +Added automatic image rebinning for fitting very large objects (>512 pixels). +Fixed several issues related to image and weight copy prior to fitting. +Fixed bug with symmetric models. +Fixed issue with new FFT planning scheme. +Pushed version number to 2.9.5. ------------------------------------------------------------------------ -r303 | baillard | 2006-07-19 15:05:48 +0200 (Wed, 19 Jul 2006) | 2 lines +r210 | bertin | 2009-10-01 17:54:49 +0200 (Thu, 01 Oct 2009) | 4 lines -Change names +Added new NLOWWEIGHT_ISO and NLOWDWEIGHT_ISO parameters that count the number +of bad pixels within the measured isophotal footprint, and within one pixel of +the detected isophotal footprint, respectively. +FLAGS_WEIGHT is now working without crashing. +Pushed version number to 2.9.3. ------------------------------------------------------------------------ -r295 | baillard | 2006-07-18 13:54:43 +0200 (Tue, 18 Jul 2006) | 2 lines +r209 | bertin | 2009-09-29 18:54:34 +0200 (Tue, 29 Sep 2009) | 6 lines + +Fixed BITPIX display info. +Changed CONCENTRATION_MODEL to SPREAD_MODEL. +Added SPREADERR_MODEL measurement (currently a crude estimate). +Optimized FFT calls. +Set PSF_NMAX to 2 by default. + +------------------------------------------------------------------------ +r208 | bertin | 2009-09-24 14:38:44 +0200 (Thu, 24 Sep 2009) | 5 lines + +Fixed CONCENTRATION_MODEL issue. +Removed singular matrix warning. +Added MATRIX_MODELERR measurement parameters. +Added DURATION_ANALYSIS measurement parameter. + +------------------------------------------------------------------------ +r207 | bertin | 2009-09-21 14:27:28 +0200 (Mon, 21 Sep 2009) | 6 lines + +Added FLUX_MAX_MODEL, FLUX_EFF_MODEL, FLUX_MEAN_MODEL, MU_MAX_MODEL, +MU_EFF_MODEL and MU_MEAN_MODEL parameters (FLUX_MAX_MODEL estimator still +somewhat inacurrate). +Added FLUX_MAX_SPHEROID, FLUX_EFF_SPHEROID, FLUX_MEAN_SPHEROID, MU_MAX_SPHEROID, +MU_EFF_SPHEROID, MU_MEAN_SPHEROID parameters. +Added FLUX_MAX_DISK, FLUX_EFF_DISK, FLUX_MEAN_DISK, MU_MAX_DISK, MU_EFF_DISK +and MU_MEAN_DISK parameters. +Changed the way total model fluxes and model moments are computed. +Pushed version number to 2.9.2. + +------------------------------------------------------------------------ +r206 | bertin | 2009-09-14 00:24:01 +0200 (Mon, 14 Sep 2009) | 10 lines + +Changed ExMODEL parameters to ELLIPx_MODEL. +Changed EPSxMODEL parameters to POLARx_MODEL. +Added AMODEL, BMODEL, THETAMODEL for both _IMAGE and _WORLD coordinates. +Added CXXMODEL CYYMODEL, CXYMODEL for both _IMAGE and _WORLD coordinates. +AddedTHETAMODEL_SKY,THETAMODEL_J2000,THETAMODEL_B1950. +Added ELLIPxMODEL_WORLD and POLARxMODEL_WORLD. +Fixed broken PSF-fitting. +Fixed warnings while generating the configure (thanks to S.Pascual). +Pushed version number to 2.9.1. + +------------------------------------------------------------------------ +r205 | bertin | 2009-09-10 19:28:28 +0200 (Thu, 10 Sep 2009) | 2 lines + +Put back missing item in configure file. + +------------------------------------------------------------------------ +r204 | bertin | 2009-09-09 17:49:41 +0200 (Wed, 09 Sep 2009) | 2 lines + +Cleaned up configure file. + +------------------------------------------------------------------------ +r203 | bertin | 2009-09-09 11:47:17 +0200 (Wed, 09 Sep 2009) | 2 lines + +Added new rpm-best option in Makefile.am. + +------------------------------------------------------------------------ +r202 | bertin | 2009-09-08 22:11:04 +0200 (Tue, 08 Sep 2009) | 3 lines + +Changed the --enable-automatic-flags configure option to --enable-auto-flags. +Added --enable-best-link configure option. + +------------------------------------------------------------------------ +r201 | bertin | 2009-09-08 18:58:59 +0200 (Tue, 08 Sep 2009) | 4 lines + +Switched to single precision for model fitting. +Changed configure behaviour towards CFLAGS and LDFLAGS: automatic settings are +now applied only if the --enable-automatic-flags configure option is set +(thanks to S.Pascual). +Version number pushed to 2.9.0. + +------------------------------------------------------------------------ +r200 | bertin | 2009-08-27 23:25:14 +0200 (Thu, 27 Aug 2009) | 5 lines + +Removed redundant code in astrom_pos(). +Fixed random crashes with model fitting (thanks to S.Desai). +Fixed gain problem in PSF fitting. +Pushed version number to 2.8.9. + +------------------------------------------------------------------------ +r199 | bertin | 2009-07-20 21:41:29 +0200 (Mon, 20 Jul 2009) | 3 lines + +Added FOCAL coordinates for centering parameters. +Re-organized astrometric calls. + +------------------------------------------------------------------------ +r198 | bertin | 2009-06-26 17:41:48 +0200 (Fri, 26 Jun 2009) | 2 lines + +Fixed incorrect FFTW type in multithread check. + +------------------------------------------------------------------------ +r197 | bertin | 2009-06-26 17:13:08 +0200 (Fri, 26 Jun 2009) | 6 lines + +Made parallel version of ATLAS not mandatory for the multithread option (unused). +Replaced configuration error with warning if FFTW is not multithreaded and +multithreading has been activated (unused). +Added autoconfig support for FFTW multithreaded versions combined in libfftw3 +(unused). +Added runtime warning if ATLAS is not multithreaded and multithreading is on +(unused). +Version number pushed to 2.8.8. + +------------------------------------------------------------------------ +r196 | bertin | 2009-05-29 21:17:33 +0200 (Fri, 29 May 2009) | 2 lines + +Further refinements on display. + +------------------------------------------------------------------------ +r195 | bertin | 2009-05-29 18:35:54 +0200 (Fri, 29 May 2009) | 2 lines + +Improved online display. + +------------------------------------------------------------------------ +r194 | bertin | 2009-05-29 18:21:25 +0200 (Fri, 29 May 2009) | 6 lines + +Removed multithreading in FFTs (would degrade performance). +Added computation of FLUXERR_MODEL and MAGERR_MODEL. +Fixed a numerical bug in E1MODEL_IMAGE and E2MODEL_IMAGE. +Improved onscreen display. +Pushed version number to 2.8.7 + +------------------------------------------------------------------------ +r193 | bertin | 2009-05-22 14:26:11 +0200 (Fri, 22 May 2009) | 2 lines + +Included Chiara's MissFITS fix in fitspick(). + +------------------------------------------------------------------------ +r192 | bertin | 2009-05-22 14:14:26 +0200 (Fri, 22 May 2009) | 3 lines + +Added filtering of non-numerical characters for floating-point FITS keywords +(thanks to D.G. Bonfield for the suggestion). + +------------------------------------------------------------------------ +r191 | bertin | 2009-05-19 17:40:54 +0200 (Tue, 19 May 2009) | 2 lines + +Increased field format size from %15.10e to %18.10e and from %5.1f to %6.2f. + +------------------------------------------------------------------------ +r190 | bertin | 2009-05-07 11:18:57 +0200 (Thu, 07 May 2009) | 2 lines + +Removed forgotten debug printout. + +------------------------------------------------------------------------ +r189 | bertin | 2009-04-28 19:40:43 +0200 (Tue, 28 Apr 2009) | 2 lines + +Fixed bug in make_kernel() test bug (thanks to R.Owen). + +------------------------------------------------------------------------ +r187 | bertin | 2009-04-09 15:31:57 +0200 (Thu, 09 Apr 2009) | 2 lines + +Forgot to regenerate configure file. + +------------------------------------------------------------------------ +r186 | bertin | 2009-04-09 15:29:59 +0200 (Thu, 09 Apr 2009) | 3 lines + +Removed obsolete measurement parameters. +Pushed version number to 2.8.6 + +------------------------------------------------------------------------ +r185 | bertin | 2009-04-01 18:53:14 +0200 (Wed, 01 Apr 2009) | 2 lines + +More junk cleaning. + +------------------------------------------------------------------------ +r184 | bertin | 2009-04-01 18:17:33 +0200 (Wed, 01 Apr 2009) | 4 lines + +Fixed icc 11 compilations options on x86-64 architecture. +Cleaned up obsolete references. +Added favicon to XSLT filter. + +------------------------------------------------------------------------ +r183 | bertin | 2009-04-01 15:53:17 +0200 (Wed, 01 Apr 2009) | 2 lines + +Added another refinement to the XSLT filter. + +------------------------------------------------------------------------ +r182 | bertin | 2009-04-01 13:11:33 +0200 (Wed, 01 Apr 2009) | 2 lines + +Updated XSLT filter (AstrOmatic theme). + +------------------------------------------------------------------------ +r181 | bertin | 2009-03-23 19:21:58 +0100 (Mon, 23 Mar 2009) | 8 lines + +Removed unstable and buggy measurements from parameter list. +Cleaned up Makefile.am RPM options. +Fixed rpm build issue on Fedora Core 10. +Fixed display of max thread number in configure help. +Updated icc compilation flags to 11.0 syntax. +Set the license string to CeCILL in the .spec file. +Pushed version number to 2.8.5. + +------------------------------------------------------------------------ +r180 | bertin | 2009-03-20 14:11:44 +0100 (Fri, 20 Mar 2009) | 3 lines + +Put back model chi2 normalisation. +Made handling of dynamic compression and chi2 computations more flexible. + +------------------------------------------------------------------------ +r179 | bertin | 2009-03-18 15:43:36 +0100 (Wed, 18 Mar 2009) | 3 lines + +Added CONCENTRATION_MODEL and finalized CLASS_ST parameters. +Version number pushed to 2.8.4. + +------------------------------------------------------------------------ +r178 | bertin | 2009-03-10 14:05:07 +0100 (Tue, 10 Mar 2009) | 1 line + +Set mime-type property of SExtractor doc to application/pdf +------------------------------------------------------------------------ +r177 | bertin | 2009-02-20 19:06:45 +0100 (Fri, 20 Feb 2009) | 4 lines + +Fixed bug which would cause the mapping to depend on the ordering of PVs. +Changed software license to CeCILL (French equivalent of GPL). +Pushed version number to 2.8.3. + +------------------------------------------------------------------------ +r176 | bertin | 2009-01-29 19:34:29 +0100 (Thu, 29 Jan 2009) | 1 line + +Fixed crash with model fitting on small objects +------------------------------------------------------------------------ +r175 | bertin | 2009-01-28 22:52:45 +0100 (Wed, 28 Jan 2009) | 1 line + +Nothing +------------------------------------------------------------------------ +r173 | bertin | 2009-01-28 18:37:46 +0100 (Wed, 28 Jan 2009) | 1 line + +merged with SExFIGI branch +------------------------------------------------------------------------ +r39 | bertin | 2009-01-28 17:05:55 +0100 (Wed, 28 Jan 2009) | 1 line + +Moved software to trunk +------------------------------------------------------------------------ +r22 | 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. + +------------------------------------------------------------------------ +r21 | 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). + +------------------------------------------------------------------------ +r20 | 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 +r19 | 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 +r18 | 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 +r17 | bertin | 2006-07-14 20:13:39 +0200 (Fri, 14 Jul 2006) | 8 lines Yet another rewriting of the XML part. Meta-data, error messages and catalog info are now consistant between the catalog and the XML metadata file. Still @@ -88,7 +495,7 @@ Updated config/default.sex, BUGS HISTORY and README files. Ready for release of V2.5. ------------------------------------------------------------------------ -r286 | bertin | 2006-07-13 22:06:48 +0200 (Thu, 13 Jul 2006) | 5 lines +r16 | bertin | 2006-07-13 22:06:48 +0200 (Thu, 13 Jul 2006) | 5 lines XML VOTable approach changed again: support for error messaging in VO catalog (not only metadata) and FITS serialization of LDAC files in XML output. @@ -97,19 +504,19 @@ Removed MAMA_CORFLEX advanced config parameter (replaced with define). Version number pushed to 2.5. ------------------------------------------------------------------------ -r285 | bertin | 2006-07-12 20:34:06 +0200 (Wed, 12 Jul 2006) | 4 lines +r15 | bertin | 2006-07-12 20:34:06 +0200 (Wed, 12 Jul 2006) | 4 lines Improved XML VOTable (still waiting for F.Ochsenbein comments, though). Added meta-data to VOTable catalog output. Fixed potential bug with long command lines. ------------------------------------------------------------------------ -r283 | bertin | 2006-07-11 23:04:18 +0200 (Tue, 11 Jul 2006) | 2 lines +r14 | bertin | 2006-07-11 23:04:18 +0200 (Tue, 11 Jul 2006) | 2 lines Completed the conversion of XML output to the VOTable format. ------------------------------------------------------------------------ -r280 | bertin | 2006-07-10 21:49:59 +0200 (Mon, 10 Jul 2006) | 6 lines +r13 | bertin | 2006-07-10 21:49:59 +0200 (Mon, 10 Jul 2006) | 6 lines Added support for ICRS in header WCS. Changed the way header WCS info is interpreted when EQUINOX is missing. @@ -118,32 +525,32 @@ Pushed max number of recorded warnings to 100. Changed XML meta-data output format to VOTable (not complete yet). ------------------------------------------------------------------------ -r278 | bertin | 2006-07-09 19:57:00 +0200 (Sun, 09 Jul 2006) | 4 lines +r12 | bertin | 2006-07-09 19:57:00 +0200 (Sun, 09 Jul 2006) | 4 lines Added support for warning history in the fits library. Added duration to XML error output. Added ten most recent warnings to XML output. ------------------------------------------------------------------------ -r277 | bertin | 2006-07-07 20:30:30 +0200 (Fri, 07 Jul 2006) | 4 lines +r11 | bertin | 2006-07-07 20:30:30 +0200 (Fri, 07 Jul 2006) | 4 lines Added catching of error messages and forwarding to XML. Added ASCII_VO output catalog format (inspired by G.Tissier's VOTable patch) Fixed issue with conflicting CDi_j/CDELTi parameters (report by J.F. Bonnarel). ------------------------------------------------------------------------ -r276 | bertin | 2006-07-05 20:11:29 +0200 (Wed, 05 Jul 2006) | 2 lines +r10 | bertin | 2006-07-05 20:11:29 +0200 (Wed, 05 Jul 2006) | 2 lines Added more configuration parameters to XML output. ------------------------------------------------------------------------ -r273 | bertin | 2006-07-04 17:39:58 +0200 (Tue, 04 Jul 2006) | 3 lines +r9 | bertin | 2006-07-04 17:39:58 +0200 (Tue, 04 Jul 2006) | 3 lines Fixed a bug with the reentrant version of strtok in TNX. Added more XML info. ------------------------------------------------------------------------ -r271 | bertin | 2006-07-03 21:31:15 +0200 (Mon, 03 Jul 2006) | 5 lines +r8 | bertin | 2006-07-03 21:31:15 +0200 (Mon, 03 Jul 2006) | 5 lines Updated display to the leatest "Bertin standards". Added comments to uncommonly used config parameters in default .sex. @@ -151,7 +558,7 @@ Changed default output channel for info about extraction to stdout. Added XML output. ------------------------------------------------------------------------ -r269 | bertin | 2006-07-02 21:15:05 +0200 (Sun, 02 Jul 2006) | 5 lines +r7 | bertin | 2006-07-02 21:15:05 +0200 (Sun, 02 Jul 2006) | 5 lines Updated WCS lib to the latest SCAMP version. Added support for TNX distortions. @@ -159,29 +566,36 @@ Added support for WCS with more than 2D (NAXIS=3 right now). Added -g compilation flag for gcc. ------------------------------------------------------------------------ -r268 | bertin | 2006-06-29 22:38:02 +0200 (Thu, 29 Jun 2006) | 7 lines +r6 | bertin | 2006-06-29 22:38:02 +0200 (Thu, 29 Jun 2006) | 7 lines Self Organizing Map code revived! The FITS body writing routine now complies with strict aliasing constraints, -but: -Strict-aliasing optimization option dropped in acx_prog_cc_optim.m4 because of -too many problems with gcc 4.1 (missing X_IMAGE output, etc.): too much "fun" -with pointers in the SExtractor code. +but: Strict-aliasing optimization option dropped in acx_prog_cc_optim.m4 +because of too many problems with gcc 4.1 (missing X_IMAGE output, etc.): too +much "fun" with pointers in the SExtractor code. Local background estimates work again after many years of oblivion, thanks to an increased top margin in the buffering mechanism (bug found by P.Astier). Overwriting of displayed infos fixed. ------------------------------------------------------------------------ -r115 | bertin | 2006-01-12 20:12:04 +0100 (Thu, 12 Jan 2006) | 2 lines +r5 | bertin | 2006-01-12 20:12:04 +0100 (Thu, 12 Jan 2006) | 2 lines Preliminary merging with P.Delorme branch (improved PSF-fitting). ------------------------------------------------------------------------ -r54 | bertin | 2005-11-30 07:29:34 +0100 (Wed, 30 Nov 2005) | 3 lines +r4 | bertin | 2005-11-30 07:29:34 +0100 (Wed, 30 Nov 2005) | 3 lines Added preliminary support for FLAGS_WEIGHT. Null weights above detections are still missed. +------------------------------------------------------------------------ +r3 | bertin | 2005-10-19 20:12:37 +0200 (Wed, 19 Oct 2005) | 1 line + + +------------------------------------------------------------------------ +r2 | bertin | 2005-10-17 16:57:55 +0200 (Mon, 17 Oct 2005) | 1 line + +first SExtractor import -------------------------------- old ChangeLog -------------------------------- Who When Where(mostly) What diff --git a/HISTORY b/HISTORY index 3215264..e28aeed 100644 --- a/HISTORY +++ b/HISTORY @@ -1,30 +1,38 @@ -Dec 07: 2.7 +October 2010: 2.13 + - Adaptive CLASS_STAR + - Model-fitting. + - Licensing back to GPL + +December 2009: 2.10 + - Support for FLAGS_WEIGHT + +December 2007: 2.7 - FITS I/O and astrometry layers updated (same as SWarp and SCAMP) - - Support for model-fitting + - Early support for model-fitting -Jul 06: 2.5 +July 2006: 2.5 - Support for VOTable catalogs and metadata in output. -Aug 05: 2.4 +August 2005: 2.4 - New windowed measurement parameters - Better FITS compliancy of output files -May 03: 2.3 +May 2003: 2.3 - Autoconf'ed package. - Dumpable internal config file - Large File Support - Support for MEF files -Feb 01: 2.2 - - Mostly bug fixes and experimental stuff added +February 2001: 2.2 + - Mostly bug fixes and experimental stuff added (PSF-fitting) -May 99: 2.1 +May 1999: 2.1 - Mostly bug fixes and experimental stuff added -April 98: 2.0 +April 1998: 2.0 - New documentation -January 97 - March 98:1.2 +January 1997 - March 1998:1.2 - Rewriting of an important part of the software, in order to prepare the future... Further optimization of many functions: V1.2 is 30 to 500% faster than V1.0. @@ -47,12 +55,12 @@ January 97 - March 98:1.2 maps, with interpolation. - Real-time cross-identification with an ASCII catalog. -May 96: 1.1 "DeNIS" version (not distributed officially) +May 1996: 1.1 "DeNIS" version (not distributed officially) - Corrects 2 fatal bugs which sometimes appeared with DEC-Alphas - Incorporates a new extended FITS output format. - Added possibility to measure within multiple apertures. -May 95: Passed 1.0a version: -> FIRST OFFICIAL RELEASE!!! <- +May 1995: Passed 1.0a version: -> FIRST OFFICIAL RELEASE!!! <- - Now the NNW filename is correct in FITS catalog headers. - Corrected a convolution bug with large masks at the bottom of the frame. Added a better-than-nothing normalization of @@ -64,7 +72,7 @@ May 95: Passed 1.0a version: -> FIRST OFFICIAL RELEASE!!! <- right one! Replaced. - 2 new SExtools released: sexreduce and sexin. -Apr 95: FIRST 1.0 version: +Apr 1995: FIRST 1.0 version: - Neural-network based star/galaxy classifier implemented. NNW-file for Moffat-like PSFs in the optical, generated from simulations. - User's manual updated. @@ -75,19 +83,19 @@ Apr 95: FIRST 1.0 version: - 2 SExTools released: sexcat and sexcopy. - Alpha VMS version added (thanks to R. Johnstone). -Feb 95: 1.0 beta 5e version: +Feb 1995: 1.0 beta 5e version: - 2 bugs major corrected: background interpolation when very special convolution masks are used, and (fixed) aperture magnitude (improved to sub-pixel integration). - Possibility to change preference keywords from the command line. -Dec 94: 1.0 beta 5 version: +Dec 1994: 1.0 beta 5 version: - Major update! Too many changes to mention. - Code optimized and much more stable now. - New executables for IBM RS6000 and AMIGA added. - "II" dropped: call me simply "SExtractor" now. -Sep 94: 1.0 beta 4 version: +Sep 1994: 1.0 beta 4 version: - "clean" distribution with source and makefiles for DEC Alpha, HP/UX, and SUN workstations. - SATUR_LEVEL keyword added. @@ -100,18 +108,19 @@ Sep 94: 1.0 beta 4 version: procedures. -Jun 94: 1.0 beta 3 version: many bugs corrected thanks to enthousiastic +Jun 1994: 1.0 beta 3 version: many bugs corrected thanks to enthousiastic testers! First public release. -May 94: 1.0 beta 2 version: reads now all kinds of FITS data. C code +May 1994: 1.0 beta 2 version: reads now all kinds of FITS data. C code completely rewritten in ANSI; image bitmaps are now stored in floating-point. Now controlled through configuration files. User's manual written. -Feb 94: 1.0 beta 1 version of "Sextractor II", still limited to 16 bits FITS +Feb 1994: 1.0 beta 1 version of "Sextractor II", still limited to 16 bits FITS frames, but pipelined processing allows now frames with size up to 65534x65534 to be processable on most machines. -Mar 93: final version of "Sextractor I": limited to 16 bits 2048x2048 max. FITS +Mar 1993: final version of "Sextractor I": limited to 16 bits 2048x2048 max. FITS frames, specifically oriented toward Schmidt plate data processing. Has reduced more than 1.2e10 pixels within 10 months... + diff --git a/INSTALL b/INSTALL index 1ef7109..bff204e 100644 --- a/INSTALL +++ b/INSTALL @@ -14,17 +14,6 @@ The simplest way to compile this package is: 3. Type `make install' to install the programs and any data files and documentation. -Optional Features -================= -The executable is dynamically linked by default. If you have the necessary -static libraries installed, you might want to turn on static linking by typing - - ./configure --enable-static - -A statically-linked executable takes more disk and memory space; however it -runs generally faster and it will work on any similar system independently of -the libraries available. - Compilers and Options ===================== diff --git a/Makefile.am b/Makefile.am index c6d0d03..598f98f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,10 +1,38 @@ -# Main Makefile for SExtractor -# Copyright (C) 2002-2009 Emmanuel Bertin. +# +# Makefile.am +# +# Main Makefile. Process this file with automake to generate a Makefile +# +#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +# +# This file part of: SExtractor +# +# Copyright: (C) 2002-2010 IAP/CNRS/UPMC +# +# Author: Emmanuel Bertin (IAP) +# +# License: GNU General Public License +# +# SExtractor is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# SExtractor is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# You should have received a copy of the GNU General Public License +# along with SExtractor. If not, see . +# +# Last modified: 11/10/2010 +# +#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + AUTOMAKE_OPTIONS = foreign no-dependencies SUBDIRS = man src tests -dist_pkgdata_DATA = xsl/sextractor.xsl -EXTRA_DIST = config doc AUTHORS BUGS ChangeLog COPYRIGHT HISTORY \ - INSTALL README THANKS \ +dist_pkgdata_DATA = config/* xsl/sextractor.xsl +EXTRA_DIST = doc AUTHORS BUGS ChangeLog COPYRIGHT HISTORY \ + INSTALL LICENSE README THANKS \ acx_atlas.m4 acx_prog_cc_optim.m4 \ acx_urbi_resolve_dir.m4 RPM_ROOTDIR = `rpmbuild --nobuild -E %_topdir` diff --git a/Makefile.in b/Makefile.in index 980f309..b9cabfd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -14,6 +14,36 @@ @SET_MAKE@ +# +# Makefile.am +# +# Main Makefile. Process this file with automake to generate a Makefile +# +#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +# +# This file part of: SExtractor +# +# Copyright: (C) 2002-2010 IAP/CNRS/UPMC +# +# Author: Emmanuel Bertin (IAP) +# +# License: GNU General Public License +# +# SExtractor is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# SExtractor is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# You should have received a copy of the GNU General Public License +# along with SExtractor. If not, see . +# +# Last modified: 11/10/2010 +# +#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -213,14 +243,11 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ - -# Main Makefile for SExtractor -# Copyright (C) 2002-2009 Emmanuel Bertin. AUTOMAKE_OPTIONS = foreign no-dependencies SUBDIRS = man src tests -dist_pkgdata_DATA = xsl/sextractor.xsl -EXTRA_DIST = config doc AUTHORS BUGS ChangeLog COPYRIGHT HISTORY \ - INSTALL README THANKS \ +dist_pkgdata_DATA = config/* xsl/sextractor.xsl +EXTRA_DIST = doc AUTHORS BUGS ChangeLog COPYRIGHT HISTORY \ + INSTALL LICENSE README THANKS \ acx_atlas.m4 acx_prog_cc_optim.m4 \ acx_urbi_resolve_dir.m4 diff --git a/README b/README index a29a3bb..06f447e 100644 --- a/README +++ b/README @@ -1,18 +1,9 @@ SExtractor stands for ``Source Extractor'': a software for making catalog of sources from astronomical images. -Multi-Extension FITS is now supported. Binary output catalogs are also MEFs. -ASCII output catalogs contain detections from all extensions merged together. -Use the "EXT_NUMBER" catalog parameter to identify the extension on which a -given source was detected. Check-images will also be written as MEFs if the -input image is a MEF. -- The (main) default config file can be dumped by typing "sex -d". Secondary -configuration files like default.param are still needed, though. - -The SExtractor homepage is -http://astromatic.net/software/sextractor +The SExtractor homepage is http://astromatic.net/software/sextractor In case of problems, questions or suggestions related to the software, please refer to the SExtractor forum: -http://astromatic.net/forum/forumdisplay.php?fid=4 +http://astromatic.net/forum - Emmanuel Bertin. + Emmanuel Bertin . diff --git a/THANKS b/THANKS index 929178a..5bd10d7 100644 --- a/THANKS +++ b/THANKS @@ -1,38 +1,65 @@ -Stephane Arnouts +Stéphane Arnouts Suggestions and extensive testing +Marta Arroyo + For her preparatory work on galaxy model-fitting Pierre Astier Suggestions and bug fixes Eric Aubourg Hints about how to optimize a C code Anthony Baillard Testing of model-fitting +Gary Bernstein + Helping with error estimates Mark Calabretta - SExtractor makes use of his nice WCS library -Pascal Fouque + SExtractor uses an early version of his great WCS library +Philippe Delorme + Debugging and improving PSF-fitting +Akim Demaille + for solving the $datarootdir issue and providing the URBI_RESOLVE_DIR() + function. +Shantanu Desai + Finding well-hidden bugs. +Pascal Fouqué Suggestions and testing +Raphaël Gavazzi + Checking shape measurements Delphine Hardin Suggestions and bug fixes Benne Holwerda For making his cookbook available Jean-Paul Kneib , Ian Smail Suggestions and spreading the software back in the early days! +Jan Kohnert + Helping SExtractor users Ville Laurikari For his VL_PROG_CC_WARNINGS (modified to ACX_PROG_CC_OPTIM) -Valerie de Lapparent +Valérie de Lapparent Suggestions and testing of model-fitting +Manolis Lourakis + For his implementation of the Levenberg-Marquardt algorithm Chiara Marmo For providing the VOTable to HTML XSLT filter and testing. Joe Mohr Suggestions and testing -Gerard Tissier +Sergio Pascual + Helping with autoconfig and packaging +Nacho Sevilla + Testing star/galaxy classification +Víctor Terrón + Suggesting and documenting DETECT_MAXAREA +Patrick Tisserand + Testing PSF-fitting +Gérard Tissier Preliminary implementation of the VOTable output -Joachim Wuttke - For his implementation of the Levenberg-Marquardt algorithm Institut d'Astrophysique de Paris -University of Leiden +DeNIS project European Southern Observatory +Sterrewacht Leiden +TERAPIX project +French Ministry of Research Grant 04-5500 (“ACI masse de donn´ees”) University of Illinois +Dark Energy Survey data management project Financial and technical support Too many people to list diff --git a/acx_atlas.m4 b/acx_atlas.m4 index 5f12903..082301b 100644 --- a/acx_atlas.m4 +++ b/acx_atlas.m4 @@ -1,6 +1,36 @@ -dnl @synopsis ACX_ATLAS([ATLAS_LIBDIR, ATLAS_INCDIR, ATLAS_PFLAG, [ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]]) -dnl This macro figures out if the ATLAS library and header files -dnl are installed. +dnl +dnl acx_atlas.m4 +dnl +dnl Figure out if the ATLAS library and header files are installed. +dnl +dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +dnl +dnl This file part of: AstrOmatic software +dnl +dnl Copyright: (C) 2003-2010 IAP/CNRS/UPMC +dnl +dnl Author: Emmanuel Bertin (IAP) +dnl +dnl License: GNU General Public License +dnl +dnl AstrOmatic software is free software: you can redistribute it and/or +dnl modify it under the terms of the GNU General Public License as +dnl published by the Free Software Foundation, either version 3 of the +dnl License, or (at your option) any later version. +dnl AstrOmatic software is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl You should have received a copy of the GNU General Public License +dnl along with AstrOmatic software. +dnl If not, see . +dnl +dnl Last modified: 10/10/2010 +dnl +dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +dnl +dnl @synopsis ACX_ATLAS([ATLAS_LIBDIR, ATLAS_INCDIR, ATLAS_PFLAG, +dnl [ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]]) dnl You may wish to use these variables in your default LIBS: dnl dnl LIBS="$ATLAS_LIBS $LIBS" @@ -8,9 +38,6 @@ dnl dnl ACTION-IF-FOUND is a list of shell commands to run if BLAS/LAPACK dnl is found (HAVE_ATLAS is defined first), and ACTION-IF-NOT-FOUND dnl is a list of commands to run it if it is not found. -dnl -dnl @version $Id: acx_atlas.m4,v 1.0 2009/06/26 14:30:17 bertin Exp $ -dnl @author Emmanuel Bertin AC_DEFUN([ACX_ATLAS], [ AC_REQUIRE([AC_CANONICAL_HOST]) diff --git a/acx_fftw.m4 b/acx_fftw.m4 index 3d197b0..1458754 100644 --- a/acx_fftw.m4 +++ b/acx_fftw.m4 @@ -1,4 +1,36 @@ -dnl @synopsis ACX_FFTW([FFTW_DIR, FFTW_INCDIR, FFTW_PFLAG, FFTW_FFLAG, [ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]]) +dnl +dnl acx_fftw.m4 +dnl +dnl Figure out if the FFTW3 library and header files are installed. +dnl +dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +dnl +dnl This file part of: AstrOmatic software +dnl +dnl Copyright: (C) 2003-2010 IAP/CNRS/UPMC +dnl +dnl Author: Emmanuel Bertin (IAP) +dnl +dnl License: GNU General Public License +dnl +dnl AstrOmatic software is free software: you can redistribute it and/or +dnl modify it under the terms of the GNU General Public License as +dnl published by the Free Software Foundation, either version 3 of the +dnl License, or (at your option) any later version. +dnl AstrOmatic software is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl You should have received a copy of the GNU General Public License +dnl along with AstrOmatic software. +dnl If not, see . +dnl +dnl Last modified: 10/10/2010 +dnl +dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +dnl +dnl @synopsis ACX_FFTW([FFTW_DIR, FFTW_INCDIR, FFTW_PFLAG, FFTW_FFLAG, +dnl [ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]]) dnl This macro figures out if the FFTW3 libraries and header dnl files are installed. dnl You may wish to use these variables in your default LIBS and CFLAGS: @@ -8,9 +40,6 @@ dnl dnl ACTION-IF-FOUND is a list of shell commands to run if FFTW dnl is found (HAVE_FFTWx are defined first), and ACTION-IF-NOT-FOUND dnl is a list of commands to run it if it is not found. -dnl -dnl @version $Id: acx_fftw.m4,v 1.0 2009/06/26 21:30:17 bertin Exp $ -dnl @author Emmanuel Bertin AC_DEFUN([ACX_FFTW], [ AC_REQUIRE([AC_CANONICAL_HOST]) diff --git a/acx_prog_cc_optim.m4 b/acx_prog_cc_optim.m4 index a065dfb..4a94692 100644 --- a/acx_prog_cc_optim.m4 +++ b/acx_prog_cc_optim.m4 @@ -1,6 +1,38 @@ -dnl @synopsis ACX_PROG_CC_OPTIM dnl -dnl Enables a reasonable set of optimization flags for the C compiler. +dnl acx_prog_cc_optim.m4 +dnl +dnl Enable a reasonable set of optimization flags for the C compiler. +dnl +dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +dnl +dnl This file part of: AstrOmatic software +dnl +dnl Copyright: (C) 2002-2010 IAP/CNRS/UPMC (this version) +dnl (C) 2002 Ville Lauriki (original version) +dnl +dnl Authors: Emmanuel Bertin (IAP) +dnl Ville Lauriki (original VL_PROG_CC_WARNINGS) +dnl +dnl Licenses: GPL (this version) +dnl MIT AllPermissive (original script) +dnl +dnl AstrOmatic software is free software: you can redistribute it and/or +dnl modify it under the terms of the GNU General Public License as +dnl published by the Free Software Foundation, either version 3 of the +dnl License, or (at your option) any later version. +dnl AstrOmatic software is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl You should have received a copy of the GNU General Public License +dnl along with AstrOmatic software. +dnl If not, see . +dnl +dnl Last modified: 09/10/2010 +dnl +dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +dnl +dnl @synopsis ACX_PROG_CC_OPTIM dnl dnl Currently this macro knows about GCC, Solaris C compiler, dnl Digital Unix C compiler, C for AIX Compiler, HP-UX C compiler, @@ -8,9 +40,8 @@ dnl IRIX C compiler, NEC SX-5 (Super-UX 10) C compiler, and Cray J90 dnl (Unicos 10.0.0.8) C compiler. dnl dnl This macro is a modification of Ville Laurikari's VL_PROG_CC_WARNINGS -dnl @version 1.4 (2009-09-08) -dnl @authors Emmanuel Bertin Ville Laurikari dnl + AC_DEFUN([ACX_PROG_CC_OPTIM], [ msg="for C compiler optimization flags" AC_CACHE_CHECK($msg, prog_cc_optim_cv_flags, [ diff --git a/acx_urbi_resolve_dir.m4 b/acx_urbi_resolve_dir.m4 index cd8b1ea..92c0598 100644 --- a/acx_urbi_resolve_dir.m4 +++ b/acx_urbi_resolve_dir.m4 @@ -1,4 +1,40 @@ - +dnl +dnl acx_urbi_resolve_dir.m4 +dnl +dnl Enable a reasonable set of optimization flags for the C compiler. +dnl +dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +dnl +dnl This file part of: AstrOmatic software +dnl +dnl Copyright: (C) 2007-2010 IAP/CNRS/UPMC (this version) +dnl (C) 2007 Akim Demaille (original version) +dnl +dnl Authors: Emmanuel Bertin (IAP) +dnl Akim Demaille (original script) +dnl +dnl License: GPL +dnl +dnl AstrOmatic software is free software: you can redistribute it and/or +dnl modify it under the terms of the GNU General Public License as +dnl published by the Free Software Foundation, either version 3 of the +dnl License, or (at your option) any later version. +dnl AstrOmatic software is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl You should have received a copy of the GNU General Public License +dnl along with AstrOmatic software. +dnl If not, see . +dnl +dnl Last modified: 09/10/2010 +dnl +dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +dnl +dnl @synopsis ACX_URBI_RESOLVE_DIR +dnl +dnl Return a directory with all inner variables expanded. +dnl Based on a macro kindly provided by Akim Demaille . # URBI_RESOLVE_DIR_PREPARE # ------------------------ @@ -6,7 +42,7 @@ m4_defun([URBI_RESOLVE_DIR_PREPARE], [# PATH urbi_resolve_dir(DIR) # -------------------------- -# Return the DIR with all inner variables expanded. +# urbi_resolve_dir () { ac_$0_dir=$[]1 diff --git a/config/default.param b/config/default.param index 3dbb7f6..6d2d488 100644 --- a/config/default.param +++ b/config/default.param @@ -1,124 +1,400 @@ -NUMBER - -#FLUX_ISO -FLUXERR_ISO -#MAG_ISO -#MAGERR_ISO - -#FLUX_ISOCOR -#FLUXERR_ISOCOR -#MAG_ISOCOR -#MAGERR_ISOCOR - -#FLUX_APER(1) -#FLUXERR_APER(1) -#MAG_APER(1) -#MAGERR_APER(1) - -FLUX_AUTO -FLUXERR_AUTO -#MAG_AUTO -#MAGERR_AUTO - -#FLUX_BEST -#FLUXERR_BEST -#MAG_BEST -#MAGERR_BEST - -#KRON_RADIUS -#BACKGROUND - -#THRESHOLD -#MU_THRESHOLD -#FLUX_MAX -#MU_MAX -#ISOAREA_IMAGE -#ISOAREA_WORLD - -#XMIN_IMAGE -#YMIN_IMAGE -#XMAX_IMAGE -#YMAX_IMAGE - -X_IMAGE -Y_IMAGE -#X_WORLD -#Y_WORLD -#ALPHA_SKY -#DELTA_SKY -#ALPHA_J2000 -#DELTA_J2000 -#ALPHA_B1950 -#DELTA_B1950 - -#X2_IMAGE -#Y2_IMAGE -#XY_IMAGE -#X2_WORLD -#Y2_WORLD -#XY_WORLD - -#CXX_IMAGE -#CYY_IMAGE -#CXY_IMAGE -#CXX_WORLD -#CYY_WORLD -#CXY_WORLD - -#A_IMAGE -#B_IMAGE -#A_WORLD -#B_WORLD - -#THETA_IMAGE -#THETA_WORLD -#THETA_SKY -#THETA_J2000 -#THETA_B1950 - -#ELONGATION -#ELLIPTICITY - -#ERRX2_IMAGE -#ERRY2_IMAGE -#ERRXY_IMAGE -#ERRX2_WORLD -#ERRY2_WORLD -#ERRXY_WORLD - -#ERRCXX_IMAGE -#ERRCYY_IMAGE -#ERRCXY_IMAGE -#ERRCXX_WORLD -#ERRCYY_WORLD -#ERRCXY_WORLD - -#ERRA_IMAGE -#ERRB_IMAGE -#ERRA_WORLD -#ERRB_WORLD - -#ERRTHETA_IMAGE -#ERRTHETA_WORLD -#ERRTHETA_SKY -#ERRTHETA_J2000 -#ERRTHETA_B1950 - -#FWHM_IMAGE -#FWHM_WORLD - -#ISO0 -#ISO1 -#ISO2 -#ISO3 -#ISO4 -#ISO5 -#ISO6 -#ISO7 - -FLAGS -#IMAFLAGS_ISO(1) -#NIMAFLAGS_ISO(1) - -#CLASS_STAR -#VIGNET(5,5) +#NUMBER Running object number +#EXT_NUMBER FITS extension number +#FLUX_ISO Isophotal flux [count] +#FLUXERR_ISO RMS error for isophotal flux [count] +#MAG_ISO Isophotal magnitude [mag] +#MAGERR_ISO RMS error for isophotal magnitude [mag] +#FLUX_ISOCOR Corrected isophotal flux [count] +#FLUXERR_ISOCOR RMS error for corrected isophotal flux [count] +#MAG_ISOCOR Corrected isophotal magnitude [mag] +#MAGERR_ISOCOR RMS error for corrected isophotal magnitude [mag] +#FLUX_APER Flux vector within fixed circular aperture(s) [count] +#FLUXERR_APER RMS error vector for aperture flux(es) [count] +#MAG_APER Fixed aperture magnitude vector [mag] +#MAGERR_APER RMS error vector for fixed aperture mag. [mag] +#FLUX_AUTO Flux within a Kron-like elliptical aperture [count] +#FLUXERR_AUTO RMS error for AUTO flux [count] +#MAG_AUTO Kron-like elliptical aperture magnitude [mag] +#MAGERR_AUTO RMS error for AUTO magnitude [mag] +#FLUX_PETRO Flux within a Petrosian-like elliptical aperture [count] +#FLUXERR_PETRO RMS error for PETROsian flux [count] +#MAG_PETRO Petrosian-like elliptical aperture magnitude [mag] +#MAGERR_PETRO RMS error for PETROsian magnitude [mag] +#FLUX_BEST Best of FLUX_AUTO and FLUX_ISOCOR [count] +#FLUXERR_BEST RMS error for BEST flux [count] +#MAG_BEST Best of MAG_AUTO and MAG_ISOCOR [mag] +#MAGERR_BEST RMS error for MAG_BEST [mag] +#FLUX_WIN Gaussian-weighted flux [count] +#FLUXERR_WIN RMS error for WIN flux [count] +#MAG_WIN Gaussian-weighted magnitude [mag] +#MAGERR_WIN RMS error for MAG_WIN [mag] +#FLUX_SOMFIT Flux derived from SOM fit [count] +#FLUXERR_SOMFIT RMS error for SOMFIT flux [count] +#MAG_SOMFIT Magnitude derived from SOM fit [mag] +#MAGERR_SOMFIT Magnitude error derived from SOM fit [mag] +#ERROR_SOMFIT Reduced Chi-square error of the SOM fit +#VECTOR_SOMFIT Position vector of the winning SOM node +#KRON_RADIUS Kron apertures in units of A or B +#PETRO_RADIUS Petrosian apertures in units of A or B +#BACKGROUND Background at centroid position [count] +#THRESHOLD Detection threshold above background [count] +#FLUX_MAX Peak flux above background [count] +#ISOAREA_IMAGE Isophotal area above Analysis threshold [pixel**2] +#ISOAREAF_IMAGE Isophotal area (filtered) above Detection threshold [pixel**2] +#XMIN_IMAGE Minimum x-coordinate among detected pixels [pixel] +#YMIN_IMAGE Minimum y-coordinate among detected pixels [pixel] +#XMAX_IMAGE Maximum x-coordinate among detected pixels [pixel] +#YMAX_IMAGE Maximum y-coordinate among detected pixels [pixel] +#XPEAK_IMAGE x-coordinate of the brightest pixel [pixel] +#YPEAK_IMAGE y-coordinate of the brightest pixel [pixel] +#XPEAK_FOCAL Focal-plane x coordinate of the brightest pixel +#YPEAK_FOCAL Focal-plane y coordinate of the brightest pixel +#XPEAK_WORLD World-x coordinate of the brightest pixel [deg] +#YPEAK_WORLD World-y coordinate of the brightest pixel [deg] +#ALPHAPEAK_SKY Right ascension of brightest pix (native) [deg] +#DELTAPEAK_SKY Declination of brightest pix (native) [deg] +#ALPHAPEAK_J2000 Right ascension of brightest pix (J2000) [deg] +#DELTAPEAK_J2000 Declination of brightest pix (J2000) [deg] +#ALPHAPEAK_B1950 Right ascension of brightest pix (B1950) [deg] +#DELTAPEAK_B1950 Declination of brightest pix (B1950) [deg] +#X_IMAGE Object position along x [pixel] +#Y_IMAGE Object position along y [pixel] +#X_IMAGE_DBL Object position along x (double precision) [pixel] +#Y_IMAGE_DBL Object position along y (double precision) [pixel] +#X_FOCAL Barycenter position along focal-plane x axis +#Y_FOCAL Barycenter position along focal-plane y axis +#X_WORLD Barycenter position along world x axis [deg] +#Y_WORLD Barycenter position along world y axis [deg] +#X_MAMA Barycenter position along MAMA x axis [m**(-6)] +#Y_MAMA Barycenter position along MAMA y axis [m**(-6)] +#ALPHA_SKY Right ascension of barycenter (native) [deg] +#DELTA_SKY Declination of barycenter (native) [deg] +#ALPHA_J2000 Right ascension of barycenter (J2000) [deg] +#DELTA_J2000 Declination of barycenter (J2000) [deg] +#ALPHA_B1950 Right ascension of barycenter (B1950) [deg] +#DELTA_B1950 Declination of barycenter (B1950) [deg] +#X2_IMAGE Variance along x [pixel**2] +#Y2_IMAGE Variance along y [pixel**2] +#XY_IMAGE Covariance between x and y [pixel**2] +#X2_WORLD Variance along X-WORLD (alpha) [deg**2] +#Y2_WORLD Variance along Y-WORLD (delta) [deg**2] +#XY_WORLD Covariance between X-WORLD and Y-WORLD [deg**2] +#CXX_IMAGE Cxx object ellipse parameter [pixel**(-2)] +#CYY_IMAGE Cyy object ellipse parameter [pixel**(-2)] +#CXY_IMAGE Cxy object ellipse parameter [pixel**(-2)] +#CXX_WORLD Cxx object ellipse parameter (WORLD units) [deg**(-2)] +#CYY_WORLD Cyy object ellipse parameter (WORLD units) [deg**(-2)] +#CXY_WORLD Cxy object ellipse parameter (WORLD units) [deg**(-2)] +#A_IMAGE Profile RMS along major axis [pixel] +#B_IMAGE Profile RMS along minor axis [pixel] +#THETA_IMAGE Position angle (CCW/x) [deg] +#A_WORLD Profile RMS along major axis (world units) [deg] +#B_WORLD Profile RMS along minor axis (world units) [deg] +#THETA_WORLD Position angle (CCW/world-x) [deg] +#THETA_SKY Position angle (east of north) (native) [deg] +#THETA_J2000 Position angle (east of north) (J2000) [deg] +#THETA_B1950 Position angle (east of north) (B1950) [deg] +#ERRX2_IMAGE Variance of position along x [pixel**2] +#ERRY2_IMAGE Variance of position along y [pixel**2] +#ERRXY_IMAGE Covariance of position between x and y [pixel**2] +#ERRX2_WORLD Variance of position along X-WORLD (alpha) [deg**2] +#ERRY2_WORLD Variance of position along Y-WORLD (delta) [deg**2] +#ERRXY_WORLD Covariance of position X-WORLD/Y-WORLD [deg**2] +#ERRCXX_IMAGE Cxx error ellipse parameter [pixel**(-2)] +#ERRCYY_IMAGE Cyy error ellipse parameter [pixel**(-2)] +#ERRCXY_IMAGE Cxy error ellipse parameter [pixel**(-2)] +#ERRCXX_WORLD Cxx error ellipse parameter (WORLD units) [deg**(-2)] +#ERRCYY_WORLD Cyy error ellipse parameter (WORLD units) [deg**(-2)] +#ERRCXY_WORLD Cxy error ellipse parameter (WORLD units) [deg**(-2)] +#ERRA_IMAGE RMS position error along major axis [pixel] +#ERRB_IMAGE RMS position error along minor axis [pixel] +#ERRTHETA_IMAGE Error ellipse position angle (CCW/x) [deg] +#ERRA_WORLD World RMS position error along major axis [deg] +#ERRB_WORLD World RMS position error along minor axis [deg] +#ERRTHETA_WORLD Error ellipse pos. angle (CCW/world-x) [deg] +#ERRTHETA_SKY Native error ellipse pos. angle (east of north) [deg] +#ERRTHETA_J2000 J2000 error ellipse pos. angle (east of north) [deg] +#ERRTHETA_B1950 B1950 error ellipse pos. angle (east of north) [deg] +#XWIN_IMAGE Windowed position estimate along x [pixel] +#YWIN_IMAGE Windowed position estimate along y [pixel] +#XWIN_FOCAL Windowed position along focal-plane x axis +#YWIN_FOCAL Windowed position along focal-plane y axis +#XWIN_WORLD Windowed position along world x axis [deg] +#YWIN_WORLD Windowed position along world y axis [deg] +#ALPHAWIN_SKY Windowed right ascension (native) [deg] +#DELTAWIN_SKY Windowed declination (native) [deg] +#ALPHAWIN_J2000 Windowed right ascension (J2000) [deg] +#DELTAWIN_J2000 windowed declination (J2000) [deg] +#ALPHAWIN_B1950 Windowed right ascension (B1950) [deg] +#DELTAWIN_B1950 Windowed declination (B1950) [deg] +#X2WIN_IMAGE Windowed variance along x [pixel**2] +#Y2WIN_IMAGE Windowed variance along y [pixel**2] +#XYWIN_IMAGE Windowed covariance between x and y [pixel**2] +#X2WIN_WORLD Windowed variance along X-WORLD (alpha) [deg**2] +#Y2WIN_WORLD Windowed variance along Y-WORLD (delta) [deg**2] +#XYWIN_WORLD Windowed covariance between X-WORLD and Y-WORLD [deg**2] +#CXXWIN_IMAGE Windowed Cxx object ellipse parameter [pixel**(-2)] +#CYYWIN_IMAGE Windowed Cyy object ellipse parameter [pixel**(-2)] +#CXYWIN_IMAGE Windowed Cxy object ellipse parameter [pixel**(-2)] +#CXXWIN_WORLD Windowed Cxx object ellipse parameter (WORLD units) [deg**(-2)] +#CYYWIN_WORLD Windowed Cyy object ellipse parameter (WORLD units) [deg**(-2)] +#CXYWIN_WORLD Windowed Cxy object ellipse parameter (WORLD units) [deg**(-2)] +#AWIN_IMAGE Windowed profile RMS along major axis [pixel] +#BWIN_IMAGE Windowed profile RMS along minor axis [pixel] +#THETAWIN_IMAGE Windowed position angle (CCW/x) [deg] +#AWIN_WORLD Windowed profile RMS along major axis (world units) [deg] +#BWIN_WORLD Windowed profile RMS along minor axis (world units) [deg] +#THETAWIN_WORLD Windowed position angle (CCW/world-x) [deg] +#THETAWIN_SKY Windowed position angle (east of north) (native) [deg] +#THETAWIN_J2000 Windowed position angle (east of north) (J2000) [deg] +#THETAWIN_B1950 Windowed position angle (east of north) (B1950) [deg] +#ERRX2WIN_IMAGE Variance of windowed pos along x [pixel**2] +#ERRY2WIN_IMAGE Variance of windowed pos along y [pixel**2] +#ERRXYWIN_IMAGE Covariance of windowed pos between x and y [pixel**2] +#ERRX2WIN_WORLD Variance of windowed pos along X-WORLD (alpha) [deg**2] +#ERRY2WIN_WORLD Variance of windowed pos along Y-WORLD (delta) [deg**2] +#ERRXYWIN_WORLD Covariance of windowed pos X-WORLD/Y-WORLD [deg**2] +#ERRCXXWIN_IMAGE Cxx windowed error ellipse parameter [pixel**(-2)] +#ERRCYYWIN_IMAGE Cyy windowed error ellipse parameter [pixel**(-2)] +#ERRCXYWIN_IMAGE Cxy windowed error ellipse parameter [pixel**(-2)] +#ERRCXXWIN_WORLD Cxx windowed error ellipse parameter (WORLD units) [deg**(-2)] +#ERRCYYWIN_WORLD Cyy windowed error ellipse parameter (WORLD units) [deg**(-2)] +#ERRCXYWIN_WORLD Cxy windowed error ellipse parameter (WORLD units) [deg**(-2)] +#ERRAWIN_IMAGE RMS windowed pos error along major axis [pixel] +#ERRBWIN_IMAGE RMS windowed pos error along minor axis [pixel] +#ERRTHETAWIN_IMAGE Windowed error ellipse pos angle (CCW/x) [deg] +#ERRAWIN_WORLD World RMS windowed pos error along major axis [deg] +#ERRBWIN_WORLD World RMS windowed pos error along minor axis [deg] +#ERRTHETAWIN_WORLD Windowed error ellipse pos. angle (CCW/world-x) [deg] +#ERRTHETAWIN_SKY Native windowed error ellipse pos. angle (east of north) [deg] +#ERRTHETAWIN_J2000 J2000 windowed error ellipse pos. angle (east of north) [deg] +#ERRTHETAWIN_B1950 B1950 windowed error ellipse pos. angle (east of north) [deg] +#NITER_WIN Number of iterations for WIN centering +#MU_THRESHOLD Detection threshold above background [mag * arcsec**(-2)] +#MU_MAX Peak surface brightness above background [mag * arcsec**(-2)] +#ISOAREA_WORLD Isophotal area above Analysis threshold [deg**2] +#ISOAREAF_WORLD Isophotal area (filtered) above Detection threshold [deg**2] +#ISO0 Isophotal area at level 0 [pixel**2] +#ISO1 Isophotal area at level 1 [pixel**2] +#ISO2 Isophotal area at level 2 [pixel**2] +#ISO3 Isophotal area at level 3 [pixel**2] +#ISO4 Isophotal area at level 4 [pixel**2] +#ISO5 Isophotal area at level 5 [pixel**2] +#ISO6 Isophotal area at level 6 [pixel**2] +#ISO7 Isophotal area at level 7 [pixel**2] +#FLAGS Extraction flags +#FLAGS_WEIGHT Weighted extraction flags +#FLAGS_WIN Flags for WINdowed parameters +#IMAFLAGS_ISO FLAG-image flags OR'ed over the iso. profile +#NIMAFLAGS_ISO Number of flagged pixels entering IMAFLAGS_ISO +#NLOWWEIGHT_ISO Nb of pixels with low weight over the iso. profile +#NLOWDWEIGHT_ISO Nb of pixels with low det. weight over the iso. profile +#FWHM_IMAGE FWHM assuming a gaussian core [pixel] +#FWHM_WORLD FWHM assuming a gaussian core [deg] +#ELONGATION A_IMAGE/B_IMAGE +#ELLIPTICITY 1 - B_IMAGE/A_IMAGE +#POLAR_IMAGE (A_IMAGE^2 - B_IMAGE^2)/(A_IMAGE^2 + B_IMAGE^2) +#POLAR_WORLD (A_WORLD^2 - B_WORLD^2)/(A_WORLD^2 + B_WORLD^2) +#POLARWIN_IMAGE (AWIN^2 - BWIN^2)/(AWIN^2 + BWIN^2) +#POLARWIN_WORLD (AWIN^2 - BWIN^2)/(AWIN^2 + BWIN^2) +#CLASS_STAR S/G classifier output +#VIGNET Pixel data around detection [count] +#VIGNET_SHIFT Pixel data around detection, corrected for shift [count] +#VECTOR_ASSOC ASSOCiated parameter vector +#NUMBER_ASSOC Number of ASSOCiated IDs +#THRESHOLDMAX Maximum threshold possible for detection [count] +#FLUX_GROWTH Cumulated growth-curve [count] +#FLUX_GROWTHSTEP Step for growth-curves [pixel] +#MAG_GROWTH Cumulated magnitude growth-curve [mag] +#MAG_GROWTHSTEP Step for growth-curves [pixel] +#FLUX_RADIUS Fraction-of-light radii [pixel] +#XPSF_IMAGE X coordinate from PSF-fitting [pixel] +#YPSF_IMAGE Y coordinate from PSF-fitting [pixel] +#XPSF_WORLD PSF position along world x axis [deg] +#YPSF_WORLD PSF position along world y axis [deg] +#ALPHAPSF_SKY Right ascension of the fitted PSF (native) [deg] +#DELTAPSF_SKY Declination of the fitted PSF (native) [deg] +#ALPHAPSF_J2000 Right ascension of the fitted PSF (J2000) [deg] +#DELTAPSF_J2000 Declination of the fitted PSF (J2000) [deg] +#ALPHAPSF_B1950 Right ascension of the fitted PSF (B1950) [deg] +#DELTAPSF_B1950 Declination of the fitted PSF (B1950) [deg] +#FLUX_PSF Flux from PSF-fitting [count] +#FLUXERR_PSF RMS flux error for PSF-fitting [count] +#MAG_PSF Magnitude from PSF-fitting [mag] +#MAGERR_PSF RMS magnitude error from PSF-fitting [mag] +#NITER_PSF Number of iterations for PSF-fitting +#CHI2_PSF Reduced chi2 from PSF-fitting +#ERRX2PSF_IMAGE Variance of PSF position along x [pixel**2] +#ERRY2PSF_IMAGE Variance of PSF position along y [pixel**2] +#ERRXYPSF_IMAGE Covariance of PSF position between x and y [pixel**2] +#ERRX2PSF_WORLD Variance of PSF position along X-WORLD (alpha) [deg**2] +#ERRY2PSF_WORLD Variance of PSF position along Y-WORLD (delta) [deg**2] +#ERRXYPSF_WORLD Covariance of PSF position X-WORLD/Y-WORLD [deg**2] +#ERRCXXPSF_IMAGE Cxx PSF error ellipse parameter [pixel**(-2)] +#ERRCYYPSF_IMAGE Cyy PSF error ellipse parameter [pixel**(-2)] +#ERRCXYPSF_IMAGE Cxy PSF error ellipse parameter [pixel**(-2)] +#ERRCXXPSF_WORLD Cxx PSF error ellipse parameter (WORLD units) [deg**(-2)] +#ERRCYYPSF_WORLD Cyy PSF error ellipse parameter (WORLD units) [deg**(-2)] +#ERRCXYPSF_WORLD Cxy PSF error ellipse parameter (WORLD units) [deg**(-2)] +#ERRAPSF_IMAGE PSF RMS position error along major axis [pixel] +#ERRBPSF_IMAGE PSF RMS position error along minor axis [pixel] +#ERRTHETAPSF_IMAGE PSF error ellipse position angle (CCW/x) [deg] +#ERRAPSF_WORLD World PSF RMS position error along major axis [pixel] +#ERRBPSF_WORLD World PSF RMS position error along minor axis [pixel] +#ERRTHETAPSF_WORLD PSF error ellipse pos. angle (CCW/world-x) [deg] +#ERRTHETAPSF_SKY Native PSF error ellipse pos. angle (east of north) [deg] +#ERRTHETAPSF_J2000 J2000 PSF error ellipse pos. angle (east of north) [deg] +#ERRTHETAPSF_B1950 B1950 PSF error ellipse pos. angle (east of north) [deg] +#DURATION_ANALYSIS Duration of analysis for this source [s] +#VECTOR_MODEL Model-fitting coefficients +#VECTOR_MODELERR Model-fitting coefficient uncertainties +#MATRIX_MODELERR Model-fitting covariance matrix +#CHI2_MODEL Reduced Chi2 of the fit +#FLAGS_MODEL Model-fitting flags +#NITER_MODEL Number of iterations for model-fitting +#FLUX_MODEL Flux from model-fitting [count] +#FLUXERR_MODEL RMS error on model-fitting flux [count] +#MAG_MODEL Magnitude from model-fitting [mag] +#MAGERR_MODEL RMS error on model-fitting magnitude [mag] +#FLUX_MAX_MODEL Peak model flux above background [count] +#FLUX_EFF_MODEL Effective model flux above background [count] +#FLUX_MEAN_MODEL Mean effective model flux above background [count] +#MU_MAX_MODEL Peak model surface brightness above background [mag * arcsec**(-2)] +#MU_EFF_MODEL Effective model surface brightness above background [mag * arcsec**(-2)] +#MU_MEAN_MODEL Mean effective model surface brightness above background [mag * arcsec**(-2)] +#XMODEL_IMAGE X coordinate from model-fitting [pixel] +#YMODEL_IMAGE Y coordinate from model-fitting [pixel] +#XFOCAL_WORLD Fitted position along focal-plane x axis +#YFOCAL_WORLD Fitted position along focal-plane y axis +#XMODEL_WORLD Fitted position along world x axis [deg] +#YMODEL_WORLD Fitted position along world y axis [deg] +#ALPHAMODEL_SKY Fitted position along right ascension (native) [deg] +#DELTAMODEL_SKY Fitted position along declination (native) [deg] +#ALPHAMODEL_J2000 Fitted position along right ascension (J2000) [deg] +#DELTAMODEL_J2000 Fitted position along declination (J2000) [deg] +#ALPHAMODEL_B1950 Fitted position along right ascension (B1950) [deg] +#DELTAMODEL_B1950 Fitted position along declination (B1950) [deg] +#ERRX2MODEL_IMAGE Variance of fitted position along x [pixel**2] +#ERRY2MODEL_IMAGE Variance of fitted position along y [pixel**2] +#ERRXYMODEL_IMAGE Covariance of fitted position between x and y [pixel**2] +#ERRX2MODEL_WORLD Variance of fitted position along X-WORLD (alpha) [deg**2] +#ERRY2MODEL_WORLD Variance of fitted position along Y-WORLD (delta) [deg**2] +#ERRXYMODEL_WORLD Covariance of fitted position X-WORLD/Y-WORLD [deg**2] +#ERRCXXMODEL_IMAGE Cxx error ellipse parameter of fitted position [pixel**(-2)] +#ERRCYYMODEL_IMAGE Cyy error ellipse parameter of fitted position [pixel**(-2)] +#ERRCXYMODEL_IMAGE Cxy error ellipse parameter of fitted position [pixel**(-2)] +#ERRCXXMODEL_WORLD Cxx fitted error ellipse parameter (WORLD units) [deg**(-2)] +#ERRCYYMODEL_WORLD Cyy fitted error ellipse parameter (WORLD units) [deg**(-2)] +#ERRCXYMODEL_WORLD Cxy fitted error ellipse parameter (WORLD units) [deg**(-2)] +#ERRAMODEL_IMAGE RMS error of fitted position along major axis [pixel] +#ERRBMODEL_IMAGE RMS error of fitted position along minor axis [pixel] +#ERRTHETAMODEL_IMAGE Error ellipse pos.angle of fitted position (CCW/x) [deg] +#ERRAMODEL_WORLD World RMS error of fitted position along major axis [deg] +#ERRBMODEL_WORLD World RMS error of fitted position along minor axis [deg] +#ERRTHETAMODEL_WORLD Error ellipse pos.angle of fitted position (CCW/world-x) [deg] +#ERRTHETAMODEL_SKY Native fitted error ellipse pos. angle (east of north) [deg] +#ERRTHETAMODEL_J2000 J2000 fitted error ellipse pos. angle (east of north) [deg] +#ERRTHETAMODEL_B1950 B1950 fitted error ellipse pos. angle (east of north) [deg] +#X2MODEL_IMAGE Variance along x from model-fitting [pixel**2] +#Y2MODEL_IMAGE Variance along y from model-fitting [pixel**2] +#XYMODEL_IMAGE Covariance between x and y from model-fitting [pixel**2] +#ELLIP1MODEL_IMAGE Ellipticity component from model-fitting +#ELLIP2MODEL_IMAGE Ellipticity component from model-fitting +#POLAR1MODEL_IMAGE Ellipticity component (quadratic) from model-fitting +#POLAR2MODEL_IMAGE Ellipticity component (quadratic) from model-fitting +#ELLIP1ERRMODEL_IMAGE Ellipticity component std.error from model-fitting +#ELLIP2ERRMODEL_IMAGE Ellipticity component std.error from model-fitting +#ELLIPCORRMODEL_IMAGE Corr.coeff between ellip.components from model-fitting +#POLAR1ERRMODEL_IMAGE Polarisation component std.error from model-fitting +#POLAR2ERRMODEL_IMAGE Polarisation component std.error from model-fitting +#POLARCORRMODEL_IMAGE Corr.coeff between polar. components from fitting +#X2MODEL_WORLD Variance along X-WORLD (alpha) from model-fitting [deg**2] +#Y2MODEL_WORLD Variance along Y_WORLD (delta) from model-fitting [deg**2] +#XYMODEL_WORLD Covariance between X-WORLD and Y-WORLD from model-fitting [deg**2] +#ELLIP1MODEL_WORLD Ellipticity component from model-fitting +#ELLIP2MODEL_WORLD Ellipticity component from model-fitting +#POLAR1MODEL_WORLD Polarisation component from model-fitting +#POLAR2MODEL_WORLD Polarisation component from model-fitting +#ELLIP1ERRMODEL_WORLD Ellipticity component std.error from model-fitting +#ELLIP2ERRMODEL_WORLD Ellipticity component std.error from model-fitting +#ELLIPCORRMODEL_WORLD Corr.coeff between ellip.components from model-fitting +#POLAR1ERRMODEL_WORLD Polarisation component std.error from model-fitting +#POLAR2ERRMODEL_WORLD Polarisation component std.error from model-fitting +#POLARCORRMODEL_WORLD Corr.coeff between polar. components from fitting +#CXXMODEL_IMAGE Cxx ellipse parameter from model-fitting [pixel**(-2)] +#CYYMODEL_IMAGE Cyy ellipse parameter from model-fittinh [pixel**(-2)] +#CXYMODEL_IMAGE Cxy ellipse parameter from model-fitting [pixel**(-2)] +#CXXMODEL_WORLD Cxx ellipse parameter (WORLD) from model-fitting [deg**(-2)] +#CYYMODEL_WORLD Cyy ellipse parameter (WORLD) from model-fitting [deg**(-2)] +#CXYMODEL_WORLD Cxy ellipse parameter (WORLD) from model-fitting [deg**(-2)] +#AMODEL_IMAGE Model RMS along major axis [pixel] +#BMODEL_IMAGE Model RMS along minor axis [pixel] +#THETAMODEL_IMAGE Model position angle (CCW/x) [deg] +#AMODEL_WORLD Model RMS along major axis (WORLD units) [deg] +#BMODEL_WORLD Model RMS along minor axis (WORLD units) [deg] +#THETAMODEL_WORLD Model position angle (CCW/WORLD-x) [deg] +#THETAMODEL_SKY Model position angle (east of north) (native) [deg] +#THETAMODEL_J2000 Model position angle (east of north) (J2000) [deg] +#THETAMODEL_B1950 Model position angle (east of north) (B1950) [deg] +#SPREAD_MODEL Spread parameter from model-fitting +#SPREADERR_MODEL Spread parameter error from model-fitting +#FLUX_BACKOFFSET Background offset from fitting [count] +#FLUXERR_BACKOFFSET RMS error on fitted background offset [count] +#FLUX_POINTSOURCE Point source flux from fitting [count] +#FLUXERR_POINTSOURCE RMS error on fitted point source total flux [count] +#MAG_POINTSOURCE Point source total magnitude from fitting [mag] +#MAGERR_POINTSOURCE RMS error on fitted point source total magnitude [mag] +#FLUX_SPHEROID Spheroid total flux from fitting [count] +#FLUXERR_SPHEROID RMS error on fitted spheroid total flux [count] +#MAG_SPHEROID Spheroid total magnitude from fitting [mag] +#MAGERR_SPHEROID RMS error on fitted spheroid total magnitude [mag] +#FLUX_MAX_SPHEROID Peak spheroid flux above background [count] +#FLUX_EFF_SPHEROID Effective spheroid flux above background [count] +#FLUX_MEAN_SPHEROID Mean effective spheroid flux above background [count] +#MU_MAX_SPHEROID Peak spheroid surface brightness above background [mag * arcsec**(-2)] +#MU_EFF_SPHEROID Effective spheroid surface brightness above background [mag * arcsec**(-2)] +#MU_MEAN_SPHEROID Mean effective spheroid surface brightness above backgrou [mag * arcsec**(-2)] +#SPHEROID_REFF_IMAGE Spheroid effective radius from fitting [pixel] +#SPHEROID_REFFERR_IMAGE RMS error on fitted spheroid effective radius [pixel] +#SPHEROID_REFF_WORLD Spheroid effective radius from fitting [deg] +#SPHEROID_REFFERR_WORLD RMS error on fitted spheroid effective radius [deg] +#SPHEROID_ASPECT_IMAGE Spheroid aspect ratio from fitting +#SPHEROID_ASPECTERR_IMAGE RMS error on fitted spheroid aspect ratio +#SPHEROID_ASPECT_WORLD Spheroid aspect ratio from fitting +#SPHEROID_ASPECTERR_WORLD RMS error on fitted spheroid aspect ratio +#SPHEROID_THETA_IMAGE Spheroid position angle (CCW/x) from fitting [deg] +#SPHEROID_THETAERR_IMAGE RMS error on spheroid position angle [deg] +#SPHEROID_THETA_WORLD Spheroid position angle (CCW/world-x) [deg] +#SPHEROID_THETAERR_WORLD RMS error on spheroid position angle [deg] +#SPHEROID_THETA_SKY Spheroid position angle (east of north, native) [deg] +#SPHEROID_THETA_J2000 Spheroid position angle (east of north, J2000) [deg] +#SPHEROID_THETA_B1950 Spheroid position angle (east of north, B1950) [deg] +#SPHEROID_SERSICN Spheroid Sersic index from fitting +#SPHEROID_SERSICNERR RMS error on fitted spheroid Sersic index +#FLUX_DISK Disk total flux from fitting [count] +#FLUXERR_DISK RMS error on fitted disk total flux [count] +#MAG_DISK Disk total magnitude from fitting [mag] +#MAGERR_DISK RMS error on fitted disk total magnitude [mag] +#FLUX_MAX_DISK Peak disk flux above background [count] +#FLUX_EFF_DISK Effective disk flux above background [count] +#FLUX_MEAN_DISK Mean effective disk flux above background [count] +#MU_MAX_DISK Peak disk surface brightness above background [mag * arcsec**(-2)] +#MU_EFF_DISK Effective disk surface brightness above background [mag * arcsec**(-2)] +#MU_MEAN_DISK Mean effective disk surface brightness above background [mag * arcsec**(-2)] +#DISK_SCALE_IMAGE Disk scalelength from fitting [pixel] +#DISK_SCALEERR_IMAGE RMS error on fitted disk scalelength [pixel] +#DISK_SCALE_WORLD Disk scalelength from fitting (world coords) [deg] +#DISK_SCALEERR_WORLD RMS error on fitted disk scalelength (world coords) [deg] +#DISK_ASPECT_IMAGE Disk aspect ratio from fitting +#DISK_ASPECTERR_IMAGE RMS error on fitted disk aspect ratio +#DISK_ASPECT_WORLD Disk aspect ratio from fitting +#DISK_ASPECTERR_WORLD RMS error on disk aspect ratio +#DISK_INCLINATION Disk inclination from fitting [deg] +#DISK_INCLINATIONERR RMS error on disk inclination from fitting [deg] +#DISK_THETA_IMAGE Disk position angle (CCW/x) from fitting [deg] +#DISK_THETAERR_IMAGE RMS error on fitted disk position angle [deg] +#DISK_THETA_WORLD Disk position angle (CCW/world-x) [deg] +#DISK_THETAERR_WORLD RMS error on disk position angle [deg] +#DISK_THETA_SKY Disk position angle (east of north, native) [deg] +#DISK_THETA_J2000 Disk position angle (east of north, J2000) [deg] +#DISK_THETA_B1950 Disk position angle (east of north, B1950) [deg] diff --git a/config/default.sex b/config/default.sex index e88fe53..bd5abfa 100644 --- a/config/default.sex +++ b/config/default.sex @@ -1,5 +1,5 @@ -# Default configuration file for SExtractor 2.5.0 -# EB 2006-07-14 +# Default configuration file for SExtractor 2.12.4 +# EB 2010-10-10 # #-------------------------------- Catalog ------------------------------------ @@ -12,7 +12,8 @@ PARAMETERS_NAME default.param # name of the file containing catalog contents #------------------------------- Extraction ---------------------------------- DETECT_TYPE CCD # CCD (linear) or PHOTO (with gamma correction) -DETECT_MINAREA 5 # minimum number of pixels above threshold +DETECT_MINAREA 3 # min. # of pixels above threshold + DETECT_THRESH 1.5 # or , in mag.arcsec-2 ANALYSIS_THRESH 1.5 # or , in mag.arcsec-2 @@ -25,21 +26,34 @@ DEBLEND_MINCONT 0.005 # Minimum contrast parameter for deblending CLEAN Y # Clean spurious detections? (Y or N)? CLEAN_PARAM 1.0 # Cleaning efficiency -MASK_TYPE CORRECT # type of detection MASKing: can be one of - # NONE, BLANK or CORRECT - +#-------------------------------- WEIGHTing ---------------------------------- + +WEIGHT_TYPE NONE # type of WEIGHTing: NONE, BACKGROUND, + # MAP_RMS, MAP_VAR or MAP_WEIGHT +WEIGHT_IMAGE weight.fits # weight-map filename + +#-------------------------------- FLAGging ----------------------------------- + +FLAG_IMAGE flag.fits # filename for an input FLAG-image +FLAG_TYPE OR # flag pixel combination: OR, AND, MIN, MAX + # or MOST + #------------------------------ Photometry ----------------------------------- PHOT_APERTURES 5 # MAG_APER aperture diameter(s) in pixels PHOT_AUTOPARAMS 2.5, 3.5 # MAG_AUTO parameters: , PHOT_PETROPARAMS 2.0, 3.5 # MAG_PETRO parameters: , # - +PHOT_AUTOAPERS 0.0,0.0 # , minimum apertures + # for MAG_AUTO and MAG_PETRO + SATUR_LEVEL 50000.0 # level (in ADUs) at which arises saturation +SATUR_KEY SATURATE # keyword for saturation level (in ADUs) MAG_ZEROPOINT 0.0 # magnitude zero-point MAG_GAMMA 4.0 # gamma of emulsion (for photographic scans) GAIN 0.0 # detector gain in e-/ADU +GAIN_KEY GAIN # keyword for detector gain in e-/ADU PIXEL_SCALE 1.0 # size of pixel in arcsec (0=use FITS WCS info) #------------------------- Star/Galaxy Separation ---------------------------- @@ -49,11 +63,11 @@ STARNNW_NAME default.nnw # Neural-Network_Weight table filename #------------------------------ Background ----------------------------------- +BACK_TYPE AUTO # AUTO or MANUAL +BACK_VALUE 0.0 # Default background value in MANUAL mode BACK_SIZE 64 # Background mesh: or , BACK_FILTERSIZE 3 # Background filter: or , -BACKPHOTO_TYPE GLOBAL # can be GLOBAL or LOCAL - #------------------------------ Check Image ---------------------------------- CHECKIMAGE_TYPE NONE # can be NONE, BACKGROUND, BACKGROUND_RMS, @@ -68,8 +82,22 @@ MEMORY_OBJSTACK 3000 # number of objects in stack MEMORY_PIXSTACK 300000 # number of pixels in stack MEMORY_BUFSIZE 1024 # number of lines in buffer +#------------------------------- ASSOCiation --------------------------------- + +ASSOC_NAME sky.list # name of the ASCII file to ASSOCiate +ASSOC_DATA 2,3,4 # columns of the data to replicate (0=all) +ASSOC_PARAMS 2,3,4 # columns of xpos,ypos[,mag] +ASSOC_RADIUS 2.0 # cross-matching radius (pixels) +ASSOC_TYPE NEAREST # ASSOCiation method: FIRST, NEAREST, MEAN, + # MAG_MEAN, SUM, MAG_SUM, MIN or MAX +ASSOCSELEC_TYPE MATCHED # ASSOC selection type: ALL, MATCHED or -MATCHED + #----------------------------- Miscellaneous --------------------------------- VERBOSE_TYPE NORMAL # can be QUIET, NORMAL or FULL +HEADER_SUFFIX .head # Filename extension for additional headers WRITE_XML N # Write XML file (Y/N)? XML_NAME sex.xml # Filename for XML output +XSL_URL file:///usr/local/share/sextractor/sextractor.xsl + # Filename for XSL style-sheet + diff --git a/configure b/configure index 9612d1f..235c1ae 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for sextractor 2.12.3. +# Generated by GNU Autoconf 2.63 for sextractor 2.13.0. # # Report bugs to . # @@ -750,8 +750,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='sextractor' PACKAGE_TARNAME='sextractor' -PACKAGE_VERSION='2.12.3' -PACKAGE_STRING='sextractor 2.12.3' +PACKAGE_VERSION='2.13.0' +PACKAGE_STRING='sextractor 2.13.0' PACKAGE_BUGREPORT='bertin@iap.fr' ac_unique_file="src/makeit.c" @@ -1508,7 +1508,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures sextractor 2.12.3 to adapt to many kinds of systems. +\`configure' configures sextractor 2.13.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1578,7 +1578,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sextractor 2.12.3:";; + short | recursive ) echo "Configuration of sextractor 2.13.0:";; esac cat <<\_ACEOF @@ -1711,7 +1711,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sextractor configure 2.12.3 +sextractor configure 2.13.0 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1725,7 +1725,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by sextractor $as_me 2.12.3, which was +It was created by sextractor $as_me 2.13.0, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2428,7 +2428,7 @@ fi # Define the identity of the package. PACKAGE='sextractor' - VERSION='2.12.3' + VERSION='2.13.0' cat >>confdefs.h <<_ACEOF @@ -23273,7 +23273,7 @@ fi # Set the data directory to a true absolute path datadir2=$(# PATH urbi_resolve_dir(DIR) # -------------------------- -# Return the DIR with all inner variables expanded. +# urbi_resolve_dir () { ac_URBI_RESOLVE_DIR_PREPARE_dir=$1 @@ -28593,7 +28593,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by sextractor $as_me 2.12.3, which was +This file was extended by sextractor $as_me 2.13.0, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -28656,7 +28656,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -sextractor config.status 2.12.3 +sextractor config.status 2.13.0 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index bd4440d..ce46644 100644 --- a/configure.ac +++ b/configure.ac @@ -1,12 +1,37 @@ -# configure.in for SExtractor -# (C) E.Bertin 2002-2010 -# Process this file with autoconf to produce a configure script. +# +# configure.ac +# +# Process this file with autoconf to generate a configure script. +# +#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +# +# This file part of: SExtractor +# +# Copyright: (C) 2002-2010 IAP/CNRS/UPMC +# +# Author: Emmanuel Bertin (IAP) +# +# SExtractor is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# SExtractor is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# You should have received a copy of the GNU General Public License +# along with SExtractor. If not, see . +# +# Last modified: 11/10/2010 +# +#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + # First, disable the annoying config.cache define([AC_CACHE_LOAD],) define([AC_CACHE_SAVE],) # This is your standard Bertin source code... -AC_INIT(sextractor, 2.12.3, [bertin@iap.fr]) +AC_INIT(sextractor, 2.13.0, [bertin@iap.fr]) AC_CONFIG_SRCDIR(src/makeit.c) AC_CONFIG_AUX_DIR(autoconf) AM_CONFIG_HEADER(config.h) diff --git a/doc/README.DOC b/doc/README.DOC index a267b12..c395ad2 100644 --- a/doc/README.DOC +++ b/doc/README.DOC @@ -1,10 +1,5 @@ -The present documentation of SExtractor2 is still very incomplete: this +The present documentation of SExtractor is still very incomplete: this is rather a ``proto-documentation''. Chapters are missing. The english -is so-so. At least I tried to remove any obsolete information from V1.0. -I will progressively upgrade the documentation during the coming months. -In the meanwhile, you may still retrieve some basic information from the -old documentation included in V1.0 archive: -ftp://ftp/pub/from_users/bertin/sextractor/sex_1.0a.tar.gz -The SExtractor handbook from Benne Holwerda is also included for convenience. +is so-so. We will progressively upgrade the documentation during 2011. Emmanuel Bertin. diff --git a/man/sex.1 b/man/sex.1 index f22ac63..6a5b5da 100644 --- a/man/sex.1 +++ b/man/sex.1 @@ -1,6 +1,6 @@ -.TH SEXTRACTOR "1" "September 2010" "SWarp 2.12.3" "User Commands" +.TH SEXTRACTOR "1" "October 2010" "SExtractor 2.13.0" "User Commands" .SH NAME -sex \- extract a source catalog from an astronomical FITS image +sex \- extract a source catalogue from an astronomical FITS image .SH SYNOPSIS .B sex \fIimage\fR [\fI-c configuration-file\fR] .RS @@ -29,19 +29,26 @@ print version number, then exit .TP \fB\-d\fR, \fB\-\-dump\fR dump a default configuration file -.SH AUTHOR -Written by Emmanuel Bertin (Institut d'Astrophysique de Paris and Observatoire de Paris). -.PP -Copyright 1994-2005 Emmanuel Bertin -.RE -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -.SH "REPORTING BUGS" -Report bugs to . -.SH "SEE ALSO" -.BR swarp (1) -.PP +.SH MANUAL The full documentation for .B SExtractor is maintained as a PDF manual available at .B http://astromatic.net/software/sextractor +.SH "REPORTING BUGS" +Please report bugs to the SExtractor software forum at +http://astromatic.net/forum. +.SH "SEE ALSO" +.BR +eye(1), missfits(1), psfex(1), scamp(1), sky(1), stiff(1), stuff(1), swarp (1), +ww(1) +.SH AUTHORS +Written by Emmanuel Bertin (Institut d'Astrophysique de Paris) +.PP +.SH LICENSE +SExtractor is licensed under the terms of the General Public License (GPL), +version 3. +.SH COPYRIGHT +.PP +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + diff --git a/man/sex.1.in b/man/sex.1.in index c63631b..d0f7208 100644 --- a/man/sex.1.in +++ b/man/sex.1.in @@ -1,6 +1,6 @@ -.TH SEXTRACTOR "1" "@DATE3@" "SWarp @PACKAGE_VERSION@" "User Commands" +.TH SEXTRACTOR "1" "@DATE3@" "SExtractor @PACKAGE_VERSION@" "User Commands" .SH NAME -sex \- extract a source catalog from an astronomical FITS image +sex \- extract a source catalogue from an astronomical FITS image .SH SYNOPSIS .B sex \fIimage\fR [\fI-c configuration-file\fR] .RS @@ -29,19 +29,26 @@ print version number, then exit .TP \fB\-d\fR, \fB\-\-dump\fR dump a default configuration file -.SH AUTHOR -Written by Emmanuel Bertin (Institut d'Astrophysique de Paris and Observatoire de Paris). -.PP -Copyright 1994-2005 Emmanuel Bertin -.RE -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -.SH "REPORTING BUGS" -Report bugs to . -.SH "SEE ALSO" -.BR swarp (1) -.PP +.SH MANUAL The full documentation for .B SExtractor is maintained as a PDF manual available at .B http://astromatic.net/software/sextractor +.SH "REPORTING BUGS" +Please report bugs to the SExtractor software forum at +http://astromatic.net/forum. +.SH "SEE ALSO" +.BR +eye(1), missfits(1), psfex(1), scamp(1), sky(1), stiff(1), stuff(1), swarp (1), +ww(1) +.SH AUTHORS +Written by Emmanuel Bertin (Institut d'Astrophysique de Paris) +.PP +.SH LICENSE +SExtractor is licensed under the terms of the General Public License (GPL), +version 3. +.SH COPYRIGHT +.PP +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + diff --git a/sextractor.spec.in b/sextractor.spec.in index cf854b6..236db0f 100644 --- a/sextractor.spec.in +++ b/sextractor.spec.in @@ -1,3 +1,33 @@ +# +# sextractor.spec.in +# +# Process this file with autoconf to generate an RPM .spec packaging script. +# +#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +# +# This file part of: SExtractor +# +# Copyright: (C) 2002-2010 IAP/CNRS/UPMC +# +# Author: Emmanuel Bertin (IAP) +# +# License: GNU General Public License +# +# SExtractor is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# SExtractor is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# You should have received a copy of the GNU General Public License +# along with SExtractor. If not, see . +# +# Last modified: 10/10/2010 +# +#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %define name @PACKAGE_NAME@ %define version @PACKAGE_VERSION@ %define release 1 @@ -8,8 +38,8 @@ Name: %{name} Version: %{version} Release: %{release} Source0: ftp://ftp.iap.fr/pub/from_users/bertin/sextractor/%{name}-%{version}.tar.gz -URL: http://astromatic.iap.fr/software/%{name} -License: CeCILL +URL: http://astromatic.net/software/%{name} +License: GPL v3+ Group: Sciences/Astronomy BuildRoot: %{_tmppath}/%{name}-buildroot BuildRequires: pkgconfig @@ -41,7 +71,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%doc AUTHORS BUGS ChangeLog COPYRIGHT HISTORY INSTALL README THANKS doc/README.DOC doc/sextractor.pdf +%doc AUTHORS BUGS ChangeLog COPYRIGHT HISTORY INSTALL LICENSE README THANKS doc/README.DOC doc/sextractor.pdf %{_bindir}/sex %{_bindir}/ldactoasc %{_mandir}/man1/sex.1* diff --git a/src/Makefile.am b/src/Makefile.am index cca7317..d875271 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,33 @@ -# Program Makefile for SEx -# Copyright (C) 2004-2010 Emmanuel Bertin. +# +# Makefile.am +# +# src Makefile.am. Process this file with automake to generate a Makefile +# +#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +# +# This file part of: SExtractor +# +# Copyright: (C) 2002-2010 IAP/CNRS/UPMC +# +# Author: Emmanuel Bertin (IAP) +# +# License: GNU General Public License +# +# SExtractor is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# SExtractor is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# You should have received a copy of the GNU General Public License +# along with SExtractor. If not, see . +# +# Last modified: 11/10/2010 +# +#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + if USE_MODEL FFTSOURCE = fft.c PATTERNSOURCE = pattern.c diff --git a/src/Makefile.in b/src/Makefile.in index 1aad71b..9b0a6d2 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -14,6 +14,36 @@ @SET_MAKE@ +# +# Makefile.am +# +# src Makefile.am. Process this file with automake to generate a Makefile +# +#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +# +# This file part of: SExtractor +# +# Copyright: (C) 2002-2010 IAP/CNRS/UPMC +# +# Author: Emmanuel Bertin (IAP) +# +# License: GNU General Public License +# +# SExtractor is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# SExtractor is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# You should have received a copy of the GNU General Public License +# along with SExtractor. If not, see . +# +# Last modified: 11/10/2010 +# +#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -234,9 +264,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ - -# Program Makefile for SEx -# Copyright (C) 2004-2010 Emmanuel Bertin. @USE_MODEL_TRUE@FFTSOURCE = fft.c @USE_MODEL_TRUE@PATTERNSOURCE = pattern.c @USE_MODEL_TRUE@PROFITSOURCE = profit.c diff --git a/src/analyse.c b/src/analyse.c index 54b20b5..17e18da 100644 --- a/src/analyse.c +++ b/src/analyse.c @@ -1,18 +1,34 @@ - /* - analyse.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* analyse.c * -* Part of: SExtractor +* Do measurements on detections. * -* Author: E.BERTIN (IAP) +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: analyse(), endobject()...: measurements on detections. +* This file part of: SExtractor * -* Last modify: 28/09/2010 +* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC +* (C) 1994,1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" @@ -232,7 +248,7 @@ void examineiso(picstruct *field, picstruct *dfield, objstruct *obj, } } else - hmedian(heap, minarea); + fqmedian(heap, minarea); h--; } } diff --git a/src/assoc.c b/src/assoc.c index 488dc7d..eca2ac5 100644 --- a/src/assoc.c +++ b/src/assoc.c @@ -1,18 +1,33 @@ - /* - assoc.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* assoc.c * -* Part of: SExtractor +* Associate catalogues. * -* Author: E.BERTIN (IAP) +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: Routines for catalog-associations. +* This file part of: SExtractor * -* Last modify: 26/11/2003 +* Copyright: (C) 1998-2010 IAP/CNRS/UPMC +* (C) 1997 ESO * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/assoc.h b/src/assoc.h index 86abac4..fc51365 100644 --- a/src/assoc.h +++ b/src/assoc.h @@ -1,19 +1,33 @@ - /* - assoc.h - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* assoc.h * -* Part of: SExtractor +* Include file for assoc.c. * -* Author: E.BERTIN, IAP & Leiden observatory +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: Include file for assoc.c. +* This file part of: SExtractor * -* Last modify: 14/10/2007 +* Copyright: (C) 1998-2010 IAP/CNRS/UPMC +* (C) 1997 ESO * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ - +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #define ASSOC_BUFINC 131072 /* Assoc buffer increment (bytes) */ diff --git a/src/astrom.c b/src/astrom.c index 2f9593e..afda18f 100644 --- a/src/astrom.c +++ b/src/astrom.c @@ -1,18 +1,34 @@ - /* - astrom.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* astrom.c * -* Part of: SExtractor +* High level astrometric computations. * -* Author: E.BERTIN (IAP) +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: Astrometrical computations. +* This file part of: SExtractor * -* Last modify: 20/08/2010 +* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC +* (C) 1994,1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" @@ -916,7 +932,7 @@ void astrom_profshapeparam(picstruct *field, objstruct *obj) obj2->prof_spheroid_refferr/obj2->prof_spheroid_reff *obj2->prof_spheroid_reffw : 0.0; - obj2->prof_spheroid_aspectw = obj2->prof_spheroid_reffw>0.0? + obj2->prof_spheroid_aspectw = (obj2->prof_spheroid_reffw>0.0 && pm2>temp)? sqrt(pm2-temp) / obj2->prof_spheroid_reffw : obj2->prof_spheroid_aspect; obj2->prof_spheroid_aspecterrw = obj2->prof_spheroid_aspect > 0.0? @@ -968,7 +984,7 @@ void astrom_profshapeparam(picstruct *field, objstruct *obj) obj2->prof_disk_scaleerrw = obj2->prof_disk_scale > 0.0? obj2->prof_disk_scaleerr/obj2->prof_disk_scale*obj2->prof_disk_scalew : 0.0; - obj2->prof_disk_aspectw = obj2->prof_disk_scalew>0.0? + obj2->prof_disk_aspectw = (obj2->prof_disk_scalew>0.0 && pm2>temp)? sqrt(pm2-temp) / obj2->prof_disk_scalew : obj2->prof_disk_aspect; obj2->prof_disk_aspecterrw = obj2->prof_disk_aspect > 0.0? diff --git a/src/astrom.h b/src/astrom.h index c189f09..82ddbae 100644 --- a/src/astrom.h +++ b/src/astrom.h @@ -1,18 +1,34 @@ - /* - astrom.h - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* astrom.h +* +* Include file for astrom.c. +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: SExtractor +* +* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC +* (C) 1994,1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -* Part of: SExtractor +* Author: Emmanuel Bertin (IAP) * -* Author: E.BERTIN, IAP & Leiden observatory +* License: GNU General Public License * -* Contents: Astrometrical stuff. +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . * -* Last modify: 15/12/2009 +* Last modified: 11/10/2010 * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifndef _FITSWCS_H_ #include "fitswcs.h" diff --git a/src/back.c b/src/back.c index cac7adb..05b5841 100644 --- a/src/back.c +++ b/src/back.c @@ -1,18 +1,34 @@ - /* - back.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* back.c * -* Part of: SExtractor +* Functions dealing with the image background. * -* Author: E.BERTIN (IAP) +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: functions dealing with background computation. +* This file part of: SExtractor * -* Last modify: 27/10/2008 +* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC +* (C) 1994,1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" @@ -296,10 +312,10 @@ void makeback(picstruct *field, picstruct *wfield) *(ratiop++) = sratio; nr++; } - wfield->sigfac = hmedian(ratio, nr); + wfield->sigfac = fqmedian(ratio, nr); for (i=0; isigfac = hmedian(ratio+i, nr-i); + wfield->sigfac = fqmedian(ratio+i, nr-i); else { warning("Null or negative global weighting factor:","defaulted to 1"); @@ -753,10 +769,10 @@ void filterback(picstruct *field) smask[i++] = sigma[x+y]; } } - if (fabs((med=hmedian(bmask, i))-back[px+py])>=fthresh) + if (fabs((med=fqmedian(bmask, i))-back[px+py])>=fthresh) { back2[px+py] = med; - sigma2[px+py] = hmedian(smask, i); + sigma2[px+py] = fqmedian(smask, i); } else { @@ -769,17 +785,17 @@ void filterback(picstruct *field) free(bmask); free(smask); memcpy(back, back2, np*sizeof(float)); - field->backmean = hmedian(back2, np); + field->backmean = fqmedian(back2, np); free(back2); memcpy(sigma, sigma2, np*sizeof(float)); - field->backsig = hmedian(sigma2, np); + field->backsig = fqmedian(sigma2, np); if (field->backsig<=0.0) { sigmat = sigma2+np; for (i=np; i-- && *(--sigmat)>0.0;); if (i>=0 && i<(np-1)) - field->backsig = hmedian(sigmat+1, np-1-i); + field->backsig = fqmedian(sigmat+1, np-1-i); else { if (field->flags&(DETECT_FIELD|MEASURE_FIELD)) diff --git a/src/back.h b/src/back.h index 5b58036..bc36b31 100644 --- a/src/back.h +++ b/src/back.h @@ -1,18 +1,34 @@ - /* - back.h - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* back.h * -* Part of: SExtractor +* Include file for back.c. * -* Author: E.BERTIN (IAP) +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: functions dealing with background computation. +* This file part of: SExtractor * -* Last modify: 02/05/99 +* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC +* (C) 1994,1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ /*----------------------------- Internal constants --------------------------*/ #define BACK_BUFSIZE 1048576 /* bkgnd buffer */ diff --git a/src/bpro.c b/src/bpro.c index 0323e0d..40e1356 100644 --- a/src/bpro.c +++ b/src/bpro.c @@ -1,21 +1,34 @@ /* - bpro.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* bpro.c * -* Part of: Any back-propagation-ANN-oriented software +* Manage backpropagation neural networks. * -* Author: E.BERTIN (IAP) +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: Routines for BP-neural network management ("read-only" -* mode). +* This file part of: SExtractor * -* Requirements: The LDACTools. +* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC +* (C) 1994,1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -* Last modify: 13/12/2002 +* Author: Emmanuel Bertin (IAP) * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* License: GNU General Public License +* +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/bpro.h b/src/bpro.h index 685fc74..17864c5 100644 --- a/src/bpro.h +++ b/src/bpro.h @@ -1,24 +1,37 @@ /* - bpro.h - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* bpro.h +* +* Include file for bpro.c. +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: SExtractor * -* Part of: Any back-propagation-ANN-oriented software +* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC +* (C) 1994,1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -* Author: E.BERTIN, IAP/LDAC +* Author: Emmanuel Bertin (IAP) * -* Contents: Routines for BP-neural network management ("read-only" -* mode). +* License: GNU General Public License * -* Requirements: The LDACTools. +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . * -* Last modify: 08/10/96 +* Last modified: 11/10/2010 * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ /*------------------------------- definitions -------------------------------*/ -#define SIGMOID(u) ((u)<15.0?((u)>-15.0?1/(1+exp(-(u))):0.0):1.0) +#define SIGMOID(u) ((u)<15.0?((u)>-15.0?1/(1+expf(-(u))):0.0):1.0) /* In-line activation function */ /*---------------------------------- types ----------------------------------*/ diff --git a/src/catout.c b/src/catout.c index 8100727..e0726c4 100644 --- a/src/catout.c +++ b/src/catout.c @@ -1,18 +1,35 @@ /* - catout.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* catout.c * -* Part of: SExtractor +* Functions related to catalogue output. * -* Author: E.BERTIN (IAP) +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: functions for output of catalog data. +* This file part of: SExtractor * -* Last modify: 20/08/2010 +* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC +* (C) 1994,1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -218,6 +235,7 @@ void updateparamflags() FLAG(obj2.fluxerr_prof) |= FLAG(obj2.magerr_prof) | FLAG(obj2.prof_concentrationerr); FLAG(obj2.flux_prof) |= FLAG(obj2.mag_prof) | FLAG(obj2.fluxerr_prof); + FLAG(obj2.prof_dirac_mag) |= FLAG(obj2.prof_dirac_magerr); FLAG(obj2.prof_spheroid_mag) |= FLAG(obj2.prof_spheroid_magerr); FLAG(obj2.prof_spheroid_reff) |= FLAG(obj2.prof_spheroid_refferr); FLAG(obj2.prof_spheroid_aspect) |= FLAG(obj2.prof_spheroid_aspecterr); @@ -384,6 +402,9 @@ void updateparamflags() | FLAG(obj2.prof_spheroid_theta) | FLAG(obj2.prof_spheroid_sersicn) | FLAG(obj2.prof_spheroid_peak); + FLAG(obj2.prof_dirac_flux) |= FLAG(obj2.prof_dirac_fluxerr) + | FLAG(obj2.prof_dirac_mag); + FLAG(obj2.prof_offset_flux) |= FLAG(obj2.prof_offset_fluxerr); prefs.prof_flag |= FLAG(obj2.prof_chi2) | FLAG(obj2.prof_niter) | FLAG(obj2.prof_vector) | FLAG(obj2.prof_errvector) | FLAG(obj2.prof_errmatrix) @@ -393,12 +414,16 @@ void updateparamflags() | FLAG(obj2.prof_mx2) | FLAG(obj2.peak_prof) | FLAG(obj2.prof_disk_flux) - | FLAG(obj2.prof_spheroid_flux); + | FLAG(obj2.prof_spheroid_flux) + | FLAG(obj2.prof_dirac_flux) + | FLAG(obj2.prof_offset_flux); /* If only global parameters are requested, fit a Sersic model */ if (prefs.prof_flag && !(FLAG(obj2.prof_spheroid_flux) - | FLAG(obj2.prof_disk_flux))) + | FLAG(obj2.prof_disk_flux) + | FLAG(obj2.prof_dirac_flux) + | FLAG(obj2.prof_offset_flux))) { FLAG(obj2.prof_spheroid_flux) |= prefs.prof_flag; FLAG(obj2.prof_spheroid_sersicn) |= prefs.prof_flag; diff --git a/src/check.c b/src/check.c index 9f49e04..659c521 100644 --- a/src/check.c +++ b/src/check.c @@ -1,18 +1,34 @@ /* - check.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* check.c * -* Part of: SExtractor +* Manage "check-images". * -* Author: E.BERTIN (IAP) +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: handling of "check-images". +* This file part of: SExtractor * -* Last modify: 23/03/2010 +* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC +* (C) 1994,1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/check.h b/src/check.h index e2c61aa..61198a5 100644 --- a/src/check.h +++ b/src/check.h @@ -1,18 +1,34 @@ /* - check.h - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* check.h +* +* Include file for check.c. +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: SExtractor +* +* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC +* (C) 1994,1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -* Part of: SExtractor +* Author: Emmanuel Bertin (IAP) * -* Author: E.BERTIN, IAP/Leiden +* License: GNU General Public License * -* Contents: handling of "check-images". +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . * -* Last modify: 18/09/2008 +* Last modified: 11/10/2010 * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ /*--------------------------------- structures ------------------------------*/ /* Check-image parameters */ diff --git a/src/clean.c b/src/clean.c index 4d0dbce..8950d74 100644 --- a/src/clean.c +++ b/src/clean.c @@ -1,19 +1,34 @@ - /* - clean.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* clean.c * -* Part of: SExtractor +* Remove spurious detections from the catalogue. * -* Author: E.BERTIN (IAP) +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: functions that remove spurious detections from the -* catalog +* This file part of: SExtractor * -* Last modify: 20/06/2007 +* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC +* (C) 1994,1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/clean.h b/src/clean.h index 2a234c6..31395d7 100644 --- a/src/clean.h +++ b/src/clean.h @@ -1,19 +1,34 @@ - /* - clean.h - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* clean.h +* +* Include file for clean.c. +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: SExtractor +* +* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC +* (C) 1994,1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -* Part of: SExtractor +* Author: Emmanuel Bertin (IAP) * -* Author: E.BERTIN, IAP & Leiden observatory & ESO +* License: GNU General Public License * -* Contents: functions that remove spurious detections from the -* catalog +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . * -* Last modify: 06/04/99 +* Last modified: 11/10/2010 * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ /*------------------------------ definitions --------------------------------*/ diff --git a/src/define.h b/src/define.h index a62fb56..ba2506a 100644 --- a/src/define.h +++ b/src/define.h @@ -1,18 +1,34 @@ - /* - define.h - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* define.h * -* Part of: SExtractor +* Global definitions * -* Author: E.BERTIN (IAP) +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: global definitions. +* This file part of: SExtractor * -* Last modify: 12/10/2009 +* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC +* (C) 1994,1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ /* Check if we are using a configure script here */ #ifndef HAVE_CONFIG_H @@ -26,7 +42,11 @@ #define BANNER "SExtractor" #define MYVERSION VERSION #define EXECUTABLE "sex" -#define COPYRIGHT "Emmanuel BERTIN " +#define COPYRIGHT "1993-2010 IAP/CNRS/UPMC" +#define DISCLAIMER BANNER " comes with ABSOLUTELY NO WARRANTY\n" \ + "You may redistribute copies of " BANNER "\n" \ + "under the terms of the GNU General Public License." +#define AUTHORS "Emmanuel BERTIN " #define WEBSITE "http://astromatic.net/software/sextractor" #define INSTITUTE "IAP http://www.iap.fr" diff --git a/src/extract.c b/src/extract.c index c3e2f4a..c9afe70 100644 --- a/src/extract.c +++ b/src/extract.c @@ -1,19 +1,34 @@ - /* - extract.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* extract.c * -* Part of: SExtractor +* Extract connected pixels from an image raster. * -* Author: E.BERTIN (IAP) +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: functions for extraction of connected pixels from -* a bitmap. +* This file part of: SExtractor * -* Last modify: 26/11/2003 +* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC +* (C) 1994,1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/extract.h b/src/extract.h index a167e60..4af4ce1 100644 --- a/src/extract.h +++ b/src/extract.h @@ -1,19 +1,34 @@ - /* - extract.h - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* extract.h +* +* Include file for extract.c. +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: SExtractor +* +* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC +* (C) 1994,1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -* Part of: SExtractor +* Author: Emmanuel Bertin (IAP) * -* Author: E.BERTIN (IAP, Leiden observatory & ESO) +* License: GNU General Public License * -* Contents: functions for extraction of connected pixels from -* a bitmap. +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . * -* Last modify: 29/11/2005 +* Last modified: 11/10/2010 * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ /*------------------------------ definitions --------------------------------*/ diff --git a/src/fft.c b/src/fft.c index 169a7e9..3eeb194 100644 --- a/src/fft.c +++ b/src/fft.c @@ -1,18 +1,32 @@ /* - fft.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* fft.c +* +* Single precision FFT functions. +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: SExtractor +* +* Copyright: (C) 2007-2010 IAP/CNRS/UPMC * -* Part of: A program that uses FFTs +* Author: Emmanuel Bertin (IAP) * -* Author: E.BERTIN (IAP) +* License: GNU General Public License * -* Contents: Routines dealing with float precision FFT. +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . * -* Last modify: 01/12/2009 +* Last modified: 11/10/2010 * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/fft.h b/src/fft.h index 32da621..7f304a1 100644 --- a/src/fft.h +++ b/src/fft.h @@ -1,18 +1,32 @@ - /* - fft.h - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* fft.h +* +* Include file for fft.c. +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: SExtractor +* +* Copyright: (C) 2007-2010 IAP/CNRS/UPMC * -* Part of: A program that uses FFTs +* Author: Emmanuel Bertin (IAP) * -* Author: E.BERTIN (IAP) +* License: GNU General Public License * -* Contents: Include for fft.c. +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . * -* Last modify: 08/10/2009 +* Last modified: 11/10/2010 * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifndef _FITSCAT_H_ #include "fits/fitscat.h" diff --git a/src/field.c b/src/field.c index c87b3cc..6569347 100644 --- a/src/field.c +++ b/src/field.c @@ -1,18 +1,34 @@ - /* - field.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* field.c * -* Part of: SExtractor +* Handle field (image) structures. * -* Author: E.BERTIN (IAP) +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: Handling of field structures. +* This file part of: SExtractor * -* Last modify: 05/02/2010 +* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC +* (C) 1994,1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/field.h b/src/field.h index c396514..05ad1d0 100644 --- a/src/field.h +++ b/src/field.h @@ -1,18 +1,34 @@ - /* - field.h - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* field.h +* +* Include file for field.c. +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: SExtractor +* +* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC +* (C) 1994,1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -* Part of: SExtractor +* Author: Emmanuel Bertin (IAP) * -* Author: E.BERTIN (IAP, Leiden observatory & ESO) +* License: GNU General Public License * -* Contents: Handling of field structures. +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . * -* Last modify: 22/03/98 +* Last modified: 11/10/2010 * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ /*------------------------------ field flags -------------------------------*/ #define DETECT_FIELD 0x01 /* Detection */ diff --git a/src/filter.c b/src/filter.c index 277606e..5bbc48c 100644 --- a/src/filter.c +++ b/src/filter.c @@ -1,19 +1,35 @@ - /* - filter.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* filter.c * -* Part of: SExtractor +* +* Filter image rasters (for detection). * -* Author: E.BERTIN (IAP) +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: functions dealing with on-line filtering of the image -* (for detection). +* This file part of: SExtractor * -* Last modify: 01/10/2009 +* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC +* (C) 1994,1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/filter.h b/src/filter.h index 500084e..0d1d95d 100644 --- a/src/filter.h +++ b/src/filter.h @@ -1,19 +1,34 @@ - /* - filter.h - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* filter.h +* +* Include file for filter.c. +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: SExtractor +* +* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC +* (C) 1994,1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -* Part of: SExtractor +* Author: Emmanuel Bertin (IAP) * -* Author: E.BERTIN, IAP/Leiden +* License: GNU General Public License * -* Contents: functions dealing with on-line filtering of the image -* (for detection). +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . * -* Last modify: 01/10/2009 +* Last modified: 11/10/2010 * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ /*------------------------------- definitions -------------------------------*/ diff --git a/src/fits/Makefile.am b/src/fits/Makefile.am index ff9ef26..bd11865 100644 --- a/src/fits/Makefile.am +++ b/src/fits/Makefile.am @@ -1,5 +1,34 @@ -# Program Makefile for the FITScat library -# Copyright (C) 2002 Emmanuel Bertin. +# +# Makefile.am +# +# Process this file with automake to generate a Makefile +# +#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +# +# This file part of: AstrOmatic FITS/LDAC library +# +# Copyright: (C) 2002-2010 IAP/CNRS/UPMC +# +# Author: Emmanuel Bertin (IAP) +# +# License: GNU General Public License +# +# AstrOmatic software is free software: you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# AstrOmatic software is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# You should have received a copy of the GNU General Public License +# along with AstrOmatic software. +# If not, see . +# +# Last modified: 09/10/2010 +# +#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + noinst_LIBRARIES = libfits.a libfits_a_SOURCES = fitsbody.c fitscat.c fitscheck.c fitscleanup.c \ fitsconv.c fitshead.c fitskey.c fitsmisc.c \ diff --git a/src/fits/Makefile.in b/src/fits/Makefile.in index 2250dde..50e4adb 100644 --- a/src/fits/Makefile.in +++ b/src/fits/Makefile.in @@ -14,6 +14,37 @@ @SET_MAKE@ +# +# Makefile.am +# +# Process this file with automake to generate a Makefile +# +#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +# +# This file part of: AstrOmatic FITS/LDAC library +# +# Copyright: (C) 2002-2010 IAP/CNRS/UPMC +# +# Author: Emmanuel Bertin (IAP) +# +# License: GNU General Public License +# +# AstrOmatic software is free software: you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# AstrOmatic software is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# You should have received a copy of the GNU General Public License +# along with AstrOmatic software. +# If not, see . +# +# Last modified: 09/10/2010 +# +#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -196,9 +227,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ - -# Program Makefile for the FITScat library -# Copyright (C) 2002 Emmanuel Bertin. noinst_LIBRARIES = libfits.a libfits_a_SOURCES = fitsbody.c fitscat.c fitscheck.c fitscleanup.c \ fitsconv.c fitshead.c fitskey.c fitsmisc.c \ diff --git a/src/fits/fitsbody.c b/src/fits/fitsbody.c index e25e5c9..e610637 100644 --- a/src/fits/fitsbody.c +++ b/src/fits/fitsbody.c @@ -1,18 +1,35 @@ /* - fitsbody.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* fitsbody.c +* +* Handle memory allocation for FITS bodies. +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: AstrOmatic FITS/LDAC library * -* Part of: The LDAC Tools +* Copyright: (C) 1998-2010 IAP/CNRS/UPMC +* (C) 1997 European Southern Observatory +* (C) 1995,1996 Sterrewacht Leiden * -* Author: E.BERTIN (IAP) +* Author: Emmanuel Bertin (IAP) * -* Contents: Handle memory allocation for FITS bodies. +* License: GNU General Public License * -* Last modify: 19/11/2009 +* AstrOmatic software is free software: you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation, either version 3 of the +* License, or (at your option) any later version. +* AstrOmatic software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with AstrOmatic software. +* If not, see . * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* Last modified: 09/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" @@ -191,7 +208,7 @@ INPUT A pointer to the tab structure, OUTPUT -. NOTES . AUTHOR E. Bertin (IAP) -VERSION 19/11/2009 +VERSION 24/08/2010 ***/ void read_body(tabstruct *tab, PIXTYPE *ptr, size_t size) { @@ -202,8 +219,10 @@ void read_body(tabstruct *tab, PIXTYPE *ptr, size_t size) cval, cblank; unsigned short suval, sublank; short val16, sval, sblank; +#ifdef HAVE_LONG_LONG_INT ULONGLONG lluval, llublank; LONGLONG llval, llblank; +#endif unsigned int iuval, iublank; int curval, dval, blankflag, ival, iblank; diff --git a/src/fits/fitscat.c b/src/fits/fitscat.c index a619349..04b9202 100644 --- a/src/fits/fitscat.c +++ b/src/fits/fitscat.c @@ -1,18 +1,35 @@ /* - fitscat.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* fitscat.c * -* Part of: The LDAC Tools +* Low-level functions for handling FITS images and tables. * -* Author: E.BERTIN (IAP) +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: low-level functions for handling LDAC FITS catalogs. +* This file part of: AstrOmatic FITS/LDAC library * -* Last modify: 25/09/2004 +* Copyright: (C) 1998-2010 IAP/CNRS/UPMC +* (C) 1997 European Southern Observatory +* (C) 1995,1996 Sterrewacht Leiden * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* AstrOmatic software is free software: you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation, either version 3 of the +* License, or (at your option) any later version. +* AstrOmatic software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with AstrOmatic software. +* If not, see . +* +* Last modified: 09/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" @@ -161,7 +178,7 @@ INPUT Pointer to a catalog structure, OUTPUT -. NOTES Unallocated pointers should have been put to NULL. AUTHOR E. Bertin (IAP & Leiden observatory) -VERSION 05/06/2001 +VERSION 05/12/2009 ***/ void free_cat(catstruct **cat, int ncat) @@ -175,10 +192,10 @@ void free_cat(catstruct **cat, int ncat) { if ((*thecat)->file) close_cat(*thecat); - remove_tabs(*(thecat++)); + remove_tabs(*thecat); + free(*(thecat++)); } - free(*cat); return; } diff --git a/src/fits/fitscat.h b/src/fits/fitscat.h index d461b52..4bf32a2 100644 --- a/src/fits/fitscat.h +++ b/src/fits/fitscat.h @@ -1,18 +1,35 @@ /* - fitscat.h - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* fitscat.h +* +* Main include file for the LDACTools FITS library. +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: AstrOmatic FITS/LDAC library +* +* Copyright: (C) 1998-2010 IAP/CNRS/UPMC +* (C) 1997 European Southern Observatory +* (C) 1995,1996 Sterrewacht Leiden * -* Part of: The LDAC Tools +* Author: Emmanuel Bertin (IAP) * -* Author: E.BERTIN, DeNIS/LDAC +* License: GNU General Public License * -* Contents: Simplified version of the LDACTools: main include file +* AstrOmatic software is free software: you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation, either version 3 of the +* License, or (at your option) any later version. +* AstrOmatic software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with AstrOmatic software. +* If not, see . * -* Last modify: 02/11/2009 +* Last modified: 09/10/2010 * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifndef _FITSCAT_H_ #define _FITSCAT_H_ diff --git a/src/fits/fitscat_defs.h b/src/fits/fitscat_defs.h index 0d02717..0e416cd 100644 --- a/src/fits/fitscat_defs.h +++ b/src/fits/fitscat_defs.h @@ -1,18 +1,35 @@ /* - fitscat_defs.h - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* fitscat_defs.h * -* Part of: The LDAC Tools +* Internal definitions for the LDACTools FITS library. * -* Author: E.BERTIN, DeNIS/LDAC +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: Simplified version of the LDACTools: internal defs +* This file part of: AstrOmatic FITS/LDAC library * -* Last modify: 26/09/2006 +* Copyright: (C) 1998-2010 IAP/CNRS/UPMC +* (C) 1997 European Southern Observatory +* (C) 1995,1996 Sterrewacht Leiden * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* AstrOmatic software is free software: you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation, either version 3 of the +* License, or (at your option) any later version. +* AstrOmatic software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with AstrOmatic software. +* If not, see . +* +* Last modified: 09/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ /* Check if we are using a configure script here */ #ifndef HAVE_CONFIG_H diff --git a/src/fits/fitscheck.c b/src/fits/fitscheck.c index f7f0196..6757dc3 100644 --- a/src/fits/fitscheck.c +++ b/src/fits/fitscheck.c @@ -1,18 +1,35 @@ /* - fitscheck.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* fitscheck.c +* +* Functions related for FITS file integrity. +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: AstrOmatic FITS/LDAC library +* +* Copyright: (C) 1998-2010 IAP/CNRS/UPMC +* (C) 1997 European Southern Observatory +* (C) 1995,1996 Sterrewacht Leiden * -* Part of: The LDAC Tools +* Author: Emmanuel Bertin (IAP) * -* Author: E.BERTIN (IAP) +* License: GNU General Public License * -* Contents: Functions related to file integrity +* AstrOmatic software is free software: you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation, either version 3 of the +* License, or (at your option) any later version. +* AstrOmatic software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with AstrOmatic software. +* If not, see . * -* Last modify: 15/08/2003 +* Last modified: 09/10/2010 * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/fits/fitscleanup.c b/src/fits/fitscleanup.c index 5054be8..3a8db08 100644 --- a/src/fits/fitscleanup.c +++ b/src/fits/fitscleanup.c @@ -1,18 +1,35 @@ /* - fitscleanup.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* fitscleanup.c +* +* Signal-catching routines to clean-up temporary files. +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: AstrOmatic FITS/LDAC library +* +* Copyright: (C) 1998-2010 IAP/CNRS/UPMC +* (C) 1997 European Southern Observatory +* (C) 1995,1996 Sterrewacht Leiden * -* Part of: The LDAC Tools +* Author: Emmanuel Bertin (IAP) * -* Author: E.BERTIN (IAP) +* License: GNU General Public License * -* Contents: Signal-catching routines to clean-up temporary files +* AstrOmatic software is free software: you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation, either version 3 of the +* License, or (at your option) any later version. +* AstrOmatic software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with AstrOmatic software. +* If not, see . * -* Last modify: 16/07/2007 +* Last modified: 09/10/2010 * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/fits/fitsconv.c b/src/fits/fitsconv.c index 6cb0fa4..e0ef1cf 100644 --- a/src/fits/fitsconv.c +++ b/src/fits/fitsconv.c @@ -1,18 +1,35 @@ /* - fitsconv.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* fitsconv.c +* +* Functions for converting LDAC FITS catalogs. +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: AstrOmatic FITS/LDAC library +* +* Copyright: (C) 1998-2010 IAP/CNRS/UPMC +* (C) 1997 European Southern Observatory +* (C) 1995,1996 Sterrewacht Leiden * -* Part of: The LDAC Tools +* Author: Emmanuel Bertin (IAP) * -* Author: E.BERTIN, DeNIS/LDAC +* License: GNU General Public License * -* Contents: functions for converting LDAC FITS catalogs. +* AstrOmatic software is free software: you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation, either version 3 of the +* License, or (at your option) any later version. +* AstrOmatic software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with AstrOmatic software. +* If not, see . * -* Last modify: 19/11/2009 +* Last modified: 09/10/2010 * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/fits/fitshead.c b/src/fits/fitshead.c index e619e20..61285a0 100644 --- a/src/fits/fitshead.c +++ b/src/fits/fitshead.c @@ -1,18 +1,35 @@ /* - fitshead.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* fitshead.c +* +* General functions for handling FITS file headers +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: AstrOmatic FITS/LDAC library +* +* Copyright: (C) 1998-2010 IAP/CNRS/UPMC +* (C) 1997 European Southern Observatory +* (C) 1995,1996 Sterrewacht Leiden * -* Part of: The LDAC Tools +* Author: Emmanuel Bertin (IAP) * -* Author: E.BERTIN, DeNIS/LDAC +* License: GNU General Public License * -* Contents: general functions for handling FITS file headers. +* AstrOmatic software is free software: you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation, either version 3 of the +* License, or (at your option) any later version. +* AstrOmatic software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with AstrOmatic software. +* If not, see . * -* Last modify: 20/07/2010 +* Last modified: 09/10/2010 * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/fits/fitskey.c b/src/fits/fitskey.c index e3e4f0f..2eac34f 100644 --- a/src/fits/fitskey.c +++ b/src/fits/fitskey.c @@ -1,18 +1,35 @@ /* - fitskey.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* fitskey.c +* +* Functions related to the management of FITS table columns ("keys"). +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: AstrOmatic FITS/LDAC library +* +* Copyright: (C) 1998-2010 IAP/CNRS/UPMC +* (C) 1997 European Southern Observatory +* (C) 1995,1996 Sterrewacht Leiden * -* Part of: The LDAC Tools +* Author: Emmanuel Bertin (IAP) * -* Author: E.BERTIN, DeNIS/LDAC +* License: GNU General Public License * -* Contents: Functions related to the management of keys. +* AstrOmatic software is free software: you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation, either version 3 of the +* License, or (at your option) any later version. +* AstrOmatic software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with AstrOmatic software. +* If not, see . * -* Last modify: 02/11/2009 +* Last modified: 09/10/2010 * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" @@ -575,7 +592,7 @@ NOTES This is approximately the same code as for read_keys. A NULL keynames pointer means read ALL keys belonging to the table. A NULL mask pointer means NO selection for reading. AUTHOR E. Bertin (IAP & Leiden observatory) -VERSION 02/11/2009 +VERSION 08/02/2010 ***/ void show_keys(tabstruct *tab, char **keynames, keystruct **keys, int nkeys, BYTE *mask, FILE *stream, @@ -970,7 +987,7 @@ void show_keys(tabstruct *tab, char **keynames, keystruct **keys, int nkeys, if (kflag) free(keys); if (o_type == SHOW_SKYCAT) - fprintf(stream, skycattail); + fprintf(stream, skycattail, 1.0); return; } diff --git a/src/fits/fitsmisc.c b/src/fits/fitsmisc.c index c3e5677..c355481 100644 --- a/src/fits/fitsmisc.c +++ b/src/fits/fitsmisc.c @@ -1,18 +1,35 @@ - /* - fitsmisc.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* fitsmisc.c * -* Part of: The LDAC Tools +* Miscellaneous functions. * -* Author: E.BERTIN, DeNIS/LDAC +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: miscellaneous functions. +* This file part of: AstrOmatic FITS/LDAC library * -* Last modify: 18/07/2008 +* Copyright: (C) 1998-2010 IAP/CNRS/UPMC +* (C) 1997 European Southern Observatory +* (C) 1995,1996 Sterrewacht Leiden * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* AstrOmatic software is free software: you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation, either version 3 of the +* License, or (at your option) any later version. +* AstrOmatic software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with AstrOmatic software. +* If not, see . +* +* Last modified: 09/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/fits/fitsread.c b/src/fits/fitsread.c index a6f67ba..02a0c22 100644 --- a/src/fits/fitsread.c +++ b/src/fits/fitsread.c @@ -1,18 +1,35 @@ /* - fitsread.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* fitsread.c +* +* Low-level functions for reading LDAC FITS catalogs. +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: AstrOmatic FITS/LDAC library +* +* Copyright: (C) 1998-2010 IAP/CNRS/UPMC +* (C) 1997 European Southern Observatory +* (C) 1995,1996 Sterrewacht Leiden * -* Part of: The LDAC Tools +* Author: Emmanuel Bertin (IAP) * -* Author: E.BERTIN, DeNIS/LDAC +* License: GNU General Public License * -* Contents: low-level functions for reading LDAC FITS catalogs. +* AstrOmatic software is free software: you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation, either version 3 of the +* License, or (at your option) any later version. +* AstrOmatic software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with AstrOmatic software. +* If not, see . * -* Last modify: 26/09/2004 +* Last modified: 09/10/2010 * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/fits/fitstab.c b/src/fits/fitstab.c index e87723f..be2a576 100644 --- a/src/fits/fitstab.c +++ b/src/fits/fitstab.c @@ -1,18 +1,35 @@ /* - fitstab.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* fitstab.c +* +* Handle FITS extensions and tables. +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: AstrOmatic FITS/LDAC library +* +* Copyright: (C) 1998-2010 IAP/CNRS/UPMC +* (C) 1997 European Southern Observatory +* (C) 1995,1996 Sterrewacht Leiden * -* Part of: The LDAC Tools +* Author: Emmanuel Bertin (IAP) * -* Author: E.BERTIN, DeNIS/LDAC +* License: GNU General Public License * -* Contents: general functions for handling LDAC FITS catalogs. +* AstrOmatic software is free software: you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation, either version 3 of the +* License, or (at your option) any later version. +* AstrOmatic software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with AstrOmatic software. +* If not, see . * -* Last modify: 28/10/2009 +* Last modified: 09/10/2010 * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/fits/fitsutil.c b/src/fits/fitsutil.c index 0a32a33..189f4dd 100644 --- a/src/fits/fitsutil.c +++ b/src/fits/fitsutil.c @@ -1,18 +1,35 @@ /* - fitsutil.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* fitsutil.c +* +* Handle FITS header keywords. +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: AstrOmatic FITS/LDAC library +* +* Copyright: (C) 1998-2010 IAP/CNRS/UPMC +* (C) 1997 European Southern Observatory +* (C) 1995,1996 Sterrewacht Leiden * -* Part of: The LDAC Tools +* Author: Emmanuel Bertin (IAP) * -* Author: E.BERTIN, DeNIS/LDAC +* License: GNU General Public License * -* Contents: functions for handling FITS keywords. +* AstrOmatic software is free software: you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation, either version 3 of the +* License, or (at your option) any later version. +* AstrOmatic software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with AstrOmatic software. +* If not, see . * -* Last modify: 02/07/2010 +* Last modified: 09/10/2010 * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" @@ -476,11 +493,11 @@ int fitswrite(char *fitsbuf, char *keyword, void *ptr, h_type htype, #endif break; - case H_FLOAT: sprintf(str, " %12.4f", (ttype==T_DOUBLE)? + case H_FLOAT: sprintf(str, " %16.8f", (ttype==T_DOUBLE)? *(double *)ptr: *(float *)ptr); break; - case H_EXPO: sprintf(str, " %16.9E", (ttype==T_DOUBLE)? + case H_EXPO: sprintf(str, " %19.12E", (ttype==T_DOUBLE)? *(double *)ptr: *(float *)ptr); break; diff --git a/src/fits/fitswrite.c b/src/fits/fitswrite.c index 3f15ca9..27083a0 100644 --- a/src/fits/fitswrite.c +++ b/src/fits/fitswrite.c @@ -1,18 +1,35 @@ /* - fitswrite.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* fitswrite.c +* +* Low-level functions for writing LDAC FITS catalogs. +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: AstrOmatic FITS/LDAC library +* +* Copyright: (C) 1998-2010 IAP/CNRS/UPMC +* (C) 1997 European Southern Observatory +* (C) 1995,1996 Sterrewacht Leiden * -* Part of: The LDAC Tools +* Author: Emmanuel Bertin (IAP) * -* Author: E.BERTIN, DeNIS/LDAC +* License: GNU General Public License * -* Contents: low-level functions for writing LDAC FITS catalogs. +* AstrOmatic software is free software: you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation, either version 3 of the +* License, or (at your option) any later version. +* AstrOmatic software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with AstrOmatic software. +* If not, see . * -* Last modify: 02/11/2009 +* Last modified: 09/10/2010 * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/fitswcs.c b/src/fitswcs.c index 33d1ae7..275f01d 100644 --- a/src/fitswcs.c +++ b/src/fitswcs.c @@ -1,18 +1,35 @@ /* - fitswcs.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* fitswcs.c * -* Part of: LDACTools+ +* Manage World Coordinate System data. * -* Author: E.BERTIN (IAP) +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: Read and write WCS header info. +* This file part of: AstrOmatic software * -* Last modify: 30/07/2010 +* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC +* (C) 1994,1997 European Southern Observatory +* (C) 1995,1996 Sterrewacht Leiden * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* AstrOmatic software is free software: you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation, either version 3 of the +* License, or (at your option) any later version. +* AstrOmatic software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with AstrOmatic software. +* If not, see . +* +* Last modified: 10/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" @@ -600,11 +617,12 @@ INPUT tab structure, OUTPUT -. NOTES -. AUTHOR E. Bertin (IAP) -VERSION 17/07/2006 +VERSION 01/09/2010 ***/ void write_wcs(tabstruct *tab, wcsstruct *wcs) { + double mjd; char str[MAXCHARS]; int j, l, naxis; @@ -621,6 +639,12 @@ void write_wcs(tabstruct *tab, wcsstruct *wcs) } addkeywordto_head(tab, "EQUINOX ", "Mean equinox"); fitswrite(tab->headbuf, "EQUINOX ", &wcs->equinox, H_FLOAT, T_DOUBLE); + if (wcs->obsdate!=0.0) + { + mjd = (wcs->obsdate-2000.0)*365.25 + MJD2000; + addkeywordto_head(tab, "MJD-OBS ", "Modified Julian date at start"); + fitswrite(tab->headbuf, "MJD-OBS ", &mjd, H_EXPO,T_DOUBLE); + } addkeywordto_head(tab, "RADECSYS", "Astrometric system"); switch(wcs->radecsys) { @@ -898,7 +922,7 @@ INPUT WCS structure. OUTPUT -. NOTES . AUTHOR E. Bertin (IAP) -VERSION 09/08/2006 +VERSION 24/08/2010 ***/ void range_wcs(wcsstruct *wcs) @@ -936,7 +960,7 @@ void range_wcs(wcsstruct *wcs) } if (lng!=lat) - lc = fmod(world[lng]+180.0, 360.0); + lc = world[lng]; else { lc = 0.0; /* to avoid gcc -Wall warnings */ @@ -978,20 +1002,26 @@ void range_wcs(wcsstruct *wcs) for (j=npoints; j--;) { raw_to_wcs(wcs, raw, world); +/*-- Compute maximum distance to center */ + if ((rad=wcs_dist(wcs, world, worldc)) > radmax) + radmax = rad; for (i=0; ilc) - world[i] -= 359.9999; + if (i==lng) + { + world[i] -= lc; + if (world[i]>180.0) + world[i] -= 360.0; + else if (world[i] <= -180.0) + world[i] += 360.0; + } if (world[i]worldmax[i]) worldmax[i] = world[i]; } -/*-- Compute maximum distance to center */ - if ((rad=wcs_dist(wcs, world, worldc)) > radmax) - radmax = rad; for (i=0; i90.0) @@ -2009,3 +2041,15 @@ double fmod_m90_p90(double angle) } +/********************************* fcmp_0_p360 *******************************/ +/* +Compare angles in the [0,+360[ domain: return 1 if anglep>anglem, 0 otherwise. +*/ +int fcmp_0_p360(double anglep, double anglem) + { + double dval = anglep - anglem; + + return (int)((dval>0.0 && dval<180.0) || dval<-180.0); + } + + diff --git a/src/fitswcs.h b/src/fitswcs.h index 51a78c4..3f3e17e 100644 --- a/src/fitswcs.h +++ b/src/fitswcs.h @@ -1,18 +1,35 @@ /* - fitswcs.h - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* fitswcs.h +* +* Include file for fitswcs.c +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: AstrOmatic software +* +* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC +* (C) 1994,1997 European Southern Observatory +* (C) 1995,1996 Sterrewacht Leiden * -* Part of: LDACTools+ +* Author: Emmanuel Bertin (IAP) * -* Author: E.BERTIN (IAP) +* License: GNU General Public License * -* Contents: Include file for fitswcs.c +* AstrOmatic software is free software: you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation, either version 3 of the +* License, or (at your option) any later version. +* AstrOmatic software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with AstrOmatic software. +* If not, see . * -* Last modify: 26/04/2008 +* Last modified: 10/10/2010 * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifndef _FITSWCS_H_ #define _FITSWCS_H_ @@ -111,6 +128,7 @@ extern double fmod_0_p360(double angle), extern int celsys_to_eq(wcsstruct *wcs, double *wcspos), eq_to_celsys(wcsstruct *wcs, double *wcspos), + fcmp_0_p360(double anglep, double anglem), raw_to_red(wcsstruct *wcs, double *pixpos, double *redpos), raw_to_wcs(wcsstruct *wcs, diff --git a/src/flag.c b/src/flag.c index d331265..1cf77ac 100644 --- a/src/flag.c +++ b/src/flag.c @@ -1,18 +1,33 @@ - /* - flag.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* flag.c +* +* Manage external flag maps. +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: SExtractor +* +* Copyright: (C) 1998-2010 IAP/CNRS/UPMC +* (C) 1997 ESO * -* Part of: SExtractor +* Author: Emmanuel Bertin (IAP) * -* Author: E.BERTIN (IAP) +* License: GNU General Public License * -* Contents: Function related to external flagging. +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . * -* Last modify: 26/11/2003 +* Last modified: 11/10/2010 * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/flag.h b/src/flag.h index a51bfd3..1c13bbc 100644 --- a/src/flag.h +++ b/src/flag.h @@ -1,18 +1,33 @@ - /* - flag.h - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* flag.h +* +* Include file for flag.c. +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: SExtractor +* +* Copyright: (C) 1998-2010 IAP/CNRS/UPMC +* (C) 1997 ESO * -* Part of: SExtractor +* Author: Emmanuel Bertin (IAP) * -* Author: E.BERTIN (IAP, Leiden observatory & ESO) +* License: GNU General Public License * -* Contents: include to flag.c (external flagging). +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . * -* Last modify: 28/04/98 +* Last modified: 11/10/2010 * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ /*--------------------------- Internal constants ----------------------------*/ diff --git a/src/globals.h b/src/globals.h index 822a225..00f1c9f 100644 --- a/src/globals.h +++ b/src/globals.h @@ -1,18 +1,34 @@ - /* - globals.h - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* globals.h +* +* Global declarations and variables. +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: SExtractor +* +* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC +* (C) 1994,1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -* Part of: SExtractor +* Author: Emmanuel Bertin (IAP) * -* Author: E.BERTIN (IAP) +* License: GNU General Public License * -* Contents: global declarations. +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . * -* Last modify: 20/08/2010 +* Last modified: 11/10/2010 * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #include "types.h" @@ -77,7 +93,7 @@ extern void alloccatparams(void), extern double counter_seconds(void); -extern float hmedian(float *, int); +extern float fqmedian(float *, int); extern int addobj(int, objliststruct *, objliststruct *), belong(int, objliststruct *, int, objliststruct *), diff --git a/src/graph.c b/src/graph.c index b558817..15df469 100644 --- a/src/graph.c +++ b/src/graph.c @@ -1,18 +1,34 @@ - /* - graph.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* graph.c * -* Part of: SExtractor +* Add simple graphics to image rasters. * -* Author: E.BERTIN (IAP) +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: simple graphical functions. +* This file part of: SExtractor * -* Last modify: 13/12/2002 +* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC +* (C) 1994,1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/growth.c b/src/growth.c index 8e02891..5e95011 100644 --- a/src/growth.c +++ b/src/growth.c @@ -1,18 +1,34 @@ - /* - growth.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* growth.c * -* Part of: SExtractor +* Manage growth curves. * -* Author: E.BERTIN (IAP) +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: Make growth curves. +* This file part of: SExtractor * -* Last modify: 02/07/2010 +* Copyright: (C) 1998-2010 IAP/CNRS/UPMC +* (C) 1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/growth.h b/src/growth.h index aadcfce..a3b035f 100644 --- a/src/growth.h +++ b/src/growth.h @@ -1,18 +1,34 @@ - /* - growth.h - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* growth.h * -* Part of: SExtractor +* Include file for growth.c. * -* Author: E.BERTIN, IAP & Leiden observatory +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: Include file for growth.c. +* This file part of: SExtractor * -* Last modify: 02/07/2010 +* Copyright: (C) 1998-2010 IAP/CNRS/UPMC +* (C) 1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ /*----------------------------- Internal constants --------------------------*/ diff --git a/src/header.c b/src/header.c index 1b49f0c..c429a9d 100644 --- a/src/header.c +++ b/src/header.c @@ -1,18 +1,32 @@ - /* - header.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* header.c +* +* Read external ASCII headers. +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: SExtractor +* +* Copyright: (C) 2010 IAP/CNRS/UPMC * -* Part of: SExtractor +* Author: Emmanuel Bertin (IAP) * -* Author: E.BERTIN (IAP) +* License: GNU General Public License * -* Contents: Read extern ASCII headers. +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . * -* Last modify: 05/02/2010 +* Last modified: 11/10/2010 * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/header.h b/src/header.h index 19a1beb..31abe28 100644 --- a/src/header.h +++ b/src/header.h @@ -1,18 +1,32 @@ - /* - header.h - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* header.h +* +* Include file for header.c. +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: SExtractor +* +* Copyright: (C) 2010 IAP/CNRS/UPMC * -* Part of: SWarp +* Author: Emmanuel Bertin (IAP) * -* Author: E.BERTIN (IAP) +* License: GNU General Public License * -* Contents: Include file for header.c. +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . * -* Last modify: 05/02/2010 +* Last modified: 11/10/2010 * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifndef _FITSCAT_H_ #include "fits/fitscat.h" diff --git a/src/image.c b/src/image.c index 29b86ee..1a72c5b 100644 --- a/src/image.c +++ b/src/image.c @@ -1,18 +1,34 @@ - /* - image.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* image.c * -* Part of: SExtractor +* Manipulate image rasters. * -* Author: E.BERTIN (IAP) +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: Function related to image manipulations. +* This file part of: SExtractor * -* Last modify: 12/09/2010 +* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC +* (C) 1994,1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/image.h b/src/image.h index 18f49b3..d1b9e2e 100644 --- a/src/image.h +++ b/src/image.h @@ -1,18 +1,34 @@ - /* - image.h - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* image.h +* +* Include file for image.c. +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: SExtractor +* +* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC +* (C) 1994,1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -* Part of: SExtractor +* Author: Emmanuel Bertin (IAP) * -* Author: E.BERTIN (IAP) +* License: GNU General Public License * -* Contents: Include file for image.c. +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . * -* Last modify: 12/09/2010 +* Last modified: 11/10/2010 * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ /*----------------------------- Internal constants --------------------------*/ diff --git a/src/interpolate.c b/src/interpolate.c index 5f5b947..676a00d 100644 --- a/src/interpolate.c +++ b/src/interpolate.c @@ -1,18 +1,32 @@ - /* - interpolate.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* interpolate.c * -* Part of: SExtractor +* Interpolate bad/missing image pixels. * -* Author: E.BERTIN (IAP) +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: Interpolation of input data. +* This file part of: SExtractor * -* Last modify: 26/11/2003 +* Copyright: (C) 1998-2010 IAP/CNRS/UPMC * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/interpolate.h b/src/interpolate.h index 8ac7823..18cd64d 100644 --- a/src/interpolate.h +++ b/src/interpolate.h @@ -1,18 +1,32 @@ - /* - interpolate.h - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* interpolate.h +* +* Include file for interpolate.c. +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: SExtractor +* +* Copyright: (C) 1998-2010 IAP/CNRS/UPMC * -* Part of: SExtractor +* Author: Emmanuel Bertin (IAP) * -* Author: E.BERTIN (IAP, Leiden observatory & ESO) +* License: GNU General Public License * -* Contents: Include file for interpolate.c. +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . * -* Last modify: 29/04/98 +* Last modified: 11/10/2010 * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ /*---------------------------------- protos --------------------------------*/ diff --git a/src/key.h b/src/key.h index b02101f..d995998 100644 --- a/src/key.h +++ b/src/key.h @@ -1,18 +1,35 @@ - /* - key.h - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* key.h +* +* Keyword structure definition. +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: AstrOmatic software +* +* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC +* (C) 1994,1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -* Part of: SExtractor +* Author: Emmanuel Bertin (IAP) * -* Author: E.BERTIN (IAP) +* License: GNU General Public License * -* Contents: Keyword structure. +* AstrOmatic software is free software: you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation, either version 3 of the +* License, or (at your option) any later version. +* AstrOmatic software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with AstrOmatic software. +* If not, see . * -* Last modify: 14/12/2004 +* Last modified: 09/10/2010 * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ /*--------------------------------- constants -------------------------------*/ diff --git a/src/ldactoasc.c b/src/ldactoasc.c index b5753b5..e845a70 100644 --- a/src/ldactoasc.c +++ b/src/ldactoasc.c @@ -1,18 +1,32 @@ /* - ldactoasc.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* ldactoasc.c +* +* Stand-along tool that converts FITS-LDAC binary files to ASCII. +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: SExtractor +* +* Copyright: (C) 2007-2010 IAP/CNRS/UPMC * -* Part of: LDACtoASC +* Author: Emmanuel Bertin (IAP) * -* Author: E.BERTIN (IAP) +* License: GNU General Public License * -* Contents: Convert LDAC binary format to ASCII. +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . * -* Last modify: 19/12/2007 +* Last modified: 11/10/2010 * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/ldactoasc.h b/src/ldactoasc.h index ffa0a56..5b854b3 100644 --- a/src/ldactoasc.h +++ b/src/ldactoasc.h @@ -1,18 +1,32 @@ - /* - ldactoasc.h - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* ldactoasc.h +* +* Include file for ldactoasc.c. +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: SExtractor +* +* Copyright: (C) 2007-2010 IAP/CNRS/UPMC * -* Part of: LDACtoASC +* Author: Emmanuel Bertin (IAP) * -* Author: E.BERTIN (IAP) +* License: GNU General Public License * -* Contents: global definitions. +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . * -* Last modify: 01/04/2009 +* Last modified: 11/10/2010 * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ /* Check if we are using a configure script here */ #ifndef HAVE_CONFIG_H diff --git a/src/levmar/misc_core.c b/src/levmar/misc_core.c index 738739f..79de56a 100644 --- a/src/levmar/misc_core.c +++ b/src/levmar/misc_core.c @@ -831,8 +831,8 @@ INPUT Pointer to the matrix to invert, Pointer to the inverted matrix, Matrix size. OUTPUT Matrix rank. -NOTES Loosely adapted from Numerical Recipes in C, 2nd Ed. (p. 671). The a - and v matrices are transposed with respect to the N.R. convention. +NOTES Based on algorithm described in Numerical Recipes in C, 2nd Ed.(p. 671). + The a and v matrices are transposed with respect to the N.R. convention. AUTHOR E. Bertin (IAP) VERSION 02/09/2010 ***/ diff --git a/src/main.c b/src/main.c index 1779806..2871504 100644 --- a/src/main.c +++ b/src/main.c @@ -1,18 +1,34 @@ - /* - main.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* main.c +* +* Command line parsing. +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: SExtractor +* +* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC +* (C) 1994,1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -* Part of: SExtractor +* Author: Emmanuel Bertin (IAP) * -* Author: E.BERTIN (IAP) +* License: GNU General Public License * -* Contents: Command-line parsing. +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . * -* Last modify: 21/01/2010 +* Last modified: 11/10/2010 * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" @@ -48,8 +64,10 @@ setlinebuf(stdout); if (argc<2) { fprintf(OUTPUT, "\n %s version %s (%s)\n", BANNER,MYVERSION,DATE); - fprintf(OUTPUT, "\nby %s\n", COPYRIGHT); - fprintf(OUTPUT, "visit %s\n", WEBSITE); + fprintf(OUTPUT, "\nby %s\n", AUTHORS); + fprintf(OUTPUT, "Copyright %s\n", COPYRIGHT); + fprintf(OUTPUT, "\nvisit %s\n", WEBSITE); + fprintf(OUTPUT, "\n%s\n", DISCLAIMER); error(EXIT_SUCCESS, "SYNTAX: ", SYNTAX); } QMALLOC(argkey, char *, argc); diff --git a/src/makeit.c b/src/makeit.c index b312437..79e99df 100644 --- a/src/makeit.c +++ b/src/makeit.c @@ -1,18 +1,34 @@ /* - makeit.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* makeit.c * -* Part of: SExtractor +* Main program. * -* Author: E.BERTIN, IAP & Leiden observatory +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: main program. +* This file part of: SExtractor * -* Last modify: 23/08/2010 +* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC +* (C) 1994,1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/manobjlist.c b/src/manobjlist.c index 5029ac0..858cbe1 100644 --- a/src/manobjlist.c +++ b/src/manobjlist.c @@ -1,18 +1,34 @@ - /* - manobjlist.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* manobjlist.c * -* Part of: SExtractor +* Manage object lists. * -* Author: E.BERTIN (IAP) +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: functions for the management of object lists. +* This file part of: SExtractor * -* Last modify: 26/11/2003 +* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC +* (C) 1994,1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/misc.c b/src/misc.c index 7ed949a..2da286b 100644 --- a/src/misc.c +++ b/src/misc.c @@ -1,18 +1,32 @@ - /* - misc.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* misc.c +* +* Miscellaneous functions. +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: SExtractor +* +* Copyright: (C) 2009-2010 IAP/CNRS/UPMC * -* Part of: SExtractor +* Author: Emmanuel Bertin (IAP) * -* Author: E.BERTIN (IAP) +* License: GNU General Public License * -* Contents: miscellaneous functions. +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . * -* Last modify: 20/08/2010 +* Last modified: 11/10/2010 * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" @@ -25,51 +39,44 @@ #include "globals.h" -/******************************** hmedian ***********************************/ -/* -Median using Heapsort algorithm (for float arrays) (based on Num.Rec algo.). -Warning: changes the order of data! -*/ -float hmedian(float *ra, int n) - +/*i**** fqcmp ************************************************************** +PROTO int fqcmp(const void *p1, const void *p2) +PURPOSE Sorting function for floats in qsort(). +INPUT Pointer to first element, + pointer to second element. +OUTPUT 1 if *p1>*p2, 0 if *p1=*p2, and -1 otherwise. +NOTES -. +AUTHOR E. Bertin (IAP) +VERSION 05/10/2010 + ***/ +static int fqcmp(const void *p1, const void *p2) { - int l, j, ir, i; - float rra; + double f1=*((float *)p1), + f2=*((float *)p2); + return f1>f2? 1 : (f1>1)+1;;) - { - if (l>1) - rra = ra[--l]; - else - { - rra = ra[ir]; - ra[ir] = ra[1]; - if (--ir == 1) - { - ra[1] = rra; - return n&1? ra[n/2+1] : (float)((ra[n/2]+ra[n/2+1])/2.0); - } - } - for (j = (i=l)<<1; j <= ir;) - { - if (j < ir && ra[j] < ra[j+1]) - ++j; - if (rra < ra[j]) - { - ra[i] = ra[j]; - j += (i=j); - } - else - j = ir + 1; - } - ra[i] = rra; - } - -/* (the 'return' is inside the loop!!) */ + else + return n&1? ra[n/2] : (ra[n/2-1]+ra[n/2])/2.0; } diff --git a/src/neurro.c b/src/neurro.c index 92d9eca..7b39e17 100644 --- a/src/neurro.c +++ b/src/neurro.c @@ -1,18 +1,34 @@ - /* - neurro.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* neurro.c * -* Part of: A program using neural networks. +* Read-only implementation of a backprogation neural network. * -* Author: E.BERTIN (IAP) +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: run only version of the neural network. +* This file part of: SExtractor * -* Last modify: 26/11/2003 +* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC +* (C) 1994,1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/neurro.h b/src/neurro.h index 1747723..f341157 100644 --- a/src/neurro.h +++ b/src/neurro.h @@ -1,18 +1,34 @@ - /* - neurro.h - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* neurro.h +* +* Include file for neurro.c. +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: SExtractor +* +* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC +* (C) 1994,1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -* Part of: neurro.c +* Author: Emmanuel Bertin (IAP) * -* Author: E.BERTIN, Institut d'Astrophysique de Paris. +* License: GNU General Public License * -* Contents: global definitions. +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . * -* Last modify: 30/03/95 +* Last modified: 11/10/2010 * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ /*--------------------------- Neural Network parameters ---------------------*/ #define LAYERS 3 /* max. number of hidden+i/o layers */ diff --git a/src/param.h b/src/param.h index 5188685..f89f082 100644 --- a/src/param.h +++ b/src/param.h @@ -1,18 +1,34 @@ /* - param.h - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* param.h * -* Part of: SExtractor +* List of regular measurement parameters. * -* Author: E.BERTIN (IAP) +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: parameter list for catalog data. +* This file part of: SExtractor * -* Last modify: 23/08/2010 +* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC +* (C) 1994,1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ objstruct outobj; obj2struct outobj2; diff --git a/src/paramprofit.h b/src/paramprofit.h index 264d64f..4441200 100644 --- a/src/paramprofit.h +++ b/src/paramprofit.h @@ -1,18 +1,32 @@ /* - paramprofit.h - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* paramprofit.h * -* Part of: SExtractor +* List model-fitting measurement parameters. * -* Author: E.BERTIN (IAP) +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: Model-fitting parameter list for catalog data. +* This file part of: SExtractor * -* Last modify: 20/08/2010 +* Copyright: (C) 2007-2010 IAP/CNRS/UPMC * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ {"VECTOR_MODEL", "Model-fitting coefficients", &outobj2.prof_vector, H_FLOAT, T_FLOAT, "%12.4g", "", @@ -324,6 +338,19 @@ &outobj2.prof_offset_fluxerr, H_FLOAT, T_FLOAT, "%12.7g", "count", "stat.error;instr.skyLevel;arith.diff;stat.fit.param", "ct"}, + {"FLUX_POINTSOURCE", "Point source flux from fitting", + &outobj2.prof_dirac_flux, H_FLOAT, T_FLOAT, "%12.7g", "count", + "phot.count;stat.fit.param", "ct"}, + {"FLUXERR_POINTSOURCE", "RMS error on fitted point source total flux", + &outobj2.prof_dirac_fluxerr, H_FLOAT, T_FLOAT, "%12.7g", "count", + "stat.error;phot.count;stat.fit.param", "ct"}, + {"MAG_POINTSOURCE", "Point source total magnitude from fitting", + &outobj2.prof_dirac_mag, H_FLOAT, T_FLOAT, "%8.4f", "mag", + "phot.mag;stat.fit.param", "mag"}, + {"MAGERR_POINTSOURCE", "RMS error on fitted point source total magnitude", + &outobj2.prof_dirac_magerr, H_FLOAT, T_FLOAT, "%8.4f", "mag", + "stat.error;phot.mag;stat.fit.param", "mag"}, + {"FLUX_SPHEROID", "Spheroid total flux from fitting", &outobj2.prof_spheroid_flux, H_FLOAT, T_FLOAT, "%12.7g", "count", "phot.count;stat.fit.param", "ct"}, diff --git a/src/pattern.c b/src/pattern.c index 87a754b..96dcd1f 100644 --- a/src/pattern.c +++ b/src/pattern.c @@ -1,18 +1,32 @@ - /* - pattern.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* pattern.c * -* Part of: SExtractor +* Manage galaxy image patterns. * -* Authors: E.BERTIN (IAP) +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: Generate and handle image patterns for image fitting. +* This file part of: SExtractor * -* Last modify: 01/12/2009 +* Copyright: (C) 2007-2010 IAP/CNRS/UPMC * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/pattern.h b/src/pattern.h index da2238e..e80f9b0 100644 --- a/src/pattern.h +++ b/src/pattern.h @@ -1,18 +1,32 @@ - /* - pattern.h - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* pattern.h * -* Part of: SExtractor +* Include file for pattern.c. * -* Authors: E.BERTIN (IAP) +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: Include file for pattern.c. +* This file part of: SExtractor * -* Last modify: 18/11/2009 +* Copyright: (C) 2007-2010 IAP/CNRS/UPMC * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifndef _PROFIT_H_ #include "profit.h" diff --git a/src/pc.c b/src/pc.c index 33caa7d..a7b4e2a 100644 --- a/src/pc.c +++ b/src/pc.c @@ -1,18 +1,32 @@ - /* - pc.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* pc.c * -* Part of: SExtractor +* Manage principal source image components. * -* Author: E.BERTIN (IAP) +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: Stuff related to Principal Component Analysis (PCA). +* This file part of: SExtractor * -* Last modify: 13/09/2009 +* Copyright: (C) 1999-2010 IAP/CNRS/UPMC * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/photom.c b/src/photom.c index f9a11ab..8d78a06 100644 --- a/src/photom.c +++ b/src/photom.c @@ -1,18 +1,34 @@ - /* - photom.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* photom.c * -* Part of: SExtractor +* Compute magnitudes and other photometric parameters. * -* Author: E.BERTIN (IAP) +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: Compute magnitudes and other photometrical parameters. +* This file part of: SExtractor * -* Last modify: 16/09/2009 +* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC +* (C) 1994,1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" @@ -899,6 +915,18 @@ void computemags(picstruct *field, objstruct *obj) + prefs.mag_zeropoint : 99.0; + if (FLAG(obj2.prof_dirac_mag)) + obj2->prof_dirac_mag = obj2->prof_dirac_flux>0.0? + -2.5*log10(obj2->prof_dirac_flux) + + prefs.mag_zeropoint + :99.0; + + if (FLAG(obj2.prof_dirac_magerr)) + obj2->prof_dirac_magerr = obj2->prof_dirac_flux>0.0? + 1.086*obj2->prof_dirac_fluxerr + / obj2->prof_dirac_flux + :99.0; + if (FLAG(obj2.prof_spheroid_mag)) obj2->prof_spheroid_mag = obj2->prof_spheroid_flux>0.0? -2.5*log10(obj2->prof_spheroid_flux) diff --git a/src/photom.h b/src/photom.h index c0bb9c2..4fe8069 100644 --- a/src/photom.h +++ b/src/photom.h @@ -1,18 +1,34 @@ - /* - photom.h - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* photom.h * -* Part of: SExtractor +* Include file for photom.c. * -* Author: E.BERTIN, IAP & Leiden observatory +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: Include file for photom.h. +* This file part of: SExtractor * -* Last modify: 22/10/2004 +* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC +* (C) 1994,1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ /*----------------------------- Internal constants --------------------------*/ diff --git a/src/plist.c b/src/plist.c index ded89ed..6b726b6 100644 --- a/src/plist.c +++ b/src/plist.c @@ -1,18 +1,34 @@ - /* - plist.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* plist.c +* +* Manage pixel lists. +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: SExtractor +* +* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC +* (C) 1994,1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -* Part of: SExtractor +* Author: Emmanuel Bertin (IAP) * -* Author: E.BERTIN (IAP) +* License: GNU General Public License * -* Contents: functions dealing with the handling of pixel lists. +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . * -* Last modify: 01/10/2009 +* Last modified: 11/10/2010 * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/plist.h b/src/plist.h index 6de28ea..fcb2b7a 100644 --- a/src/plist.h +++ b/src/plist.h @@ -1,18 +1,34 @@ - /* - plist.h - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* plist.h +* +* Include file for plist.c. +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: SExtractor +* +* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC +* (C) 1994,1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -* Part of: SExtractor +* Author: Emmanuel Bertin (IAP) * -* Author: E.BERTIN, (IAP) +* License: GNU General Public License * -* Contents: functions dealing with the handling of pixel lists. +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . * -* Last modify: 29/11/2005 +* Last modified: 11/10/2010 * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ /*------------------------------- definitions -------------------------------*/ diff --git a/src/preflist.h b/src/preflist.h index ef4c765..eaf2582 100644 --- a/src/preflist.h +++ b/src/preflist.h @@ -1,19 +1,34 @@ - /* - preflist.h - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* preflist.h * -* Part of: SExtractor +* Configuration keyword definitions. * -* Author: E.BERTIN (IAP) +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: Keywords for the configuration file. +* This file part of: SExtractor * -* Last modify: 23/08/2010 +* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC +* (C) 1994,1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ - +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #include "key.h" diff --git a/src/prefs.c b/src/prefs.c index 0a37184..af47932 100644 --- a/src/prefs.c +++ b/src/prefs.c @@ -1,18 +1,34 @@ - /* - prefs.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* prefs.c * -* Part of: SExtractor +* Functions related to run-time configurations. * -* Author: E.BERTIN (IAP) +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: Functions to handle the configuration file. +* This file part of: SExtractor * -* Last modify: 22/09/2010 +* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC +* (C) 1994,1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/prefs.h b/src/prefs.h index e06aba0..412e723 100644 --- a/src/prefs.h +++ b/src/prefs.h @@ -1,19 +1,34 @@ - /* - prefs.h - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* prefs.h * -* Part of: SExtractor +* Include file for prefs.c. * -* Author: E.BERTIN (IAP) +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: Keywords for the configuration file. +* This file part of: SExtractor * -* Last modify: 05/02/2010 +* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC +* (C) 1994,1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ - +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifndef _PROFIT_H_ #include "profit.h" diff --git a/src/profit.c b/src/profit.c index 7c21e55..b31a879 100644 --- a/src/profit.c +++ b/src/profit.c @@ -1,18 +1,32 @@ - /* - profit.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* profit.c * -* Part of: SExtractor +* Fit a range of galaxy models to an image. * -* Authors: E.BERTIN (IAP) +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: Fit an arbitrary profile combination to a detection. +* This file part of: SExtractor * -* Last modify: 26/08/2010 +* Copyright: (C) 2006-2010 IAP/CNRS/UPMC * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" @@ -50,14 +64,16 @@ static void make_kernel(float pos, float *kernel, interpenum interptype); /*------------------------------- variables ---------------------------------*/ -const char profname[][32]={"background offset", "Sersic spheroid", - "De Vaucouleurs spheroid", "exponential disk", "spiral arms", +const char profname[][32]={"background offset", "point source", + "Sersic spheroid", "de Vaucouleurs spheroid", + "exponential disk", "spiral arms", "bar", "inner ring", "outer ring", "tabulated model", ""}; const int interp_kernwidth[5]={1,2,4,6,8}; -const int flux_flag[PARAM_NPARAM] = {0,0,0, +const int flux_flag[PARAM_NPARAM] = {0, + 1,0,0, 1,0,0,0,0, 1,0,0,0, 1,0,0,0,0,0,0,0, @@ -79,13 +95,14 @@ INPUT Pointer to PSF structure. OUTPUT A pointer to an allocated profit structure. NOTES -. AUTHOR E. Bertin (IAP) -VERSION 02/07/2010 +VERSION 08/10/2010 ***/ profitstruct *profit_init(psfstruct *psf) { profitstruct *profit; int p, nprof, - backflag, spheroidflag, diskflag, barflag, armsflag; + backflag, diracflag, spheroidflag, diskflag, + barflag, armsflag; QCALLOC(profit, profitstruct, 1); profit->psf = psf; @@ -93,7 +110,7 @@ profitstruct *profit_init(psfstruct *psf) profit->nparam = 0; QMALLOC(profit->prof, profstruct *, PROF_NPROF); - backflag = spheroidflag = diskflag = barflag = armsflag = 0; + backflag = diracflag = spheroidflag = diskflag = barflag = armsflag = 0; nprof = 0; for (p=0; pprof[p] = prof_init(profit, PROF_DIRAC); + diracflag = 1; + nprof++; + } else if (!spheroidflag && FLAG(obj2.prof_spheroid_flux)) { profit->prof[p] = prof_init(profit, @@ -194,7 +217,7 @@ OUTPUT Pointer to an allocated fit structure (containing details about the fit). NOTES It is a modified version of the lm_minimize() of lmfit. AUTHOR E. Bertin (IAP) -VERSION 26/08/2010 +VERSION 07/10/2010 ***/ void profit_fit(profitstruct *profit, picstruct *field, picstruct *wfield, @@ -229,9 +252,9 @@ void profit_fit(profitstruct *profit, profit->ix = (int)(obj->mx + 0.49999);/* internal convention: 1st pix = 0 */ profit->iy = (int)(obj->my + 0.49999);/* internal convention: 1st pix = 0 */ psf_fwhm = psf->masksize[0]*psf->pixstep; - profit->objnaxisn[0] = (((int)(obj2->hl_radius*6.0 + psf_fwhm + 0.499) + profit->objnaxisn[0] = (((int)((obj->xmax-obj->xmin+1) + psf_fwhm + 0.499) *1.2)/2)*2 + 1; - profit->objnaxisn[1] = (((int)(obj2->hl_radius*6.0 + psf_fwhm + 0.499) + profit->objnaxisn[1] = (((int)((obj->ymax-obj->ymin+1) + psf_fwhm + 0.499) *1.2)/2)*2 + 1; if (profit->objnaxisn[1]objnaxisn[0]) profit->objnaxisn[1] = profit->objnaxisn[0]; @@ -505,6 +528,21 @@ profit->niter = profit_minimize(profit, PROFIT_MAXITER); if (FLAG(obj2.peak_prof)) profit_surface(profit, obj2); +/* Background offset */ + if (FLAG(obj2.prof_offset_flux)) + { + obj2->prof_offset_flux = *profit->paramlist[PARAM_BACK]; + obj2->prof_offset_fluxerr=profit->paramerr[profit->paramindex[PARAM_BACK]]; + } + +/* Point source */ + if (FLAG(obj2.prof_dirac_flux)) + { + obj2->prof_dirac_flux = *profit->paramlist[PARAM_DIRAC_FLUX]; + obj2->prof_dirac_fluxerr = + profit->paramerr[profit->paramindex[PARAM_DIRAC_FLUX]]; + } + /* Spheroid */ if (FLAG(obj2.prof_spheroid_flux)) { @@ -709,12 +747,12 @@ profit->niter = profit_minimize(profit, PROFIT_MAXITER); pprofit.paraminit[pprofit.paramindex[PARAM_X]] = *profit->paramlist[PARAM_X]; pprofit.paraminit[pprofit.paramindex[PARAM_Y]] = *profit->paramlist[PARAM_Y]; } - pprofit.paraminit[pprofit.paramindex[PARAM_DISK_FLUX]] = profit->flux; + pprofit.paraminit[pprofit.paramindex[PARAM_DIRAC_FLUX]] = profit->flux; for (p=0; pniter = profit_minimize(profit, PROFIT_MAXITER); /****i* prof_gammainc ********************************************************* PROTO double prof_gammainc(double x, double a) -PURPOSE Returns the incomplete Gamma function (from Num. Recipes in C, p.216). +PURPOSE Returns the incomplete Gamma function (based on algorithm described in + Numerical Recipes in C, chap. 6.1). INPUT A double, upper integration limit. OUTPUT Incomplete Gamma function. NOTES -. AUTHOR E. Bertin (IAP) -VERSION 18/09/009 +VERSION 08/10/2010 */ static double prof_gammainc (double x, double a) @@ -805,12 +844,13 @@ static double prof_gammainc (double x, double a) /****i* prof_gamma ************************************************************ PROTO double prof_gamma(double xx) -PURPOSE Returns the Gamma function (from Num. Recipes in C, p.213). +PURPOSE Returns the Gamma function (based on algorithm described in Numerical + Recipes in C, chap 6.1). INPUT A double. OUTPUT Gamma function. NOTES -. AUTHOR E. Bertin (IAP) -VERSION 11/09/009 +VERSION 11/09/2009 */ static double prof_gamma(double xx) @@ -839,7 +879,7 @@ INPUT Profit structure pointer, OUTPUT Radius (in pixels). NOTES -. AUTHOR E. Bertin (IAP) -VERSION 21/09/009 +VERSION 08/10/2010 */ float profit_minradius(profitstruct *profit, float refffac) @@ -852,19 +892,23 @@ float profit_minradius(profitstruct *profit, float refffac) { switch (profit->prof[p]->code) { + case PROF_BACK: + case PROF_DIRAC: + reff = 0.0; + break; case PROF_SERSIC: reff = *profit->paramlist[PARAM_SPHEROID_REFF]; - break; + break; case PROF_DEVAUCOULEURS: reff = *profit->paramlist[PARAM_SPHEROID_REFF]; - break; + break; case PROF_EXPONENTIAL: reff = *profit->paramlist[PARAM_DISK_SCALE]*1.67835; - break; + break; default: error(EXIT_FAILURE, "*Internal Error*: Unknown profile parameter in ", "profit_minradius()"); - break; + break; } r = reff*(double)refffac; if (r>rmax) @@ -946,7 +990,7 @@ INPUT Pointer to the profit structure involved in the fit, OUTPUT Number of iterations used. NOTES -. AUTHOR E. Bertin (IAP) -VERSION 02/04/2010 +VERSION 11/10/2010 ***/ int profit_minimize(profitstruct *profit, int niter) { @@ -958,11 +1002,11 @@ int profit_minimize(profitstruct *profit, int niter) memset(dcovar, 0, profit->nparam*profit->nparam*sizeof(double)); /* Perform fit */ - lm_opts[0] = 1.0e-3; + lm_opts[0] = 1.0e-2; lm_opts[1] = 1.0e-12; lm_opts[2] = 1.0e-12; lm_opts[3] = 1.0e-12; - lm_opts[4] = 1.0e-3; + lm_opts[4] = 1.0e-4; profit_boundtounbound(profit, profit->paraminit, dparam, PARAM_ALLPARAMS); @@ -1037,7 +1081,7 @@ INPUT Pointer to the vector of parameters, OUTPUT -. NOTES -. AUTHOR E. Bertin (IAP) -VERSION 08/07/2010 +VERSION 07/10/2010 ***/ void profit_evaluate(double *dpar, double *fvec, int m, int n, void *adata) { @@ -1073,7 +1117,7 @@ void profit_evaluate(double *dpar, double *fvec, int m, int n, void *adata) jflag = 1; } - if (jflag) + if (jflag && !(profit->nprof==1 && profit->prof[0]->code == PROF_DIRAC)) { prof = profit->prof; nprof = profit->nprof; @@ -1084,6 +1128,13 @@ void profit_evaluate(double *dpar, double *fvec, int m, int n, void *adata) sflag = 1; switch(profit->paramrevindex[pd]) { + case PARAM_BACK: + lmodpixt = profit->lmodpix; + lmodpix2t = profit->lmodpix2; + val = (profit->param[pd] - tparam); + for (i=profit->nobjpix;i--;) + *(lmodpix2t++) = val; + break; case PARAM_X: case PARAM_Y: profit_resample(profit, profit->cmodpix, profit->lmodpix2, 1.0); @@ -1092,6 +1143,7 @@ void profit_evaluate(double *dpar, double *fvec, int m, int n, void *adata) for (i=profit->nobjpix;i--;) *(lmodpix2t++) -= *(lmodpixt++); break; + case PARAM_DIRAC_FLUX: case PARAM_SPHEROID_FLUX: case PARAM_DISK_FLUX: case PARAM_ARMS_FLUX: @@ -2345,7 +2397,7 @@ endcheck(check); /*-- Sort model pixel values */ spix = NULL; /* to avoid gcc -Wall warnings */ QMEMCPY(hdprofit.modpix, spix, float, npix); - hmedian(spix, npix); + fqmedian(spix, npix); /*-- Build a cumulative distribution */ dsum = 0.0; spixt = spix; @@ -2454,7 +2506,7 @@ INPUT Pointer to the profit structure, OUTPUT -. NOTES -. AUTHOR E. Bertin (IAP) -VERSION 26/08/2010 +VERSION 08/10/2010 ***/ void profit_resetparam(profitstruct *profit, paramenum paramtype) { @@ -2489,14 +2541,20 @@ void profit_resetparam(profitstruct *profit, paramenum paramtype) parammin = -range; parammax = range; break; - case PARAM_SPHEROID_FLUX: - param = obj2->flux_auto/2.0; + case PARAM_DIRAC_FLUX: + param = obj2->flux_auto/profit->nprof; parammin = -obj2->flux_auto/1000.0; parammax = 2*obj2->flux_auto; break; + case PARAM_SPHEROID_FLUX: + param = obj2->flux_auto/profit->nprof; + parammin = -obj2->flux_auto/1000.0; + parammax = 4*obj2->flux_auto; + break; case PARAM_SPHEROID_REFF: - param = obj2->hl_radius; - parammin = 0.1; + param = FLAG(obj2.prof_disk_flux)? obj2->hl_radius + : obj2->hl_radius*sqrtf(obj->a/obj->b); + parammin = 0.0; parammax = param * 4.0; break; case PARAM_SPHEROID_ASPECT: @@ -2511,17 +2569,17 @@ void profit_resetparam(profitstruct *profit, paramenum paramtype) break; case PARAM_SPHEROID_SERSICN: param = 4.0; - parammin = 1.0; + parammin = FLAG(obj2.prof_disk_flux)? 1.0 : 0.3; parammax = 10.0; break; case PARAM_DISK_FLUX: - param = obj2->flux_auto/2.0; + param = obj2->flux_auto/profit->nprof; parammin = -obj2->flux_auto/1000.0; parammax = 2*obj2->flux_auto; break; case PARAM_DISK_SCALE: /* From scalelength to Re */ - param = obj2->hl_radius/1.67835*sqrt(obj->a/obj->b); - parammin = param/4.0; + param = obj2->hl_radius/1.67835*sqrtf(obj->a/obj->b); + parammin = FLAG(obj2.prof_spheroid_flux)? 0.0 : param/4.0; parammax = param * 4.0; break; case PARAM_DISK_ASPECT: @@ -2867,7 +2925,7 @@ INPUT Pointer to the profile-fitting structure, OUTPUT A pointer to an allocated prof structure. NOTES -. AUTHOR E. Bertin (IAP) -VERSION 07/04/2010 +VERSION 08/10/2010 ***/ profstruct *prof_init(profitstruct *profit, proftypenum profcode) { @@ -2887,6 +2945,17 @@ profstruct *prof_init(profitstruct *profit, proftypenum profcode) profit_addparam(profit, PARAM_BACK, &prof->flux); prof->typscale = 1.0; break; + case PROF_DIRAC: + prof->naxis = 2; + prof->naxisn[0] = PROFIT_MAXMODSIZE; + prof->naxisn[1] = PROFIT_MAXMODSIZE; + prof->naxisn[2] = 1; + prof->npix = prof->naxisn[0]*prof->naxisn[1]*prof->naxisn[2]; + prof->typscale = 1.0; + profit_addparam(profit, PARAM_X, &prof->x[0]); + profit_addparam(profit, PARAM_Y, &prof->x[1]); + profit_addparam(profit, PARAM_DIRAC_FLUX, &prof->flux); + break; case PROF_SERSIC: prof->naxis = 2; prof->naxisn[0] = PROFIT_MAXMODSIZE; @@ -3008,17 +3077,6 @@ profstruct *prof_init(profitstruct *profit, proftypenum profcode) profit_addparam(profit, PARAM_OUTRING_FLUX, &prof->flux); profit_addparam(profit, PARAM_OUTRING_WIDTH, &prof->featwidth); break; - case PROF_DIRAC: - prof->naxis = 2; - prof->naxisn[0] = PROFIT_MAXMODSIZE; - prof->naxisn[1] = PROFIT_MAXMODSIZE; - prof->naxisn[2] = 1; - prof->npix = prof->naxisn[0]*prof->naxisn[1]*prof->naxisn[2]; - prof->typscale = 1.0; - profit_addparam(profit, PARAM_X, &prof->x[0]); - profit_addparam(profit, PARAM_Y, &prof->x[1]); - profit_addparam(profit, PARAM_DISK_FLUX, &prof->flux); - break; case PROF_SERSIC_TABEX: /* An example of tabulated profile */ prof->naxis = 3; width = prof->naxisn[0] = PROFIT_PROFRES; @@ -3115,7 +3173,7 @@ INPUT Profile-fitting structure, OUTPUT Total (asymptotic) flux contribution. NOTES -. AUTHOR E. Bertin (IAP) -VERSION 08/07/2010 +VERSION 08/10/2010 ***/ float prof_add(profitstruct *profit, profstruct *prof, int extfluxfac_flag) { @@ -3130,7 +3188,7 @@ float prof_add(profitstruct *profit, profstruct *prof, int extfluxfac_flag) width, invwidth2, r,r2,rmin, r2minxin,r2minxout, rmax, r2max, r2max1, r2max2, r2min, invr2xdif, - val, theta, thresh, ra,rb,rao, num; + val, theta, thresh, ra,rb,rao, num,num2,den; int npix, noversamp, threshflag, d,e,i, ix1,ix2, idx1,idx2, nx2, npix2; @@ -3171,15 +3229,27 @@ float prof_add(profitstruct *profit, profstruct *prof, int extfluxfac_flag) /*-- Compute the largest r^2 that fits in the frame */ num = cd11*cd22-cd12*cd21; + num *= num; x1max = x1cout - 1.0; x2max = x2cout - 1.0; - r2max1 = x1max*x1max*fabs(num*num / (cd12*cd12+cd22*cd22)); - r2max2 = x2max*x2max*fabs(num*num / (cd11*cd11+cd21*cd21)); - r2max = r2max1 < r2max2? r2max1 : r2max2; + den = fabs(cd12*cd12+cd22*cd22); + num2 = x1max*x1max*num; + r2max1 = num2code) { + case PROF_DIRAC: + memset(prof->pix, 0, npix*sizeof(float)); + prof->pix[profit->modnaxisn[0]/2 + + (profit->modnaxisn[1]/2)*profit->modnaxisn[0]] = 1.0; + prof->lostfluxfrac = 0.0; + threshflag = 0; + break; case PROF_SERSIC: n = fabs(*prof->extra[0]); bn = 2.0*n - 1.0/3.0 + 4.0/(405.0*n) + 46.0/(25515.0*n*n) @@ -3526,13 +3596,6 @@ width = 3.0; prof->lostfluxfrac = 0.0; threshflag = 1; break; - case PROF_DIRAC: - memset(prof->pix, 0, npix*sizeof(float)); - prof->pix[profit->modnaxisn[0]/2 - + (profit->modnaxisn[1]/2)*profit->modnaxisn[0]] = 1.0; - prof->lostfluxfrac = 0.0; - threshflag = 0; - break; default: /*---- Tabulated profile: remap each pixel */ /*---- Initialize multi-dimensional counters */ diff --git a/src/profit.h b/src/profit.h index c082ab5..7258a47 100644 --- a/src/profit.h +++ b/src/profit.h @@ -1,18 +1,32 @@ - /* - profit.h - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* profit.h * -* Part of: SExtractor +* Include file for profit.c. * -* Authors: E.BERTIN (IAP) +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: Include file for profit.c. +* This file part of: SExtractor * -* Last modify: 21/07/2010 +* Copyright: (C) 2006-2010 IAP/CNRS/UPMC * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifndef _PROFIT_H_ #define _PROFIT_H_ @@ -36,6 +50,7 @@ #define PROFIT_OVERSAMP 5 /* Max. profile oversamp. factor on each axis */ #define PROFIT_HIDEFRES 201 /* Hi. def. model resol. (must be 0 /*--------------------------------- typedefs --------------------------------*/ -typedef enum {PROF_BACK, PROF_SERSIC, PROF_DEVAUCOULEURS, +typedef enum {PROF_BACK, PROF_DIRAC, PROF_SERSIC, PROF_DEVAUCOULEURS, PROF_EXPONENTIAL, PROF_ARMS, PROF_BAR, PROF_INRING, - PROF_OUTRING, PROF_SERSIC_TABEX, PROF_DIRAC, PROF_NPROF} + PROF_OUTRING, PROF_SERSIC_TABEX, PROF_NPROF} proftypenum; /* Profile code */ typedef enum {INTERP_NEARESTNEIGHBOUR, INTERP_BILINEAR, INTERP_LANCZOS2, INTERP_LANCZOS3, INTERP_LANCZOS4} interpenum; -typedef enum {PARAM_BACK, PARAM_X, PARAM_Y, +typedef enum {PARAM_BACK, + PARAM_DIRAC_FLUX, PARAM_X, PARAM_Y, PARAM_SPHEROID_FLUX, PARAM_SPHEROID_REFF, PARAM_SPHEROID_ASPECT, PARAM_SPHEROID_POSANG, PARAM_SPHEROID_SERSICN, PARAM_DISK_FLUX, PARAM_DISK_SCALE, PARAM_DISK_ASPECT, diff --git a/src/psf.c b/src/psf.c index 647a30b..fe8cdaa 100644 --- a/src/psf.c +++ b/src/psf.c @@ -1,19 +1,32 @@ - /* - psf.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* psf.c * -* Part of: SExtractor +* Fit a PSF model to an image. * -* Authors: E.BERTIN (IAP) -* P.DELORME (LAOG) +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: Fit the PSF to a detection. +* This file part of: SExtractor * -* Last modify: 07/07/2010 +* Copyright: (C) 1998-2010 IAP/CNRS/UPMC * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/psf.h b/src/psf.h index 1141ad9..168c8d9 100644 --- a/src/psf.h +++ b/src/psf.h @@ -1,19 +1,32 @@ - /* - psf.h - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* psf.h * -* Part of: SExtractor +* Include file for psf.c. * -* Authors: E.BERTIN (IAP) -* P.DELORME (LAOG) +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: Include file for psffit.c. +* This file part of: SExtractor * -* Last modify: 18/05/2010 +* Copyright: (C) 1998-2010 IAP/CNRS/UPMC * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ /*----------------------------- Internal constants --------------------------*/ diff --git a/src/readimage.c b/src/readimage.c index 4f609b8..274b1ff 100644 --- a/src/readimage.c +++ b/src/readimage.c @@ -1,18 +1,34 @@ /* - readimage.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* readimage.c. * -* Part of: SExtractor +* Read image data. * -* Author: E.BERTIN (IAP) +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: functions for input of image data. +* This file part of: SExtractor * -* Last modify: 08/03/2010 +* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC +* (C) 1994,1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/refine.c b/src/refine.c index 9b29bac..9ccac40 100644 --- a/src/refine.c +++ b/src/refine.c @@ -1,18 +1,34 @@ - /* - refine.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* refine.c * -* Part of: SExtractor +* Deblend sources based on their pixel lists. * -* Author: E.BERTIN (IAP) +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: functions to refine extraction of objects. +* This file part of: SExtractor * -* Last modify: 10/01/2008 +* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC +* (C) 1994,1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" @@ -270,7 +286,7 @@ int gatherup(objliststruct *objlistin, objliststruct *objlistout) goto exit_gatherup; } dist = objt->fdnpix/(2*PI*objt->abcor*objt->a*objt->b); - amp[i] = dist<70.0? objt->thresh*exp(dist) : 4.0*objt->fdpeak; + amp[i] = dist<70.0? objt->dthresh*expf(dist) : 4.0*objt->fdpeak; /* ------------ limitate expansion ! */ if (amp[i]>4.0*objt->fdpeak) @@ -305,7 +321,7 @@ int gatherup(objliststruct *objlistin, objliststruct *objlistout) dx = x - objt->mx; dy = y - objt->my; dist=0.5*(objt->cxx*dx*dx+objt->cyy*dy*dy+objt->cxy*dx*dy)/objt->abcor; - p[i] = p[i-1] + (dist<70.0?amp[i]*exp(-dist) : 0.0); + p[i] = p[i-1] + (dist<70.0?amp[i]*expf(-dist) : 0.0); if (dist. +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/retina.h b/src/retina.h index c95c25c..49c33f8 100644 --- a/src/retina.h +++ b/src/retina.h @@ -1,18 +1,35 @@ - /* - retina.h - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* retina.h +* +* Include file for retina.c. +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Part of: SExtractor +* This file part of: SExtractor * -* Author: E.BERTIN, IAP & Leiden Sterrewacht. +* Copyright: (C) 1998-2010 IAP/CNRS/UPMC +* (C) 1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -* Contents: include file related to retina.c. +* Author: Emmanuel Bertin (IAP) * -* Last modify: 07/12/96 +* License: GNU General Public License * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ + /*------------------------------- structures --------------------------------*/ typedef struct structreti diff --git a/src/scan.c b/src/scan.c index 2a30b42..02b6c2e 100644 --- a/src/scan.c +++ b/src/scan.c @@ -1,19 +1,34 @@ - /* - scan.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* scan.c * -* Part of: SExtractor +* Main image scanning routines. * -* Author: E.BERTIN (IAP) +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: functions for extraction of connected pixels from -* a pixmap. +* This file part of: SExtractor * -* Last modify: 28/09/2010 +* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC +* (C) 1994,1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/sexhead.h b/src/sexhead.h index 1fb8b24..137f5ae 100644 --- a/src/sexhead.h +++ b/src/sexhead.h @@ -1,18 +1,34 @@ /* - sexhead.h - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* sexhead.h * -* Part of: SExtractor +* Keyword list for FITS-LDAC catalogue headers. * -* Author: E.BERTIN (IAP) +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: header structure and templates for catalog data. +* This file part of: SExtractor * -* Last modify: 13/12/2004 +* Copyright: (C) 1998-2010 IAP/CNRS/UPMC +* (C) 1997 ESO +* (C) 1996 Sterrewacht Leiden * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ keystruct headkey[] = { {"FITSFILE", "File name of the analysed image", diff --git a/src/sexhead1.h b/src/sexhead1.h index bbeb221..15c5717 100644 --- a/src/sexhead1.h +++ b/src/sexhead1.h @@ -1,19 +1,34 @@ /* - sexhead1.h - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* sexhead1.h * -* Part of: SExtractor +* Keyword list for FITS_1.0 catalogue headers. * -* Author: E.BERTIN (IAP) +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: header (FITS format #1) and templates for catalog data. +* This file part of: SExtractor * -* Last modify: 02/07/2010 +* Copyright: (C) 1998-2010 IAP/CNRS/UPMC +* (C) 1997 ESO +* (C) 1996 Sterrewacht Leiden * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ - +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ int idummy; double ddummy; diff --git a/src/sexheadsc.h b/src/sexheadsc.h index 3d9a828..a18dabc 100644 --- a/src/sexheadsc.h +++ b/src/sexheadsc.h @@ -1,18 +1,33 @@ /* - sexheadsc.h - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* sexheadsc.h +* +* Keyword list for SkyCat catalogue headers. +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: SExtractor +* +* Copyright: (C) 1998-2010 IAP/CNRS/UPMC +* (C) 1997 ESO * -* Part of: SExtractor +* Author: Emmanuel Bertin (IAP) * -* Author: E.BERTIN, DeNIS/LDAC. +* License: GNU General Public License * -* Contents: header structure and templates for SkyCat output. +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . * -* Last modify: 02/09/97 +* Last modified: 11/10/2010 * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ char skycathead[] = "QueryResult\n\n" "# Config entry for original catalog server:\n" diff --git a/src/som.c b/src/som.c index e359c7a..88f467f 100644 --- a/src/som.c +++ b/src/som.c @@ -1,18 +1,34 @@ - /* - som.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* som.c * -* Part of: A program using neural networks. +* Implementation of Kohonen's Self Organizing Map (V3.0). * -* Author: E.BERTIN (IAP) +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: Implementation of Kohonen's Self Organizing Map (V3.0). +* This file part of: SExtractor * -* Last modify: 19/12/2007 +* Copyright: (C) 1998-2010 IAP/CNRS/UPMC +* (C) 1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . +* +* Last modified: 11/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/som.h b/src/som.h index eba1ea4..191b8f1 100644 --- a/src/som.h +++ b/src/som.h @@ -1,18 +1,34 @@ - /* - som.h - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* som.h +* +* Include file for som.c. +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: SExtractor +* +* Copyright: (C) 1998-2010 IAP/CNRS/UPMC +* (C) 1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -* Part of: A program using neural networks. +* Author: Emmanuel Bertin (IAP) * -* Author: E.BERTIN, IAP & Leiden observatory. +* License: GNU General Public License * -* Contents: Include for Kohonen's Self Organizing Map (V2.0). +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . * -* Last modify: 17/12/97 +* Last modified: 11/10/2010 * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ /*--------------------------------- constants ------------------------------*/ diff --git a/src/threads.h b/src/threads.h index f097f9f..407793d 100644 --- a/src/threads.h +++ b/src/threads.h @@ -1,18 +1,33 @@ - /* - threads.h - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* threads.h +* +* Definitions and shortcuts for POSIX threads. +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: AstrOmatic software +* +* Copyright: (C) 2002-2010 IAP/CNRS/UPMC * -* Part of: A program that uses POSIX threads +* Author: Emmanuel Bertin (IAP) * -* Author: E.BERTIN +* License: GNU General Public License * -* Contents: Definitions and shortcuts for POSIX threads. +* AstrOmatic software is free software: you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation, either version 3 of the +* License, or (at your option) any later version. +* AstrOmatic software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with AstrOmatic software. +* If not, see . * -* Last modify: 03/07/2002 +* Last modified: 10/10/2010 * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #include #include diff --git a/src/types.h b/src/types.h index 2f9e571..8936a0c 100644 --- a/src/types.h +++ b/src/types.h @@ -1,18 +1,34 @@ - /* - types.h - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* types.h +* +* Global type definitions. +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: SExtractor +* +* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC +* (C) 1994,1997 ESO +* (C) 1995,1996 Sterrewacht Leiden * -* Part of: SExtractor +* Author: Emmanuel Bertin (IAP) * -* Author: E.BERTIN (IAP) +* License: GNU General Public License * -* Contents: global type definitions. +* SExtractor is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* SExtractor is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with SExtractor. If not, see . * -* Last modify: 20/08/2010 +* Last modified: 11/10/2010 * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #include @@ -381,6 +397,10 @@ typedef struct float prof_concentrationerr; /* RMS error */ float prof_offset_flux; /* Background offset */ float prof_offset_fluxerr; /* RMS error */ + float prof_dirac_flux; /* Point source total flux */ + float prof_dirac_fluxerr; /* RMS error */ + float prof_dirac_mag; /* Point source "total" mag */ + float prof_dirac_magerr; /* RMS error */ float prof_spheroid_flux; /* Spheroid total flux */ float prof_spheroid_fluxerr; /* RMS error */ float prof_spheroid_peak; /* Spheroid peak flux */ diff --git a/src/wcs/LICENSE b/src/wcs/LICENSE new file mode 100644 index 0000000..5bc8fb2 --- /dev/null +++ b/src/wcs/LICENSE @@ -0,0 +1,481 @@ + GNU LIBRARY GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1991 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the library GPL. It is + numbered 2 because it goes with version 2 of the ordinary GPL.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Library General Public License, applies to some +specially designated Free Software Foundation software, and to any +other libraries whose authors decide to use it. You can use it for +your libraries, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if +you distribute copies of the library, or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link a program with the library, you must provide +complete object files to the recipients so that they can relink them +with the library, after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + Our method of protecting your rights has two steps: (1) copyright +the library, and (2) offer you this license which gives you legal +permission to copy, distribute and/or modify the library. + + Also, for each distributor's protection, we want to make certain +that everyone understands that there is no warranty for this free +library. If the library is modified by someone else and passed on, we +want its recipients to know that what they have is not the original +version, so that any problems introduced by others will not reflect on +the original authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that companies distributing free +software will individually obtain patent licenses, thus in effect +transforming the program into proprietary software. To prevent this, +we have made it clear that any patent must be licensed for everyone's +free use or not licensed at all. + + Most GNU software, including some libraries, is covered by the ordinary +GNU General Public License, which was designed for utility programs. This +license, the GNU Library General Public License, applies to certain +designated libraries. This license is quite different from the ordinary +one; be sure to read it in full, and don't assume that anything in it is +the same as in the ordinary license. + + The reason we have a separate public license for some libraries is that +they blur the distinction we usually make between modifying or adding to a +program and simply using it. Linking a program with a library, without +changing the library, is in some sense simply using the library, and is +analogous to running a utility program or application program. However, in +a textual and legal sense, the linked executable is a combined work, a +derivative of the original library, and the ordinary General Public License +treats it as such. + + Because of this blurred distinction, using the ordinary General +Public License for libraries did not effectively promote software +sharing, because most developers did not use the libraries. We +concluded that weaker conditions might promote sharing better. + + However, unrestricted linking of non-free programs would deprive the +users of those programs of all benefit from the free status of the +libraries themselves. This Library General Public License is intended to +permit developers of non-free programs to use free libraries, while +preserving your freedom as a user of such programs to change the free +libraries that are incorporated in them. (We have not seen how to achieve +this as regards changes in header files, but we have achieved it as regards +changes in the actual functions of the Library.) The hope is that this +will lead to faster development of free libraries. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, while the latter only +works together with the library. + + Note that it is possible for a library to be covered by the ordinary +General Public License rather than by this special one. + + GNU LIBRARY GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library which +contains a notice placed by the copyright holder or other authorized +party saying it may be distributed under the terms of this Library +General Public License (also called "this License"). Each licensee is +addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also compile or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + c) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + d) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the source code distributed need not include anything that is normally +distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Library General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/src/wcs/Makefile.am b/src/wcs/Makefile.am index 1884b2e..c9dc978 100644 --- a/src/wcs/Makefile.am +++ b/src/wcs/Makefile.am @@ -1,7 +1,40 @@ -# Program Makefile for the WCS library -# Copyright (C) 2002 Emmanuel Bertin. +# +# Makefile.am +# +# WCSlib Makefile.am. Process this file with automake to generate a Makefile +# +#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +# +# This file part of: AstrOmatic WCS library +# +# Copyright: (C) 2002-2010 IAP/CNRS/UPMC +# +# Authors: Emmanuel Bertin (this Makefile.am) +# Mark Calabretta (WCSlib library) +# +# Licenses: GNU General Public License (this file) +# GNU Library General Public License (WCSlib) +# +# AstrOmatic software is free software: you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# AstrOmatic software is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# You should have received a copy of the GNU General Public License +# along with AstrOmatic software. +# If not, see . +# +# Last modified: 1010/2010 +# +#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + noinst_LIBRARIES = libwcs_c.a libwcs_c_a_SOURCES = cel.c lin.c poly.c proj.c sph.c tnx.c wcs.c \ wcstrig.c \ cel.h lin.h poly.h proj.h sph.h tnx.h wcs.h \ wcsmath.h wcstrig.h +EXTRA_DIST = LICENSE README + diff --git a/src/wcs/Makefile.in b/src/wcs/Makefile.in index ae533ad..dd7e089 100644 --- a/src/wcs/Makefile.in +++ b/src/wcs/Makefile.in @@ -14,6 +14,39 @@ @SET_MAKE@ +# +# Makefile.am +# +# WCSlib Makefile.am. Process this file with automake to generate a Makefile +# +#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +# +# This file part of: AstrOmatic WCS library +# +# Copyright: (C) 2002-2010 IAP/CNRS/UPMC +# +# Authors: Emmanuel Bertin (this Makefile.am) +# Mark Calabretta (WCSlib library) +# +# Licenses: GNU General Public License (this file) +# GNU Library General Public License (WCSlib) +# +# AstrOmatic software is free software: you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# AstrOmatic software is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# You should have received a copy of the GNU General Public License +# along with AstrOmatic software. +# If not, see . +# +# Last modified: 1010/2010 +# +#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -33,7 +66,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = src/wcs -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acx_atlas.m4 \ $(top_srcdir)/acx_fftw.m4 $(top_srcdir)/acx_prog_cc_optim.m4 \ @@ -194,15 +227,13 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ - -# Program Makefile for the WCS library -# Copyright (C) 2002 Emmanuel Bertin. noinst_LIBRARIES = libwcs_c.a libwcs_c_a_SOURCES = cel.c lin.c poly.c proj.c sph.c tnx.c wcs.c \ wcstrig.c \ cel.h lin.h poly.h proj.h sph.h tnx.h wcs.h \ wcsmath.h wcstrig.h +EXTRA_DIST = LICENSE README all: all-am .SUFFIXES: diff --git a/src/wcs/cel.c b/src/wcs/cel.c index 49c64c5..85166cc 100644 --- a/src/wcs/cel.c +++ b/src/wcs/cel.c @@ -1,3 +1,35 @@ +/* +* cel.c +* +* Lower level spherical coordinate transformation and projection routines. +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: AstrOmatic WCS library +* +* Copyright: (C) 2000-2010 IAP/CNRS/UPMC +* (C) 1995-1999 Mark Calabretta +* +* Authors: Emmanuel Bertin (this version) +* Mark Calabretta (original version) +* +* Licenses: GNU General Public License +* +* AstrOmatic software is free software: you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation, either version 3 of the +* License, or (at your option) any later version. +* AstrOmatic software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with AstrOmatic software. +* If not, see . +* +* Last modified: 10/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ /*============================================================================= * * WCSLIB - an implementation of the FITS WCS proposal. diff --git a/src/wcs/cel.h b/src/wcs/cel.h index fc302b2..9827599 100644 --- a/src/wcs/cel.h +++ b/src/wcs/cel.h @@ -1,3 +1,35 @@ +/* +* cel.h +* +* Include file for cel.c. +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: AstrOmatic WCS library +* +* Copyright: (C) 2000-2010 IAP/CNRS/UPMC +* (C) 1995-1999 Mark Calabretta +* +* Authors: Emmanuel Bertin (this version) +* Mark Calabretta (original version) +* +* Licenses: GNU General Public License +* +* AstrOmatic software is free software: you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation, either version 3 of the +* License, or (at your option) any later version. +* AstrOmatic software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with AstrOmatic software. +* If not, see . +* +* Last modified: 10/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ /*============================================================================= * * WCSLIB - an implementation of the FITS WCS proposal. diff --git a/src/wcs/lin.c b/src/wcs/lin.c index 69e05d8..3bb8969 100644 --- a/src/wcs/lin.c +++ b/src/wcs/lin.c @@ -1,3 +1,35 @@ +/* +* lin.c +* +* Linear transformations. +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: AstrOmatic WCS library +* +* Copyright: (C) 2000-2010 IAP/CNRS/UPMC +* (C) 1995-1999 Mark Calabretta +* +* Authors: Emmanuel Bertin (this version) +* Mark Calabretta (original version) +* +* Licenses: GNU General Public License +* +* AstrOmatic software is free software: you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation, either version 3 of the +* License, or (at your option) any later version. +* AstrOmatic software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with AstrOmatic software. +* If not, see . +* +* Last modified: 10/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ /*============================================================================= * * WCSLIB - an implementation of the FITS WCS proposal. diff --git a/src/wcs/lin.h b/src/wcs/lin.h index c151e02..8b56d41 100644 --- a/src/wcs/lin.h +++ b/src/wcs/lin.h @@ -1,3 +1,35 @@ +/* +* lin.h +* +* Include file for lin.c. +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +* +* This file part of: AstrOmatic WCS library +* +* Copyright: (C) 2000-2010 IAP/CNRS/UPMC +* (C) 1995-1999 Mark Calabretta +* +* Authors: Emmanuel Bertin (this version) +* Mark Calabretta (original version) +* +* Licenses: GNU General Public License +* +* AstrOmatic software is free software: you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation, either version 3 of the +* License, or (at your option) any later version. +* AstrOmatic software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with AstrOmatic software. +* If not, see . +* +* Last modified: 10/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ /*============================================================================= * * WCSLIB - an implementation of the FITS WCS proposal. diff --git a/src/wcs/poly.c b/src/wcs/poly.c index d8c9a1e..3d1ebc6 100644 --- a/src/wcs/poly.c +++ b/src/wcs/poly.c @@ -1,18 +1,33 @@ - /* - poly.c - -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +/* +* poly.c * -* Part of: A program using Polynomials +* Manage polynomials. * -* Author: E.BERTIN (IAP) +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * -* Contents: Polynomial fitting +* This file part of: AstrOmatic WCS library * -* Last modify: 08/03/2005 +* Copyright: (C) 1998-2010 IAP/CNRS/UPMC * -*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*/ +* Author: Emmanuel Bertin (IAP) +* +* License: GNU General Public License +* +* AstrOmatic software is free software: you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation, either version 3 of the +* License, or (at your option) any later version. +* AstrOmatic software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with AstrOmatic software. +* If not, see . +* +* Last modified: 10/10/2010 +* +*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #ifdef HAVE_CONFIG_H #include "config.h" @@ -24,7 +39,9 @@ #include #include "poly.h" - +#ifdef HAVE_ATLAS +#include ATLAS_LAPACK_H +#endif #define QCALLOC(ptr, typ, nel) \ {if (!(ptr = (typ *)calloc((size_t)(nel),sizeof(typ)))) \ @@ -338,7 +355,7 @@ OUTPUT -. NOTES Requires quadruple-precision. **For the time beeing, this function returns completely wrong results!!** AUTHOR E. Bertin (IAP) -VERSION 03/03/2004 +VERSION 05/10/2010 ***/ void poly_addcste(polystruct *poly, double *cste) { @@ -395,21 +412,13 @@ void poly_addcste(polystruct *poly, double *cste) for (j=ndim; j--; mcoefft += maxdegree) val *= mcoefft[*(powerst2++)]; acoeff[i] += val*coeff[p]; -/* -printf("%g \n", val); -*/ } } /* Add the new coefficients to the previous ones */ for (i=0; i