Changeset 13705 for trunk/pswarp/src/pswarpParseCamera.c

Timestamp:

Jun 7, 2007, 2:49:27 PM (19 years ago)

Author:

Paul Price

Message:

Updating to use the automatically generated skycell version of the camera. This means that the output file shares the same file rule as the original camera, not the same file rule as the skycell. This in turn means that we don't have to deal with multiple groups of file rules.

File:

• trunk/pswarp/src/pswarpParseCamera.c (modified) (3 diffs)

trunk/pswarp/src/pswarpParseCamera.c

@@ -9 +9 @@
     // the input image(s) are required arguments; they define the camera
     status = false;
-    pmFPAfile *input = pmFPAfileDefineFromArgs (&status, config, "PSWARP.INPUT", "INPUT");
+    pmFPAfile *input = pmFPAfileDefineFromArgs(&status, config, "PSWARP.INPUT", "INPUT");
     if (!input || !status) {
         psError(PSWARP_ERR_CONFIG, false, "Failed to build FPA from PSWARP.INPUT");
@@ -17 +17 @@
     // the input image(s) are required arguments; they define the camera
     status = false;
-    pmFPAfile *astrom = pmFPAfileDefineFromArgs (&status, config, "PSWARP.ASTROM", "ASTROM");
+    pmFPAfile *astrom = pmFPAfileBindFromArgs(&status, input, config, "PSWARP.ASTROM", "ASTROM");
     if (!status) {
         psError (PS_ERR_UNKNOWN, false, "failed to load find definition");
@@ -49 +49 @@
     // the input skycell is a required argument: it defines the output image
     // XXX we may need a different skycell structure here
-    status = pswarpDefineSkycell (&skycell, &skyConfig, config, "PSWARP.SKYCELL", "SKYCELL");
+    status = pswarpDefineSkycell(&skycell, &skyConfig, config, "PSWARP.SKYCELL", "SKYCELL");
     if (!status) {
         psError(PSWARP_ERR_CONFIG, false, "Failed to build FPA from PSWARP.SKYCELL");
         return false;
     }
+    psFree(skyConfig);
 
-    // these calls bind the I/O handle to the specified fpa
-    // NOTE: output file could be binned relative to sky cell...
-    // if (!pmFPAfileDefineFromFPA (skyConfig, skycell->fpa, 1, 1, "PSWARP.OUTPUT")) {
-    if (!pmFPAfileDefineOutput (skyConfig, skycell->fpa, "PSWARP.OUTPUT")) {
+    // The output skycell
+    pmFPAfile *output = pmFPAfileDefineSkycell(config, NULL, "PSWARP.OUTPUT");
+    if (!output) {
         psError(PSWARP_ERR_CONFIG, false, "Failed to build FPA from PSWARP.OUTPUT");
         return false;
     }
-    if (!pmFPAfileDefineOutput (skyConfig, skycell->fpa, "PSWARP.OUTPUT.MASK")) {
+    if (!pmFPAfileDefineSkycell(config, output->fpa, "PSWARP.OUTPUT.MASK")) {
         psError(PSWARP_ERR_CONFIG, false, "Failed to build FPA from PSWARP.OUTPUT.MASK");
         return false;
     }
     if (inWeight) {
-        if (!pmFPAfileDefineOutput (skyConfig, skycell->fpa, "PSWARP.OUTPUT.WEIGHT")) {
+        if (!pmFPAfileDefineSkycell(config, output->fpa, "PSWARP.OUTPUT.WEIGHT")) {
             psError(PSWARP_ERR_CONFIG, false, "Failed to build FPA from PSWARP.OUTPUT.WEIGHT");
             return false;
         }
     }
-    psFree (skyConfig);
 
     // Chip selection: turn on only the chips specified