Changeset 2916

Timestamp:

Jan 5, 2005, 1:43:58 PM (22 years ago)

Author:

gusciora

Message:

Added some type checking.

Location:

trunk/psModules/src

Files:

• pmNonLinear.c (modified) (4 diffs)
• pmReadoutCombine.c (modified) (2 diffs)
• pmSubtractBias.c (modified) (4 diffs)
• pmSubtractSky.c (modified) (2 diffs)

trunk/psModules/src/pmNonLinear.c

@@ -5 +5 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-01-05 23:25:24 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-01-05 23:43:58 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -35 +35 @@
     PS_PTR_CHECK_NULL(inputReadout, NULL);
     PS_PTR_CHECK_NULL(inputReadout->image, NULL);
+    PS_IMAGE_CHECK_TYPE(inputReadout->image, PS_TYPE_F32, NULL);
     PS_PTR_CHECK_NULL(input1DPoly, NULL);
 
@@ -62 +63 @@
     PS_PTR_CHECK_NULL(inputReadout,NULL);
     PS_PTR_CHECK_NULL(inputReadout->image,NULL);
+    PS_IMAGE_CHECK_TYPE(inputReadout->image, PS_TYPE_F32, NULL);
     PS_PTR_CHECK_NULL(inFlux,NULL);
     psS32 tableSize = inFlux->n;
@@ -74 +76 @@
                  "WARNING: pmNonLinear.c: pmNonLinearityLookup(): input vectors have different sizes (%d, %d)\n", inFlux->n, outFlux->n);
     }
+    PS_VECTOR_CHECK_TYPE(inFlux, PS_TYPE_F32, NULL);
+    PS_VECTOR_CHECK_TYPE(outFlux, PS_TYPE_F32, NULL);
 
     psS32 i;

trunk/psModules/src/pmReadoutCombine.c

@@ -5 +5 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-01-05 23:25:24 $
+ *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-01-05 23:43:58 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -160 +160 @@
         *(psS32 *) &(output->row0) = minInputRows;
     } else {
+        PS_IMAGE_CHECK_TYPE(output, PS_TYPE_F32, NULL);
         if (((output->col0 + output->numCols) < maxInputCols) ||
                 ((output->row0 + output->numRows) < maxInputRows)) {

trunk/psModules/src/pmSubtractBias.c

@@ -6 +6 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-12-30 22:22:00 $
+ *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-01-05 23:43:58 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -252 +252 @@
     PS_READOUT_CHECK_EMPTY(in, NULL);
     PS_READOUT_CHECK_TYPE(in, PS_TYPE_F32, NULL);
+
+    //
+    // If the overscans != NULL, then check the type of each image.
+    //
+    if (overscans != NULL) {
+        psListElem *tmpOverscan = (psListElem *) overscans->head;
+        while (NULL != tmpOverscan) {
+            psImage *myOverscanImage = (psImage *) tmpOverscan->data;
+            PS_IMAGE_CHECK_TYPE(myOverscanImage, PS_TYPE_F32, NULL);
+            tmpOverscan = tmpOverscan->next;
+        }
+    }
+
     if ((overscans == NULL) && (overScanAxis != PM_OVERSCAN_NONE)) {
         psError(PS_ERR_UNKNOWN,true, "(overscans == NULL) && (overScanAxis != PM_OVERSCAN_NONE).  Returning in image\n");
@@ -301 +314 @@
     }
 
+
+
+
     if (overScanAxis == PM_OVERSCAN_NONE) {
         if (fit != PM_FIT_NONE) {
@@ -322 +338 @@
     //
     // We subtract each overscan region from the image data.
+    // If we get here we know that overscans != NULL.
     //
+
     if (overScanAxis == PM_OVERSCAN_ALL) {
         tmpOverscan = (psListElem *) overscans->head;
         while (NULL != tmpOverscan) {
             myOverscanImage = (psImage *) tmpOverscan->data;
+
+            PS_IMAGE_CHECK_TYPE(myOverscanImage, PS_TYPE_F32, NULL);
             psStats *rc = psImageStats(myStats, myOverscanImage, NULL, 0xffffffff);
             if (rc == NULL) {

trunk/psModules/src/pmSubtractSky.c

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-12-30 22:22:00 $
+ *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-01-05 23:43:58 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -414 +414 @@
  
 XXX: use static vectors for myStats, and the binned image
+ 
+XXX: The SDR is silent about types.  PS_TYPE_F32 is implemented here.
  *****************************************************************************/
 psReadout *pmSubtractSky(psReadout *in,