Changeset 5547

Timestamp:

Nov 18, 2005, 10:22:35 AM (21 years ago)

Author:

magnier

Message:

changed psProjection Xs,Ys units from pix/rad to rad/pix

File:

• branches/eam_rel8_b0/psLib/src/astro/psCoord.c (modified) (5 diffs)

branches/eam_rel8_b0/psLib/src/astro/psCoord.c

@@ -10 +10 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.88 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-10-12 21:02:20 $
+*  @version $Revision: 1.88.4.1 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-11-18 20:22:35 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -215 +215 @@
 
     psPlaneTransform *pt = psAlloc(sizeof(psPlaneTransform));
-    pt->x = psPolynomial2DAlloc(n1-1, n2-1, PS_POLYNOMIAL_ORD);
-    pt->y = psPolynomial2DAlloc(n1-1, n2-1, PS_POLYNOMIAL_ORD);
+    pt->x = psPolynomial2DAlloc(n1, n2, PS_POLYNOMIAL_ORD);
+    pt->y = psPolynomial2DAlloc(n1, n2, PS_POLYNOMIAL_ORD);
 
     psMemSetDeallocator(pt, (psFreeFunc) planeTransformFree);
@@ -286 +286 @@
 
     psPlaneDistort *pt = psAlloc(sizeof(psPlaneDistort));
-    pt->x = psPolynomial4DAlloc(n1-1, n2-1, n3-1, n4-1, PS_POLYNOMIAL_ORD);
-    pt->y = psPolynomial4DAlloc(n1-1, n2-1, n3-1, n4-1, PS_POLYNOMIAL_ORD);
+    pt->x = psPolynomial4DAlloc(n1, n2, n3, n4, PS_POLYNOMIAL_ORD);
+    pt->y = psPolynomial4DAlloc(n1, n2, n3, n4, PS_POLYNOMIAL_ORD);
 
     psMemSetDeallocator(pt, (psFreeFunc) planeDistortFree);
@@ -428 +428 @@
 
     // Apply plate scales
-    out->x *= projection->Xs;
-    out->y *= projection->Ys;
+    out->x /= projection->Xs;
+    out->y /= projection->Ys;
 
     // Return output
@@ -448 +448 @@
 
     // Remove plate scales
-    psF64  x = coord->x/projection->Xs;
-    psF64  y = coord->y/projection->Ys;
+    psF64  x = coord->x*projection->Xs;
+    psF64  y = coord->y*projection->Ys;
 
     // Perform inverse projection