Changeset 27986 for trunk/ppViz/src/ppCoord

Timestamp:

May 17, 2010, 5:14:46 PM (16 years ago)

Author:

Paul Price

Message:

ppCoord now uses its own input file rules, rather than borrowing from pswarp and ppImage. Use of the WCS type makes it much faster (doesn't have to read in all the sources).

Location:

trunk/ppViz/src/ppCoord

Files:

• ppCoordCamera.c (modified) (2 diffs)
• ppCoordLoop.c (modified) (2 diffs)

trunk/ppViz/src/ppCoord/ppCoordCamera.c

@@ -33 +33 @@
 
     fileArguments("ASTROM", data->astromName, "Input astrometry", data->config);
-    pmFPAfile *astrom = pmFPAfileDefineFromArgs(&status, data->config, "PSWARP.ASTROM", "ASTROM"); // File
+    pmFPAfile *astrom = pmFPAfileDefineFromArgs(&status, data->config, "PPCOORD.ASTROM", "ASTROM"); // File
     if (!status || !astrom) {
-        psError(PS_ERR_IO, false, "Failed to build file from PSWARP.ASTROM");
+        psError(PS_ERR_IO, false, "Failed to build file from PPCOORD.ASTROM");
         return false;
     }
@@ -41 +41 @@
     if (data->rawName) {
         fileArguments("RAW", data->rawName, "Input raw image", data->config);
-        pmFPAfile *raw = pmFPAfileDefineFromArgs(&status, data->config, "PPIMAGE.INPUT", "RAW"); // File
+        pmFPAfile *raw = pmFPAfileDefineFromArgs(&status, data->config, "PPCOORD.RAW", "RAW"); // File
         if (!status || !raw) {
-            psError(PS_ERR_IO, false, "Failed to build file from PPIMAGE.INPUT");
+            psError(PS_ERR_IO, false, "Failed to build file from PPCOORD.RAW");
             return false;
         }

trunk/ppViz/src/ppCoord/ppCoordLoop.c

@@ -71 +71 @@
 {
     pmConfig *config = data->config;                                        // Configuration data
-    pmFPAfile *astromFile = pmFPAfileSelectSingle(config->files, "PSWARP.ASTROM", 0); // File with astrometry
+    pmFPAfile *astromFile = pmFPAfileSelectSingle(config->files, "PPCOORD.ASTROM", 0); // File with astrometry
 
     if (astromFile->fpa->chips->n > 0 && data->pixelsName && !data->chipName) {
@@ -77 +77 @@
     }
 
-    pmFPAfile *rawFile = data->rawName ? pmFPAfileSelectSingle(config->files, "PPIMAGE.INPUT", 0) :
+    pmFPAfile *rawFile = data->rawName ? pmFPAfileSelectSingle(config->files, "PPCOORD.RAW", 0) :
         NULL; // File with raw image