Changeset 14801 for trunk/psModules/src/imcombine/pmSubtractionMatch.c

Timestamp:

Sep 10, 2007, 10:10:05 AM (19 years ago)

Author:

Paul Price

Message:

Preparing to take a (long) list of sources as candidate stamps. Changed the list of stamps from a simple array to a more complicated structure so that I can carry around a list of candidate stamps for each region of interest; when one is rejected, it is replaced by the next brightest within the same region. Optionally apply an exclusion zone around stamps, which is important when we're convolving to a specified PSF (as opposed to convolving to match an image).

File:

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

trunk/psModules/src/imcombine/pmSubtractionMatch.c

@@ -46 +46 @@
 
 
-static bool getStamps(psArray **stamps, // Stamps to read
+static bool getStamps(pmSubtractionStampList **stamps, // Stamps to read
                       const psArray *stampsData, // Stamp data from a file
                       const pmReadout *reference, // Reference readout
@@ -84 +84 @@
 
         psFree(*stamps);
-        *stamps = pmSubtractionSetStamps(xStamp, yStamp, fluxStamp, subMask, region);
-    } else {
-        psTrace("psModules.imcombine", 3, "Finding stamps...\n");
-        *stamps = pmSubtractionFindStamps(*stamps, reference->image, subMask, region,
-                                          threshold, stampSpacing);
-    }
-    if (!stamps) {
+        // Apply exclusion zone if we're matching to a nominated PSF; otherwise don't care
+        *stamps = pmSubtractionSetStamps(xStamp, yStamp, fluxStamp, reference->image, subMask,
+                                         region, stampSpacing, input ? 0 : footprint);
+    }
+    psTrace("psModules.imcombine", 3, "Finding stamps...\n");
+    *stamps = pmSubtractionFindStamps(*stamps, reference->image, subMask, region,
+                                      threshold, stampSpacing);
+    if (!*stamps) {
         psError(PS_ERR_UNKNOWN, false, "Unable to find stamps.");
         return false;
@@ -220 +221 @@
     psRegion *region = NULL;            // Iso-kernel region
     psString regionString = NULL;       // String for region
-    psArray *stamps = NULL;             // Stamps for matching PSF
+    pmSubtractionStampList *stamps = NULL; // Stamps for matching PSF
     psVector *solution = NULL;          // Solution to match PSF
     pmSubtractionKernels *kernels = NULL; // Kernel basis functions