Changeset 33415 for branches/meh_branches/ppstack_test/psModules/src/imcombine/pmSubtractionEquation.c

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/imcombine/pmSubtractionEquation.c (modified) (8 diffs)

branches/meh_branches/ppstack_test/psModules/src/imcombine/pmSubtractionEquation.c

@@ -796 +796 @@
     stamp->normSquare1 = normSquare1;
     stamp->normSquare2 = normSquare2;
-
-    // psLogMsg ("psModules.imcombine", PS_LOG_DETAIL, "normValue: %f %f %f  (%f %f)\n", normI1, normI2, stamp->norm, normSquare1, normSquare2);
+    
+    //psLogMsg ("psModules.imcombine", PS_LOG_DETAIL, "normValue: %f %f %f  (%f %f)\n", normI1, normI2, stamp->norm, normSquare1, normSquare2);
 
     return true;
@@ -958 +958 @@
     }
 
-    if (!psThreadPoolWait(true)) {
+    if (!psThreadPoolWait(true, true)) {
         psError(psErrorCodeLast(), false, "Error waiting for threads.");
         return false;
@@ -1037 +1037 @@
                 (void)psBinaryOp(sumVector, sumVector, "+", stamp->vector);
 
-                pmSubtractionStampPrint(ds9, stamp->x, stamp->y, stamps->footprint, "green");
+                pmSubtractionStampPrint(ds9, stamp->x, stamp->y, stamps->footprint, "green", "");
                 numStamps++;
             } else if (stamp->status == PM_SUBTRACTION_STAMP_REJECTED) {
-                pmSubtractionStampPrint(ds9, stamp->x, stamp->y, stamps->footprint, "red");
+                pmSubtractionStampPrint(ds9, stamp->x, stamp->y, stamps->footprint, "red", "");
             }
         }
@@ -1139 +1139 @@
                 normSquare2 += stamp->normSquare2;
 
-                pmSubtractionStampPrint(ds9, stamp->x, stamp->y, stamps->footprint, "green");
+                pmSubtractionStampPrint(ds9, stamp->x, stamp->y, stamps->footprint, "green", "");
                 numStamps++;
             } else if (stamp->status == PM_SUBTRACTION_STAMP_REJECTED) {
-                pmSubtractionStampPrint(ds9, stamp->x, stamp->y, stamps->footprint, "red");
+                pmSubtractionStampPrint(ds9, stamp->x, stamp->y, stamps->footprint, "red", "");
             }
         }
@@ -1382 +1382 @@
         float Myy = fluxY2 / fluxC1;
 
+        //MEH uncomment and update
         // fprintf (stderr, "conv1, flux2: %f, Mx: %f, My: %f, Mxx: %f, Myy: %f, chisq: %f, npix: %d\n", flux2, Mx, My, Mxx, Myy, chisq, npix);
+        //fprintf (stderr, "conv1, flux2: %f, fluxC1: %f, Mxx: %f, Myy: %f, chisqR: %f, npix: %d\n", flux2, fluxC1, Mxx, Myy, chisqR, npix);
+
         moment += Mxx + Myy;
     }
@@ -1554 +1557 @@
                     residual->kernel[y][x] = difference->kernel[y][x] - convolved1->kernel[y][x];
                     convolved1->kernel[y][x] += source->kernel[y][x] * norm;
+                    //MEH 
+                    //psLogMsg("psModules.imcombine", PS_LOG_INFO, "xy: %d %d, norm: %6.3f, bg: %6.3f, difference: %6.3f, target: %6.3f, source: %6.3f, residual: %6.3f, convolved1: %6.3f \n",x,y,norm,background,difference->kernel[y][x],target->kernel[y][x],source->kernel[y][x],residual->kernel[y][x],convolved1->kernel[y][x]);
+
                 }
             }
@@ -1652 +1658 @@
     } else {
         sumKernel2 = 1.0;
-    }
+        //MEH
+        sumKernel2 = 0.001;
+    }
+    //MEH if sumKernel2 not use essentially, then not need to be 2.0*? but level of orderFactor may need to be adjusted then
 
     // if we modify the chisq value by the (sumKernel1 + sumKernel2), we account for the
@@ -1658 +1667 @@
     // penalized by increasing the score somewhat.  the 0.01 value is not well-chosen.
     float orderFactor = 0.01 * kernels->spatialOrder;
-    float score = 2.0 * chisqRValue / (sumKernel1 + sumKernel2) + orderFactor;
-    psLogMsg("psModules.imcombine", PS_LOG_INFO, "chisq: %6.3f, chisqD: %6.3f, moment: %6.3f, sumKernel_1: %6.3f, sumKernel_2, score: %6.3f: %6.3f\n", chisqRValue, chisqDValue, momentValue, sumKernel1, sumKernel2, score);
+    //MEH
+    //float score = 2.0 * chisqRValue / (sumKernel1 + sumKernel2) + orderFactor;
+    float score = 2.0 * chisqRValue / (sqrt(sumKernel1) + sqrt(sumKernel2)) + orderFactor;
+    psLogMsg("psModules.imcombine", PS_LOG_INFO, "chisq: %6.3f, chisqD: %6.3f, moment: %6.3f, sumKernel_1: %6.3f, sumKernel_2: %6.3f, score: %6.3f\n", chisqRValue, chisqDValue, momentValue, sumKernel1, sumKernel2, score);
 
     // save this result if it is the first or the best (skip if bestMatch is NULL)