Changeset 29148 for branches/eam_branches/ipp-20100823/psModules/src/imcombine/pmSubtractionStamps.c

Timestamp:

Sep 12, 2010, 12:38:23 PM (16 years ago)

Author:

eugene

Message:

re-scale kernels by fwhm^{2 to avoid excessive dynamic range; modify residual stats to be more sensible; add threshold to min significant element of SVD inversion (1e-6); adjust penalties again (still not clear what is best...)}

File:

• branches/eam_branches/ipp-20100823/psModules/src/imcombine/pmSubtractionStamps.c (modified) (1 diff)

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

@@ -919 +919 @@
         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 
+        if (1) {
+            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 
+            // 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 
+        } else {
+            penalty1 = PS_SQR(fwhm1 / 2.35); // rescale the unconvolved second-moment by the image second moment 
+            penalty2 = PS_SQR(fwhm2 / 2.35); // rescale the unconvolved second-moment by the image second moment 
+        }
     }
     kernels->penalties1->data.F32[index] = kernels->penalty * penalty1;