Changeset 7910 for trunk/ppStats

Timestamp:

Jul 14, 2006, 3:58:46 PM (20 years ago)

Author:

Paul Price

Message:

Adding option of outputting concepts in addition to headers.

Location:

trunk/ppStats/src

Files:

• ppStatsData.c (modified) (2 diffs)
• ppStatsData.h (modified) (1 diff)
• ppStatsLoop.c (modified) (6 diffs)
• ppStatsSetup.c (modified) (4 diffs)

trunk/ppStats/src/ppStatsData.c

@@ -18 +18 @@
     }
     psFree(data->headers);
+    psFree(data->concepts);
+    psFree(data->stats);
+
     psFree(data->chips);
     psFree(data->cells);
-    psFree(data->stats);
 
     return;
@@ -36 +38 @@
     data->outFile = NULL;
     data->inFPA = NULL;
+
+    data->headers = psListAlloc(NULL);
+    data->concepts = psListAlloc(NULL);
+    data->stats = psStatsAlloc(0);
+    data->doStats = false;
+
     data->sample = 0;
     data->maskVal = 0;
-    data->headers = psListAlloc(NULL);
     data->chips = psListAlloc(NULL);
     data->cells = psListAlloc(NULL);
-    data->stats = psStatsAlloc(0);
-    data->doStats = false;
 
     return data;

trunk/ppStats/src/ppStatsData.h

@@ -12 +12 @@
     FILE *outFile;                      // Output file handle
     pmFPA *inFPA;                       // Input FPA
-    // Options
+    // Stuff to output
+    psStats *stats;                     // Statistics to calculate
+    bool doStats;                       // Do statistics?
+    psList *headers;                    // Headers to read
+    psList *concepts;                   // Concepts to read
+    // Options for input data
     float sample;                       // Fraction of cell to sample for statistics
     psMaskType maskVal;                 // Mask value for images
-    psList *headers;                    // Headers to read
     psList *chips;                      // Chips to look at
     psList *cells;                      // Cells to look at
-    psStats *stats;                     // Statistics to calculate
-    bool doStats;                       // Do statistics?
 } ppStatsData;
 

trunk/ppStats/src/ppStatsLoop.c

