Changeset 2762 for trunk/psLib/src/dataManip

Timestamp:

Dec 20, 2004, 11:39:42 AM (22 years ago)

Author:

gusciora

Message:

New macros for psCOnstants.h

Location:

trunk/psLib/src/dataManip

Files:

• psConstants.h (modified) (2 diffs)
• psStats.c (modified) (2 diffs)

trunk/psLib/src/dataManip/psConstants.h

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.46 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-12-17 00:18:31 $
+ *  @version $Revision: 1.47 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-12-20 21:39:42 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -429 +429 @@
 }
 
-
+#define PS_IMAGE_PRINT_F32(NAME) \
+printf("======== printing %s ========\n", #NAME); \
+for (int i = 0 ; i < NAME->numRows ; i++) { \
+    for (int j = 0 ; j < NAME->numCols ; j++) { \
+        printf("%.2f ", NAME->data.F32[i][j]); \
+    } \
+    printf("\n"); \
+}\
+
+#define PS_IMAGE_SET_F32(NAME, VALUE) \
+for (int i = 0 ; i < NAME->numRows ; i++) { \
+    for (int j = 0 ; j < NAME->numCols ; j++) { \
+        NAME->data.F32[i][j] = VALUE; \
+    } \
+}\
+
+#define PS_IMAGE_SET_U8(NAME, VALUE) \
+for (int i = 0 ; i < NAME->numRows ; i++) { \
+    for (int j = 0 ; j < NAME->numCols ; j++) { \
+        NAME->data.U8[i][j] = VALUE; \
+    } \
+}\
 
 /*****************************************************************************
     PS_READOUT macros:
- *****************************************************************************/
+*****************************************************************************/
 #define PS_READOUT_CHECK_NULL(NAME, RVAL) \
 if (NAME == NULL || NAME->image == NULL) { \

trunk/psLib/src/dataManip/psStats.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.103 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-12-16 23:04:18 $
+ *  @version $Revision: 1.104 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-12-20 21:39:42 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -793 +793 @@
         }
     }
-    if (countInt <= 1) {
+    if (countInt == 0) {
         stats->sampleStdev = NAN;
-        psLogMsg(__func__, PS_LOG_WARN, "WARNING: p_psVectorSampleStdev(): no valid psVector elements.  Setting stats->sampleStdev = NAN.\n");
+        psLogMsg(__func__, PS_LOG_WARN, "WARNING: p_psVectorSampleStdev(): no valid psVector elements (%d).  Setting stats->sampleStdev = NAN.\n", countInt);
+    } else if (countInt == 1) {
+        stats->sampleStdev = 0.0;
+        psLogMsg(__func__, PS_LOG_WARN, "WARNING: p_psVectorSampleStdev(): only one valid psVector elements (%d).  Setting stats->sampleStdev = 0.0.\n", countInt);
     } else {
         countFloat = (float)countInt;