Skip to content
GitLab
Commit 8810cda9 authored by Emmanuel Bertin's avatar Emmanuel Bertin
Browse files

Added FLUXHYBRID_,MAG_HYBRID

parent 48d60ffa
Show whitespace changes
Inline Side-by-side
src/back.c
View file @ 8810cda9
......@@ -7,11 +7,7 @@
*
* This file part of: SExtractor
*
* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC
* (C) 1994,1997 ESO
* (C) 1995,1996 Sterrewacht Leiden
*
* Author: Emmanuel Bertin (IAP)
* Copyright: (C) 1993-2010 Emmanuel Bertin -- IAP/CNRS/UPMC
*
* License: GNU General Public License
*
......
src/back.h
View file @ 8810cda9
......@@ -7,11 +7,7 @@
*
* This file part of: SExtractor
*
* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC
* (C) 1994,1997 ESO
* (C) 1995,1996 Sterrewacht Leiden
*
* Author: Emmanuel Bertin (IAP)
* Copyright: (C) 1993-2010 Emmanuel Bertin -- IAP/CNRS/UPMC
*
* License: GNU General Public License
*
......
src/bpro.c
View file @ 8810cda9
......@@ -7,11 +7,7 @@
*
* This file part of: SExtractor
*
* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC
* (C) 1994,1997 ESO
* (C) 1995,1996 Sterrewacht Leiden
*
* Author: Emmanuel Bertin (IAP)
* Copyright: (C) 1993-2010 Emmanuel Bertin -- IAP/CNRS/UPMC
*
* License: GNU General Public License
*
......
src/bpro.h
View file @ 8810cda9
......@@ -7,11 +7,7 @@
*
* This file part of: SExtractor
*
* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC
* (C) 1994,1997 ESO
* (C) 1995,1996 Sterrewacht Leiden
*
* Author: Emmanuel Bertin (IAP)
* Copyright: (C) 1993-2010 Emmanuel Bertin -- IAP/CNRS/UPMC
*
* License: GNU General Public License
*
......
src/catout.c
View file @ 8810cda9
......@@ -7,11 +7,7 @@
*
* This file part of: SExtractor
*
* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC
* (C) 1994,1997 ESO
* (C) 1995,1996 Sterrewacht Leiden
*
* Author: Emmanuel Bertin (IAP)
* Copyright: (C) 1993-2010 Emmanuel Bertin -- IAP/CNRS/UPMC
*
* License: GNU General Public License
*
......@@ -26,7 +22,7 @@
* You should have received a copy of the GNU General Public License
* along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
*
* Last modified: 11/10/2010
* Last modified: 19/10/2010
*
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
......@@ -232,9 +228,15 @@ void updateparamflags()
| FLAG(obj2.prof_concentration)
| FLAG(obj2.prof_class_star);
FLAG(obj2.fluxcorerr_prof) |= FLAG(obj2.magcorerr_prof);
FLAG(obj2.fluxcor_prof) |= FLAG(obj2.magcor_prof)
| FLAG(obj2.fluxcorerr_prof);
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_concentrationerr)
| FLAG(obj2.fluxcorerr_prof);
FLAG(obj2.flux_prof) |= FLAG(obj2.mag_prof)
| FLAG(obj2.fluxerr_prof)
| FLAG(obj2.fluxcor_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);
......@@ -557,7 +559,8 @@ void updateparamflags()
| FLAG(obj2.kronfactor)
| FLAG(obj2.flux_best)
| FLAG(obj2.flux_radius)
| FLAG(obj2.hl_radius);
| FLAG(obj2.hl_radius)
| FLAG(obj2.fluxcor_prof);
FLAG(obj2.flux_petro) |= FLAG(obj2.mag_petro) | FLAG(obj2.magerr_petro)
| FLAG(obj2.fluxerr_petro)
| FLAG(obj2.petrofactor);
......
src/check.c
View file @ 8810cda9
......@@ -7,11 +7,7 @@
*
* This file part of: SExtractor
*
* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC
* (C) 1994,1997 ESO
* (C) 1995,1996 Sterrewacht Leiden
*
* Author: Emmanuel Bertin (IAP)
* Copyright: (C) 1993-2010 Emmanuel Bertin -- IAP/CNRS/UPMC
*
* License: GNU General Public License
*
......@@ -378,7 +374,7 @@ void reinitcheck(picstruct *field, checkstruct *check)
QMALLOC(ptrf, PIXTYPE, check->npix);
check->pix = (void *)ptrf;
for (i=check->npix; i--;)
*(ptrf++) = -10.0;
*(ptrf++) = 0.0;
QFWRITE(check->fitshead,check->fitsheadsize,check->file,check->filename);
free(check->fitshead);
break;
......
src/check.h
View file @ 8810cda9
......@@ -7,11 +7,7 @@
*
* This file part of: SExtractor
*
* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC
* (C) 1994,1997 ESO
* (C) 1995,1996 Sterrewacht Leiden
*
* Author: Emmanuel Bertin (IAP)
* Copyright: (C) 1993-2010 Emmanuel Bertin -- IAP/CNRS/UPMC
*
* License: GNU General Public License
*
......
src/clean.c
View file @ 8810cda9
......@@ -7,11 +7,7 @@
*
* This file part of: SExtractor
*
* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC
* (C) 1994,1997 ESO
* (C) 1995,1996 Sterrewacht Leiden
*
* Author: Emmanuel Bertin (IAP)
* Copyright: (C) 1993-2010 Emmanuel Bertin -- IAP/CNRS/UPMC
*
* License: GNU General Public License
*
......
src/clean.h
View file @ 8810cda9
......@@ -7,11 +7,7 @@
*
* This file part of: SExtractor
*
* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC
* (C) 1994,1997 ESO
* (C) 1995,1996 Sterrewacht Leiden
*
* Author: Emmanuel Bertin (IAP)
* Copyright: (C) 1993-2010 Emmanuel Bertin -- IAP/CNRS/UPMC
*
* License: GNU General Public License
*
......
src/define.h
View file @ 8810cda9
......@@ -7,11 +7,7 @@
*
* This file part of: SExtractor
*
* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC
* (C) 1994,1997 ESO
* (C) 1995,1996 Sterrewacht Leiden
*
* Author: Emmanuel Bertin (IAP)
* Copyright: (C) 1993-2010 Emmanuel Bertin -- IAP/CNRS/UPMC
*
* License: GNU General Public License
*
......
src/extract.c
View file @ 8810cda9
......@@ -7,11 +7,7 @@
*
* This file part of: SExtractor
*
* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC
* (C) 1994,1997 ESO
* (C) 1995,1996 Sterrewacht Leiden
*
* Author: Emmanuel Bertin (IAP)
* Copyright: (C) 1993-2010 Emmanuel Bertin -- IAP/CNRS/UPMC
*
* License: GNU General Public License
*
......
src/extract.h
View file @ 8810cda9
......@@ -7,11 +7,7 @@
*
* This file part of: SExtractor
*
* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC
* (C) 1994,1997 ESO
* (C) 1995,1996 Sterrewacht Leiden
*
* Author: Emmanuel Bertin (IAP)
* Copyright: (C) 1993-2010 Emmanuel Bertin -- IAP/CNRS/UPMC
*
* License: GNU General Public License
*
......
src/fft.c
View file @ 8810cda9
......@@ -7,9 +7,7 @@
*
* This file part of: SExtractor
*
* Copyright: (C) 2007-2010 IAP/CNRS/UPMC
*
* Author: Emmanuel Bertin (IAP)
* Copyright: (C) 2007-2010 Emmanuel Bertin -- IAP/CNRS/UPMC
*
* License: GNU General Public License
*
......
src/fft.h
View file @ 8810cda9
......@@ -7,9 +7,7 @@
*
* This file part of: SExtractor
*
* Copyright: (C) 2007-2010 IAP/CNRS/UPMC
*
* Author: Emmanuel Bertin (IAP)
* Copyright: (C) 2007-2010 Emmanuel Bertin -- IAP/CNRS/UPMC
*
* License: GNU General Public License
*
......
src/field.c
View file @ 8810cda9
......@@ -7,11 +7,7 @@
*
* This file part of: SExtractor
*
* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC
* (C) 1994,1997 ESO
* (C) 1995,1996 Sterrewacht Leiden
*
* Author: Emmanuel Bertin (IAP)
* Copyright: (C) 1993-2010 Emmanuel Bertin -- IAP/CNRS/UPMC
*
* License: GNU General Public License
*
......
src/field.h
View file @ 8810cda9
......@@ -7,11 +7,7 @@
*
* This file part of: SExtractor
*
* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC
* (C) 1994,1997 ESO
* (C) 1995,1996 Sterrewacht Leiden
*
* Author: Emmanuel Bertin (IAP)
* Copyright: (C) 1993-2010 Emmanuel Bertin -- IAP/CNRS/UPMC
*
* License: GNU General Public License
*
......
src/filter.c
View file @ 8810cda9
......@@ -8,11 +8,7 @@
*
* This file part of: SExtractor
*
* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC
* (C) 1994,1997 ESO
* (C) 1995,1996 Sterrewacht Leiden
*
* Author: Emmanuel Bertin (IAP)
* Copyright: (C) 1993-2010 Emmanuel Bertin -- IAP/CNRS/UPMC
*
* License: GNU General Public License
*
......
src/filter.h
View file @ 8810cda9
......@@ -7,11 +7,7 @@
*
* This file part of: SExtractor
*
* Copyright: (C) 1993,1998-2010 IAP/CNRS/UPMC
* (C) 1994,1997 ESO
* (C) 1995,1996 Sterrewacht Leiden
*
* Author: Emmanuel Bertin (IAP)
* Copyright: (C) 1993-2010 Emmanuel Bertin -- IAP/CNRS/UPMC
*
* License: GNU General Public License
*
......
src/fits/Makefile.am
View file @ 8810cda9
......@@ -7,9 +7,9 @@
#
# This file part of: AstrOmatic FITS/LDAC library
#
# Copyright: (C) 2002-2010 IAP/CNRS/UPMC
# Copyright: (C) 2002-2010 Emmanuel Bertin -- IAP/CNRS/UPMC
#
# Author: Emmanuel Bertin (IAP)
# Last modified: 09/10/2010
#
# License: GNU General Public License
#
......@@ -25,8 +25,6 @@
# along with AstrOmatic software.
# If not, see <http://www.gnu.org/licenses/>.
#
# Last modified: 09/10/2010
#
#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
noinst_LIBRARIES = libfits.a
......
src/fits/Makefile.in
View file @ 8810cda9
......@@ -23,9 +23,9 @@
#
# This file part of: AstrOmatic FITS/LDAC library
#
# Copyright: (C) 2002-2010 IAP/CNRS/UPMC
# Copyright: (C) 2002-2010 Emmanuel Bertin -- IAP/CNRS/UPMC
#
# Author: Emmanuel Bertin (IAP)
# Last modified: 09/10/2010
#
# License: GNU General Public License
#
......@@ -41,8 +41,6 @@
# along with AstrOmatic software.
# If not, see <http://www.gnu.org/licenses/>.
#
# Last modified: 09/10/2010
#
#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
VPATH = @srcdir@
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment