Changeset 8195 for trunk/ppStats/src/ppStatsLoop.c

Timestamp:

Aug 5, 2006, 3:53:08 PM (20 years ago)

Author:

Paul Price

Message:

Fixing up errors when we don't have an entire FPA.

File:

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

trunk/ppStats/src/ppStatsLoop.c

@@ -69 +69 @@
         getMetadata(fpaResults, fpa->concepts, conceptsIter);
     }
-
     psArray *chips = fpa->chips;        // Array of component chips
     for (long i = 0; i < chips->n; i++) {
@@ -86 +85 @@
 
         if (psListLength(data->headers) > 0 && chip->hdu) {
-            pmChipReadHeader(chip, data->inFile);
+            if (!pmChipReadHeader(chip, data->inFile)) {
+                continue;
+            }
             pmHDU *hdu = chip->hdu;     // HDU for headers
             getMetadata(chipResults, hdu->header, headersIter);
         }
         if (psListLength(data->concepts) > 0) {
-            pmChipReadHeader(chip, data->inFile);
+            if (!pmChipReadHeader(chip, data->inFile)) {
+                continue;
+            }
             pmConceptsReadChip(chip, PM_CONCEPT_SOURCE_ALL, false, false, config->database);
             getMetadata(chipResults, chip->concepts, conceptsIter);
@@ -112 +115 @@
 
             if (psListLength(data->headers) > 0 && cell->hdu) {
-                pmCellReadHeader(cell, data->inFile);
+                if (!pmCellReadHeader(cell, data->inFile)) {
+                    continue;
+                }
                 pmHDU *hdu = cell->hdu;     // HDU for headers
                 getMetadata(cellResults, hdu->header, headersIter);
             }
             if (psListLength(data->concepts) > 0) {
-                pmCellReadHeader(cell, data->inFile);
+                if (!pmCellReadHeader(cell, data->inFile)) {
+                    continue;
+                }
                 pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_ALL, false, config->database);
                 getMetadata(cellResults, cell->concepts, conceptsIter);