Changeset 26502 for branches/eam_branches/20091201/psModules/src/imcombine/pmSubtractionStamps.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/pmSubtractionStamps.c (modified) (7 diffs)

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

@@ -81 +81 @@
 
 // Search a region for a suitable stamp
-bool stampSearch(int *xStamp, int *yStamp, // Coordinates of stamp, to return
+bool stampSearch(float *xStamp, float *yStamp, // Coordinates of stamp, to return
                  float *fluxStamp, // Flux of stamp, to return
                  const psImage *image1, const psImage *image2, // Images to search
@@ -116 +116 @@
                 ((image1) ? image1->data.F32[y][x] : image2->data.F32[y][x]); // Flux at pixel
             if (flux > *fluxStamp) {
-                *xStamp = x;
-                *yStamp = y;
+                *xStamp = x + 0.5;
+                *yStamp = y + 0.5;
                 *fluxStamp = flux;
                 found = true;
@@ -405 +405 @@
             numSearch++;
 
-            int xStamp = 0, yStamp = 0; // Coordinates of stamp
+            float xStamp = 0.0, yStamp = 0.0; // Coordinates of stamp
             float fluxStamp = -INFINITY; // Flux of stamp
             bool goodStamp = false;     // Found a good stamp?
@@ -437 +437 @@
                     goodStamp = stampSearch(&xStamp, &yStamp, &fluxStamp, image1, image2, thresh1, thresh2,
                                             subMask, xMin, xMax, yMin, yMax, numCols, numRows, border);
+
+                    // XXX reset for a test:
+                    xStamp = xList->data.F32[j];
+                    yStamp = yList->data.F32[j];
+                    fprintf (stderr, "find: %d %d ==> %5.1f %5.1f\n", xCentre, yCentre, xStamp, yStamp);
                 }
             } else {
@@ -543 +548 @@
         }
 
+        fprintf (stderr, "stamp: %5.1f %5.1f == %d %d\n", xStamp, yStamp, xPix, yPix);
+
         bool found = false;
         for (int j = 0; j < numStamps && !found; j++) {
@@ -735 +742 @@
             return false;
         }
+        fprintf (stderr, "stamp: %5.1f %5.1f == %d %d\n", stamp->x, stamp->y, x, y);
 
         // Catch memory leaks --- these should have been freed and NULLed before
@@ -811 +819 @@
             y->data.F32[numOut] = source->peak->yf;
         }
+        fprintf (stderr, "stamp: %5.1f %5.1f\n", x->data.F32[numOut], y->data.F32[numOut]);
         numOut++;
     }