Changeset 28894 for branches/eam_branches/ipp-20100621/psModules/src/imcombine/pmSubtractionKernels.c

Timestamp:

Aug 11, 2010, 9:18:20 AM (16 years ago)

Author:

eugene

Message:

some test prints are on; kernel second moments added in quadrature to image second moment

File:

• branches/eam_branches/ipp-20100621/psModules/src/imcombine/pmSubtractionKernels.c (modified) (2 diffs)

branches/eam_branches/ipp-20100621/psModules/src/imcombine/pmSubtractionKernels.c

@@ -218 +218 @@
         if (uOrder % 2 == 0 && vOrder % 2 == 0) {
             // Even functions: normalise to unit sum and subtract null pixel so that sum is zero
-            scale2D = 1.0 / fabs(sum);
+            // Re-normalize 
+            // scale2D  = 1.0 / fabs(sum);
+            scale2D  = 1.0 / sqrt(sum2);
             zeroNull = true;
         } else {
@@ -252 +254 @@
 
     if (zeroNull) {
-        preCalc->kernel->kernel[0][0] -= 1.0;
-    }
-
-#if 0
+        // preCalc->kernel->kernel[0][0] -= 1.0;
+        preCalc->kernel->kernel[0][0] -= sum / sqrt (sum2);
+    }
+
+#if 1
     {
-        double sum = 0.0;   // Sum of kernel component
+        double Sum = 0.0;   // Sum of kernel component
+        double Sum2 = 0.0;   // Sum of kernel component
         float min = INFINITY, max = -INFINITY;  // Minimum and maximum kernel value
         for (int v = preCalc->kernel->yMin; v <= preCalc->kernel->yMax; v++) {
             for (int u = preCalc->kernel->xMin; u <= preCalc->kernel->xMax; u++) {
-                sum += preCalc->kernel->kernel[v][u];
+                double value = preCalc->kernel->kernel[v][u];
+                Sum += value;
+                Sum2 += PS_SQR(value);
                 min = PS_MIN(preCalc->kernel->kernel[v][u], min);
                 max = PS_MAX(preCalc->kernel->kernel[v][u], max);
             }
         }
-        fprintf(stderr, "%d mod: %lf, null: %f, min: %lf, max: %lf, scale: %f\n", index, sum, preCalc->kernel->kernel[0][0], min, max, scale2D);
+        fprintf(stderr, "%d sum: %lf, sum2: %lf, null: %f, min: %lf, max: %lf, scale: %f\n", index, Sum, Sum2, preCalc->kernel->kernel[0][0], min, max, scale2D);
     }
 #endif