Changeset 41836 for branches/eam_branches/ipp-dev-20210817/psModules/src/astrom/pmAstrometryObjects.c

Timestamp:

Oct 11, 2021, 11:45:42 AM (5 years ago)

Author:

eugene

Message:

add dXstdev, dYstdev stats; plug memleak

File:

• branches/eam_branches/ipp-dev-20210817/psModules/src/astrom/pmAstrometryObjects.c (modified) (6 diffs)

branches/eam_branches/ipp-dev-20210817/psModules/src/astrom/pmAstrometryObjects.c

@@ -354 +354 @@
 
         bool isValid = true;
-        isValid = isValid & isfinite (xFit->data.F32[i]);
-        isValid = isValid & isfinite (yFit->data.F32[i]);
+        isValid = isValid & isfinite (x->data.F32[i]);
+        isValid = isValid & isfinite (y->data.F32[i]);
         isValid = isValid & isfinite (xRes->data.F32[i]);
         isValid = isValid & isfinite (yRes->data.F32[i]);
         if (isValid) {
-          psVectorAppend (xPosValid, xFit->data.F32[i]);
-          psVectorAppend (yPosValid, yFit->data.F32[i]);
+          psVectorAppend (xPosValid, x->data.F32[i]);
+          psVectorAppend (yPosValid, y->data.F32[i]);
           psVectorAppend (xResValid, xRes->data.F32[i]);
           psVectorAppend (yResValid, yRes->data.F32[i]);
@@ -391 +391 @@
       results->dXsys   = results->dYsys   = NAN;
       results->dXrange = results->dYrange = NAN;
+      results->dXstdev = results->dYstdev = NAN;
     } else {
       results->dXsys = psVectorSystematicError (xResGood, xErr, 0.05);
@@ -427 +428 @@
 
 # define VAL_COUNT 9.0
-# define MIN_COUNT 7.0
+# define MIN_COUNT 5.0
 
 float pmAstrom2DSystematics (psVector *xPos, psVector *yPos, psVector *value) {
 
     // pre-filter the values to ensure no NANs, other invalid
-    if (xPos->n < VAL_COUNT*2*2) { return NAN; }
+    if (xPos->n < VAL_COUNT*2*2) {
+      return NAN;
+    }
 
     // generate a grid covering the full range of x,y and measure the median value in each
@@ -455 +458 @@
     float yStep = Ncell / (yMax - yMin);
   
-    if (isnan(xStep)) { return NAN; }
-    if (isnan(yStep)) { return NAN; }
+    if (isnan(xStep)) {
+      return NAN;
+    }
+    if (isnan(yStep)) {
+      return NAN;
+    }
 
     psArray *xBin = psArrayAlloc (Ncell);
@@ -487 +494 @@
         for (int iy = 0; iy < Ncell; iy++) {
             psVector *Bin = yBin->data[iy];
-      
+            if (Bin->n < MIN_COUNT) { continue; }
+
             // psVectorStats resets stats so we can call this repeatedly
             psVectorStats (stats, Bin, NULL, NULL, 0); 
@@ -499 +507 @@
     psVectorStats (stats, sample, NULL, NULL, 0); 
     float result = stats->sampleStdev;
+
+    if (!isfinite(stats->sampleStdev)) {
+      fprintf (stderr, "*** bad solution ***\n");
+    }
 
     // NOTE: the elements of xBin are freed automatically, which extends down to the vectors