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

Timestamp:

Sep 10, 2007, 12:35:59 PM (19 years ago)

Author:

Paul Price

Message:

Adding ability to get stamps from sources.

File:

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

trunk/psModules/src/imcombine/pmSubtractionMatch.c

@@ -93 +93 @@
 bool pmSubtractionMatch(pmReadout *convolved, const pmReadout *reference, const pmReadout *input,
                         int footprint, float regionSize, float stampSpacing, float threshold,
-                        const char *stampsName, float targetWidth, pmSubtractionKernelsType type,
-                        int size, int spatialOrder, const psVector *isisWidths, const psVector *isisOrders,
-                        int inner, int ringsOrder, int binning, bool optimum, psVector *optFWHMs,
+                        const psArray *sources, const char *stampsName, float targetWidth,
+                        pmSubtractionKernelsType type, int size, int spatialOrder,
+                        const psVector *isisWidths, const psVector *isisOrders,
+                        int inner, int ringsOrder, int binning, bool optimum, const psVector *optFWHMs,
                         int optOrder, float optThreshold, int iter, float rej, psMaskType maskBad,
                         psMaskType maskBlank)
@@ -132 +133 @@
     PS_ASSERT_FLOAT_LARGER_THAN(stampSpacing, 0.0, false);
     // Don't care what threshold is
+    if (sources) {
+        PS_ASSERT_ARRAY_NON_NULL(sources, false);
+    }
     // stampsName may be anything
     // targetWidth can be just about anything (except maybe negative, but it can be NAN)
@@ -231 +235 @@
             }
 
-            // Read stamps from file
-            if (stampsName && strlen(stampsName) > 0) {
+            if (sources) {
+                stamps = pmSubtractionStampsSetFromSources(sources, subMask, region, stampSpacing,
+                                                           input ? 0 : 2 * footprint);
+            } else if (stampsName && strlen(stampsName) > 0) {
+                // Read stamps from file
                 psTrace("psModules.imcombine", 3, "Reading stamps from %s...\n", stampsName);
                 const char *stampFormat = input ? "%f %f" : "%f %f %f"; // Format for reading stamp file