Changeset 27517 for branches/eam_branches/20100225/psModules/src/objects/pmSourceMatch.c

Timestamp:

Mar 29, 2010, 3:55:49 PM (16 years ago)

Author:

eugene

Message:

update merges from trunk

Location:

branches/eam_branches/20100225

Files:

• . (modified) (1 prop)
• psModules/src/objects/pmSourceMatch.c (modified) (6 diffs)

branches/eam_branches/20100225/psModules/src/objects/pmSourceMatch.c

@@ -8 +8 @@
 
 #include "pmSource.h"
+#include "pmErrorCodes.h"
 
 #include "pmSourceMatch.h"
@@ -17 +18 @@
 #define SOURCES_MAX_LEAF 2              // Maximum number of points on a tree leaf
 #define ARRAY_BUFFER 16                 // Buffer for array
-
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -113 +113 @@
     psFree(match->mag);
     psFree(match->magErr);
+    psFree(match->x);
+    psFree(match->y);
     psFree(match->image);
     psFree(match->index);
+    psFree(match->mask);
 }
 
@@ -180 +183 @@
     for (int i = 0; i < numImages; i++) {
         psArray *sources = sourceArrays->data[i]; // Sources in image
-        if (!sources) {
+        if (!sources || sources->n == 0) {
             continue;
         }
@@ -270 +273 @@
         psFree(magImage);
         psFree(magErrImage);
-    }
+        psFree(indices);
+    }
+
+    psFree(xMaster);
+    psFree(yMaster);
+    psFree(boundsMaster);
 
     if (cullSingles) {
@@ -608 +616 @@
     int numImages = zp->n;              // Number of images
     int numStars = matches->n;          // Number of stars
+    psVector *badImage = psVectorAlloc(numImages, PS_TYPE_U8); // Bad image?
+    psVectorInit(badImage, 0);
+
+    // Check for data integrity
+    {
+        psVector *num = psVectorAlloc(numImages, PS_TYPE_S32); // Number of stars per image
+        psVectorInit(num, 0);
+        for (int i = 0; i < numStars; i++) {
+            pmSourceMatch *match = matches->data[i]; // Matched stars
+            for (int j = 0; j < match->num; j++) {
+                int index = match->image->data.U32[j]; // Image index
+                psAssert(index >= 0 && index < numImages, "Bad index: %d", index);
+                num->data.S32[index]++;
+            }
+        }
+        int numGood = 0;                // Number of good images
+        for (int i = 0; i < numImages; i++) {
+            if (num->data.S32[i] == 0 || !isfinite(zp->data.F32[i])) {
+                badImage->data.U8[i] = 0xFF;
+                continue;
+            }
+            numGood++;
+        }
+        psFree(num);
+        if (numGood == 0) {
+            psError(PM_ERR_DATA, true, "No images with good stars.");
+            psFree(badImage);
+            return false;
+        }
+    }
+
     psVector *trans = psVectorAlloc(numImages, PS_TYPE_F32); // Transparencies for each image, magnitudes
     psVectorInit(trans, 0.0);
     psVector *photo = psVectorAlloc(numImages, PS_TYPE_U8); // Photometric determination for each image
     psVectorInit(photo, 0);
-    psVector *badImage = psVectorAlloc(numImages, PS_TYPE_U8); // Bad image?
-    psVectorInit(badImage, 0);
     psVector *stars = psVectorAlloc(numStars, PS_TYPE_F32); // Magnitudes for each star