Index: trunk/psModules/src/concepts/pmConceptsRead.h
===================================================================
--- trunk/psModules/src/concepts/pmConceptsRead.h	(revision 7017)
+++ trunk/psModules/src/concepts/pmConceptsRead.h	(revision 9570)
@@ -2,93 +2,52 @@
 #define PM_CONCEPTS_READ_H
 
-#include "pslib.h"
+#include <pslib.h>
 #include "pmFPA.h"
 
-bool pmConceptsReadFromCamera(psMetadata *specs, // The concept specifications
-                              pmCell *cell,  // The cell
-                              psMetadata *target // Place into which to read the concepts
-                             );
-bool pmConceptsReadFromDefaults(psMetadata *specs, // The concept specifications
-                                pmFPA *fpa, // The FPA
-                                pmChip *chip, // The chip
-                                pmCell *cell, // The cell
-                                psMetadata *target // Place into which to read the concepts
-                               );
-bool pmConceptsReadFromHeader(psMetadata *specs, // The concept specifications
-                              pmFPA *fpa, // The FPA
-                              pmChip *chip, // The chip
-                              pmCell *cell,  // The cell
-                              psMetadata *target // Place into which to read the concepts
-                             );
-bool pmConceptsReadFromDatabase(psMetadata *specs, // The concept specifications
-                                pmFPA *fpa, // The FPA
-                                pmChip *chip, // The chip
-                                pmCell *cell,  // The cell
-                                psDB *db, // The database handle
-                                psMetadata *target // Place into which to read the concepts
+/// Read concepts from the camera configuration file's CELLS.
+///
+/// Examines the CELLS metadata in the camera configuration file
+/// for the current type of cell, and sucks in the concepts defined there.
+/// This is a useful way of defining concepts that vary depending on the
+/// type of the cell.
+bool p_pmConceptsReadFromCells(psMetadata *target, ///< Place into which to read the concepts
+                               const psMetadata *specs, ///< The concept specifications
+                               const pmCell *cell ///< The cell
+                              );
+
+/// Read concepts from the DEFAULTS in the camera configuration file.
+///
+/// Examines the DEFAULTS metadata in the camera configuration file
+/// for concepts in the specs, and imports them into the target.
+bool p_pmConceptsReadFromDefaults(psMetadata *target, // Place into which to read the concepts
+                                  const psMetadata *specs, // The concept specifications
+                                  const pmFPA *fpa, // The FPA
+                                  const pmChip *chip, // The chip
+                                  const pmCell *cell // The cell
+                                 );
+
+/// Read concepts from the header TRANSLATION in the camera configuration file.
+///
+/// Examines the TRANSLATION metadata in the camera configuration file
+/// for concepts in the specs, and imports them into the target.
+bool p_pmConceptsReadFromHeader(psMetadata *target, // Place into which to read the concepts
+                                const psMetadata *specs, // The concept specifications
+                                const pmFPA *fpa, // The FPA
+                                const pmChip *chip, // The chip
+                                const pmCell *cell  // The cell
                                );
 
-
-
-
-#ifdef OLD
-psMetadataItem *pmConceptReadFromCamera(pmCell *cell, // The cell
-                                        const char *concept // Name of concept
-                                       );
-
-psMetadataItem *pmConceptReadFromHeader(pmFPA *fpa, // The FPA that contains the chip
-                                        pmChip *chip, // The chip that contains the cell
-                                        pmCell *cell, // The cell
-                                        const char *concept // Name of concept
-                                       );
-
-psMetadataItem *pmConceptReadFromDefault(pmFPA *fpa, // The FPA that contains the chip
-        pmChip *chip, // The chip that contains the cell
-        pmCell *cell, // The cell
-        const char *concept // Name of concept
-                                        );
-
-psMetadataItem *pmConceptReadFromDB(pmFPA *fpa, // The FPA that contains the chip
-                                    pmChip *chip, // The chip that contains the cell
-                                    pmCell *cell, // The cell
-                                    psDB *db, // DB handle
-                                    const char *concept // Name of concept
-                                   );
-
-psMetadataItem *pmConceptRead(pmFPA *fpa, // The FPA
-                              pmChip *chip,// The chip
-                              pmCell *cell, // The cell
-                              psDB *db, // DB handle
-                              const char *concept // Concept name
-                             );
-
-float pmConceptReadF32(pmFPA *fpa,        // The FPA
-                       pmChip *chip,      // The chip
-                       pmCell *cell,      // The cell
-                       psDB *db,          // DB handle
-                       const char *name // Name of the concept
-                      );
-
-double pmConceptReadF64(pmFPA *fpa,   // The FPA
-                        pmChip *chip, // The chip
-                        pmCell *cell, // The cell
-                        psDB *db,     // DB handle
-                        const char *name // Name of the concept
-                       );
-
-int pmConceptReadS32(pmFPA *fpa,   // The FPA
-                     pmChip *chip, // The chip
-                     pmCell *cell, // The cell
-                     psDB *db,     // DB handle
-                     const char *name // Name of the concept
-                    );
-
-psString pmConceptReadString(pmFPA *fpa, // The FPA
-                             pmChip *chip, // The chip
-                             pmCell *cell, // The cell
-                             psDB *db,  // DB handle
-                             const char *name // Name of the concept
-                            );
-#endif
+/// Read concepts from the header DATABASE in the camera configuration file.
+///
+/// Examines the DATABASE metadata in the camera configuration file
+/// for concepts in the specs, and imports them into the target.
+/// WARNING: This function has not been tested; use at your own risk!
+bool p_pmConceptsReadFromDatabase(psMetadata *target, // Place into which to read the concepts
+                                  const psMetadata *specs, // The concept specifications
+                                  const pmFPA *fpa, // The FPA
+                                  const pmChip *chip, // The chip
+                                  const pmCell *cell,  // The cell
+                                  psDB *db // The database handle
+                                 );
 
 #endif