Changeset 30740

Timestamp:

Feb 22, 2011, 2:28:35 PM (15 years ago)

Author:

eugene

Message:

handle poor norm window as bad quality

File:

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

trunk/psModules/src/imcombine/pmSubtractionMatch.c

@@ -667 +667 @@
             }
 
+            int nTries = 0;
             bool tryAgain = true;
             while (tryAgain) {
@@ -677 +678 @@
 
                 // generate the window function from the set of stamps
+                // we attempt to set the window based on the measured kron radius, but the
+                // initial guess may be too small. allow the window to grow if the kron radius
+                // implies the need for a larger windon.  But only allow 2 additional tries
                 if (!pmSubtractionStampsGetWindow(&tryAgain, stamps, size)) {
                     // if we failed, it might be due to the desired normWindow being larger than the current footprint.
                     // in this case, just adjust the footprint and try again.
+                    if (tryAgain && (nTries >= 2)) {
+                        // unrecoverable error
+                        psError(PM_ERR_STAMPS, true, "Unable to get stamp window (failure to converge).");
+                        goto MATCH_ERROR;
+                    }
                     if (tryAgain) {
                         // keep the border constant
@@ -688 +697 @@
                         // we need to reconstruct everything, so just free the stamps here and retry
                         psFree(stamps);
+                        nTries ++;
                     } else {
-                        // unrecoverable error
+                        // unrecoverable error generated in pmSubtractionStampsGetWindow
                         psError(psErrorCodeLast(), false, "Unable to get stamp window.");
                         goto MATCH_ERROR;