Changeset 26717 for branches/pap/psModules/src/imcombine/pmSubtraction.c

Timestamp:

Jan 28, 2010, 5:32:15 PM (16 years ago)

Author:

Paul Price

Message:

Attempting to use a wide function for the normalisation component, rather than delta-function.

File:

• branches/pap/psModules/src/imcombine/pmSubtraction.c (modified) (4 diffs)

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

@@ -188 +188 @@
     if (normalise) {
         // Put in the normalisation component
-        kernel->kernel[0][0] += (wantDual ? 1.0 : p_pmSubtractionSolutionNorm(kernels));
+//        kernel->kernel[0][0] += (wantDual ? 1.0 : p_pmSubtractionSolutionNorm(kernels));
+        double value = wantDual ? 1.0 : p_pmSubtractionSolutionNorm(kernels);
+        for (int v = -size; v <= size; v++) {
+            for (int u = -size; u <= size; u++) {
+                kernel->kernel[v][u] += value * kernels->norm->kernel[v][u];
+            }
+        }
     }
 
@@ -754 +760 @@
       case PM_SUBTRACTION_MODE_1:
         stamp->convolutions1 = convolveStamp(stamp->convolutions1, stamp->image1, kernels, footprint);
+        stamp->normConv = p_pmSubtractionConvolveStampPrecalc(stamp->image1, kernels->norm);
         break;
       case PM_SUBTRACTION_MODE_2:
         stamp->convolutions2 = convolveStamp(stamp->convolutions2, stamp->image2, kernels, footprint);
+        stamp->normConv = p_pmSubtractionConvolveStampPrecalc(stamp->image2, kernels->norm);
         break;
       case PM_SUBTRACTION_MODE_UNSURE:
@@ -762 +770 @@
         stamp->convolutions1 = convolveStamp(stamp->convolutions1, stamp->image1, kernels, footprint);
         stamp->convolutions2 = convolveStamp(stamp->convolutions2, stamp->image2, kernels, footprint);
+        stamp->normConv = p_pmSubtractionConvolveStampPrecalc(stamp->image1, kernels->norm);
         break;
       default:
@@ -908 +917 @@
                 psFree(stamp->vector);
                 stamp->vector = NULL;
+
+                psFree(stamp->normConv);
+                stamp->normConv = NULL;
             } else {
                 numGood++;