Commit 1755ca24 authored by Emmanuel Bertin's avatar Emmanuel Bertin
Browse files

Fixed potential issues in ASSOCCOORD_TYPE WORLD mode.

Fixed triggering of model surface brightness measurement.
Added new FLUX_DETMODEL,FLUXERR_DETMODEL, MAG_DETMODEL,MAGERR_DETMODEL, FLAGS_DE
TMODEL and CHI2_DETMODEL measurement parameters that apply on the measurement im
age a model fitted on the detection image (two PSF models required); these new p
arameters are meant for measuring faint galaxy colors.
Improved displayed info for memory allocation failures.
Increased default maximum number of threads set by configure to 1024.
Updated Copyright display line (2012).
Added support for "TPV" WCS projection.
Pushed version number to 2.16.0.
parent c3d4de93
......@@ -7,7 +7,7 @@
*
* This file part of: AstrOmatic WCS library
*
* Copyright: (C) 2000-2010 Emmanuel Bertin -- IAP/CNRS/UPMC
* Copyright: (C) 2000-2012 Emmanuel Bertin -- IAP/CNRS/UPMC
* (C) 1995-1999 Mark Calabretta (original version)
*
* Licenses: GNU General Public License
......@@ -24,7 +24,7 @@
* along with AstrOmatic software.
* If not, see <http://www.gnu.org/licenses/>.
*
* Last modified: 10/10/2010
* Last modified: 18/04/2012
*
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
/*=============================================================================
......@@ -230,6 +230,7 @@
* ZEA: zenithal/azimuthal equal area
* AIR: Airy
* TNX: IRAF's polynomial correction to TAN
* TPV: AstrOmatic's polynomial correction to TAN
*
* Cylindricals:
* CYP: cylindrical perspective
......@@ -262,8 +263,9 @@
*
* Author: Mark Calabretta, Australia Telescope National Facility
* IRAF's TNX added by E.Bertin 2000/03/28
* TPV added by E.Bertin 2012/04/11
* Filtering of abs(phi)>180 and abs(theta)>90 added by E.Bertin 2000/11/11
* $Id: cel.c,v 1.1.1.1 2002/03/15 16:33:26 bertin Exp $
* $Id: cel.c,v 1.1.1.1 2012/04/18 16:33:26 bertin Exp $
*===========================================================================*/
#ifdef HAVE_CONFIG_H
......@@ -281,11 +283,11 @@
#include "sph.h"
#include "tnx.h"
int npcode = 26;
char pcodes[26][4] =
int npcode = 27;
char pcodes[27][4] =
{"AZP", "TAN", "SIN", "STG", "ARC", "ZPN", "ZEA", "AIR", "CYP", "CAR",
"MER", "CEA", "COP", "COD", "COE", "COO", "BON", "PCO", "GLS", "PAR",
"AIT", "MOL", "CSC", "QSC", "TSC", "TNX"};
"AIT", "MOL", "CSC", "QSC", "TSC", "TNX", "TPV"};
/* Map error number to error message for each function. */
const char *celset_errmsg[] = {
......@@ -320,14 +322,18 @@ struct prjprm *prj;
double u, v, x, y, z;
/* Set pointers to the forward and reverse projection routines. */
if (strcmp(pcode, "AZP") == 0) {
cel->prjfwd = azpfwd;
cel->prjrev = azprev;
if (strcmp(pcode, "TAN") == 0) {
cel->prjfwd = tanfwd;
cel->prjrev = tanrev;
theta0 = 90.0;
} else if (strcmp(pcode, "TAN") == 0) {
} else if (strcmp(pcode, "TPV") == 0) {
cel->prjfwd = tanfwd;
cel->prjrev = tanrev;
theta0 = 90.0;
} else if (strcmp(pcode, "AZP") == 0) {
cel->prjfwd = azpfwd;
cel->prjrev = azprev;
theta0 = 90.0;
} else if (strcmp(pcode, "SIN") == 0) {
cel->prjfwd = sinfwd;
cel->prjrev = sinrev;
......
......@@ -7,7 +7,7 @@
*
* This file part of: AstrOmatic WCS library
*
* Copyright: (C) 2000-2010 Emmanuel Bertin -- IAP/CNRS/UPMC
* Copyright: (C) 2000-2012 Emmanuel Bertin -- IAP/CNRS/UPMC
* (C) 1995-1999 Mark Calabretta (original version)
*
* Licenses: GNU General Public License
......@@ -24,7 +24,7 @@
* along with AstrOmatic software.
* If not, see <http://www.gnu.org/licenses/>.
*
* Last modified: 10/10/2010
* Last modified: 11/04/2012
*
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
/*=============================================================================
......@@ -55,7 +55,7 @@
* AUSTRALIA
*
* Author: Mark Calabretta, Australia Telescope National Facility
* $Id: cel.h,v 1.1.1.1 2002/03/15 16:33:26 bertin Exp $
* $Id: cel.h,v 1.1.1.1 2012/04/11 16:33:26 bertin Exp $
*===========================================================================*/
#ifndef WCSLIB_CEL
......@@ -68,7 +68,7 @@ extern "C" {
#endif
extern int npcode;
extern char pcodes[26][4];
extern char pcodes[27][4];
struct celprm {
int flag;
......
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