Changeset 2275 for trunk/psModules/src/pmFlatField.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/pmFlatField.c (modified) (7 diffs)

trunk/psModules/src/pmFlatField.c

@@ -18 +18 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-14 23:52:09 $
+ *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-04 02:02:10 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -56 +56 @@
         return true;       // Readout may not have data in it
     } else if(flat==NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "pmFlatField", PS_ERR_BAD_PARAMETER_NULL, true,
-                   PS_ERRORTEXT_pmFlatField_NULL_FLAT_READOUT);
+        psError( PS_ERR_BAD_PARAMETER_NULL, true,
+                 PS_ERRORTEXT_pmFlatField_NULL_FLAT_READOUT);
         return false;
     }
@@ -64 +64 @@
     flatImage = flat->image;
     if (inImage == NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "pmFlatField", PS_ERR_BAD_PARAMETER_NULL, true,
-                   PS_ERRORTEXT_pmFlatField_NULL_INPUT_IMAGE);
+        psError( PS_ERR_BAD_PARAMETER_NULL, true,
+                 PS_ERRORTEXT_pmFlatField_NULL_INPUT_IMAGE);
         return false;
     } else if(flatImage == NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "pmFlatField", PS_ERR_BAD_PARAMETER_NULL, true,
-                   PS_ERRORTEXT_pmFlatField_NULL_FLAT_IMAGE);
+        psError( PS_ERR_BAD_PARAMETER_NULL, true,
+                 PS_ERRORTEXT_pmFlatField_NULL_FLAT_IMAGE);
         return false;
     } else if(in->mask == NULL) {
@@ -79 +79 @@
     // Check input image and its mask are not larger than flat image
     if(inImage->numRows>flatImage->numRows || inImage->numCols>flatImage->numCols) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "pmFlatField", PS_ERR_BAD_PARAMETER_SIZE, true,
-                   PS_ERRORTEXT_pmFlatField_SIZE_INPUT_IMAGE,
-                   inImage->numRows, inImage->numCols, flatImage->numRows, flatImage->numCols);
+        psError( PS_ERR_BAD_PARAMETER_SIZE, true,
+                 PS_ERRORTEXT_pmFlatField_SIZE_INPUT_IMAGE,
+                 inImage->numRows, inImage->numCols, flatImage->numRows, flatImage->numCols);
         return false;
     } else if(inMask->numRows>flatImage->numRows || inMask->numCols > flatImage->numCols) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "pmFlatField", PS_ERR_BAD_PARAMETER_SIZE, true,
-                   PS_ERRORTEXT_pmFlatField_SIZE_MASK_IMAGE,
-                   inMask->numRows, inMask->numCols, flatImage->numRows, flatImage->numCols);
+        psError( PS_ERR_BAD_PARAMETER_SIZE, true,
+                 PS_ERRORTEXT_pmFlatField_SIZE_MASK_IMAGE,
+                 inMask->numRows, inMask->numCols, flatImage->numRows, flatImage->numCols);
         return false;
     }
@@ -96 +96 @@
     // Check that offsets are within image limits
     if(totOffRow>=flatImage->numRows || totOffCol>=flatImage->numCols) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "pmFlatField", PS_ERR_BAD_PARAMETER_SIZE, true,
-                   PS_ERRORTEXT_pmFlatField_OFFSET_FLAT_IMAGE,
-                   totOffRow, totOffCol, flatImage->numRows, flatImage->numCols);
+        psError( PS_ERR_BAD_PARAMETER_SIZE, true,
+                 PS_ERRORTEXT_pmFlatField_OFFSET_FLAT_IMAGE,
+                 totOffRow, totOffCol, flatImage->numRows, flatImage->numCols);
         return false;
     } else if(totOffRow>=inImage->numRows || totOffCol>=inImage->numCols) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "pmFlatField", PS_ERR_BAD_PARAMETER_SIZE, true,
-                   PS_ERRORTEXT_pmFlatField_OFFSET_INPUT_IMAGE,
-                   totOffRow, totOffCol, inImage->numRows, inImage->numCols);
+        psError( PS_ERR_BAD_PARAMETER_SIZE, true,
+                 PS_ERRORTEXT_pmFlatField_OFFSET_INPUT_IMAGE,
+                 totOffRow, totOffCol, inImage->numRows, inImage->numCols);
         return false;
     } else if(totOffRow>=inMask->numRows || totOffCol>=inMask->numCols) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "pmFlatField", PS_ERR_BAD_PARAMETER_SIZE, true,
-                   PS_ERRORTEXT_pmFlatField_OFFSET_MASK_IMAGE,
-                   totOffRow, totOffCol, inMask->numRows, inMask->numCols);
+        psError( PS_ERR_BAD_PARAMETER_SIZE, true,
+                 PS_ERRORTEXT_pmFlatField_OFFSET_MASK_IMAGE,
+                 totOffRow, totOffCol, inMask->numRows, inMask->numCols);
         return false;
     }
@@ -117 +117 @@
     maskType = inMask->type.type;
     if(PS_IS_PSELEMTYPE_COMPLEX(inType)) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "pmFlatField", PS_ERR_BAD_PARAMETER_TYPE, true,
-                   PS_ERRORTEXT_pmFlatField_TYPE_INPUT_IMAGE,
-                   inType);
+        psError( PS_ERR_BAD_PARAMETER_TYPE, true,
+                 PS_ERRORTEXT_pmFlatField_TYPE_INPUT_IMAGE,
+                 inType);
         return false;
     } else if(PS_IS_PSELEMTYPE_COMPLEX(flatType)) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "pmFlatField", PS_ERR_BAD_PARAMETER_TYPE, true,
-                   PS_ERRORTEXT_pmFlatField_TYPE_FLAT_IMAGE,
-                   flatType);
+        psError( PS_ERR_BAD_PARAMETER_TYPE, true,
+                 PS_ERRORTEXT_pmFlatField_TYPE_FLAT_IMAGE,
+                 flatType);
         return false;
     } else if(maskType != PS_TYPE_MASK) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "pmFlatField", PS_ERR_BAD_PARAMETER_TYPE, true,
-                   PS_ERRORTEXT_pmFlatField_TYPE_MASK_IMAGE,
-                   maskType);
+        psError( PS_ERR_BAD_PARAMETER_TYPE, true,
+                 PS_ERRORTEXT_pmFlatField_TYPE_MASK_IMAGE,
+                 maskType);
         return false;
     } else if(inType != flatType) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "pmFlatField", PS_ERR_BAD_PARAMETER_TYPE, true,
-                   PS_ERRORTEXT_pmFlatField_TYPE_MISMATCH,
-                   inType, flatType);
+        psError( PS_ERR_BAD_PARAMETER_TYPE, true,
+                 PS_ERRORTEXT_pmFlatField_TYPE_MISMATCH,
+                 inType, flatType);
         return false;
     }
@@ -172 +172 @@
         PM_FLAT_DIVISION(F64);
     default:
-        psErrorMsg(PS_ERRORNAME_DOMAIN "pmFlatField", PS_ERR_BAD_PARAMETER_TYPE, true,
-                   PS_ERRORTEXT_pmFlatField_TYPE_UNSUPPORTED,
-                   inType);
+        psError( PS_ERR_BAD_PARAMETER_TYPE, true,
+                 PS_ERRORTEXT_pmFlatField_TYPE_UNSUPPORTED,
+                 inType);
     }