Changeset 24155

Timestamp:

May 12, 2009, 6:17:35 PM (17 years ago)

Author:

Paul Price

Message:

Merging ppSub from branches/pap_magic/ to get important change: write WCS for inverse image.

Location:

trunk/ppSub

Files:

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

trunk/ppSub/src/ppSub.h

@@ -24 +24 @@
 
 #define PPSUB_RECIPE "PPSUB"            /// Name of the recipe to use
+#define WCS_TOLERANCE 0.001             // Tolerance for WCS
 
 // Output files, for activation/deactivation

trunk/ppSub/src/ppSubReadoutInverse.c

@@ -7 +7 @@
 
 #include "ppSub.h"
-
 
 bool ppSubReadoutInverse(pmConfig *config)
@@ -24 +23 @@
     invRO->data_exists = invRO->parent->data_exists = invRO->parent->parent->data_exists = true;
 
-    pmConceptsCopyFPA(invRO->parent->parent->parent, outRO->parent->parent->parent, true, true);
+    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)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to write WCS astrometry to PPSUB.INVERSE.");
+        return false;
+    }
 
     return true;

trunk/ppSub/src/ppSubReadoutSubtract.c

@@ -20 +20 @@
 
 #include "ppSub.h"
-
-#define WCS_TOLERANCE 0.001             // Tolerance for WCS
 
 bool ppSubReadoutSubtract(pmConfig *config)