Changeset 27661

Timestamp:

Apr 12, 2010, 10:03:56 AM (16 years ago)

Author:

Paul Price

Message:

Allow kernel to be specified on command-line

File:

• trunk/ppSub/src/ppSubCamera.c (modified) (3 diffs)

trunk/ppSub/src/ppSubCamera.c

@@ -101 +101 @@
                                  pmFPAfile *bind,    // File to which to bind, or NULL
                                  char *filerule,     // Name of file rule
+                                 const char *argname,   // Argument name for file
                                  pmFPAfileType fileType // Type of file
     )
@@ -108 +109 @@
     // look for the file on the RUN metadata
     pmFPAfile *file = pmFPAfileDefineFromRun(&status, NULL, config, filerule); // File to return
+    if (!status) {
+        psError(psErrorCodeLast(), false, "Failed to load file definition for %s", filerule);
+        return NULL;
+    }
+    file = pmFPAfileBindFromArgs(&status, bind, config, filerule, argname);
     if (!status) {
         psError(psErrorCodeLast(), false, "Failed to load file definition for %s", filerule);
@@ -337 +343 @@
 
     // Output subtraction kernel
-    pmFPAfile *kernel = defineCalcFile(config, output, "PPSUB.OUTPUT.KERNELS", PM_FPA_FILE_SUBKERNEL);
+    pmFPAfile *kernel = defineCalcFile(config, output, "PPSUB.OUTPUT.KERNELS", "KERNEL",
+                                       PM_FPA_FILE_SUBKERNEL);
     if (!kernel) {
         psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to define file PPSUB.OUTPUT.KERNELS");