Changeset 29543 for trunk/psModules/src/imcombine/pmSubtractionVisual.c

Timestamp:

Oct 25, 2010, 2:45:41 PM (16 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20100823

File:

• trunk/psModules/src/imcombine/pmSubtractionVisual.c (modified) (9 diffs)

trunk/psModules/src/imcombine/pmSubtractionVisual.c

@@ -146 +146 @@
     }
     pmVisualScaleImage(kapa1, canvas, "Subtraction_Stamps", 0, true);
+    psFree(canvas);
 
     pmVisualAskUser(&plotStamps);
@@ -152 +153 @@
 
 /** Plot the least-squares matrix of each stamp */
-bool pmSubtractionVisualPlotLeastSquares (pmSubtractionStampList *stamps, bool dual) {
+bool pmSubtractionVisualPlotLeastSquares (pmSubtractionStampList *stamps) {
 
     if (!pmVisualTestLevel("ppsub.chisq", 1)) return true;
@@ -209 +210 @@
     pmVisualScaleImage(kapa1, canvas32, "Least_Squares", 0, true);
 
+    if (0) {
+        static int count = 0;
+        char filename[64];
+        sprintf (filename, "chisq.%02d.fits", count);
+        count ++;
+        psFits *fits = psFitsOpen (filename, "w");
+        psFitsWriteImage (fits, NULL, canvas32, 0, NULL);
+        psFitsClose (fits);
+    }
+
     pmVisualAskUser(&plotLeastSquares);
     psFree(canvas);
@@ -271 +282 @@
             }
         }
-        fprintf (stderr, "kernel %d, sum %f\n", i, sum);
+        // fprintf (stderr, "kernel %d, sum %f\n", i, sum);
     }                                                    
         
     pmVisualScaleImage(kapa1, output, "Image", 0, true);
+    psFree(output);
     pmVisualAskUser(&plotImage);
     return true;
@@ -286 +298 @@
         return false;
     }
+
+    // XXX clear the overlay(s) (red at least!)
 
     // get the kernel sizes
@@ -297 +311 @@
         if (!isfinite(stamp->flux)) continue;
         if (!stamp->convolutions1 && !stamp->convolutions2) continue;
+        // fprintf (stderr, "flux: %f, maxFlux: %f  ", stamp->flux, maxFlux);
         if (!maxStamp) {
             maxFlux = stamp->flux;
             maxStamp = stamp;
+            // fprintf (stderr, "maxStamp %d\n", i);
             continue;
+        } else {
+            // fprintf (stderr, "\n");
         }
         if (stamp->flux > maxFlux) {
@@ -337 +355 @@
             
             double sum = 0.0;
+            double sum2 = 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];
+                    sum2 += PS_SQR(kernel->kernel[y][x]);
                 }
             }
-            fprintf (stderr, "kernel %d, sum %f\n", i, sum);
+            // fprintf (stderr, "kernel %d, sum %f, sum2: %e\n", i, sum, sum2);
         }               
         pmVisualScaleImage(kapa2, output, "Image", 0, true);
-    }                                    
+
+        if (0) {
+            psFits *fits = psFitsOpen("basis.1.fits", "w");
+            psFitsWriteImage(fits, NULL, output, 0, NULL);
+            psFitsClose(fits);
+        }
+    }
         
     if (maxStamp->convolutions2) {
@@ -371 +397 @@
             
             double sum = 0.0;
+            double sum2 = 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];
+                    sum2 += PS_SQR(kernel->kernel[y][x]);
                 }
             }
-            fprintf (stderr, "kernel %d, sum %f\n", i, sum);
+            // fprintf (stderr, "kernel %d, sum %f, sum2: %e\n", i, sum, sum2);
         }               
         pmVisualScaleImage(kapa2, output, "Image", 1, true);
+
+        if (0) {
+            psFits *fits = psFitsOpen("basis.2.fits", "w");
+            psFitsWriteImage(fits, NULL, output, 0, NULL);
+            psFitsClose(fits);
+        }
+        psFree(output);
     }                                    
         
@@ -676 +711 @@
     psFree (x);
     psFree (y);
+    psFree (polyValues);
 
     pmVisualAskUser(NULL);