Changeset 2275 for trunk/psModules/src/pmReadoutCombine.c

Timestamp:

Nov 3, 2004, 4:02:10 PM (22 years ago)

Author:

desonia

Message:

fixed problems with psError and associate parameter checking macros.

File:

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

trunk/psModules/src/pmReadoutCombine.c

@@ -5 +5 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-11-03 22:10:37 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-04 02:02:10 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -15 +15 @@
 #include<math.h>
 #include "pslib.h"
-// XXX: have Desonia do this correctly.
-#include "../../psLib/src/dataManip/psConstants.h"
+#include "psConstants.h"
 
 typedef struct
@@ -90 +89 @@
         // XXX
         if (numInputCols != tmpReadout->image->numCols) {
-            psError(__func__, "Image %d not same size as other input images (%d, %d)\n",
+            psError(PS_ERR_UNKNOWN,true, "Image %d not same size as other input images (%d, %d)\n",
                     tmpReadout->image->numRows, tmpReadout->image->numCols);
             return(NULL);
@@ -96 +95 @@
         // XXX
         if (numInputRows != tmpReadout->image->numRows) {
-            psError(__func__, "Image %d not same size as other input images (%d, %d)\n",
+            psError(PS_ERR_UNKNOWN,true, "Image %d not same size as other input images (%d, %d)\n",
                     tmpReadout->image->numRows, tmpReadout->image->numCols);
             return(NULL);
@@ -111 +110 @@
 
     if (1 < p_psDetermineNumBits(params->stats->options)) {
-        psError(__func__, "Multiple statistical options have been requested.\n");
+        psError(PS_ERR_UNKNOWN,true, "Multiple statistical options have been requested.\n");
         return(NULL);
     }
@@ -175 +174 @@
             double statValue;
             if (!p_psGetStatValue(stats, &statValue)) {
-                psError(__func__, "Could not determine stats value.\n");
+                psError(PS_ERR_UNKNOWN,true, "Could not determine stats value.\n");
                 return(NULL);
             } else {