Changeset 23594 for branches/cnb_branches/cnb_branch_20090301/ppStack/src/ppStackOptions.c

Timestamp:

Mar 29, 2009, 6:15:31 PM (17 years ago)

Author:

beaumont

Message:

merged with head

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• ppStack (modified) (1 prop)
• ppStack/src/ppStackOptions.c (modified) (3 diffs)

branches/cnb_branches/cnb_branch_20090301/ppStack/src/ppStackOptions.c

@@ -18 +18 @@
     psFree(options->inputMask);
     psFree(options->sourceLists);
+    psFree(options->norm);
     psFree(options->cells);
-    psFree(options->subKernels);
-    psFree(options->subRegions);
+    psFree(options->kernels);
+    psFree(options->regions);
     psFree(options->matchChi2);
     psFree(options->weightings);
@@ -35 +36 @@
     psMemSetDeallocator(options, (psFreeFunc)stackOptionsFree);
 
+    options->convolve = true;
     options->stats = NULL;
     options->statsFile = NULL;
@@ -44 +46 @@
     options->inputMask = NULL;
     options->sourceLists = NULL;
+    options->norm = NULL;
     options->cells = NULL;
-    options->subKernels = NULL;
-    options->subRegions = NULL;
+    options->kernels = NULL;
+    options->regions = NULL;
     options->numCols = 0;
     options->numRows = 0;