Changeset 25898 for branches/pap/psModules/src/imcombine/pmSubtractionKernels.c

Timestamp:

Oct 19, 2009, 2:55:12 PM (17 years ago)

Author:

Paul Price

Message:

Getting the GUNK kernel working again.

File:

• branches/pap/psModules/src/imcombine/pmSubtractionKernels.c (modified) (3 diffs)

branches/pap/psModules/src/imcombine/pmSubtractionKernels.c

@@ -81 +81 @@
     kernels->penalties = psVectorRealloc(kernels->penalties, start + numNew);
     kernels->inner = start;
+    kernels->num += numNew;
 
     // Generate a set of kernels for each (u,v)
@@ -99 +100 @@
         }
     }
+
+    kernels->widths->n = start + numNew;
+    kernels->u->n = start + numNew;
+    kernels->v->n = start + numNew;
+    kernels->preCalc->n = start + numNew;
+    kernels->penalties->n = start + numNew;
 
     return true;
@@ -471 +478 @@
     PS_ASSERT_INT_LESS_THAN(inner, size, NULL);
 
-    // XXX GUNK doesn't seem to work --- doesn't add the POIS components, or at least, they're not noticed
-
     pmSubtractionKernels *kernels = p_pmSubtractionKernelsRawISIS(size, spatialOrder, fwhms, orders,
                                                                   penalty, mode); // Kernels
+    kernels->type = PM_SUBTRACTION_KERNEL_GUNK;
     psStringPrepend(&kernels->description, "GUNK=");
     psStringAppend(&kernels->description, "+POIS(%d,%d)", inner, spatialOrder);