Changeset 27162

Timestamp:

Mar 3, 2010, 2:33:56 PM (16 years ago)

Author:

Paul Price

Message:

Catch images with no sources.

Location:

trunk

Files:

• ppStack/src/ppStackSources.c (modified) (1 diff)
• psModules/src/objects/pmSourceMatch.c (modified) (2 diffs)

trunk/ppStack/src/ppStackSources.c

@@ -132 +132 @@
         psAssert(sources, "Don't have source list %d", i);
         if (sources->n == 0) {
+            psLogMsg("ppStack", PS_LOG_WARN, "Image %d has no sources for transparency measurement.", i);
             options->inputMask->data.PS_TYPE_VECTOR_MASK_DATA[i] |= PPSTACK_MASK_CAL;
+            zp->data.F32[i] = NAN;
             continue;
         }

trunk/psModules/src/objects/pmSourceMatch.c

@@ -8 +8 @@
 
 #include "pmSource.h"
+#include "pmErrorCodes.h"
 
 #include "pmSourceMatch.h"
@@ -608 +609 @@
     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
+        for (int i = 0; i < numStars; i++) {
+            pmSourceMatch *match = matches->data[i]; // Matched stars
+            for (int j = 0; j < match->num; j++) {
+                if (match->mask->data.PS_TYPE_VECTOR_MASK_DATA[j] & PM_SOURCE_MATCH_MASK_PHOT) {
+                    continue;
+                }
+                int index = match->image->data.U32[j]; // Image 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