Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/psastro/src/psastroMetadataStats.c

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• psastro (modified) (1 prop)
• psastro/src (modified) (1 prop)
• psastro/src/psastroMetadataStats.c (modified) (4 diffs)

branches/cnb_branches/cnb_branch_20090301/psastro/src

@@ -17 +17 @@
 psastroModelFit
 psastroExtract
+psastroVersionDefinitions.h

@@ -17 +17 @@
 psastroModelFit
 psastroExtract
+psastroVersionDefinitions.h

branches/cnb_branches/cnb_branch_20090301/psastro/src/psastroMetadataStats.c

@@ -13 +13 @@
 # include "psastroInternal.h"
 
-bool psastroMetadataStats (pmConfig *config) {
+bool psastroMetadataStats (pmConfig *config, psMetadata *stats) {
 
     bool status;
@@ -24 +24 @@
 
     if (!output) {
-        psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find output file (PSASTRO.OUTPUT).");
-        return false;
+        psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find output file (PSASTRO.OUTPUT).");
+        return false;
     }
 
-    // create output stats metadata
-    psMetadata *stats = psMetadataAlloc ();
-
-    // extract stats for the complete fpa 
+    // extract stats for the complete fpa
     pmFPAview *view = pmFPAviewAlloc(0);
 
     if (!ppStatsMetadata(stats, output->fpa, view, 0, config)) {
-        psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to generate stats for image.");
-        psFree(view);
-        psFree(stats);
-        return false;
+        psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to generate stats for image.");
+        psFree(view);
+        return false;
     }
 
     // if we did not request any specific stats, the structure is empty
     if (stats && stats->list->n == 0) {
-        psWarning ("stats output specified, but no requested stats entries in headers");
-        psFree(view);
-        psFree(stats);
-        return true;
+        psWarning ("stats output specified, but no requested stats entries in headers");
+        psFree(view);
+        return true;
     }
 
@@ -52 +47 @@
     char *statsMDC = psMetadataConfigFormat(stats);
     if (!statsMDC || strlen(statsMDC) == 0) {
-        psError(PS_ERR_IO, false, "Unable to serialize stats metadata.\n");
-        return false;
-    } 
+        psError(PS_ERR_IO, false, "Unable to serialize stats metadata.\n");
+        return false;
+    }
 
     // convert to a real UNIX filename
@@ -60 +55 @@
     FILE *statsFile = fopen (resolved, "w");
     if (!statsFile) {
-        psError(PS_ERR_IO, true, "Unable to open statistics file %s for writing.\n", resolved);
-        psFree(stats);
-        psFree(view);
-        psFree(statsMDC);
-        psFree(resolved);
-        return false;
+        psError(PS_ERR_IO, true, "Unable to open statistics file %s for writing.\n", resolved);
+        psFree(view);
+        psFree(statsMDC);
+        psFree(resolved);
+        return false;
     }
 
     // write the stats MDC to a file
-    // XXX why does this not call psMetadataConfigPrint?
     fprintf(statsFile, "%s", statsMDC);
     fclose(statsFile);
+
+    pmConfigRunFilenameAddWrite(config, "STATS", filename);
 
     psFree(resolved);
     psFree(statsMDC);
     psFree(view);
-    psFree(stats);
     return true;
 }

@@ -17 +17 @@
 psastroModelFit
 psastroExtract
+psastroVersionDefinitions.h