Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/ppStats/src/ppStatsReadout.c

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• ppStats/src (modified) (1 prop)
• ppStats/src/ppStatsReadout.c (modified) (1 diff)

branches/cnb_branches/cnb_branch_20090301/ppStats/src

@@ -10 +10 @@
 config.h.in
 stamp-h1
+ppStatsVersionDefinitions.h

@@ -10 +10 @@
 config.h.in
 stamp-h1
+ppStatsVersionDefinitions.h

branches/cnb_branches/cnb_branch_20090301/ppStats/src/ppStatsReadout.c

@@ -92 +92 @@
         }
         if (!psVectorStats(data->stats, sampleValues, NULL, sampleMask, 1)) {
-            psWarning("Unable to perform statistics on readout %s.\n", readoutName);
-            psErrorClear();
-        }
+            psError(PS_ERR_UNKNOWN, false, "failure to measure stats for readout %s", readoutName);
+        }
+        // XXX raise if we get a NAN? psWarning("Unable to perform statistics on readout %s.\n", readoutName);
         psFree(sampleValues);
         psFree(sampleMask);

@@ -10 +10 @@
 config.h.in
 stamp-h1
+ppStatsVersionDefinitions.h