@@ -6 +6 @@
 
 
-static void getHeaders(psMetadata *target, // Target for headers
-                       psMetadata *source, // Source header
-                       psListIterator *keywordsIter // Iterator for header keywords
+static void getMetadata(psMetadata *target, // Target for metadata
+                        psMetadata *source, // Source for metadata
+                        psListIterator *iterator // Iterator for keywords
     )
 {
-    psListIteratorSet(keywordsIter, PS_LIST_HEAD);
-    psString keyword;                    // Header from iteration
-    while ((keyword = psListGetAndIncrement(keywordsIter))) {
-        psMetadataAddItem(target, psMetadataLookup(source, keyword), PS_LIST_TAIL, 0);
+    psListIteratorSet(iterator, PS_LIST_HEAD);
+    psString name;                      // Name from iteration
+    while ((name = psListGetAndIncrement(iterator))) {
+        psMetadataItem *item = psMetadataLookup(source, name); // Item of interest, or NULL
+        if (item) {
+            psMetadataAddItem(target, item, PS_LIST_TAIL, 0);
+        }
     }
     return;
@@ -26 +29 @@
     psMetadata *fpaResults = psMetadataAlloc(); // Metadata to hold the FPA results
 
-    psListIterator *headersIter = psListIteratorAlloc(data->headers, PS_LIST_HEAD, false); // Headers iterator
-
+    // Iterators for the headers and concepts
+    psListIterator *headersIter = psListIteratorAlloc(data->headers, PS_LIST_HEAD, false); // Headers
+    psListIterator *conceptsIter = psListIteratorAlloc(data->concepts, PS_LIST_HEAD, false); // Concepts
 
     // Iterate through the FPA
@@ -33 +37 @@
     if (psListLength(data->headers) > 0 && fpa->hdu && pmFPAReadHeader(fpa, data->inFile)) {
         pmHDU *hdu = fpa->hdu;          // HDU for headers
-        getHeaders(fpaResults, hdu->header, headersIter);
+        getMetadata(fpaResults, hdu->header, headersIter);
+    }
+    if (psListLength(data->concepts) > 0 &&
+        pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_ALL, false, config->database)) {
+        getMetadata(fpaResults, fpa->concepts, conceptsIter);
     }
 
@@ -47 +55 @@
         if (psListLength(data->headers) > 0 && chip->hdu && pmChipReadHeader(chip, data->inFile)) {
             pmHDU *hdu = chip->hdu;     // HDU for headers
-            getHeaders(chipResults, hdu->header, headersIter);
+            getMetadata(chipResults, hdu->header, headersIter);
+        }
+        if (psListLength(data->concepts) > 0 &&
+            pmConceptsReadChip(chip, PM_CONCEPT_SOURCE_ALL, false, false, config->database)) {
+            getMetadata(chipResults, chip->concepts, conceptsIter);
         }
 
@@ -61 +73 @@
             if (psListLength(data->headers) > 0 && cell->hdu && pmCellReadHeader(cell, data->inFile)) {
                 pmHDU *hdu = cell->hdu;     // HDU for headers
-                getHeaders(cellResults, hdu->header, headersIter);
+                getMetadata(cellResults, hdu->header, headersIter);
                 psMetadataAdd(chipResults, PS_LIST_TAIL, cellName, PS_DATA_METADATA,
                               "Results for cell", cellResults);
+            }
+            if (psListLength(data->concepts) > 0 &&
+                pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_ALL, false, config->database)) {
+                getMetadata(cellResults, cell->concepts, conceptsIter);
             }
 
@@ -174 +190 @@
     pmFPAFreeData(fpa);
     psFree(headersIter);
+    psFree(conceptsIter);
 
     psString output = psMetadataConfigFormat(fpaResults);

trunk/ppStats/src/ppStatsSetup.c

@@ -30 +30 @@
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-cell", PS_META_DUPLICATE_OK, "Cell to inspect", NULL);
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-header", PS_META_DUPLICATE_OK, "Header to look up", NULL);
+    psMetadataAddStr(arguments, PS_LIST_TAIL, "-concept", PS_META_DUPLICATE_OK, "Concept to look up", NULL);
     psMetadataAddBool(arguments, PS_LIST_TAIL, "-mean", 0, "Calculate sample mean", false);
     psMetadataAddBool(arguments, PS_LIST_TAIL, "-stdev", 0, "Calculate sample standard deviation", false);
@@ -77 +78 @@
     GET_LIST_FROM_ARGUMENTS("Cell", "-cell", data->cells);
     GET_LIST_FROM_ARGUMENTS("Header", "-header", data->headers);
+    GET_LIST_FROM_ARGUMENTS("Concept", "-concept", data->concepts);
 
     // Set the statistics options
@@ -102 +104 @@
 
     // Open the input file, determine the camera
-    data->inFile = psFitsOpen(data->inName, "r");
-    if (!data->inFile) {
-        psError(PS_ERR_IO, false, "Unable to open input file %s\n", data->inName);
-        goto die;
-    }
-    psMetadata *header = psFitsReadHeader(NULL, data->inFile); // The FITS (primary) header
-    psMetadata *format = pmConfigCameraFormatFromHeader(config, header);
-    if (!format) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to determine camera format for %s\n", data->inName);
-        psFree(header);
-        goto die;
-    }
-    data->inFPA = pmFPAConstruct(config->camera);
-    if (!data->inFPA) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to construct FPA for %s\n", data->inName);
+    {
+        data->inFile = psFitsOpen(data->inName, "r");
+        if (!data->inFile) {
+            psError(PS_ERR_IO, false, "Unable to open input file %s\n", data->inName);
+            goto die;
+        }
+        psMetadata *header = psFitsReadHeader(NULL, data->inFile); // The FITS (primary) header
+        psMetadata *format = pmConfigCameraFormatFromHeader(config, header);
+        if (!format) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to determine camera format for %s\n", data->inName);
+            psFree(header);
+            goto die;
+        }
+        data->inFPA = pmFPAConstruct(config->camera);
+        if (!data->inFPA) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to construct FPA for %s\n", data->inName);
+            psFree(header);
+            psFree(format);
+            goto die;
+        }
+        pmFPAview *view = pmFPAAddSourceFromHeader(data->inFPA, header, format);
         psFree(header);
         psFree(format);
-        goto die;
-    }
-    pmFPAview *view = pmFPAAddSourceFromHeader(data->inFPA, header, format);
-    psFree(header);
-    psFree(format);
-    if (!view) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to add input file %s to FPA.\n", data->inName);
-        goto die;
-    }
-    psFree(view);
+        if (!view) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to add input file %s to FPA.\n", data->inName);
+            goto die;
+        }
+        psFree(view);
+    }
 
     // Open the output file
@@ -174 +178 @@
 
     GET_LIST_FROM_RECIPE("CHIPS", data->chips);
-    GET_LIST_FROM_RECIPE("CELLS", data->chips);
-    GET_LIST_FROM_RECIPE("HEADER", data->chips);
+    GET_LIST_FROM_RECIPE("CELLS", data->cells);
+    GET_LIST_FROM_RECIPE("HEADER", data->headers);
+    GET_LIST_FROM_RECIPE("CONCEPT", data->concepts);
 
     // Parse the statistics options