Changeset 8004 for trunk/psModules/src/imcombine/pmImageCombine.c

Timestamp:

Jul 27, 2006, 5:21:19 PM (20 years ago)

Author:

Paul Price

Message:

Changing p_psGetStatsValue over to psStatsSingleOption and psStatsGetValue

File:

• trunk/psModules/src/imcombine/pmImageCombine.c (modified) (6 diffs)

trunk/psModules/src/imcombine/pmImageCombine.c

@@ -8 +8 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-30 23:59:49 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-07-28 03:21:19 $
  *
  *  XXX: pmRejectPixels() has a known bug with the pmImageTransform() call.
@@ -45 +45 @@
     psS32 numIter,                      ///< Number of rejection iterations
     psF32 sigmaClip,                    ///< Number of standard deviations at which to reject
-    const psStats *stats)               ///< Statistics to use in the combination
+    psStats *stats)               ///< Statistics to use in the combination
 {
 
@@ -98 +98 @@
     }
     PS_ASSERT_PTR_NON_NULL(stats, combine);
+    psStatsOptions statistic = psStatsSingleOption(stats->options);
+    if (statistic == 0) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Multiple or no statistics options set: %x\n", statistic);
+        return combine;
+    }
 
     // Allocate and initialize the combined image, if necessary.
@@ -185 +190 @@
                 // Combine all the pixels, using the specified stat.
 
-                stats = psVectorStats((psStats *) stats, pixelData, pixelErrors, pixelMask, maskVal);
-                psF64 combinedPixel;
-                psBool rc = p_psGetStatValue(stats, &combinedPixel);
-                if (rc != true) {
-                    psLogMsg(__func__, PS_LOG_WARN, "WARNING: could not combine pixels (%d, %d) with the specified stat.\n", row, col);
-                }
+                stats = psVectorStats(stats, pixelData, pixelErrors, pixelMask, maskVal);
+                psF64 combinedPixel = psStatsGetValue(stats, statistic);
+
                 if (iter == 0) {
                     combine->data.F32[row][col] = (psF32) combinedPixel;
@@ -202 +204 @@
                 for (psS32 im = 0 ; im < numImages ; im++) {
                     stdevStats = psVectorStats(stdevStats, pixelData, pixelErrors, pixelMask, maskVal);
-                    psF64 stdev;
-                    psBool rc = p_psGetStatValue(stdevStats, &stdev);
-                    if (rc != true) {
-                        psLogMsg(__func__, PS_LOG_WARN, "WARNING: could not compute the standard deviation of pixel (%d, %d).\n", row, col);
-                        psLogMsg(__func__, PS_LOG_WARN, "WARNING: could not combine pixels (%d, %d) with the specified stat.\n", row, col);
-                    }
+                    psF64 stdev = stdevStats->sampleStdev;
 
                     if (!(pixelMask->data.U8[im] & maskVal)) {
@@ -289 +286 @@
                 }
                 // Combine all the pixels, using the specified stat.
-                stats = psVectorStats((psStats *) stats, pixelData, pixelErrors, pixelMask, maskVal);
-                psF64 tmpF64;
-                psBool rc = p_psGetStatValue(stats, &tmpF64);
-                combine->data.F32[row][col] = (psF32) tmpF64;
-                if (rc != true) {
-                    psLogMsg(__func__, PS_LOG_WARN, "WARNING: could not combine pixels (%d, %d) with the specified stat.\n", row, col);
-                }
+                stats = psVectorStats(stats, pixelData, pixelErrors, pixelMask, maskVal);
+                combine->data.F32[row][col] = psStatsGetValue(stats, statistic);
             }
         }