Changeset 31671

Timestamp:

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

Author:

eugene

Message:

allow single direction to be chosen automatically; other minor points

Location:

trunk/psModules/src

Files:

• astrom/pmAstrometryObjects.c (modified) (2 diffs)
• camera/pmFPAfile.c (modified) (1 diff)
• imcombine/pmSubtractionMask.c (modified) (2 diffs)
• imcombine/pmSubtractionMatch.c (modified) (5 diffs)
• imcombine/pmSubtractionTypes.h (modified) (1 diff)

trunk/psModules/src/astrom/pmAstrometryObjects.c

@@ -996 +996 @@
             newStat->center = center;
 
-            if (isfinite(newStat->minMetric) && (newStat->minMetric > 0.0) && (newStat->minMetric < minStat->minMetric)) {
+            if (isfinite(newStat->minMetric) && (newStat->minMetric > 0.0) && (newStat->nSigma >= minSigma) && (newStat->minMetric < minStat->minMetric)) {
                 *minStat = *newStat;
                 psLogMsg ("psModule.astrom", 4, "grid test - offset: %7.2f,%7.2f @ %6.1f deg x %7.3f (%4d pts, %5.1f sig, %5.1f var, %6.3f log metric) *",
@@ -1080 +1080 @@
     psVector *xHistNew = psVectorSmooth(NULL, xHist, tweakSmooth, tweakNsigma);
     psVector *yHistNew = psVectorSmooth(NULL, yHist, tweakSmooth, tweakNsigma);
+
+    // if we failed to smooth, just use the original vector (probably too narrow a range)
+    if (!xHistNew) xHistNew = psMemIncrRefCounter (xHist);
+    if (!yHistNew) yHistNew = psMemIncrRefCounter (yHist);
 
     // select peak in x and in y

trunk/psModules/src/camera/pmFPAfile.c

@@ -201 +201 @@
     newName = psStringCopy(rule);
 
+    bool status = false;
     if (strstr(newName, "{FPA.OBS}")) {
-        char *name = psMetadataLookupStr(NULL, fpa->concepts, "FPA.OBS");
+        char *name = psMetadataLookupStr(&status, fpa->concepts, "FPA.OBS");
         if (name) {
             psStringSubstitute(&newName, name, "{FPA.OBS}");
-        }
+        } 
     }
     if (strstr(newName, "{FPA.NAME}")) {

trunk/psModules/src/imcombine/pmSubtractionMask.c

@@ -185 +185 @@
         break;
       case PM_SUBTRACTION_MODE_UNSURE:
+      case PM_SUBTRACTION_MODE_SINGLE_AUTO:
       case PM_SUBTRACTION_MODE_DUAL:
         maskRej |= PM_SUBTRACTION_MASK_CONVOLVE_1 | PM_SUBTRACTION_MASK_CONVOLVE_2;
@@ -271 +272 @@
       case PM_SUBTRACTION_MODE_ERR:
       case PM_SUBTRACTION_MODE_UNSURE:
+      case PM_SUBTRACTION_MODE_SINGLE_AUTO:
       default:
         psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Unsuppored subtraction mode: %x", mode);

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

trunk/psModules/src/imcombine/pmSubtractionTypes.h

@@ -49 +49 @@
     PM_SUBTRACTION_MODE_1,              // Convolve image 1
     PM_SUBTRACTION_MODE_2,              // Convolve image 2
-    PM_SUBTRACTION_MODE_UNSURE,         // Not sure yet which image to convolve so try to satisfy both
+    PM_SUBTRACTION_MODE_UNSURE,         // deprecated way of choosing the direction
+    PM_SUBTRACTION_MODE_SINGLE_AUTO,    // choose between SINGLE1 and SINGLE2
     PM_SUBTRACTION_MODE_DUAL,           // Dual convolution
 } pmSubtractionMode;