Changeset 24293

Timestamp:

Jun 1, 2009, 4:15:53 PM (17 years ago)

Author:

Paul Price

Message:

Include variance in matrix equation.

File:

• trunk/psModules/src/imcombine/pmSubtractionEquation.c (modified) (7 diffs)

trunk/psModules/src/imcombine/pmSubtractionEquation.c

@@ -16 +16 @@
 
 //#define TESTING
+
+#define USE_VARIANCE                    // Include variance in equation?
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -31 +33 @@
     for (int y = - footprint; y <= footprint; y++) {
         for (int x = - footprint; x <= footprint; x++) {
-            sum += image1->kernel[y][x] * image2->kernel[y][x] / 1.0; // variance->kernel[y][x];
+            double value = image1->kernel[y][x] * image2->kernel[y][x];
+#ifdef USE_VARIANCE
+            value /= variance->kernel[y][x];
+#endif
+            sum += value;
         }
     }
@@ -195 +201 @@
             for (int y = - footprint; y <= footprint; y++) {
                 for (int x = - footprint; x <= footprint; x++) {
-                    sumC += conv->kernel[y][x] / 1.0; // variance->kernel[y][x];
+                    double value = conv->kernel[y][x];
+#ifdef USE_VARIANCE
+                    value /= variance->kernel[y][x];
+#endif
+                    sumC += value;
                 }
             }
@@ -218 +228 @@
         for (int y = - footprint; y <= footprint; y++) {
             for (int x = - footprint; x <= footprint; x++) {
-                double invNoise2 = 1.0 / 1.0; // variance->kernel[y][x];
+                double invNoise2 = 1.0;
+#ifdef USE_VARIANCE
+                invNoise2 /= variance->kernel[y][x];
+#endif
                 double value = input->kernel[y][x] * invNoise2;
                 sumI += value;
@@ -277 +290 @@
         for (int y = - footprint; y <= footprint; y++) {
             for (int x = - footprint; x <= footprint; x++) {
-                sumTC += target->kernel[y][x] * conv->kernel[y][x] / 1.0; // variance->kernel[y][x];
+                double value = target->kernel[y][x] * conv->kernel[y][x];
+#ifdef USE_VARIANCE
+                value /= variance->kernel[y][x];
+#endif
+                sumTC += value;
             }
         }
@@ -297 +314 @@
         for (int y = - footprint; y <= footprint; y++) {
             for (int x = - footprint; x <= footprint; x++) {
-                float value = target->kernel[y][x] / 1.0; // variance->kernel[y][x];
+                double value = target->kernel[y][x];
+#ifdef USE_VARIANCE
+                value /= variance->kernel[y][x];
+#endif
                 sumIT += value * input->kernel[y][x];
                 sumT += value;
@@ -366 +386 @@
         for (int y = - footprint; y <= footprint; y++) {
             for (int x = - footprint; x <= footprint; x++) {
-                sumC += conv->kernel[y][x] / 1.0; // variance->kernel[y][x];
+                double value = conv->kernel[y][x];
+#ifdef USE_VARIANCE
+                value /= variance->kernel[y][x];
+#endif
+                sumC += value;
             }
         }