Changeset 25050 for branches/czw_branch/cleanup/psModules/src/astrom/pmAstrometryWCS.c

Timestamp:

Aug 11, 2009, 2:36:22 PM (17 years ago)

Author:

watersc1

Message:

Fixed typos in cleanup sql and created the correct filelist to delete.

Made changes to psastro and pmAstrometryWCS to allow the choice between PC and CD header keywords.

File:

• branches/czw_branch/cleanup/psModules/src/astrom/pmAstrometryWCS.c (modified) (7 diffs)

branches/czw_branch/cleanup/psModules/src/astrom/pmAstrometryWCS.c

@@ -289 +289 @@
     // test the CDELTi varient
     if (pcKeys) {
-        wcs->useCDkeys = 0;
+        wcs->wcsCDkeys = 0;
         wcs->cdelt1 = psMetadataLookupF64 (&status, header, "CDELT1");
         wcs->cdelt2 = psMetadataLookupF64 (&status, header, "CDELT2");
@@ -335 +335 @@
     // test the CDi_j varient
     if (cdKeys) {
-        wcs->useCDkeys = 1;
+        wcs->wcsCDkeys = 1;
         wcs->trans->x->coeff[1][0] = psMetadataLookupF64 (&status, header, "CD1_1"); // == PC1_1
         wcs->trans->x->coeff[0][1] = psMetadataLookupF64 (&status, header, "CD1_2"); // == PC1_2
@@ -377 +377 @@
     // XXX make it optional to write out CDi_j terms, or other versions
     // apply CDELT1,2 (degrees / pixel) to yield PCi,j terms of order unity
-    if (!(wcs->useCDkeys)) {
+    if (!(wcs->wcsCDkeys)) {
 
       double cdelt1 = wcs->cdelt1;
@@ -419 +419 @@
       }
     }
-    if (wcs->useCDkeys) {
+    if (wcs->wcsCDkeys) {
       
       psMetadataAddF64 (header, PS_LIST_TAIL, "CD1_1", PS_META_REPLACE, "", wcs->trans->x->coeff[1][0]);
@@ -555 +555 @@
         fpa->toSky->R -= 2.0*M_PI;
 
+    fpa->wcsCDkeys = wcs->wcsCDkeys;
+
     psTrace ("psastro", 5, "toFPA: %f %f  (%f,%f),(%f,%f)\n",
              chip->toFPA->x->coeff[0][0], chip->toFPA->y->coeff[0][0],
@@ -702 +704 @@
     wcs->cdelt2 = hypot (wcs->trans->y->coeff[1][0], wcs->trans->y->coeff[0][1]);
 
+    wcs->wcsCDkeys = fpa->wcsCDkeys;
     psFree (toTPA);
 
@@ -942 +945 @@
     wcs->trans = psPlaneTransformAlloc (nXorder, nYorder);
     wcs->toSky = NULL;
-    wcs->useCDkeys = 0;
+    wcs->wcsCDkeys = 0;
 
     memset (wcs->ctype1, 0, PM_ASTROM_WCS_TYPE_SIZE);