Changeset 24557 for branches/eam_branches/20090522/ppSub/src/ppSubReadoutInverse.c

Timestamp:

Jun 25, 2009, 2:00:56 PM (17 years ago)

Author:

eugene

Message:

merging changes from head

Location:

branches/eam_branches/20090522

Files:

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

branches/eam_branches/20090522/ppSub/src/ppSubReadoutInverse.c

@@ -23 +23 @@
     invRO->data_exists = invRO->parent->data_exists = invRO->parent->parent->data_exists = true;
 
+    // Get concepts from reference
+    pmFPAfile *refFile = psMetadataLookupPtr(NULL, config->files, "PPSUB.REF.CONV"); // File with concepts
+    pmFPA *invFPA = invRO->parent->parent->parent; // Inverse FPA
+    pmConceptsCopyFPA(invFPA, refFile->fpa, true, true);
+
+    // Get astrometry from (forward) subtraction
     pmChip *outChip = outRO->parent->parent;       // Output chip
     pmFPA *outFPA = outChip->parent;               // Output FPA
-    pmFPA *invFPA = invRO->parent->parent->parent; // Inverse FPA
-
-    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 +37 @@
         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;