Changeset 23679

Timestamp:

Apr 2, 2009, 12:06:37 PM (17 years ago)

Author:

Paul Price

Message:

Fixing syntax errors in pswarpPixelFraction. Renaming this function (and its file) more along the lines of its current purpose: investigate the lit pixels (don't bother about the fraction, because ppStats will calculate that).

Location:

branches/pap/pswarp

Files:

• pswarpPixelsLit.c (moved) (moved from branches/pap/pswarp/src/pswarpPixelFraction.c ) (3 diffs)
• src/Makefile.am (modified) (1 diff)
• src/pswarp.h (modified) (1 diff)
• src/pswarpLoop.c (modified) (1 diff)

branches/pap/pswarp/pswarpPixelsLit.c

@@ -21 +21 @@
 #include "pswarp.h"
 
-bool pswarpPixelFraction(const pmReadout *readout, psMetadata *stats, const pmConfig *config)
+bool pswarpPixelsLit(const pmReadout *readout, psMetadata *stats, const pmConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(readout, false);
@@ -52 +52 @@
     // output mask bits
     psImageMaskType maskValue = psMetadataLookupImageMask(&status, recipe, "MASK.OUTPUT");
-    psAssert (status, "MASK.OUTPUT was not defined");
+    psAssert(status, "MASK.OUTPUT was not defined");
 
     psImage *image = readout->image;    ///< Image of interest
@@ -62 +62 @@
     int xMin = INT_MAX, xMax = -INT_MAX, yMin = INT_MAX, yMax = -INT_MAX;
 
-    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))
+            if (!(mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] & maskValue)) {
                 if (y > yMax) {
                     yMax = y;

branches/pap/pswarp/src/Makefile.am

@@ -24 +24 @@
         pswarpMatchRange.c              \
         pswarpParseCamera.c             \
-        pswarpPixelFraction.c           \
+        pswarpPixelsLit.c               \
         pswarpSetMaskBits.c             \
         pswarpSetThreads.c              \

branches/pap/pswarp/src/pswarp.h

@@ -102 +102 @@
                           const char *filename, const char *argname);
 
-/// Check to see if the readout has a minimum fraction of "lit" pixels
-bool pswarpPixelFraction(const pmReadout *readout, ///< Readout to inspect
-                         psMetadata *stats, ///< Statistics to update with the result
-                         const pmConfig *config ///< Configuration
+/// Get the range of lit pixels
+bool pswarpPixelsLit(const pmReadout *readout, ///< Readout to inspect
+                     psMetadata *stats, ///< Statistics to update with the result
+                     const pmConfig *config ///< Configuration
     );
 

branches/pap/pswarp/src/pswarpLoop.c

@@ -290 +290 @@
     pmFPA *outFPA = outChip->parent;    ///< Output FP
 
-    if (pswarpPixelFraction(output, stats, config)) {
+    if (pswarpPixelsLit(output, stats, config)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to calculate pixel regions.");
         psFree(cells);