Changeset 29126 for branches/eam_branches/ipp-20100823/psModules/src/imcombine/pmSubtractionEquation.c

Timestamp:

Sep 7, 2010, 9:31:59 AM (16 years ago)

Author:

eugene

Message:

some test fprints, some notes; updated the meaning of the analysis statistics (fResMax, etc) - not yet complete

File:

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

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

@@ -1286 +1286 @@
     float dmin = 0.0;
 
+    // XXX update these with a bit more rigour
     for (int y = - footprint; y <= footprint; y++) {
         for (int x = - footprint; x <= footprint; x++) {
-            float dflux = 0.5*(target->kernel[y][x] + source->kernel[y][x] * norm);
-            if (dflux < 0.02*sum) continue;
+          // float dflux = 0.5*(target->kernel[y][x] + source->kernel[y][x] * norm);
+            // if (dflux < 0.02*sum) continue;
             dflux1 += residual->kernel[y][x];
             dflux2 += PS_SQR(residual->kernel[y][x]);
-            dmax = PS_MAX(residual->kernel[y][x], dmax);
-            dmin = PS_MIN(residual->kernel[y][x], dmin);
+            // dmax = PS_MAX(residual->kernel[y][x], dmax);
+            // dmin = PS_MIN(residual->kernel[y][x], dmin);
+            dmax += fabs(residual->kernel[y][x]);
+
+            if (hypot(x,y) > 2.0) {
+              dmin += fabs(residual->kernel[y][x]);
+            }
             npix ++;
         }
@@ -1303 +1309 @@
     if (!isfinite(peak)) return false;
 
-    // fprintf (stderr, "sum: %f, peak: %f, sigma: %f, fsigma: %f, fmax: %f, fmin: %f\n", sum, peak, sigma, sigma/sum, dmax/peak, dmin/peak);
+    fprintf (stderr, "sum: %f, peak: %f, sigma: %f, fsigma: %f, fmax: %f, fmin: %f\n", sum, peak, sigma, sigma/sum, dmax/sum, dmin/sum);
     psVectorAppend(fSigRes, sigma/sum);
-    psVectorAppend(fMaxRes, dmax/peak);
-    psVectorAppend(fMinRes, dmin/peak);
+    psVectorAppend(fMaxRes, dmax/sum);
+    psVectorAppend(fMinRes, dmin/sum);
     return true;
 }