Changeset 18167

Timestamp:

Jun 17, 2008, 12:26:25 PM (18 years ago)

Author:

Paul Price

Message:

New API for pmFPARead(), etc.

File:

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

trunk/ppStats/src/ppStatsLoop.c

@@ -21 +21 @@
     // Iterate through the FPA
     if (psListLength(data->headers) > 0 && fpa->hdu) {
-        if (fits && !pmFPAReadHeader(fpa, fits, config->database)) {
+        if (fits && !pmFPAReadHeader(fpa, fits, config)) {
             psError(PS_ERR_IO, false, "Unable to read header for FPA.");
             psFree(view);
@@ -32 +32 @@
     }
     if (psListLength(data->concepts) > 0) {
-        if (fits && fpa->hdu && !pmFPAReadHeader(fpa, fits, config->database)) {
+        if (fits && fpa->hdu && !pmFPAReadHeader(fpa, fits, config)) {
             psError(PS_ERR_IO, false, "Unable to read header for FPA.");
             psFree(view);
@@ -39 +39 @@
             return NULL;
         }
-        pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_ALL, false, config->database);
+        pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_ALL, false, config);
         p_ppStatsGetMetadata(newResults, fpa->concepts, data->concepts);
     }
@@ -53 +53 @@
     // Iterate over chips (if view->chip is set, skip all others)
     for (int i = 0; i < chips->n; i++) {
-        if ((view->chip >= 0) && (i != view->chip)) continue; 
+        if ((view->chip >= 0) && (i != view->chip)) continue;
         pmChip *chip = chips->data[i];  // Chip of interest
         *result = ppStatsChip(newResults, chip, fits, view, data, config);