Changeset 17036 for trunk/psModules/src/astrom/pmAstrometryWCS.c

Timestamp:

Mar 18, 2008, 8:38:14 AM (18 years ago)

Author:

eugene

Message:

renaming pmAstrometryTable to pmAstrometryModel; adding pmAstrometryRefstars; using PS_DEG_RAD, PS_RAD_DEG

File:

• trunk/psModules/src/astrom/pmAstrometryWCS.c (modified) (6 diffs)

trunk/psModules/src/astrom/pmAstrometryWCS.c

@@ -7 +7 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-01-15 02:48:58 $
+ *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-03-18 18:38:14 $
  *
  *  Copyright 2006 Institute for Astronomy, University of Hawaii
@@ -339 +339 @@
     psFree (type);
 
-    psMetadataAddF64 (header, PS_LIST_TAIL, "CRVAL1", PS_META_REPLACE, "", wcs->toSky->R*PM_DEG_RAD);
-    psMetadataAddF64 (header, PS_LIST_TAIL, "CRVAL2", PS_META_REPLACE, "", wcs->toSky->D*PM_DEG_RAD);
+    psMetadataAddF64 (header, PS_LIST_TAIL, "CRVAL1", PS_META_REPLACE, "", wcs->toSky->R*PS_DEG_RAD);
+    psMetadataAddF64 (header, PS_LIST_TAIL, "CRVAL2", PS_META_REPLACE, "", wcs->toSky->D*PS_DEG_RAD);
 
     psMetadataAddF64 (header, PS_LIST_TAIL, "CRPIX1", PS_META_REPLACE, "", wcs->crpix1);
@@ -604 +604 @@
     // convert projection from FPA to SKY into wcs projection (degrees to radians)
     wcs->toSky = psProjectionAlloc (fpa->toSky->R, fpa->toSky->D, PM_RAD_DEG, PM_RAD_DEG, fpa->toSky->type);
-    wcs->crval1 = fpa->toSky->R*PM_DEG_RAD;
-    wcs->crval2 = fpa->toSky->D*PM_DEG_RAD;
+    wcs->crval1 = fpa->toSky->R*PS_DEG_RAD;
+    wcs->crval2 = fpa->toSky->D*PS_DEG_RAD;
 
     // given transformation, solve for coordinates which yields output coordinates of 0,0
@@ -620 +620 @@
 
     // pdelt1,2 has units of degrees/micron
-    double pdelt1 = fpa->toSky->Xs * PM_DEG_RAD;
-    double pdelt2 = fpa->toSky->Ys * PM_DEG_RAD;
+    double pdelt1 = fpa->toSky->Xs * PS_DEG_RAD;
+    double pdelt2 = fpa->toSky->Ys * PS_DEG_RAD;
 
     // convert wcs->trans to a matrix with units of degrees/pixel
@@ -696 +696 @@
     // convert projection from TPA to SKY into wcs projection (degrees to radians)
     wcs->toSky = psProjectionAlloc (fpa->toSky->R, fpa->toSky->D, PM_RAD_DEG, PM_RAD_DEG, PS_PROJ_DIS);
-    wcs->crval1 = fpa->toSky->R*PM_DEG_RAD;
-    wcs->crval2 = fpa->toSky->D*PM_DEG_RAD;
+    wcs->crval1 = fpa->toSky->R*PS_DEG_RAD;
+    wcs->crval2 = fpa->toSky->D*PS_DEG_RAD;
 
     // given transformation, solve for coordinates which yields output coordinates of 0,0
@@ -712 +712 @@
 
     // pdelt1,2 has units of degrees/micron
-    double pdelt1 = fpa->toSky->Xs * PM_DEG_RAD;
-    double pdelt2 = fpa->toSky->Ys * PM_DEG_RAD;
+    double pdelt1 = fpa->toSky->Xs * PS_DEG_RAD;
+    double pdelt2 = fpa->toSky->Ys * PS_DEG_RAD;
 
     // convert wcs->trans to units of degree/micron