Changeset 13677

Timestamp:

Jun 6, 2007, 9:36:07 AM (19 years ago)

Author:

eugene

Message:

modified ppStats API

Location:

trunk

Files:

• ppImage/src/ppImageLoop.c (modified) (2 diffs)
• ppMerge/src/ppMergeCombine.c (modified) (1 diff)
• ppStats/src/ppStats.c (modified) (2 diffs)
• ppStats/src/ppStats.h (modified) (1 diff)

trunk/ppImage/src/ppImageLoop.c

@@ -26 +26 @@
             psFree(resolved);
             return false;
-        } else {
-            stats = psMetadataAlloc();
-        }
+        }
+        stats = psMetadataAlloc();
         psFree(resolved);
     }
@@ -124 +123 @@
                 }
 
-                psMetadata *newStats = ppStats(output->fpa, view,
-                                               options->satMask | options->badMask | options->maskValue,
-                                               config);
-                if (!newStats) {
+                if (ppStats(stats, 
+                            output->fpa, 
+                            view,
+                            options->satMask | options->badMask | options->maskValue,
+                            config)) {
                     psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to generate stats for image.\n");
-                    return false;
-                }
-                psMetadataCopy (stats, newStats);
-                psFree (newStats);
-            }
-
+                    psFree (stats);
+                    return false;
+                }
+            }
+            
             // Add MD5 information for cell
             pmHDU *hdu = pmHDUFromCell(cell); // HDU that owns the cell

trunk/ppMerge/src/ppMergeCombine.c

@@ -265 +265 @@
             // Statistics on the merged cell
             if (data->statsFile) {
-                data->stats = ppStats(data->stats, data->out, view, options->combine->maskVal,
-                                      config); // Statistics for output FPA
-            }
+                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

trunk/ppStats/src/ppStats.c

@@ -9 +9 @@
 #include "ppStats.h"
 
-psMetadata *ppStats(pmFPA *fpa,         // FPA for which to get statistics
+psMetadata *ppStats(psMetadata *out,
+                    pmFPA *fpa,         // FPA for which to get statistics
                     pmFPAview *view,    // View for analysis
                     psMaskType maskVal, // Value to mask
@@ -53 +54 @@
     }
 
+    if (out != NULL) {
+        psMetadataCopy (out, result);
+        psFree(result);
+        psFree(data);
+        return out;
+    }
+
     psFree(data);
     return result;

trunk/ppStats/src/ppStats.h

@@ -12 +12 @@
 
 // Perform the ppStats steps
-psMetadata *ppStats(pmFPA *fpa,         // FPA for which to get statistics
+psMetadata *ppStats(psMetadata *out,
+                    pmFPA *fpa,         // FPA for which to get statistics
                     pmFPAview *view,    // View for analysis
                     psMaskType maskVal, // Value to mask