Changeset 15787

Timestamp:

Dec 11, 2007, 4:09:06 PM (18 years ago)

Author:

Paul Price

Message:

Cleaning up some stamp processing.

File:

• trunk/psModules/src/imcombine/pmSubtractionStamps.c (modified) (7 diffs)

trunk/psModules/src/imcombine/pmSubtractionStamps.c

@@ -53 +53 @@
     psFree(stamp->matrix2);
     psFree(stamp->matrixX);
-    psFree(stamp->vector);
+    psFree(stamp->vector1);
+    psFree(stamp->vector2);
 
 }
@@ -173 +174 @@
     stamp->matrix2 = NULL;
     stamp->matrixX = NULL;
-    stamp->vector = NULL;
+    stamp->vector1 = NULL;
+    stamp->vector2 = NULL;
 
     return stamp;
@@ -348 +350 @@
         if (!checkStampRegion(xPix, yPix, region)) {
             // It's not in the big region
+            psTrace("psModules.imcombine", 9, "Rejecting input stamp (%d,%d) because outside region",
+                    xPix, yPix);
             continue;
         }
         if (!checkStampMask(xPix, yPix, subMask, mode)) {
             // Not a good stamp
+            psTrace("psModules.imcombine", 9, "Rejecting input stamp (%d,%d) because bad mask",
+                    xPix, yPix);
             continue;
         }
 
-        for (int j = 0; j < numStamps; j++) {
+        bool found = false;
+        for (int j = 0; j < numStamps && !found; j++) {
             psRegion *subRegion = stamps->regions->data[j]; // Subregion of interest
             if (checkStampRegion(xPix, yPix, subRegion)) {
@@ -362 +369 @@
 
                 int index = xList->n;   // Index of new stamp candidate
+
+                psVectorExtend(xList, STAMP_LIST_BUFFER, 1);
+                psVectorExtend(yList, STAMP_LIST_BUFFER, 1);
+                psVectorExtend(fluxList, STAMP_LIST_BUFFER, 1);
+
                 xList->data.F32[index] = xStamp;
                 yList->data.F32[index] = yStamp;
@@ -371 +383 @@
                 }
 
-                psVectorExtend(xList, STAMP_LIST_BUFFER, 1);
-                psVectorExtend(yList, STAMP_LIST_BUFFER, 1);
-                psVectorExtend(fluxList, STAMP_LIST_BUFFER, 1);
-
-                break;
+                found = true;
+                psTrace("psModules.imcombine", 9, "Putting input stamp (%d,%d) into subregion %d",
+                        xPix, yPix, j);
             }
+        }
+
+        if (!found) {
+            psTrace("psModules.imcombine", 9, "Unable to find subregion for stamp (%d,%d)",
+                    xPix, yPix);
         }
     }
@@ -563 +578 @@
 
 
-pmSubtractionStampList *pmSubtractionStampsSetFromFile(const char *filename, const psImage *subMask,
-                                                       const psRegion *region, int footprint, float spacing,
-                                                       pmSubtractionMode mode)
+pmSubtractionStampList *pmSubtractionStampsSetFromFile(const char *filename, const psImage *image,
+                                                       const psImage *subMask, const psRegion *region,
+                                                       int footprint, float spacing, pmSubtractionMode mode)
 {
     PS_ASSERT_STRING_NON_EMPTY(filename, NULL);
@@ -583 +598 @@
     psBinaryOp(y, y, "-", psScalarAlloc(1.0, PS_TYPE_F32));
 
-    pmSubtractionStampList *stamps = pmSubtractionStampsSet(x, y, flux, NULL, subMask, region, footprint,
+    pmSubtractionStampList *stamps = pmSubtractionStampsSet(x, y, flux, image, subMask, region, footprint,
                                                             spacing, mode);
     psFree(data);