Changeset 8337 for trunk/ppStats

Timestamp:

Aug 14, 2006, 4:55:08 PM (20 years ago)

Author:

Paul Price

Message:

Making ppStats into a library, so we can incorporate it into ppImage, etc. There's still an executable which provides a wrapper to the functionality. Nothing tested yet following the change.

Location:

trunk/ppStats

Files:

• . (modified) (1 prop)
• .cvsignore (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• autogen.sh (modified) (2 diffs)
• configure.ac (modified) (2 diffs)
• ppStats.pc.in (added)
• src (modified) (1 prop)
• src/.cvsignore (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)
• src/ppStats.c (modified) (1 diff)
• src/ppStats.h (modified) (1 diff)
• src/ppStatsData.c (modified) (2 diffs)
• src/ppStatsData.h (modified) (1 diff)
• src/ppStatsLoop.c (modified) (9 diffs)
• src/ppStatsLoop.h (added)
• src/ppStatsSetupFromArgs.c (added)
• src/ppStatsSetupFromArgs.h (added)
• src/ppStatsSetupFromRecipe.c (added)
• src/ppStatsSetupFromRecipe.h (added)
• src/ppStatsStandAlone.c (added)

trunk/ppStats

@@ -10 +10 @@
 install-sh
 missing
+config.guess
+config.sub
+libtool
+ltmain.sh
+ppStats.pc

@@ -10 +10 @@
 install-sh
 missing
+config.guess
+config.sub
+libtool
+ltmain.sh
+ppStats.pc

trunk/ppStats/.cvsignore

@@ -10 +10 @@
 install-sh
 missing
+config.guess
+config.sub
+libtool
+ltmain.sh
+ppStats.pc

trunk/ppStats/Makefile.am

@@ -2 +2 @@
 
 CLEANFILES = *~ core core.*
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA= ppStats.pc
+
+EXTRA_DIST = \
+        ppStats.pc.in

trunk/ppStats/autogen.sh

@@ -21 +21 @@
 AUTOCONF=autoconf
 
-#($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 || {
-#        echo
-#        echo "You must have $LIBTOOlIZE installed to compile $PROJECT."
-#        echo "Download the appropriate package for your distribution,"
-#        echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/"
-#        DIE=1
-#}
+($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 || {
+        echo
+        echo "You must have $LIBTOOlIZE installed to compile $PROJECT."
+        echo "Download the appropriate package for your distribution,"
+        echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/"
+        DIE=1
+}
 
 ($ACLOCAL --version) < /dev/null > /dev/null 2>&1 || {
@@ -75 +75 @@
 fi
 
-#$LIBTOOLIZE --copy --force || echo "$LIBTOOlIZE failed"
+$LIBTOOLIZE --copy --force || echo "$LIBTOOlIZE failed"
 $ACLOCAL || echo "$ACLOCAL failed"
 #$AUTOHEADER || echo "$AUTOHEADER failed"

trunk/ppStats/configure.ac

@@ -12 +12 @@
 AC_PROG_CC
 AC_PROG_INSTALL
-dnl AC_PROG_LIBTOOL
+AC_PROG_LIBTOOL
 
 dnl handle debug building
@@ -59 +59 @@
   Makefile
   src/Makefile
+  ppStats.pc
 ])
 AC_OUTPUT

trunk/ppStats/src

@@ -2 +2 @@
 Makefile
 Makefile.in
+.libs
+*.lo
+*.la
 ppStats

@@ -2 +2 @@
 Makefile
 Makefile.in
+.libs
+*.lo
+*.la
 ppStats

trunk/ppStats/src/.cvsignore

@@ -2 +2 @@
 Makefile
 Makefile.in
+.libs
+*.lo
+*.la
 ppStats

trunk/ppStats/src/Makefile.am

@@ +1 @@
+lib_LTLIBRARIES = libppStats.la
+libppStats_la_CPPFLAGS = $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) $(ppStats_CFLAGS)
+
 bin_PROGRAMS = ppStats
 
 ppStats_CFLAGS += $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
 ppStats_LDFLAGS += $(PSMODULE_LIBS) $(PSLIB_LIBS) -Wl,-Bdynamic
+ppStats_LDADD = libppStats.la
 
-ppStats_SOURCES =               \
+libppStats_la_SOURCES =         \
         ppStats.c               \
         ppStatsData.c           \
         ppStatsLoop.c           \
-        ppStatsSetup.c
+        ppStatsSetupFromRecipe.c
 
-noinst_HEADERS =                \
+ppStats_SOURCES =               \
+        ppStatsData.c           \
+        ppStatsLoop.c           \
+        ppStatsSetupFromArgs.c  \
+        ppStatsStandAlone.c
+
+include_HEADERS =               \
+        ppStats.h               \
         ppStatsData.h           \
