Changeset 24240

Timestamp:

May 26, 2009, 11:01:13 AM (17 years ago)

Author:

Paul Price

Message:

Inverse FPA didn't hold the astrometry, so the sources couldn't get RA, Dec in the output.

File:

• trunk/ppSub/src/ppSubReadoutInverse.c (modified) (2 diffs)

trunk/ppSub/src/ppSubReadoutInverse.c

@@ -29 +29 @@
     pmConceptsCopyFPA(invFPA, outFPA, true, true);
 
-#if 0
-    // Copy astrometry over
-    pmHDU *outHDU = outFPA->hdu;          // Output HDU
     pmChip *invChip = invRO->parent->parent; // Inverse chip
-    psFree(view);
-    if (!outHDU || !inHDU) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to find HDU at FPA level to copy astrometry.");
-        return false;
-    }
-    if (!pmAstromReadWCS(invFPA, invChip, outHDU->header, 1.0)) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to read WCS astrometry from PPSUB.OUTPUT.");
-        return false;
-    }
-#endif
     pmHDU *invHDU = invFPA->hdu;          // Inverse HDU
     if (!pmAstromWriteWCS(invHDU->header, outFPA, outChip, WCS_TOLERANCE)) {
@@ -48 +35 @@
         return false;
     }
+    // Read from newly written astrometry so that it exists in the "inverse" FPA (for sources)
+    if (!pmAstromReadWCS(invFPA, invChip, invHDU->header, 1.0)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to read WCS astrometry.");
+        return false;
+    }
 
     return true;