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

Timestamp:

Feb 22, 2008, 9:24:42 AM (18 years ago)

Author:

Paul Price

Message:

Merging in ppStack development branch --- ppStack now works with incremental reads. Small conflicts (due to stupid patch application by CVS) resolved.

File:

• trunk/psModules/src/imcombine/pmReadoutCombine.c (modified) (1 diff)

trunk/psModules/src/imcombine/pmReadoutCombine.c

@@ -113 +113 @@
     }
 
-    pmReadoutUpdateSize(output, minInputCols, minInputRows, xSize, ySize, true);
+    pmReadoutUpdateSize(output, minInputCols, minInputRows, xSize, ySize, true, params->weights,
+                        params->blank);
     psTrace("psModules.imcombine", 7, "Output minimum: %d,%d\n", output->col0, output->row0);
 
     psStatsOptions combineStdev = 0; // Statistics option for weights
     if (params->weights) {
-
-        if (!output->weight) {
-            output->weight = psImageAlloc(xSize, ySize, PS_TYPE_F32);
-        }
-        if (output->weight->numCols < xSize || output->weight->numRows < ySize) {
-            psImage *newWeight = psImageAlloc(xSize, ySize, PS_TYPE_F32);
-            psImageInit(newWeight, 0.0);
-            psImageOverlaySection(newWeight, output->weight, output->col0, output->row0, "=");
-            psFree(output->weight);
-            output->weight = newWeight;
-        }
-
         if (first) {
             psMetadataAddStr(hdu->header, PS_LIST_TAIL, "HISTORY", PS_META_DUPLICATE_OK,