Changeset 14210

Timestamp:

Jul 13, 2007, 5:41:36 PM (19 years ago)

Author:

Paul Price

Message:

Making the astrometry pmFPAfile into its own empire. We were having trouble reading the real astrometry (separate file output from psastro) because it was using the input image header as the source. Tried playing around with supplementing FITS headers, before realising the simplest solution: the astrometry can have its own FPA, and then read the astrometric solution into the image FPA. Works nicely.

Location:

trunk/pswarp/src

Files:

• pswarpLoop.c (modified) (5 diffs)
• pswarpParseCamera.c (modified) (1 diff)

trunk/pswarp/src/pswarpLoop.c

@@ -1 +1 @@
 # include "pswarp.h"
 #include <ppStats.h>
+
+#define WCS_NONLIN_TOL 0.001            // Non-linear tolerance for header WCS
 
 // Loop over the inputs, warp them to the output skycell and then write out the output.
@@ -20 +22 @@
     if (!astrom) {
         astrom = input;
+    }
+
+    if (astrom->camera != input->camera) {
+        psError(PS_ERR_UNKNOWN, true, "Input camera and astrometry camera do not match.");
+        return false;
     }
 
@@ -89 +96 @@
     // find the FPA phu
     bool bilevelAstrometry = false;
-    pmHDU *phu = pmFPAviewThisPHU (view, astrom->fpa);
+    pmHDU *phu = pmFPAviewThisPHU(view, astrom->fpa);
     if (phu) {
-        char *ctype = psMetadataLookupStr (NULL, phu->header, "CTYPE1");
+        char *ctype = psMetadataLookupStr(NULL, phu->header, "CTYPE1");
         if (ctype) {
             bilevelAstrometry = !strcmp (&ctype[4], "-DIS");
@@ -208 +215 @@
 #endif
 
-
     // Perform statistics on the output image
     if (stats) {
@@ -216 +222 @@
     }
 
-    pmHDU *hdu = output->parent->parent->parent->hdu; // HDU for the output warped image
+    pmHDU *hdu = outFPA->hdu;           // HDU for the output warped image
     if (!hdu->header) {
         hdu->header = psMetadataAlloc();
+    }
+
+    if (!pmAstromWriteWCS(hdu->header, outFPA, outChip, WCS_NONLIN_TOL)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to generate WCS header.");
+        psFree(stats);
+        return false;
     }
 

trunk/pswarp/src/pswarpParseCamera.c

@@ -17 +17 @@
     // the input image(s) are required arguments; they define the camera
     status = false;
-    pmFPAfile *astrom = pmFPAfileBindFromArgs(&status, input, config, "PSWARP.ASTROM", "ASTROM");
+    pmFPAfile *astrom = pmFPAfileDefineFromArgs(&status, config, "PSWARP.ASTROM", "ASTROM");
     if (!status) {
         psError (PS_ERR_UNKNOWN, false, "failed to load find definition");