Changeset 23677 for branches/pap/pswarp/src/pswarpPixelFraction.c

Timestamp:

Apr 2, 2009, 11:55:52 AM (17 years ago)

Author:

Paul Price

Message:

Removing warpSkyfile.ignored from database, in favour of using the quality flags. This means that we can ignore skycells on the basis of usefulness (whether we can measure the PSF) rather than an arbitrary cut of 10% lit pixels (which pixels may or may not be useful).

File:

• branches/pap/pswarp/src/pswarpPixelFraction.c (modified) (5 diffs)

branches/pap/pswarp/src/pswarpPixelFraction.c

@@ -34 +34 @@
     PS_ASSERT_IMAGE_TYPE(readout->mask, PS_TYPE_IMAGE_MASK, false);
 
-    if (stats) {
-        PS_ASSERT_METADATA_NON_NULL(stats, false);
+    if (!stats) {
+        // No point in continuing --- we record results to the statistics
+        return true;
     }
     PS_ASSERT_PTR_NON_NULL(config, false);
     PS_ASSERT_METADATA_NON_NULL(config->arguments, false);
 
-    bool status; 
-
-    float minFrac = psMetadataLookupF32(NULL, config->arguments, "ACCEPT.FRAC"); ///< Minimum fraction
+    bool status;
 
     // load the recipe
@@ -52 +51 @@
 
     // output mask bits
-    psImageMaskType maskValue = psMetadataLookupImageMask(&status, recipe, "MASK.OUTPUT"); 
+    psImageMaskType maskValue = psMetadataLookupImageMask(&status, recipe, "MASK.OUTPUT");
     psAssert (status, "MASK.OUTPUT was not defined");
 
@@ -59 +58 @@
 
     int numCols = image->numCols, numRows = image->numRows; ///< Size of image
-    long numPix = numCols * numRows;
 
     // Range of valid pixels
     int xMin = INT_MAX, xMax = -INT_MAX, yMin = INT_MAX, yMax = -INT_MAX;
 
-    long numBad = 0;                     ///< Number of bad pixels
+    long numGood = 0;                   ///< Number of bad pixels
     for (int y = 0; y < numRows; y++) {
         for (int x = 0; x < numCols; x++) {
-            if (mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] & maskValue) {
-                numBad++;
-            } else {
+            if (!(mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] & maskValue))
                 if (y > yMax) {
                     yMax = y;
@@ -86 +82 @@
     }
 
-    float goodFrac = (numPix - numBad) / (float)numPix; ///< Fraction of good pixels
-    bool accept = (goodFrac >= minFrac ? true : false); ///< Accept this readout?
-
     if (stats) {
-        psMetadataAddBool(stats, PS_LIST_HEAD, "ACCEPT", 0, "Accept this readout?", accept);
-
         psMetadataAddS32(stats, PS_LIST_TAIL, "RANGE.XMIN", 0, "Minimum valid x value", xMin);
         psMetadataAddS32(stats, PS_LIST_TAIL, "RANGE.XMAX", 0, "Maximum valid x value", xMax);
@@ -98 +89 @@
     }
 
-    return accept;
+    return true;
 }