Changeset 34666 for branches/czw_branch/20120906/ppStack/src/ppStackSetup.c

Timestamp:

Nov 15, 2012, 1:32:57 PM (14 years ago)

Author:

watersc1

Message:

Median code completes now, but is saving in the wrong output format.

File:

• branches/czw_branch/20120906/ppStack/src/ppStackSetup.c (modified) (3 diffs)

branches/czw_branch/20120906/ppStack/src/ppStackSetup.c

@@ -91 +91 @@
     options->bkgImages = psArrayAlloc(num);
     pmFPAview *view = pmFPAviewAlloc(0);
+    int nullMasks = 0;
+    int nullVariances = 0;
     for (int i = 0; i < num; i++) {
         {
@@ -98 +100 @@
         {
             // We want the convolved mask, since that defines the area that has been tested for outliers
+          if (options->convolve) {
             options->origMasks->data[i] = psMemIncrRefCounter(options->convMasks->data[i]);
+          }
+          else {
+            pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PPSTACK.INPUT.MASK", i);
+            options->origMasks->data[i] = pmFPAfileName(file, view, config);
+          }
+          if (!(options->origMasks->data[i])) {
+            nullMasks++;
+          }
         }
         {
             pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PPSTACK.INPUT.VARIANCE", i);
             options->origVariances->data[i] = pmFPAfileName(file, view, config);
+            if (!(options->origVariances->data[i])) {
+              nullVariances++;
+            }
         }
 /*      { */
@@ -109 +123 @@
 /*      } */
     }
+    if (nullMasks == num) {
+      psFree(options->origMasks);
+    }
+    if (nullVariances == num) {
+      psFree(options->origVariances);
+    }
+    
     psFree(view);