Index: trunk/psModules/src/concepts/pmConceptsStandard.h
===================================================================
--- trunk/psModules/src/concepts/pmConceptsStandard.h	(revision 9510)
+++ trunk/psModules/src/concepts/pmConceptsStandard.h	(revision 9572)
@@ -2,91 +2,136 @@
 #define PM_CONCEPTS_STANDARD_H
 
-#include "pslib.h"
+#include <pslib.h>
 #include "pmFPA.h"
 
 // Functions to parse and format the standard concepts
 
-psMetadataItem *p_pmConceptParse_FPA_Coords(psMetadataItem *concept,
-        psMetadataItem *pattern,
-        psMetadata *cameraFormat,
-        pmFPA *fpa,
-        pmChip *chip,
-        pmCell *cell);
-psMetadataItem *p_pmConceptFormat_FPA_Coords(psMetadataItem *concept,
-        psMetadata *cameraFormat,
-        pmFPA *fpa,
-        pmChip *chip,
-        pmCell *cell);
-psMetadataItem *p_pmConceptParse_CELL_TRIMSEC(psMetadataItem *concept,
-        psMetadataItem *pattern,
-        psMetadata *cameraFormat,
-        pmFPA *fpa,
-        pmChip *chip,
-        pmCell *cell);
-psMetadataItem *p_pmConceptParse_CELL_BIASSEC(psMetadataItem *concept,
-        psMetadataItem *pattern,
-        psMetadata *cameraFormat,
-        pmFPA *fpa,
-        pmChip *chip,
-        pmCell *cell);
-psMetadataItem *p_pmConceptParse_CELL_Binning(psMetadataItem *concept,
-        psMetadataItem *pattern,
-        psMetadata *cameraFormat,
-        pmFPA *fpa,
-        pmChip *chip,
-        pmCell *cell);
-psMetadataItem *p_pmConceptParse_TIMESYS(psMetadataItem *concept,
-        psMetadataItem *pattern,
-        psMetadata *cameraFormat,
-        pmFPA *fpa,
-        pmChip *chip,
-        pmCell *cell);
-psMetadataItem *p_pmConceptParse_TIME(psMetadataItem *concept,
-                                      psMetadataItem *pattern,
-                                      psMetadata *cameraFormat,
-                                      pmFPA *fpa,
-                                      pmChip *chip,
-                                      pmCell *cell);
-psMetadataItem *p_pmConceptParse_Positions(psMetadataItem *concept,
-        psMetadataItem *pattern,
-        psMetadata *cameraFormat,
-        pmFPA *fpa,
-        pmChip *chip,
-        pmCell *cell);
-psMetadataItem *p_pmConceptFormat_CELL_TRIMSEC(psMetadataItem *concept,
-        psMetadata *cameraFormat,
-        pmFPA *fpa,
-        pmChip *chip,
-        pmCell *cell);
-psMetadataItem *p_pmConceptFormat_CELL_BIASSEC(psMetadataItem *concept,
-        psMetadata *cameraFormat,
-        pmFPA *fpa,
-        pmChip *chip,
-        pmCell *cell);
-psMetadataItem *p_pmConceptFormat_CELL_XBIN(psMetadataItem *concept,
-        psMetadata *cameraFormat,
-        pmFPA *fpa,
-        pmChip *chip,
-        pmCell *cell);
-psMetadataItem *p_pmConceptFormat_CELL_YBIN(psMetadataItem *concept,
-        psMetadata *cameraFormat,
-        pmFPA *fpa,
-        pmChip *chip,
-        pmCell *cell);
-psMetadataItem *p_pmConceptFormat_TIMESYS(psMetadataItem *concept,
-        psMetadata *cameraFormat,
-        pmFPA *fpa,
-        pmChip *chip,
-        pmCell *cell);
-psMetadataItem *p_pmConceptFormat_TIME(psMetadataItem *concept,
-                                       psMetadata *cameraFormat,
-                                       pmFPA *fpa,
-                                       pmChip *chip,
-                                       pmCell *cell);
-psMetadataItem *p_pmConceptFormat_Positions(psMetadataItem *concept,
-        psMetadata *cameraFormat,
-        pmFPA *fpa,
-        pmChip *chip,
-        pmCell *cell);
+
+/// Parse the coordinates concepts: FPA.RA and FPA.DEC
+psMetadataItem *p_pmConceptParse_FPA_Coords(const psMetadataItem *concept, ///< Concept to parse
+        const psMetadataItem *pattern, ///< Pattern to use in parsing
+        const psMetadata *cameraFormat, ///< Camera format definition
+        const pmFPA *fpa, ///< FPA for concept, or NULL
+        const pmChip *chip, ///< Chip for concept, or NULL
+        const pmCell *cell ///< Cell for concept, or NULL
+                                           );
+
+/// Format the coordinates concepts: FPA.RA and FPA.DEC
+psMetadataItem *p_pmConceptFormat_FPA_Coords(const psMetadataItem *concept, ///< Concept to format
+        const psMetadata *cameraFormat, ///< Camera format definition
+        const pmFPA *fpa, ///< FPA for concept, or NULL
+        const pmChip *chip, ///< Chip for concept, or NULL
+        const pmCell *cell ///< Cell for concept, or NULL
+                                            );
+
+/// Parse the CELL.TRIMSEC concept
+psMetadataItem *p_pmConceptParse_CELL_TRIMSEC(const psMetadataItem *concept, ///< Concept to parse
+        const psMetadataItem *pattern, ///< Pattern to use in parsing
+        const psMetadata *cameraFormat, ///< Camera format definition
+        const pmFPA *fpa, ///< FPA for concept, or NULL
+        const pmChip *chip, ///< Chip for concept, or NULL
+        const pmCell *cell ///< Cell for concept, or NULL
+                                             );
+
+/// Parse the CELL.BIASSEC concept
+psMetadataItem *p_pmConceptParse_CELL_BIASSEC(const psMetadataItem *concept, ///< Concept to parse
+        const psMetadataItem *pattern, ///< Pattern to use in parsing
+        const psMetadata *cameraFormat, ///< Camera format definition
+        const pmFPA *fpa, ///< FPA for concept, or NULL
+        const pmChip *chip, ///< Chip for concept, or NULL
+        const pmCell *cell ///< Cell for concept, or NULL
+                                             );
+
+/// Parse the cell binning concepts: CELL.XBIN, CELL.YBIN
+psMetadataItem *p_pmConceptParse_CELL_Binning(const psMetadataItem *concept, ///< Concept to parse
+        const psMetadataItem *pattern, ///< Pattern to use in parsing
+        const psMetadata *cameraFormat, ///< Camera format definition
+        const pmFPA *fpa, ///< FPA for concept, or NULL
+        const pmChip *chip, ///< Chip for concept, or NULL
+        const pmCell *cell ///< Cell for concept, or NULL
+                                             );
+
+/// Parse the time system concepts: FPA.TIMESYS and CELL.TIMESYS
+psMetadataItem *p_pmConceptParse_TIMESYS(const psMetadataItem *concept, ///< Concept to parse
+        const psMetadataItem *pattern, ///< Pattern to use in parsing
+        const psMetadata *cameraFormat, ///< Camera format definition
+        const pmFPA *fpa, ///< FPA for concept, or NULL
+        const pmChip *chip, ///< Chip for concept, or NULL
+        const pmCell *cell ///< Cell for concept, or NULL
+                                        );
+
+/// Parse the time concepts: FPA.TIME and CELL.TIME
+psMetadataItem *p_pmConceptParse_TIME(const psMetadataItem *concept, ///< Concept to parse
+                                      const psMetadataItem *pattern, ///< Pattern to use in parsing
+                                      const psMetadata *cameraFormat, ///< Camera format definition
+                                      const pmFPA *fpa, ///< FPA for concept, or NULL
+                                      const pmChip *chip, ///< Chip for concept, or NULL
+                                      const pmCell *cell ///< Cell for concept, or NULL
+                                     );
+
+/// Parse a cell position concept, e.g., CELL.X0
+psMetadataItem *p_pmConceptParse_Positions(const psMetadataItem *concept, ///< Concept to parse
+        const psMetadataItem *pattern, ///< Pattern to use in parsing
+        const psMetadata *cameraFormat, ///< Camera format definition
+        const pmFPA *fpa, ///< FPA for concept, or NULL
+        const pmChip *chip, ///< Chip for concept, or NULL
+        const pmCell *cell ///< Cell for concept, or NULL
+                                          );
+
+/// Format the CELL.TRIMSEC concept
+psMetadataItem *p_pmConceptFormat_CELL_TRIMSEC(const psMetadataItem *concept, ///< Concept to format
+        const psMetadata *cameraFormat, ///< Camera format definition
+        const pmFPA *fpa, ///< FPA for concept, or NULL
+        const pmChip *chip, ///< Chip for concept, or NULL
+        const pmCell *cell ///< Cell for concept, or NULL
+                                              );
+
+/// Format the CELL.BIASSEC concept
+psMetadataItem *p_pmConceptFormat_CELL_BIASSEC(const psMetadataItem *concept, ///< Concept to format
+        const psMetadata *cameraFormat, ///< Camera format definition
+        const pmFPA *fpa, ///< FPA for concept, or NULL
+        const pmChip *chip, ///< Chip for concept, or NULL
+        const pmCell *cell ///< Cell for concept, or NULL
+                                              );
+
+/// Format the CELL.XBIN concept
+psMetadataItem *p_pmConceptFormat_CELL_XBIN(const psMetadataItem *concept, ///< Concept to format
+        const psMetadata *cameraFormat, ///< Camera format definition
+        const pmFPA *fpa, ///< FPA for concept, or NULL
+        const pmChip *chip, ///< Chip for concept, or NULL
+        const pmCell *cell ///< Cell for concept, or NULL
+                                           );
+
+/// Format the CELL.YBIN concept
+psMetadataItem *p_pmConceptFormat_CELL_YBIN(const psMetadataItem *concept, ///< Concept to format
+        const psMetadata *cameraFormat, ///< Camera format definition
+        const pmFPA *fpa, ///< FPA for concept, or NULL
+        const pmChip *chip, ///< Chip for concept, or NULL
+        const pmCell *cell ///< Cell for concept, or NULL
+                                           );
+
+/// Format the time system concepts: FPA.TIMESYS and CELL.TIMESYS
+psMetadataItem *p_pmConceptFormat_TIMESYS(const psMetadataItem *concept, ///< Concept to format
+        const psMetadata *cameraFormat, ///< Camera format definition
+        const pmFPA *fpa, ///< FPA for concept, or NULL
+        const pmChip *chip, ///< Chip for concept, or NULL
+        const pmCell *cell ///< Cell for concept, or NULL
+                                         );
+
+/// Format the time concepts: FPA.TIME and CELL.TIME
+psMetadataItem *p_pmConceptFormat_TIME(const psMetadataItem *concept, ///< Concept to format
+                                       const psMetadata *cameraFormat, ///< Camera format definition
+                                       const pmFPA *fpa, ///< FPA for concept, or NULL
+                                       const pmChip *chip, ///< Chip for concept, or NULL
+                                       const pmCell *cell ///< Cell for concept, or NULL
+                                      );
+
+/// Format a cell position concept, e.g., CELL.X0
+psMetadataItem *p_pmConceptFormat_Positions(const psMetadataItem *concept, ///< Concept to format
+        const psMetadata *cameraFormat, ///< Camera format definition
+        const pmFPA *fpa, ///< FPA for concept, or NULL
+        const pmChip *chip, ///< Chip for concept, or NULL
+        const pmCell *cell ///< Cell for concept, or NULL
+                                           );
 
 #endif