Changeset 15329

Timestamp:

Oct 17, 2007, 12:14:31 PM (19 years ago)

Author:

Paul Price

Message:

Exclusion zone isn't twice the footprint, but the footprint plus the kernel size --- if the footprint extends more than half the way to a neighbouring star, but the kernel is smaller than the footprint so that it doesn't go near the other star, then we shouldn't exclude these stars.

File:

• trunk/psModules/src/imcombine/pmSubtractionMatch.c (modified) (4 diffs)

trunk/psModules/src/imcombine/pmSubtractionMatch.c

@@ -283 +283 @@
 
                 stamps = pmSubtractionStampsSet(xStamp, yStamp, fluxStamp, reference->image, subMask,
-                                                region, stampSpacing, input ? 0 : 2 * footprint);
+                                                region, stampSpacing, input ? 0 : footprint + size);
                 psFree(stampsData);
             }
@@ -312 +312 @@
             int numRejected = -1;               // Number of rejected stamps in each iteration
             for (int k = 0; k < iter && numRejected != 0; k++) {
-                psTrace("psModules.imcombine", 2, "Iteration %d...\n", k);
+                psLogMsg("psModules.imcombine", PS_LOG_INFO, "Iteration %d.", k);
 
                 if (!getStamps(&stamps, reference, input, subMask, weight, region,
@@ -342 +342 @@
                     goto ERROR;
                 }
-                psLogMsg("psModules.imcombine", PS_LOG_INFO, "%d stamps rejected on iteration %d.",
-                         numRejected, k);
-
                 memCheck("  reject stamps");
             }
@@ -355 +352 @@
                     goto ERROR;
                 }
+                (void)pmSubtractionRejectStamps(stamps, subMask, solution, footprint, NAN, kernels);
             }
             psFree(stamps);