Changeset 2584

Timestamp:

Dec 1, 2004, 11:20:24 AM (22 years ago)

Author:

gusciora

Message:

First version of Subtract Sky.

Location:

trunk/psModules/src

Files:

• pmReadoutCombine.c (modified) (9 diffs)
• pmSubtractSky.c (added)
• pmSubtractSky.h (added)

trunk/psModules/src/pmReadoutCombine.c

@@ -5 +5 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-11-05 04:49:47 $
+ *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-12-01 21:20:24 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -55 +55 @@
     PS_PTR_CHECK_NULL(inputs, NULL);
     PS_PTR_CHECK_NULL(params, NULL);
-    unsigned int maskVal = params->maskVal;
     psStats *stats = params->stats;
     int i;
@@ -64 +63 @@
     int minInputRows = MAX_INT;
     psListElem *tmpInput = NULL;
+    psReadout *tmpReadout = NULL;
     int numInputs = 0;
-    psReadout *tmpReadout = NULL;
-    float tmpF;
-
+    int tmpI;
 
     //
@@ -91 +89 @@
         minInputRows = PS_MIN(minInputRows,
                               (tmpReadout->row0 + tmpReadout->image->row0));
-        tmpF = tmpReadout->row0 +
+        tmpI = tmpReadout->row0 +
                tmpReadout->image->row0 +
                tmpReadout->image->numRows;
-        maxInputRows = PS_MAX(maxInputRows, tmpF);
+        maxInputRows = PS_MAX(maxInputRows, tmpI);
 
         minInputCols = PS_MIN(minInputCols,
                               (tmpReadout->col0 + tmpReadout->image->col0));
-        tmpF = tmpReadout->col0 +
+        tmpI = tmpReadout->col0 +
                tmpReadout->image->col0 +
                tmpReadout->image->numCols;
-        maxInputCols = PS_MAX(maxInputCols, tmpF);
+        maxInputCols = PS_MAX(maxInputCols, tmpI);
         tmpInput = tmpInput->next;
         numInputs++;
@@ -170 +168 @@
     // For each input readout, we create a pointer to that readout in
     // "tmpReadouts[]", and we store the min/max pixel indices for that
-    // readout, in putput image coordinates, in the psVectors
+    // readout, in output image coordinates, in the psVectors
     // (outRowLower, outColLower, outRowUpper, outColUpper).
     i = 0;
@@ -184 +182 @@
                                    tmpReadouts[i]->image->col0 +
                                    tmpReadouts[i]->image->numCols;
-
-        //        printf("Bounds: [%d][%d] to [%d][%d]\n", outRowLower->data.U32[i], outColLower->data.U32[i], outRowUpper->data.U32[i], outColUpper->data.U32[i]);
-
-
         tmpInput = tmpInput->next;
         i++;
@@ -203 +197 @@
         for (j = output->col0; j < (output->col0 + output->numCols) ; j++) {
             for (int r = 0; r < numInputs ; r++) {
-                //                printf("[%d][%d]: [%d][%d] to [%d][%d]\n", i, j, outRowLower->data.U32[r], outColLower->data.U32[r], outRowUpper->data.U32[r], outColUpper->data.U32[r]);
+                //  printf("[%d][%d]: [%d][%d] to [%d][%d]\n", i, j, outRowLower->data.U32[r], outColLower->data.U32[r], outRowUpper->data.U32[r], outColUpper->data.U32[r]);
                 if ((outRowLower->data.U32[r] <= i) &&
                         (outColLower->data.U32[r] <= j) &&
@@ -215 +209 @@
 
                     if ((NULL == tmpReadouts[r]->mask) ||
-                            !(maskVal && tmpReadouts[r]->mask->data.U8[imageRow][imageCol])) {
+                            !(params->maskVal && tmpReadouts[r]->mask->data.U8[imageRow][imageCol])) {
                         tmpPixels->data.F32[r] = tmpReadouts[r]->image->data.F32[imageRow][imageCol];
                         tmpPixelMask->data.U8[r] = 0;
@@ -226 +220 @@
                     tmpPixelMask->data.U8[r] = 1;
                 }
-                //                printf("readout[%d], image [%d][%d] is %f\n", r, i, j, tmpPixels->data.F32[r]);
+                // printf("readout[%d], image [%d][%d] is %f\n", r, i, j, tmpPixels->data.F32[r]);
             }
             // At this point, we have scanned all input readouts for this