Changeset 26321 for branches/pap/psModules/src/imcombine/pmSubtractionMatch.c

Timestamp:

Dec 2, 2009, 12:04:51 PM (16 years ago)

Author:

Paul Price

Message:

Merging Gene's work on adding a window function to the stamps. I'd been thinking about something like this for a while, so glad someone's done it. It's got visualisation turned on though.

Location:

branches/pap/psModules/src/imcombine

Files:

• . (modified) (1 prop)
• pmSubtractionMatch.c (modified) (3 diffs)

branches/pap/psModules/src/imcombine/pmSubtractionMatch.c

@@ -483 +483 @@
             }
 
+
+            // generate the window function from the set of stamps
+            if (!pmSubtractionStampsGetWindow(stamps, size)) {
+                goto MATCH_ERROR;
+            }
 
             // Define kernel basis functions
@@ -550 +555 @@
                 }
 
+                // generate the window function from the set of stamps
+                if (!pmSubtractionStampsGetWindow(stamps, size)) {
+                    goto MATCH_ERROR;
+                }
+
                 psTrace("psModules.imcombine", 3, "Calculating equation...\n");
                 if (!pmSubtractionCalculateEquation(stamps, kernels)) {
@@ -587 +597 @@
             }
 
+            // if we hit the max number of iterations and we have rejected stamps, re-solve
             if (numRejected > 0) {
                 psTrace("psModules.imcombine", 3, "Solving equation...\n");