Changeset 29531

Timestamp:

Oct 22, 2010, 5:08:47 PM (16 years ago)

Author:

eugene

Message:

switch to 2.0*R1 (1st radial moment) to define normalization window

File:

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

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

@@ -790 +790 @@
     psTrace("psModules.imcombine", 3, "Window total (2): %f, threshold: %f\n", sum2, (1.0 - stamps->normFrac) * sum2);
 
-# if (0)
+# if (1)
     // this block attempts to calculate the radius based on the first radial moment
-    bool done1 = false;
-    bool done2 = false;
-    double prior1 = 0.0;
-    double prior2 = 0.0;
+    double Sr1 = 0.0;
+    double Sr2 = 0.0;
+    double Sf1 = 0.0;
+    double Sf2 = 0.0;
     for (int y = -size; y <= size; y++) {
         for (int x = -size; x <= size; x++) {
@@ -809 +809 @@
     float R2 = Sr2 / Sf2;
 
-    stamps->normWindow1 = 2.5*R1;
-    stamps->normWindow1 = 2.5*R2;
+    stamps->normWindow1 = 2.0*R1;
+    stamps->normWindow2 = 2.0*R2;
+    psLogMsg ("psModules.imcombine", PS_LOG_DETAIL, "Kron Radii: %f for 1, %f for 2\n", stamps->normWindow1, stamps->normWindow2);
+
 # else
     // XXX : this block attempts to calculate the radius by looking at the curve of growth (or something vaguely equivalent).