Changeset 28334 for branches/czw_branch/20100519/ppBackground/src/ppBackgroundCamera.c

Timestamp:

Jun 15, 2010, 11:22:56 AM (16 years ago)

Author:

watersc1

Message:

association and jpegs look fine. random simtest errors are a bit worrying, though.

Location:

branches/czw_branch/20100519

Files:

• . (modified) (1 prop)
• ppBackground (modified) (1 prop)
• ppBackground/src (modified) (1 prop)
• ppBackground/src/ppBackgroundCamera.c (modified) (3 diffs)

branches/czw_branch/20100519/ppBackground/src/ppBackgroundCamera.c

@@ -32 +32 @@
     bool status;                        // Status of file definition
 
-    fileArguments("PATTERN", data->patternName, "Input pattern", data->config);
-    pmFPAfile *pattern = pmFPAfileDefineFromArgs(&status, data->config, "PPBACKGROUND.PATTERN",
-                                                 "PATTERN"); // File
-    if (!status) {
-        psError(psErrorCodeLast(), false, "Failed to build file from PPBACKGROUND.PATTERN");
-        return false;
+    if (data->patternName) {
+        fileArguments("PATTERN", data->patternName, "Input pattern", data->config);
+        pmFPAfileDefineFromArgs(&status, data->config, "PPBACKGROUND.PATTERN", "PATTERN"); // File
+        if (!status) {
+            psError(psErrorCodeLast(), false, "Failed to build file from PPBACKGROUND.PATTERN");
+            return false;
+        }
     }
 
-    fileArguments("BACKGROUND", data->backgroundName, "Input background model", data->config);
-    pmFPAfile *background = pmFPAfileBindFromArgs(&status, data->config, "PPBACKGROUND.BACKGROUND",
-                                                  "BACKGROUND"); // File
-    if (!status) {
-        psError(psErrorCodeLast(), false, "Failed to build file from PPBACKGROUND.BACKGROUND");
-        return false;
+    if (data->backgroundName) {
+        fileArguments("BACKGROUND", data->backgroundName, "Input background model", data->config);
+        pmFPAfileDefineFromArgs(&status, data->config, "PPBACKGROUND.BACKGROUND", "BACKGROUND"); // File
+        if (!status) {
+            psError(psErrorCodeLast(), false, "Failed to build file from PPBACKGROUND.BACKGROUND");
+            return false;
+        }
     }
 
-    fileArguments("IMAGE", data->backgroundName, "Input uncorrected image", data->config);
-    pmFPAfile *image = pmFPAfileBindFromArgs(&status, background, data->config, "PPBACKGROUND.IMAGE",
-                                             "IMAGE"); // File
-    if (!status) {
+    fileArguments("IMAGE", data->imageName, "Input uncorrected image", data->config);
+    pmFPAfile *image = pmFPAfileDefineFromArgs(&status, data->config, "PPBACKGROUND.IMAGE",
+                                               "IMAGE"); // File
+    if (!status || !image) {
         psError(psErrorCodeLast(), false, "Failed to build file from PPBACKGROUND.IMAGE");
         return false;
     }
 
-    fileArguments("MASK", data->backgroundName, "Input uncorrected mask", data->config);
-    pmFPAfile *mask = pmFPAfileBindFromArgs(&status, image, data->config, "PPBACKGROUND.MASK",
-                                              "MASK"); // File
+    fileArguments("MASK", data->maskName, "Input uncorrected mask", data->config);
+    pmFPAfileBindFromArgs(&status, image, data->config, "PPBACKGROUND.MASK", "MASK"); // File
     if (!status) {
         psError(psErrorCodeLast(), false, "Failed to build file from PPBACKGROUND.MASK");
@@ -64 +65 @@
     }
 
-    pmFPAfile *output = pmFPAfileDefineOutput(data->config, file->fpa, "PPBACKGROUND.OUTPUT");
+    pmFPAfile *output = pmFPAfileDefineOutput(data->config, image->fpa, "PPBACKGROUND.OUTPUT");
     if (!output) {
         psError(psErrorCodeLast(), false, "Unable to define output.");
@@ -70 +71 @@
     }
     output->save = true;
+
+    pmFPAfile *outMask = pmFPAfileDefineOutput(data->config, output->fpa, "PPBACKGROUND.OUTPUT.MASK");
+    if (!outMask) {
+        psError(psErrorCodeLast(), false, "Unable to define output.");
+        return false;
+    }
+    outMask->save = true;
 
 #if 0