Changeset 28894 for branches/eam_branches/ipp-20100621/psModules/src/imcombine/pmSubtractionEquation.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/pmSubtractionEquation.c (modified) (2 diffs)

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

@@ -603 +603 @@
                 matrix->data.F64[index][index] += norm * penalties1->data.F32[i];
                 if (kernels->mode == PM_SUBTRACTION_MODE_DUAL) {
-                    fprintf (stderr, "penalty: %f + %f (%f * %f)\n", matrix->data.F64[index + numParams + 2][index + numParams + 2], norm * penalties2->data.F32[i], norm, penalties2->data.F32[i]);
+                    fprintf (stderr, "penalty: (x^%d y^%d fwhm %f) : %f + %f (%f * %f)\n", kernels->u->data.S32[index], kernels->v->data.S32[index], kernels->widths->data.F32[index], 
+                             matrix->data.F64[index + numParams + 2][index + numParams + 2], norm * penalties2->data.F32[i], norm, penalties2->data.F32[i]);
                     matrix->data.F64[index + numParams + 2][index + numParams + 2] += norm * penalties2->data.F32[i];                        
                     // matrix[i][i] is ~ (k_i * I_1)(k_i * I_1)
@@ -1116 +1117 @@
 
         int normIndex = PM_SUBTRACTION_INDEX_NORM(kernels); // Index for normalisation
-        calculatePenalty(sumMatrix, sumVector, kernels, sumMatrix->data.F64[normIndex][normIndex] / 10000.0);
+        calculatePenalty(sumMatrix, sumVector, kernels, sumMatrix->data.F64[normIndex][normIndex] / 100.0);
 #endif