-        ppStats.h
+        ppStatsLoop.h           \
+        ppStatsSetupFromRecipe.h
+
+noinst_HEADERS =                \
+        ppStats.h               \
+        ppStatsSetupFromArgs.h
 
 CLEANFILES = *~

trunk/ppStats/src/ppStats.c

@@ -5 +5 @@
 #include "ppStats.h"
 
-int main(int argc, char *argv[])
+psMetadata *ppStats(psMetadata *out,    // Output metadata
+                    pmFPA *fpa,         // FPA for which to get statistics
+                    pmConfig *config    // Configuration
+    )
 {
+    // Get the options, open the files
+    ppStatsData *data = ppStatsSetupFromRecipe(NULL, config);
 
-    psLibInit(NULL);
-    psTimerStart(TIMERNAME);
-
-    // Parse the configuration and arguments
-    pmConfig *config = pmConfigRead(&argc, argv);
-
-    // Get the options, open the files
-    ppStatsData *data = ppStatsSetup(config);
+    if (data->fpa) {
+        psFree(data->fpa);
+    }
+    data->fpa = psMemIncrRefCounter(fpa);
 
     // Go through the FPA and do the hard work
-    ppStatsLoop(data, config);
+    out = ppStatsLoop(out, data, config);
 
     psFree(data);
-    psFree(config);
-    pmConceptsDone();
-    pmConfigDone();
-    psLibFinalize();
 
-    return EXIT_SUCCESS;
+    return out;
 }

trunk/ppStats/src/ppStats.h

@@ -3 +3 @@
 
 #define RECIPENAME "PPSTATS"
-#define TIMERNAME "PPSTATS"
 
 #include <psmodules.h>
+
 #include "ppStatsData.h"
-
-// Set up the options and input/output files
-ppStatsData *ppStatsSetup(pmConfig *config // Configuration
-    );
-
-// Loop over the input image and do all the hard work
-void ppStatsLoop(ppStatsData *data,     // The data
-                 const pmConfig *config // Configuration
-    );
+#include "ppStatsSetupFromRecipe.h"
+#include "ppStatsLoop.h"
 
 #endif

trunk/ppStats/src/ppStatsData.c

