Changeset 2845

Timestamp:

Dec 29, 2004, 11:18:33 AM (22 years ago)

Author:

gusciora

Message:

Improving the tests and error condition code.

Location:

trunk/psModules/src

Files:

• pmSubtractBias.c (modified) (3 diffs)
• pmSubtractSky.c (modified) (2 diffs)

trunk/psModules/src/pmSubtractBias.c

@@ -6 +6 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-12-29 02:52:51 $
+ *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-12-29 21:18:33 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -161 +161 @@
             "---- ScaleOverscanVector() begin ----\n");
 
+    printf("HMMM: fit is %d\n", fit);
+
     if (NULL == overscanVector) {
         return(overscanVector);
     }
 
+    // Allocate the new vector.
     psVector *newVec = psVectorAlloc(n, PS_TYPE_F32);
+
+    //
+    // If the new vector is the same size as the old, simply copy the data.
+    if (n == overscanVector->n) {
+        for (psS32 i = 0 ; i < n ; i++) {
+            newVec->data.F32[i] = overscanVector->data.F32[i];
+        }
+        return(newVec);
+    }
     psPolynomial1D *myPoly;
     psSpline1D *mySpline;
@@ -220 +232 @@
     if ((overscans == NULL) && (overScanAxis != PM_OVERSCAN_NONE)) {
         psError(PS_ERR_UNKNOWN,true, "(overscans == NULL) && (overScanAxis != PM_OVERSCAN_NONE)\n");
+        return(in);
+    }
+    if ((fit != PM_OVERSCAN_NONE) &&
+            (fit != PM_OVERSCAN_ROWS) &&
+            (fit != PM_OVERSCAN_COLUMNS) &&
+            (fit != PM_OVERSCAN_ALL)) {
+        psError(PS_ERR_UNKNOWN, true, "fit is unallowable (%d)\n", fit);
+        return(in);
+    }
+    if ((overScanAxis != PM_OVERSCAN_NONE) &&
+            (overScanAxis != PM_OVERSCAN_ROWS) &&
+            (overScanAxis != PM_OVERSCAN_COLUMNS) &&
+            (overScanAxis != PM_OVERSCAN_ALL)) {
+        psError(PS_ERR_UNKNOWN, true, "overScanAxis is unallowable (%d)\n", overScanAxis);
         return(in);
     }

trunk/psModules/src/pmSubtractSky.c

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-12-28 19:04:29 $
+ *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-12-29 21:18:33 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -423 +423 @@
     psTrace(".psModule.pmSubtractSky", 4,
             "---- pmSubtractSky() begin ----\n");
+    if ((fit != PM_FIT_NONE) &&
+            (fit != PM_FIT_POLYNOMIAL) &&
+            (fit != PM_FIT_SPLINE)) {
+        psError(PS_ERR_UNKNOWN, true, "psFit is unallowable (%d)\n", fit);
+        return(in);
+    }
+
     psStatsOptions statOptions = 0;