Changeset 26502 for branches/eam_branches/20091201/psModules/src/imcombine/pmSubtractionVisual.c

Timestamp:

Jan 2, 2010, 6:13:37 PM (17 years ago)

Author:

eugene

Message:

adding window to dual convolution; fixing normalization for deconvolved-hermitians

File:

• branches/eam_branches/20091201/psModules/src/imcombine/pmSubtractionVisual.c (modified) (8 diffs)

branches/eam_branches/20091201/psModules/src/imcombine/pmSubtractionVisual.c

@@ -251 +251 @@
         int yPix = ySub * (2*footprint + 1 + 3) + footprint;
 
+        double sum = 0.0;
         for (int y = -footprint; y <= footprint; y++) {
             for (int x = -footprint; x <= footprint; x++) {
                 output->data.F32[y + yPix][x + xPix] = kernel->kernel[y][x];
+                sum += kernel->kernel[y][x];
             }
         }
+        fprintf (stderr, "kernel %d, sum %f\n", i, sum);
     }                                                    
         
@@ -274 +277 @@
 
     // choose the brightest stamp
-    pmSubtractionStamp *maxStamp = stamps->stamps->data[0];
-    float maxFlux = maxStamp->flux; 
-    for (int i = 1; i < stamps->num; i++) {
+    pmSubtractionStamp *maxStamp = NULL;
+    float maxFlux = NAN;
+    for (int i = 0; i < stamps->num; i++) {
         pmSubtractionStamp *stamp = stamps->stamps->data[i];
+        if (!isfinite(stamp->flux)) continue;
+        if (!stamp->convolutions1 && !stamp->convolutions2) continue;
+        if (!maxStamp) {
+            maxFlux = stamp->flux;
+            maxStamp = stamp;
+            continue;
+        }
         if (stamp->flux > maxFlux) {
             maxFlux = stamp->flux;
             maxStamp = stamp;
         }
+    }
+
+    if (!isfinite(maxStamp->flux)) {
+        fprintf (stderr, "no valid stamps?\n");
     }
 
@@ -308 +322 @@
             int yPix = ySub * (2*footprint + 1 + 3) + footprint;
             
+            double sum = 0.0;
             for (int y = -footprint; y <= footprint; y++) {
                 for (int x = -footprint; x <= footprint; x++) {
                     output->data.F32[y + yPix][x + xPix] = kernel->kernel[y][x];
+                    sum += kernel->kernel[y][x];
                 }
             }
+            fprintf (stderr, "kernel %d, sum %f\n", i, sum);
         }               
         pmVisualScaleImage(kapa2, output, "Image", 0, true);
@@ -339 +356 @@
             int yPix = ySub * (2*footprint + 1 + 3) + footprint;
             
+            double sum = 0.0;
             for (int y = -footprint; y <= footprint; y++) {
                 for (int x = -footprint; x <= footprint; x++) {
                     output->data.F32[y + yPix][x + xPix] = kernel->kernel[y][x];
+                    sum += kernel->kernel[y][x];
                 }
             }
+            fprintf (stderr, "kernel %d, sum %f\n", i, sum);
         }               
         pmVisualScaleImage(kapa2, output, "Image", 1, true);
@@ -375 +395 @@
         overlay[Noverlay].type = KII_OVERLAY_BOX;
         if ((stamp->x < 1.0) && (stamp->y < 1.0)) {
-            fprintf (stderr, "stamp zero: %f %f\n", stamp->x, stamp->y);
+            // fprintf (stderr, "stamp zero: %f %f\n", stamp->x, stamp->y);
             continue;
         }
         if (!isfinite(stamp->x) && !isfinite(stamp->y)) {
-            fprintf (stderr, "stamp nan: %f %f\n", stamp->x, stamp->y);
+            // fprintf (stderr, "stamp nan: %f %f\n", stamp->x, stamp->y);
             continue;
         }
@@ -409 +429 @@
 bool pmSubtractionVisualShowFitInit(pmSubtractionStampList *stamps) {
 
-    if (!pmVisualIsVisual()) return true;
+    // if (!pmVisualIsVisual()) return true;
 
     // generate 4 storage images large enough to hold the N stamps:
@@ -446 +466 @@
 bool pmSubtractionVisualShowFitAddStamp(psKernel *target, psKernel *source, psKernel *convolution, double background, double norm, int index) {
 
-    if (!pmVisualIsVisual()) return true;
+    // if (!pmVisualIsVisual()) return true;
 
     double sum;
@@ -517 +537 @@
 bool pmSubtractionVisualShowFit() {
 
-    if (!pmVisualIsVisual()) return true;
+    // if (!pmVisualIsVisual()) return true;
     if (!pmVisualInitWindow(&kapa1, "ppSub:Images")) return false;
     if (!pmVisualInitWindow(&kapa2, "ppSub:Misc")) return false;