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

Timestamp:

Jan 7, 2007, 6:48:50 AM (20 years ago)

Author:

eugene

Message:

functioning pswarp, needs opt code

File:

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

trunk/pswarp/src/pswarpParseCamera.c

@@ -3 +3 @@
 bool pswarpParseCamera (pmConfig *config) {
 
-    bool status = false;
+    bool status;
 
     // the input image(s) are required arguments; they define the camera
+    status = false;
     pmFPAfile *input = pmFPAfileDefineFromArgs (&status, config, "PSWARP.INPUT", "INPUT");
-    if (!status) {
+    if (!input) {
         psError(PSWARP_ERR_CONFIG, false, "Failed to build FPA from PSWARP.INPUT");
         return false;
@@ -13 +14 @@
 
     // the input skycell is a required argument: it defines the output image
+    status = false;
     pmFPAfile *skycell = pmFPAfileDefineFromArgs (&status, config, "PSWARP.SKYCELL", "SKYCELL");
-    if (!status) {
-        psError(PSWARP_ERR_CONFIG, false, "Failed to build FPA from PSWARP.INPUT");
+    if (!skycell) {
+        psError(PSWARP_ERR_CONFIG, false, "Failed to build FPA from PSWARP.SKYCELL");
         return false;
     }
 
     // the mask is not required; the  skycell is a required argument: it defines the output image
+    status = false;
     pmFPAfileDefineFromArgs (&status, config, "PSWARP.MASK", "MASK");
     if (!status) {
@@ -26 +29 @@
 
     // the weight is not required; the  skycell is a required argument: it defines the output image
+    status = false;
     pmFPAfileDefineFromArgs (&status, config, "PSWARP.WEIGHT", "WEIGHT");
     if (!status) {
@@ -32 +36 @@
 
     // these calls bind the I/O handle to the specified fpa
-    pmFPAfileDefineOutput (config, skycell->fpa, "PSWARP.OUTPUT");
+    if (!pmFPAfileDefineOutput (config, skycell->fpa, "PSWARP.OUTPUT")) {
+        psError(PSWARP_ERR_CONFIG, false, "Failed to build FPA from PSWARP.OUTPUT");
+        return false;
+    }
 
     // Chip selection: turn on only the chips specified