Changeset 2928 for trunk/psModules/src

Timestamp:

Jan 7, 2005, 10:00:34 AM (22 years ago)

Author:

gusciora

Message:

Fixed a few error conditions.

Location:

trunk/psModules/src

Files:

• pmNonLinear.c (modified) (6 diffs)
• pmReadoutCombine.c (modified) (2 diffs)
• pmSubtractSky.c (modified) (3 diffs)

trunk/psModules/src/pmNonLinear.c

@@ -5 +5 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-01-05 23:43:58 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-01-07 20:00:34 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -41 +41 @@
     psS32 j;
 
-    for (i=0;i<(inputReadout->image)->numRows;i++) {
-        for (j=0;j<(inputReadout->image)->numCols;j++) {
-            (inputReadout->image)->data.F32[i][j] = psPolynomial1DEval(input1DPoly, (inputReadout->image)->data.F32[i][j]);
+    for (i=0;i<inputReadout->image->numRows;i++) {
+        for (j=0;j<inputReadout->image->numCols;j++) {
+            inputReadout->image->data.F32[i][j] = psPolynomial1DEval(input1DPoly, inputReadout->image->data.F32[i][j]);
         }
     }
@@ -65 +65 @@
     PS_IMAGE_CHECK_TYPE(inputReadout->image, PS_TYPE_F32, NULL);
     PS_PTR_CHECK_NULL(inFlux,NULL);
-    psS32 tableSize = inFlux->n;
     if (inFlux->n < 2) {
         psError(PS_ERR_UNKNOWN,true, "pmNonLinearityLookup(): input vector less than 2 elements.  Returning inputReadout image.");
@@ -71 +70 @@
     }
     PS_PTR_CHECK_NULL(outFlux,NULL);
+    psS32 tableSize = inFlux->n;
     if (inFlux->n != outFlux->n) {
         tableSize = PS_MIN(inFlux->n, outFlux->n);
@@ -87 +87 @@
 
     x.type.type = PS_TYPE_F32;
-    for (i=0;i<(inputReadout->image)->numRows;i++) {
-        for (j=0;j<(inputReadout->image)->numCols;j++) {
-            x.data.F32 = (inputReadout->image)->data.F32[i][j];
-
+    for (i=0;i<inputReadout->image->numRows;i++) {
+        for (j=0;j<inputReadout->image->numCols;j++) {
+            x.data.F32 = inputReadout->image->data.F32[i][j];
             binNum = p_psVectorBinDisect((psVector *)inFlux, &x);
 
             if (binNum == -2) {
                 // We get here if x is below the table lookup range.
-                (inputReadout->image)->data.F32[i][j] = outFlux->data.F32[0];
+                inputReadout->image->data.F32[i][j] = outFlux->data.F32[0];
                 numPixels++;
 
             } else if (binNum == -1) {
                 // We get here if x is above the table lookup range.
-                (inputReadout->image)->data.F32[i][j] = outFlux->data.F32[tableSize-1];
+                inputReadout->image->data.F32[i][j] = outFlux->data.F32[tableSize-1];
+                numPixels++;
 
-                numPixels++;
             } else if (binNum < -2) {
                 // We get here if there was some other problem.
@@ -112 +111 @@
                 slope = (outFlux->data.F32[binNum+1] - outFlux->data.F32[binNum]) /
                         (inFlux->data.F32[binNum+1]  - inFlux->data.F32[binNum]);
-                (inputReadout->image)->data.F32[i][j] = outFlux->data.F32[binNum] +
-                                                        ((x.data.F32 - inFlux->data.F32[binNum]) * slope);
+                inputReadout->image->data.F32[i][j] = outFlux->data.F32[binNum] +
+                                                      ((x.data.F32 - inFlux->data.F32[binNum]) * slope);
             }
         }

trunk/psModules/src/pmReadoutCombine.c

@@ -5 +5 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-01-05 23:43:58 $
+ *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-01-07 20:00:34 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -27 +27 @@
     psS32 numBits = 0;
 
-    for (i=0;i<4 * sizeof(psStatsOptions);i++) {
+    for (i=0;i<8 * sizeof(psStatsOptions);i++) {
         if (0x0001 & tmpData) {
             numBits++;

trunk/psModules/src/pmSubtractSky.c

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-01-05 23:43:58 $
+ *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-01-07 20:00:34 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -29 +29 @@
     psS32 numBits = 0;
 
-    for (i=0;i<4 * sizeof(psStatsOptions);i++) {
+    for (i=0;i<8 * sizeof(psStatsOptions);i++) {
         if (0x0001 & tmpData) {
             numBits++;
@@ -439 +439 @@
     psStatsOptions statOptions = 0;
 
+    //
     // Return the original input readout if the fit specs are poorly defined.
+    // No warning or error messages should be generated.
+    //
     if ((fitSpec == NULL) ||
             ((fit == PM_FIT_NONE) || (fit == PM_FIT_SPLINE))) {
-        psLogMsg(__func__, PS_LOG_WARN, "Fit specs are poorly defined.  Returning in image.\n");
+        //        psLogMsg(__func__, PS_LOG_WARN, "Fit specs are poorly defined.  Returning in image.\n");
         return(in);
     }