Changeset 7204 for trunk/psModules/src/imcombine/pmReadoutCombine.c

Timestamp:

May 24, 2006, 6:06:28 PM (20 years ago)

Author:

Paul Price

Message:

Debugging readout combination for ppMerge. There are still problems, possibly in the combination range in pmReadoutCombine.

File:

• trunk/psModules/src/imcombine/pmReadoutCombine.c (modified) (4 diffs)

trunk/psModules/src/imcombine/pmReadoutCombine.c

@@ -5 +5 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-05-24 05:08:52 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-05-25 04:06:28 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -179 +179 @@
         minInputCols = PS_MIN(minInputCols, readout->col0);
         maxInputCols = PS_MAX(maxInputCols, readout->col0 + readout->image->numCols);
+        psTrace(__func__, 7, "Readout %d: offset %d,%d; size %dx%d\n", i,
+                readout->col0, readout->row0, readout->image->numCols, readout->image->numRows);
         // Bounds of input image
         rowLower->data.U32[i] = readout->row0;
@@ -192 +194 @@
     // If there's existing images, we need to extend them
     long minOutputRows = (output->image || output->mask || output->weight) ?
-                         PS_MIN(minInputRows, output->row0) : minInputRows; // Smallest row value, considering the output
+                         PS_MIN(minInputRows, output->row0) : minInputRows;  // Smallest output row value
     long minOutputCols = (output->image || output->mask || output->weight) ?
-                         PS_MIN(minInputCols, output->col0) : minInputCols; // Smallest column value, considering the output
+                         PS_MIN(minInputCols, output->col0) : minInputCols; // Smallest output column value
+    psTrace(__func__, 7, "Output minimum: %d,%d\n", minOutputCols, minOutputRows);
 
     // Update the origin
@@ -267 +270 @@
     psMaskType maskVal = params->maskVal; // The mask value
 
+    psTrace(__func__, 3, "Iterating %d --> %d, %d --> %d\n",
+            minInputCols - output->col0, maxInputCols - output->col0,
+            minInputRows - output->row0, maxInputRows - output->row0);
+
     for (int i = minInputRows; i < maxInputRows; i++) {
         for (int j = minInputCols; j < maxInputCols; j++) {