Changeset 34800 for trunk/ppStack/src/ppStackSetup.c

Timestamp:

Dec 11, 2012, 2:04:31 PM (13 years ago)

Author:

watersc1

Message:

Merge from my branch including background restoration and stack stage projection cell binned images.

Location:

trunk

Files:

• . (modified) (1 prop)
• ppStack/src/ppStackSetup.c (modified) (2 diffs)

trunk/ppStack/src/ppStackSetup.c

@@ -89 +89 @@
     options->origMasks = psArrayAlloc(num);
     options->origVariances = psArrayAlloc(num);
+    options->bkgImages = psArrayAlloc(num);
     pmFPAview *view = pmFPAviewAlloc(0);
+    int nullMasks = 0;
+    int nullVariances = 0;
     for (int i = 0; i < num; i++) {
         {
@@ -97 +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++;
+            }
         }
+/*      { */
+/*        pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PPSTACK.INPUT.BKGMODEL", i); */
+/*        options->bkgImages->data[i] = pmFPAfileName(file, view, config); */
+/*      } */
     }
+    if (nullMasks == num) {
+      psFree(options->origMasks);
+    }
+    if (nullVariances == num) {
+      psFree(options->origVariances);
+    }
+    
     psFree(view);