Index: trunk/psModules/src/camera/pmFPAHeader.c
===================================================================
--- trunk/psModules/src/camera/pmFPAHeader.c	(revision 7314)
+++ trunk/psModules/src/camera/pmFPAHeader.c	(revision 7469)
@@ -6,49 +6,4 @@
 #include "pmConcepts.h"
 #include "pmFPAHeader.h"
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// File-static (private) functions
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-// Read concepts for all cells in a chip
-static bool chipConcepts(pmChip *chip   // The chip for which to read the concepts
-                        )
-{
-    assert(chip);
-
-    bool status = true;                 // Status of concept reading
-    status |= pmConceptsReadChip(chip, PM_CONCEPT_SOURCE_HEADER, false, NULL);
-    psArray *cells = chip->cells;       // The cells
-    for (int i = 0; i < cells->n; i++) {
-        pmCell *cell = cells->data[i];  // The cell of interest
-        if (!cell) {
-            continue;
-        }
-        status |= pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_HEADER, false, NULL);
-    }
-
-    return status;
-}
-
-// Read concepts for all chips in an FPA
-static bool fpaConcepts(pmFPA *fpa   // The FPA for which to read the concepts
-                       )
-{
-    assert(fpa);
-
-    bool status = true;                 // Status of concept reading
-    status |= pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_HEADER, NULL);
-    psArray *chips = fpa->chips;        // The chips
-    for (int i = 0; i < chips->n; i++) {
-        pmChip *chip = chips->data[i];  // The chip of interest
-        if (!chip) {
-            continue;
-        }
-        status |= chipConcepts(chip);
-    }
-
-    return status;
-}
-
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -90,5 +45,5 @@
     }
 
-    if (!chipConcepts(chip)) {
+    if (!pmConceptsReadChip(chip, PM_CONCEPT_SOURCE_HEADER, true, true, NULL)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to read concepts for chip.\n");
         return false;
@@ -114,5 +69,5 @@
     }
 
-    if (!fpaConcepts(fpa)) {
+    if (!pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_HEADER, true, NULL)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to read concepts for FPA.\n");
         return false;