Changeset 8405

Timestamp:

Aug 16, 2006, 4:18:39 PM (20 years ago)

Author:

Paul Price

Message:

Change to output statistics of combined image.

Location:

trunk/ppMerge

Files:

• configure.ac (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)
• src/ppMerge.c (modified) (2 diffs)
• src/ppMerge.h (modified) (1 diff)
• src/ppMergeCheckInputs.c (modified) (1 diff)
• src/ppMergeCombine.c (modified) (4 diffs)
• src/ppMergeConfig.c (modified) (1 diff)
• src/ppMergeData.c (modified) (2 diffs)
• src/ppMergeData.h (modified) (1 diff)
• src/ppMergeOptions.c (modified) (1 diff)

trunk/ppMerge/configure.ac

@@ -35 +35 @@
 PKG_CHECK_MODULES([PSLIB], [pslib >= 0.9.0]) 
 PKG_CHECK_MODULES([PSMODULE], [psmodule >= 0.0.0]) 
+PKG_CHECK_MODULES([PPSTATS], [ppStats >= 0.0.0]) 
 
 dnl handle profiler building

trunk/ppMerge/src/Makefile.am

@@ -1 +1 @@
 bin_PROGRAMS = ppMerge
 
-ppMerge_CFLAGS += $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
-ppMerge_LDFLAGS += $(PSMODULE_LIBS) $(PSLIB_LIBS) -Wl,-Bdynamic
+ppMerge_CFLAGS += $(PPSTATS_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
+ppMerge_LDFLAGS += $(PPSTATS_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS) -Wl,-Bdynamic
 
 ppMerge_SOURCES =               \

trunk/ppMerge/src/ppMerge.c

@@ -2 +2 @@
 #include <pslib.h>
 #include <psmodules.h>
+#include <ppStats.h>
 
 #include "ppMerge.h"
@@ -49 +50 @@
     ppMergeCombine(scale, zero, data, options, config);
 
+    if (data->statsFile) {
+        psMetadata *stats = ppStats(NULL, data->out, NULL, config); // Statistics for output FPA
+        psString statsOut = psMetadataConfigFormat(stats); // String to write out
+        fprintf(data->statsFile, "%s", statsOut);
+        psFree(statsOut);
+        psFree(stats);
+    }
+
     pmFPAPrint(stdout, data->out, true, true);
 

trunk/ppMerge/src/ppMerge.h

@@ -3 +3 @@
 
 #define TIMERNAME "ppMerge"
-#define RECIPENAME "PPMERGE"
+#define PPMERGE_RECIPE "PPMERGE"
 
 #endif

trunk/ppMerge/src/ppMergeCheckInputs.c

@@ -23 +23 @@
         psErrorStackPrint(stderr, "Can't open output image: %s\n", outName);
         exit(EXIT_FAILURE);
+    }
+
+    // Statistics file
+    psString statsName = psMetadataLookupStr(NULL, config->arguments, "-stats"); // Name for statistics file
+    if (statsName && strlen(statsName) > 0) {
+        data->statsFile = fopen(statsName, "w");
+        if (!data->statsFile) {
+            psLogMsg(__func__, PS_LOG_WARN, "Unable to open statistics file %s --- ignored.\n",
+                     statsName);
+        }
     }
 

trunk/ppMerge/src/ppMergeCombine.c

@@ -1 +1 @@
 #include <stdio.h>
+#include <unistd.h>
 #include <assert.h>
 #include <pslib.h>
@@ -12 +13 @@
     if (psTraceGetLevel(__func__) > 9) {
         psMemBlock **leaks = NULL;
-        int numLeaks = psMemCheckLeaks(0, &leaks, NULL, false);
+        int numLeaks = psMemCheckLeaks(0, &leaks, NULL, true);
         size_t largestSize = 0;
         psMemId largest = 0;
@@ -27 +28 @@
         psTrace(__func__, 0, "Memory in use: %zd\n", totalSize);
         psTrace(__func__, 0, "Largest block: %ld\n", largest);
+        psTrace(__func__, 0, "sbrk(): %zd\n", sbrk(0));
     }
     return;
@@ -121 +123 @@
                 }
                 numScan++;
+
+                memCheck();
+
             } while (numRead > 0);
             psFree(readout);            // Drop reference

trunk/ppMerge/src/ppMergeConfig.c

@@ -34 +34 @@
     psMetadataAddBool(config->arguments, PS_LIST_TAIL, "-exptime", 0, "Scale by the exposure time?", false);
     psMetadataAddS32(config->arguments, PS_LIST_TAIL, "-onoff", 0, "Number of on/off pairs", 0);
+    psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-stats", 0, "MDC file to hold statistics ", NULL);
 
     if (argc == 1) {

trunk/ppMerge/src/ppMergeData.c

@@ -20 +20 @@
     if (data->outFile) {
         psFitsClose(data->outFile);
+        data->outFile = NULL;
+    }
+    if (data->statsFile) {
+        fclose(data->statsFile);
+        data->statsFile = NULL;
     }
 }
@@ -34 +39 @@
     data->out = NULL;
     data->outFile = NULL;
+    data->statsFile = NULL;
 
     return data;

trunk/ppMerge/src/ppMergeData.h

@@ -12 +12 @@
     pmFPA *out;                         // Output FPA structure
     psFits *outFile;                    // FITS file handle for output
+    FILE *statsFile;                    // File stream for statistics output
 } ppMergeData;
 

trunk/ppMerge/src/ppMergeOptions.c

@@ -122 +122 @@
     // Now we can read the recipe
     bool mdok = true;                   // Status of MD lookup
-    psMetadata *recipe = psMetadataLookupMD(&mdok, config->recipes, RECIPENAME); // Recipe information
+    psMetadata *recipe = psMetadataLookupMD(&mdok, config->recipes, PPMERGE_RECIPE); // Recipe information
     if (!mdok || !recipe) {
-        psError(PS_ERR_IO, true, "Unable to find recipe %s", RECIPENAME);
+        psError(PS_ERR_IO, true, "Unable to find recipe %s", PPMERGE_RECIPE);
         exit(EXIT_FAILURE);
     }