Changeset 26880

Timestamp:

Feb 10, 2010, 4:26:01 PM (16 years ago)

Author:

eugene

Message:

updates from trunk

File:

• branches/eam_branches/20091201/ppSub/src/ppSubCamera.c (modified) (2 diffs)

branches/eam_branches/20091201/ppSub/src/ppSubCamera.c

@@ -35 +35 @@
     *success = false;
 
-    // look for the file on the RUN metadata
-    pmFPAfile *file = pmFPAfileDefineFromRun(&status, bind, config, filerule); // File to return
+    pmFPAfile *file = NULL;
+
+    // look for the file on the argument list
+    if (bind) {
+        file = pmFPAfileBindFromArgs(&status, bind, config, filerule, argname);
+    } else {
+        file = pmFPAfileDefineFromArgs(&status, config, filerule, argname);
+    }
+
     if (!status) {
         psError(PS_ERR_UNKNOWN, false, "Failed to load file definition for %s", filerule);
-        return NULL;
+        return false;
     }
     if (!file) {
-        // look for the file on the argument list
-        if (bind) {
-            file = pmFPAfileBindFromArgs(&status, bind, config, filerule, argname);
-        } else {
-            file = pmFPAfileDefineFromArgs(&status, config, filerule, argname);
-        }
+        // look for the file on the RUN metadata
+        file = pmFPAfileDefineFromRun(&status, bind, config, filerule); // File to return
         if (!status) {
             psError(PS_ERR_UNKNOWN, false, "Failed to load file definition for %s", filerule);
@@ -345 +348 @@
 
     // Output subtraction kernel
-    pmFPAfile *kernel = defineCalcFile(config, output, "PPSUB.OUTPUT.KERNELS", PM_FPA_FILE_SUBKERNEL);
+    pmFPAfile *kernel = defineCalcFile(config, NULL, "PPSUB.OUTPUT.KERNELS", PM_FPA_FILE_SUBKERNEL);
     if (!kernel) {
         psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to define file PPSUB.OUTPUT.KERNELS");