Changeset 31252

Timestamp:

Apr 8, 2011, 6:30:45 PM (15 years ago)

Author:

watersc1

Message:

unconvolved stack edits

Location:

branches/czw_branch/20110406

Files:

• ppStack/src/ppStackCombineFinal.c (modified) (2 diffs)
• ppStack/src/ppStackCombineInitial.c (modified) (1 diff)
• ppStack/src/ppStackLoop.c (modified) (1 diff)
• ppStack/src/ppStackReject.c (modified) (2 diffs)
• psModules/src/imcombine/pmStackReject.c (modified) (1 diff)

branches/czw_branch/20110406/ppStack/src/ppStackCombineFinal.c

@@ -1 +1 @@
 #include "ppStack.h"
 
-//#define TESTING                         // Enable test output
+#define TESTING                         // Enable test output
 
 bool ppStackCombineFinal(ppStackThreadData *stack, psArray *covariances, ppStackOptions *options,
@@ -29 +29 @@
             reject->data[i] = pmStackRejectGrow(options->rejected->data[i], numCols, numRows, poorFrac,
                                                 options->regions->data[i], options->kernels->data[i]);
-            if (!reject->data[i]) {
-                psError(psErrorCodeLast(), false, "Unable to grow rejected pixels for image %d", i);
-                psFree(reject);
-                return false;
-            }
         } else {
             reject->data[i] = psMemIncrRefCounter(options->rejected->data[i]);

branches/czw_branch/20110406/ppStack/src/ppStackCombineInitial.c

@@ -1 +1 @@
 #include "ppStack.h"
 
-//#define TESTING                         // Enable test output
+#define TESTING                         // Enable test output
 
 bool ppStackCombineInitial(ppStackThreadData *stack, ppStackOptions *options, pmConfig *config)

branches/czw_branch/20110406/ppStack/src/ppStackLoop.c

@@ -123 +123 @@
     }
     else {
-      // Since we haven't convolved, I believe we do need to normalize here. We also cannot grow.
-      if (!ppStackCombineFinal(stack, options->convCovars, options, config, false, true, false)) {
+      // Since we haven't convolved, I believe we do need to normalize here.
+      if (!ppStackCombineFinal(stack, options->convCovars, options, config, false, true, true)) {
         psError(psErrorCodeLast(), false, "Unable to perform final combination.");
         psFree(stack);

branches/czw_branch/20110406/ppStack/src/ppStackReject.c

@@ -1 +1 @@
 #include "ppStack.h"
 
-// #define TESTING
+#define TESTING
 
 bool ppStackReject(ppStackOptions *options, pmConfig *config)
@@ -13 +13 @@
 /*     } */
 
+    
     int num = options->num;             // Number of inputs
+
+    // Construct a small convolution kernel to aid in rejection
+    if (!options->convolve) {
+      for (int i = 0; i < num; i++) {
+        psArray *regions = psArrayAllocEmpty(1);
+        psRegion *region = psRegionAlloc(0,options->numCols - 1, 0, options->numRows - 1);
+        regions = psArrayAdd(regions,1, region);
+        
+        psArray *kernels = psArrayAllocEmpty(1);
+        psVector *fwhms = psVectorAllocEmpty(1, PS_TYPE_F32);
+        psVectorAppend(fwhms,5.0); // Should be a parameter
+        psVector *orders = psVectorAllocEmpty(1, PS_TYPE_S32);
+        psVectorAppend(orders,0);
+        pmSubtractionKernels *kernel = pmSubtractionKernelsISIS(15,0,fwhms,orders,0,*region,PM_SUBTRACTION_MODE_2);
+        kernels = psArrayAdd(kernels, 1, kernel);
+        
+        kernel->solution1 = psVectorAlloc(3, PS_TYPE_F64);
+        psVectorSet(kernel->solution1, 1, 1.0);
+        psVectorSet(kernel->solution1, 2, 1.0);
+        psVectorSet(kernel->solution1, 3, 1.0);
+        kernel->solution2 = psVectorAlloc(3, PS_TYPE_F64);
+        psVectorSet(kernel->solution2, 1, 1.0);
+        psVectorSet(kernel->solution1, 2, 1.0);
+        psVectorSet(kernel->solution1, 3, 1.0);
+        
+        options->kernels->data[i] = kernels;
+        options->regions->data[i] = regions;
+      }
+    }
+        
 
     psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes, PPSTACK_RECIPE); // ppStack recipe

branches/czw_branch/20110406/psModules/src/imcombine/pmStackReject.c

@@ -127 +127 @@
 
     if (!subRegions || !subKernels) {
+      psTrace("psModules.imcombine",2,"Do not have the necessary kernels and regions, returning input pixels.");
       psPixels *out = psPixelsCopy(NULL,in);
       return out;