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

Timestamp:

Jun 22, 2011, 12:50:35 AM (15 years ago)

Author:

eugene

Message:

allow single direction to be chosen automatically; other minor points

File:

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

trunk/psModules/src/imcombine/pmSubtractionMatch.c

@@ -154 +154 @@
     )
 {
-    if (subMode == PM_SUBTRACTION_MODE_1 || subMode == PM_SUBTRACTION_MODE_UNSURE ||
+    if (subMode == PM_SUBTRACTION_MODE_1 || 
+        subMode == PM_SUBTRACTION_MODE_SINGLE_AUTO ||
         subMode == PM_SUBTRACTION_MODE_DUAL) {
         if (!conv1->image) {
@@ -173 +174 @@
         }
     }
-    if (subMode == PM_SUBTRACTION_MODE_2 || subMode == PM_SUBTRACTION_MODE_UNSURE ||
+    if (subMode == PM_SUBTRACTION_MODE_2 || 
+        subMode == PM_SUBTRACTION_MODE_SINGLE_AUTO ||
         subMode == PM_SUBTRACTION_MODE_DUAL) {
         if (!conv2->image) {
@@ -575 +577 @@
         TestModes[0] = PM_SUBTRACTION_MODE_2;
         break;
+      case PM_SUBTRACTION_MODE_SINGLE_AUTO:
+        N_TEST_MODES = 2;
+        TestModes[0] = PM_SUBTRACTION_MODE_1;
+        TestModes[1] = PM_SUBTRACTION_MODE_2;
+        break;
       case PM_SUBTRACTION_MODE_DUAL:
         N_TEST_MODES = 3;
@@ -754 +761 @@
             memCheck("kernels");
 
+// this section was an old version of auto-choosing the direction.  the test was not as reliable as
+// we would like; this is replaced by pmSubtractionMatchAttempt
+# if (0)
             if (subMode == PM_SUBTRACTION_MODE_UNSURE) {
                 pmSubtractionMode newMode = pmSubtractionBestMode(&stamps, &kernels, subMask, rej);
@@ -769 +779 @@
                 subMode = newMode;
             }
+# endif
 
             int numRejected = -1;       // Number of rejected stamps in each iteration