@@ -8 +8 @@
 {
     // inName and region are not on the psLib memory system (they are from argv).
-    psFree(data->inFPA);
-    if (data->inFile) {
-        psFitsClose(data->inFile);
-        data->inFile = NULL;
-    }
-    if (data->outFile) {
-        fclose(data->outFile);
-        data->outFile = NULL;
+    psFree(data->fpa);
+    if (data->fits) {
+        psFitsClose(data->fits);
+        data->fits = NULL;
     }
     psFree(data->headers);
@@ -33 +29 @@
     psMemSetDeallocator(data, (psFreeFunc)statsDataFree);
 
-    data->inName = NULL;
-    data->inFile = NULL;
-    data->outName = NULL;
-    data->outFile = NULL;
-    data->inFPA = NULL;
+    data->fpa = NULL;
+    data->fits = NULL;
 
     data->headers = psListAlloc(NULL);

trunk/ppStats/src/ppStatsData.h

@@ -7 +7 @@
 typedef struct {
     // Inputs
-    const char *inName;                 // Input FITS image file
-    const char *outName;                // Output filename
-    psFits *inFile;                     // Input file handle
-    FILE *outFile;                      // Output file handle
-    pmFPA *inFPA;                       // Input FPA
+    psFits *fits;                       // Input file handle
+    pmFPA *fpa;                         // FPA to analyse
     // Stuff to output
     psStats *stats;                     // Statistics to calculate

trunk/ppStats/src/ppStatsLoop.c

@@ -5 +5 @@
 
 #include "ppStats.h"
+#include "ppStatsLoop.h"
 
 
@@ -47 +48 @@
 
 
-void ppStatsLoop(ppStatsData *data,     // The data
-                 const pmConfig *config // Configuration
+psMetadata *ppStatsLoop(psMetadata *fpaResults, // Metadata to hold the FPA results
+                        ppStatsData *data, // The data
+                        const pmConfig *config // Configuration
     )
 {
-    psMetadata *fpaResults = psMetadataAlloc(); // Metadata to hold the FPA results
+    PS_ASSERT_PTR_NON_NULL(data, NULL);
+    pmFPA *fpa = data->fpa;             // FPA to analyse
+    psFits *fits = data->fits;          // FITS file handle
+    PS_ASSERT_PTR_NON_NULL(fpa, NULL);
+
+    if (!fpaResults) {
+        fpaResults = psMetadataAlloc();
+    }
+
+    bool mdok;                          // Status of MD lookup
 
     // Iterators for the headers and concepts
@@ -58 +69 @@
 
     // Iterate through the FPA
-    pmFPA *fpa = data->inFPA;           // The FPA of interest
     if (psListLength(data->headers) > 0 && fpa->hdu) {
-        pmFPAReadHeader(fpa, data->inFile);
+        if (fits) {
+            pmFPAReadHeader(fpa, fits);
+        }
         pmHDU *hdu = fpa->hdu;          // HDU for headers
         getMetadata(fpaResults, hdu->header, headersIter);
     }
     if (psListLength(data->concepts) > 0) {
-        pmFPAReadHeader(fpa, data->inFile);
+        if (fits) {
+            pmFPAReadHeader(fpa, fits);
+        }
         pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_ALL, false, config->database);
         getMetadata(fpaResults, fpa->concepts, conceptsIter);
@@ -82 +96 @@
         }
 
-        psMetadata *chipResults = psMetadataAlloc(); // Metadata to hold the chip-level results
+        psMetadata *chipResults = psMetadataLookupMD(&mdok, fpaResults, chipName); // Chip-level results
+        if (!mdok || !chipResults) {
+            chipResults = psMetadataAlloc();
+        }
 
         if (psListLength(data->headers) > 0 && chip->hdu) {
-            if (!pmChipReadHeader(chip, data->inFile)) {
+            if (fits && !pmChipReadHeader(chip, fits)) {
                 continue;
             }
@@ -92 +109 @@
         }
         if (psListLength(data->concepts) > 0) {
-            if (!pmChipReadHeader(chip, data->inFile)) {
+            if (fits && !pmChipReadHeader(chip, fits)) {
                 continue;
             }
@@ -112 +129 @@
             }
 
-            psMetadata *cellResults = psMetadataAlloc(); // Metadata to hold the cell-level results
+            psMetadata *cellResults = psMetadataLookupMD(&mdok, chipResults, cellName); // Cell-level results
+            if (!mdok || !cellResults) {
+                cellResults = psMetadataAlloc();
+            }
 
             if (psListLength(data->headers) > 0 && cell->hdu) {
-                if (!pmCellReadHeader(cell, data->inFile)) {
+                if (fits && !pmCellReadHeader(cell, fits)) {
                     continue;
                 }
@@ -122 +142 @@
             }
             if (psListLength(data->concepts) > 0) {
-                if (!pmCellReadHeader(cell, data->inFile)) {
+                if (fits && !pmCellReadHeader(cell, fits)) {
                     continue;
                 }
@@ -143 +163 @@
             }
 
-            if (!pmCellRead(cell, data->inFile, config->database)) {
+            if (fits && !pmCellRead(cell, fits, config->database)) {
                 psLogMsg(__func__, PS_LOG_WARN, "Unable to read chip %s cell %s\n", chipName, cellName);
                 pmCellFreeData(cell);
@@ -229 +249 @@
 
             // Add the cell results to the chip
-            psMetadataAdd(chipResults, PS_LIST_TAIL, cellName, PS_DATA_METADATA,
-                          "Results for cell", cellResults);
-
-            psFree(cellResults);
-            pmCellFreeData(cell);
-        }
-        pmChipFreeData(chip);
-        if (psListLength(chipResults->list) > 0) {
+            if (psListLength(cellResults->list) > 0 && !psMetadataLookup(chipResults, cellName)) {
+                psMetadataAdd(chipResults, PS_LIST_TAIL, cellName, PS_DATA_METADATA,
+                              "Results for cell", cellResults);
+                psFree(cellResults);
+            }
+
+            if (fits) {
+                pmCellFreeData(cell);
+            }
+        }
+        if (fits) {
+            pmChipFreeData(chip);
+        }
+
+        if (psListLength(chipResults->list) > 0 && !psMetadataLookup(fpaResults, chipName)) {
             psMetadataAdd(fpaResults, PS_LIST_TAIL, chipName, PS_DATA_METADATA,
                           "Results for chip", chipResults);
-        }
-        psFree(chipResults);
-    }
-    pmFPAFreeData(fpa);
+            psFree(chipResults);
+        }
+    }
+    if (fits) {
+        pmFPAFreeData(fpa);
+    }
+
     psFree(headersIter);
     psFree(conceptsIter);
 
-    if (psListLength(fpaResults->list) == 0) {
-        psError(PS_ERR_UNKNOWN, true, "No output.\n");
-        return;
-    }
-
-    psString output = psMetadataConfigFormat(fpaResults);
-    psFree(fpaResults);
-    if (!output) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to generate configuration file with result.\n");
-        return;
-    }
-    fprintf(data->outFile, "%s", output);
-    psFree(output);
-
-    return;
+    return fpaResults;
 }

@@ -10 +10 @@
 install-sh
 missing
+config.guess
+config.sub
+libtool
+ltmain.sh
+ppStats.pc

@@ -2 +2 @@
 Makefile
 Makefile.in
+.libs
+*.lo
+*.la
 ppStats