Changeset 31671 for trunk/psModules/src/astrom/pmAstrometryObjects.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/astrom/pmAstrometryObjects.c (modified) (2 diffs)

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