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

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

@@ -891 +891 @@
     pmSubtractionGetFWHMs(&fwhm1, &fwhm2);
 
+    bool zeroNull = false;
+    int uOrder = kernels->u->data.S32[index];
+    int vOrder = kernels->v->data.S32[index];
+    if (uOrder % 2 == 0 && vOrder % 2 == 0) zeroNull = true;
+
     if (EMPIRICAL) {
         psKernel *convolution1 = stamp->convolutions1->data[index];
-        penalty1 = pmSubtractionKernelPenaltySingle(convolution1);
+        penalty1 = pmSubtractionKernelPenaltySingle(convolution1, zeroNull);
 
         psKernel *convolution2 = stamp->convolutions2->data[index];
-        penalty2 = pmSubtractionKernelPenaltySingle(convolution2);
+        penalty2 = pmSubtractionKernelPenaltySingle(convolution2, zeroNull);
     } else {
         pmSubtractionKernelPreCalc *kernel = kernels->preCalc->data[index];
-        float M2 = pmSubtractionKernelPenaltySingle(kernel->kernel);
-
-        penalty1 = M2 * PS_SQR(fwhm1 / 2.35); // rescale the unconvolved second-moment by the image second moment 
-        penalty2 = M2 * PS_SQR(fwhm2 / 2.35); // rescale the unconvolved second-moment by the image second moment 
+        float M2 = pmSubtractionKernelPenaltySingle(kernel->kernel, zeroNull);
+
+        penalty1 = M2 + PS_SQR(fwhm1 / 2.35); // rescale the unconvolved second-moment by the image second moment 
+        penalty2 = M2 + PS_SQR(fwhm2 / 2.35); // rescale the unconvolved second-moment by the image second moment 
     }
     kernels->penalties1->data.F32[index] = kernels->penalty * penalty1;
@@ -915 +920 @@
 }
 
-float pmSubtractionKernelPenaltySingle(psKernel *kernel)
+float pmSubtractionKernelPenaltySingle(psKernel *kernel, bool zeroNull)
 {
     // Calculate moments
@@ -924 +929 @@
         for (int u = kernel->xMin; u <= kernel->xMax; u++) {
             double value = kernel->kernel[v][u];
+            if (false && zeroNull && (u == 0) && (v == 0)) {
+                value += 1.0;
+            }
             double value2 = PS_SQR(value);
             sum += value;
@@ -934 +942 @@
     penalty *= 1.0 / sum2;
 
-    if (0) {
-        fprintf(stderr, "min: %lf, max: %lf, moment: %lf\n", min, max, penalty);
+    if (1) {
+        fprintf(stderr, "min: %lf, max: %lf, moment: %lf, flux^2: %lf\n", min, max, penalty, sum2);
         // psTrace("psModules.imcombine", 7, "Kernel %d: %f %d %d %f\n", index, fwhm, uOrder, vOrder, penalty);
     }