Changeset 21010

Timestamp:

Dec 15, 2008, 4:38:23 PM (17 years ago)

Author:

Paul Price

Message:

Get WCS into both image and source list.

File:

• trunk/ppSub/src/ppSubReadout.c (modified) (3 diffs)

trunk/ppSub/src/ppSubReadout.c

@@ -456 +456 @@
     outRO->data_exists = outCell->data_exists = outCell->parent->data_exists = true;
 
+    // Copy astrometry over
+    // It should get into the output images and photometry
+    pmFPA *refFPA = refRO->parent->parent->parent; // Reference FPA
+    pmHDU *refHDU = refFPA->hdu;        // Reference HDU
+    if (!outHDU || !refHDU) {
+        psWarning("Unable to find HDU at FPA level to copy astrometry.");
+    } else if (!pmAstromReadWCS(outFPA, outCell->parent, refHDU->header, 1.0)) {
+        psWarning("Unable to read WCS astrometry from reference FPA.");
+        psErrorClear();
+    } else if (!pmAstromWriteWCS(outHDU->header, outFPA, outCell->parent, WCS_TOLERANCE)) {
+        psWarning("Unable to write WCS astrometry to output FPA.");
+        psErrorClear();
+    }
+
 #if 0
     pmReadoutMaskApply(outRO, maskBad);
@@ -538 +552 @@
         // The PSF should already be stored for the readout
         pmFPAfile *photFile = psMetadataLookupPtr(NULL, config->files, "PSPHOT.INPUT");
-        pmFPACopy(photFile->fpa, outRO->parent->parent->parent);
+        pmFPACopy(photFile->fpa, outFPA);
 
         pmReadout *psfRO = pmFPAfileThisReadout(config->files, view, "PSPHOT.PSF.LOAD");
@@ -663 +677 @@
     }
 
-    // Copy astrometry over
-    pmFPA *refFPA = refRO->parent->parent->parent; // Reference FPA
-    pmHDU *refHDU = refFPA->hdu;        // Reference HDU
-    if (!outHDU || !refHDU) {
-        psWarning("Unable to find HDU at FPA level to copy astrometry.");
-    } else {
-        if (!pmAstromReadWCS(outFPA, outCell->parent, refHDU->header, 1.0)) {
-            psWarning("Unable to read WCS astrometry from reference FPA.");
-            psErrorClear();
-        } else if (!pmAstromWriteWCS(outHDU->header, outFPA, outCell->parent, WCS_TOLERANCE)) {
-            psWarning("Unable to write WCS astrometry to output FPA.");
-            psErrorClear();
-        }
+    if (!pmAstromWriteWCS(outHDU->header, outFPA, outCell->parent, WCS_TOLERANCE)) {
+        psWarning("Unable to write WCS astrometry to output FPA.");
+        psErrorClear();
     }