Index: trunk/psModules/src/camera/pmFPAConstruct.c
===================================================================
--- trunk/psModules/src/camera/pmFPAConstruct.c	(revision 12642)
+++ trunk/psModules/src/camera/pmFPAConstruct.c	(revision 12660)
@@ -141,15 +141,5 @@
     pmFPASetFileStatus(fpa, true);
 
-    pmConceptSource source = 0;         // Source for concepts
-    if (hdu->header) {
-        if (hdu->blankPHU) {
-            source = PM_CONCEPT_SOURCE_PHU;
-        } else {
-            source = PM_CONCEPT_SOURCE_HEADER;
-        }
-    }
-    source |= PM_CONCEPT_SOURCE_DEFAULTS;
-
-    return pmConceptsReadFPA(fpa, source, true, NULL);
+    return true;
 }
 
@@ -171,14 +161,6 @@
     chip->hdu = psMemIncrRefCounter(hdu);
     pmChipSetFileStatus(chip, true);
-    pmConceptSource source = 0;         // Source for concepts
-    if (hdu->header) {
-        if (hdu->blankPHU) {
-            source = PM_CONCEPT_SOURCE_PHU;
-        } else {
-            source = PM_CONCEPT_SOURCE_HEADER;
-        }
-    }
-    source |= PM_CONCEPT_SOURCE_DEFAULTS;
-    return pmConceptsReadChip(chip, source, true, true, NULL);
+
+    return true;
 }
 
@@ -200,14 +182,6 @@
     cell->hdu = psMemIncrRefCounter(hdu);
     pmCellSetFileStatus(cell, true);
-    pmConceptSource source = 0;         // Source for concepts
-    if (hdu->header) {
-        if (hdu->blankPHU) {
-            source = PM_CONCEPT_SOURCE_PHU;
-        } else {
-            source = PM_CONCEPT_SOURCE_HEADER;
-        }
-    }
-    source |= PM_CONCEPT_SOURCE_DEFAULTS;
-    return pmConceptsReadCell(cell, source, true, NULL);
+
+    return true;
 }
 
@@ -1008,5 +982,7 @@
               phdu->blankPHU = true;
               if (install) {
-                  if (!addHDUtoFPA(fpa, phdu) || !addSource_FPA_CHIP(fpa, format)) {
+                  if (!addHDUtoFPA(fpa, phdu) || !addSource_FPA_CHIP(fpa, format) ||
+                      !pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_DEFAULTS | PM_CONCEPT_SOURCE_PHU,
+                                         true, NULL)) {
                       psError(PS_ERR_UNKNOWN, false, "Unable to add source.");
                       psFree(phdu);
@@ -1020,5 +996,7 @@
               if (install) {
                   phdu->blankPHU = true;
-                  if (!addHDUtoFPA(fpa, phdu) || !addSource_FPA_CELL(fpa, format)) {
+                  if (!addHDUtoFPA(fpa, phdu) || !addSource_FPA_CELL(fpa, format) ||
+                      !pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_DEFAULTS | PM_CONCEPT_SOURCE_PHU,
+                                         true, NULL)) {
                       psError(PS_ERR_UNKNOWN, false, "Unable to add source.");
                       psFree(phdu);
@@ -1032,5 +1010,7 @@
               if (install) {
                   phdu->blankPHU = false;
-                  if (!addHDUtoFPA(fpa, phdu) || !addSource_FPA_NONE(fpa, format)) {
+                  if (!addHDUtoFPA(fpa, phdu) || !addSource_FPA_NONE(fpa, format) ||
+                      !pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_DEFAULTS | PM_CONCEPT_SOURCE_PHU,
+                                         true, NULL)) {
                       psError(PS_ERR_UNKNOWN, false, "Unable to add source.");
                       psFree(phdu);
@@ -1063,5 +1043,7 @@
               if (install) {
                   phdu->blankPHU = true;
-                  if (!addHDUtoChip(chip, phdu) || !addSource_CHIP_CELL(chip, format)) {
+                  if (!addHDUtoChip(chip, phdu) || !addSource_CHIP_CELL(chip, format) ||
+                      !pmConceptsReadChip(chip, PM_CONCEPT_SOURCE_DEFAULTS | PM_CONCEPT_SOURCE_PHU,
+                                          true, true, NULL)) {
                       psError(PS_ERR_UNKNOWN, false, "Unable to add source.");
                       psFree(phdu);
@@ -1075,5 +1057,7 @@
               if (install) {
                   phdu->blankPHU = false;
-                  if (!addHDUtoChip(chip, phdu) || !addSource_CHIP_NONE(chip, format)) {
+                  if (!addHDUtoChip(chip, phdu) || !addSource_CHIP_NONE(chip, format) ||
+                      !pmConceptsReadChip(chip, PM_CONCEPT_SOURCE_DEFAULTS | PM_CONCEPT_SOURCE_PHU,
+                                          true, true, NULL)) {
                       psError(PS_ERR_UNKNOWN, false, "Unable to add source.");
                       psFree(phdu);
@@ -1113,5 +1097,7 @@
           if (install) {
               phdu->blankPHU = false;
-              if (!addHDUtoCell(cell, phdu) || !addSource_CELL_NONE(cell, format)) {
+              if (!addHDUtoCell(cell, phdu) || !addSource_CELL_NONE(cell, format) ||
+                  !pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_DEFAULTS | PM_CONCEPT_SOURCE_PHU,
+                                      true, NULL)) {
                   psError(PS_ERR_UNKNOWN, false, "Unable to add source.");
                   psFree(phdu);