Changeset 7910 for trunk/ppStats/src/ppStatsSetup.c

Timestamp:

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

Author:

Paul Price

Message:

Adding option of outputting concepts in addition to headers.

File:

• trunk/ppStats/src/ppStatsSetup.c (modified) (4 diffs)

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