Changeset 9514 for trunk/psModules/src/camera/pmFPAConstruct.c

Timestamp:

Oct 12, 2006, 11:44:22 AM (20 years ago)

Author:

Paul Price

Message:

Read concepts from the PHU after adding the source.

File:

• trunk/psModules/src/camera/pmFPAConstruct.c (modified) (3 diffs)

trunk/psModules/src/camera/pmFPAConstruct.c

@@ -543 +543 @@
         }
         psFree(phdu);
+
+        if (header && !pmConceptsRead(fpa, NULL, NULL, PM_CONCEPT_SOURCE_PHU, NULL)) {
+            psWarning("Unable to read concepts from PHU.\n");
+        }
 
         return view;
@@ -652 +656 @@
         psFree(phdu);
 
+        if (header && !pmConceptsRead(fpa, chip, cell, PM_CONCEPT_SOURCE_PHU, NULL)) {
+            psWarning("Unable to read concepts from PHU.\n");
+        }
+
         return view;
     }
@@ -728 +736 @@
     psFree(contentsIter);
 
+    if (header && !pmConceptsRead(fpa, chip, cell, PM_CONCEPT_SOURCE_PHU, NULL)) {
+        psWarning("Unable to read concepts from PHU.\n");
+    }
+
     if (!pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_DEFAULTS, true, NULL)) {
-        psLogMsg(__func__, PS_LOG_WARN, "Unable to read concepts from defaults for FPA.  Attempting to "
-                 "proceed anyway.\n");
+        psWarning("Unable to read concepts from defaults for FPA.  Attempting to "
+                  "proceed anyway.\n");
     }
 
     return view;
-
 }