Changeset 27249 for trunk/psLib

Timestamp:

Mar 11, 2010, 9:20:14 AM (16 years ago)

Author:

Paul Price

Message:

Wasn't being rigorous about checking for good pixels: just because
psImageBackground says there were no good pixels doesn't mean there
aren't any (because it samples the image randomly and may miss them).

File:

• trunk/psLib/src/fits/psFitsScale.c (modified) (4 diffs)

trunk/psLib/src/fits/psFitsScale.c

@@ -122 +122 @@
     psRandom *rng = psRandomAlloc(PS_RANDOM_TAUS);
     psStats *stats = psStatsAlloc(MEAN_STAT | STDEV_STAT); // Statistics object
-    psVector *sample = NULL;                               // Sample of pixels
     double mean, stdev;                                    // Mean and standard deviation
-    if (!psImageBackground(stats, &sample, image, mask, maskVal, rng)) {
+    if (!psImageBackground(stats, NULL, image, mask, maskVal, rng)) {
         // It could be because the image is entirely masked, in which case we don't want to error
-        if (sample->n == 0) {
+        bool good = false;              // Any good pixels?
+
+
+// Find good pixels in an image, by image type
+#define GOOD_PIXELS_CASE(TYPE) \
+      case PS_TYPE_##TYPE: \
+        for (int y = 0; y < image->numRows && !good; y++) { \
+            for (int x = 0; x < image->numCols && !good; x++) { \
+                if (mask && (mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] & maskVal)) { \
+                    continue; \
+                } \
+                if (!isfinite(image->data.TYPE[y][x])) { \
+                    continue; \
+                } \
+                good = true; \
+            } \
+        } \
+        break;
+
+        switch (image->type.type) {
+            GOOD_PIXELS_CASE(F32);
+            GOOD_PIXELS_CASE(F64);
+          default:
+            psAbort("Unsupported case: %x", image->type.type);
+        }
+
+        if (!good) {
             psLogMsg("psLib.fits", PS_LOG_DETAIL, "Image has no good pixels, setting BSCALE = 1, BZERO = 0");
             psErrorClear();
@@ -133 +158 @@
             psFree(rng);
             psFree(stats);
-            psFree(sample);
             return true;
         }
+
+        // There are some good pixels in there somewhere; psImageBackground just didn't find them
         psLogMsg("psLib.fits", PS_LOG_DETAIL,
                  "Couldn't measure background statistics for image quantisation; retrying.");
@@ -151 +177 @@
                 psFree(rng);
                 psFree(stats);
-                psFree(sample);
                 return false;
             } else {
@@ -168 +193 @@
         stdev = psStatsGetValue(stats, STDEV_STAT);
     }
-    psFree(sample);
     psFree(rng);
     psFree(stats);