Changeset 13880

Timestamp:

Jun 19, 2007, 10:31:22 AM (19 years ago)

Author:

Paul Price

Message:

Only perform statistics if we merged this cell.

File:

• trunk/ppMerge/src/ppMergeCombine.c (modified) (2 diffs)

trunk/ppMerge/src/ppMergeCombine.c

@@ -255 +255 @@
             }
 
-            // Add MD5 information for cell
             if (readout->image) {
+                // Add MD5 information for cell
                 pmHDU *hdu = pmHDUFromCell(cell); // HDU that owns the cell
                 const char *chipName = psMetadataLookupStr(NULL, chip->concepts, "CHIP.NAME");
@@ -271 +271 @@
                 psFree(md5string);
                 psFree(headerName);
+
+
+                // Statistics on the merged cell
+                if (data->statsFile) {
+                    if (!data->stats) {
+                        data->stats = psMetadataAlloc();
+                    }
+                    if (!ppStats(data->stats, data->out, view, options->combine->maskVal, config)) {
+                        psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to generate stats for image.\n");
+                        return false;
+                    }
+                }
             }
 
             psFree(readout);            // Drop reference
 
-            // Statistics on the merged cell
-            if (data->statsFile) {
-                if (!data->stats) {
-                    data->stats = psMetadataAlloc();
-                }
-                if (!ppStats(data->stats, data->out, view, options->combine->maskVal, config)) {
-                    psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to generate stats for image.\n");
-                    return false;
-                }
-            }
 
             // We threw away the bias sections --- record this