Changeset 31442 for branches/eam_branches/ipp-20110404/ppStack/src/ppStackReject.c

Timestamp:

May 5, 2011, 10:09:53 AM (15 years ago)

Author:

eugene

Message:

merging updates from trunk

File:

• branches/eam_branches/ipp-20110404/ppStack/src/ppStackReject.c (modified) (2 diffs)

branches/eam_branches/ipp-20110404/ppStack/src/ppStackReject.c

@@ -1 +1 @@
 #include "ppStack.h"
 
+// This is the doomsday switch. 
 // #define TESTING
 
@@ -8 +9 @@
     psAssert(config, "Require configuration");
 
+/*     if (!options->convolve) { */
+/*         // No need to do complicated rejection when we haven't convolved */
+/*         return true; */
+/*     } */
+
+    
+    int num = options->num;             // Number of inputs
+
+    // Construct a small convolution kernel to aid in rejection
     if (!options->convolve) {
-        // No need to do complicated rejection when we haven't convolved
-        return true;
+      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;
+      }
     }
-
-    int num = options->num;             // Number of inputs
+        
 
     psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes, PPSTACK_RECIPE); // ppStack recipe