Index: trunk/psModules/src/concepts/pmConceptsStandard.h
===================================================================
--- trunk/psModules/src/concepts/pmConceptsStandard.h	(revision 11253)
+++ trunk/psModules/src/concepts/pmConceptsStandard.h	(revision 11749)
@@ -4,6 +4,6 @@
  * @author Paul Price, IfA
  *
- * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-01-24 02:54:15 $
+ * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-02-12 22:22:15 $
  * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
  */
@@ -17,8 +17,10 @@
 #include <pslib.h>
 #include "pmFPA.h"
+#include "pmConcepts.h"
 
 /// Parse the FPA.FILTER concept to apply a lookup table
 psMetadataItem *p_pmConceptParse_FPA_FILTER(const psMetadataItem *concept, ///< Concept to parse
         const psMetadataItem *pattern, ///< Pattern to use in parsing
+                                            pmConceptSource source, ///< Source for concept
         const psMetadata *cameraFormat, ///< Camera format definition
         const pmFPA *fpa, ///< FPA for concept, or NULL
@@ -29,4 +31,5 @@
 /// Format the FPA.FILTER concept to (reverse-)apply a lookup table
 psMetadataItem *p_pmConceptFormat_FPA_FILTER(const psMetadataItem *concept, ///< Concept to format
+                                            pmConceptSource source, ///< Source for concept
         const psMetadata *cameraFormat, ///< Camera format definition
         const pmFPA *fpa, ///< FPA for concept, or NULL
@@ -38,4 +41,5 @@
 psMetadataItem *p_pmConceptParse_FPA_Coords(const psMetadataItem *concept, ///< Concept to parse
         const psMetadataItem *pattern, ///< Pattern to use in parsing
+                                            pmConceptSource source, ///< Source for concept
         const psMetadata *cameraFormat, ///< Camera format definition
         const pmFPA *fpa, ///< FPA for concept, or NULL
@@ -46,4 +50,5 @@
 /// Format the coordinates concepts: FPA.RA and FPA.DEC
 psMetadataItem *p_pmConceptFormat_FPA_Coords(const psMetadataItem *concept, ///< Concept to format
+                                            pmConceptSource source, ///< Source for concept
         const psMetadata *cameraFormat, ///< Camera format definition
         const pmFPA *fpa, ///< FPA for concept, or NULL
@@ -55,4 +60,5 @@
 psMetadataItem *p_pmConceptParse_CELL_TRIMSEC(const psMetadataItem *concept, ///< Concept to parse
         const psMetadataItem *pattern, ///< Pattern to use in parsing
+                                            pmConceptSource source, ///< Source for concept
         const psMetadata *cameraFormat, ///< Camera format definition
         const pmFPA *fpa, ///< FPA for concept, or NULL
@@ -64,4 +70,5 @@
 psMetadataItem *p_pmConceptParse_CELL_BIASSEC(const psMetadataItem *concept, ///< Concept to parse
         const psMetadataItem *pattern, ///< Pattern to use in parsing
+                                            pmConceptSource source, ///< Source for concept
         const psMetadata *cameraFormat, ///< Camera format definition
         const pmFPA *fpa, ///< FPA for concept, or NULL
@@ -73,4 +80,5 @@
 psMetadataItem *p_pmConceptParse_CELL_Binning(const psMetadataItem *concept, ///< Concept to parse
         const psMetadataItem *pattern, ///< Pattern to use in parsing
+                                            pmConceptSource source, ///< Source for concept
         const psMetadata *cameraFormat, ///< Camera format definition
         const pmFPA *fpa, ///< FPA for concept, or NULL
@@ -82,4 +90,5 @@
 psMetadataItem *p_pmConceptParse_TIMESYS(const psMetadataItem *concept, ///< Concept to parse
         const psMetadataItem *pattern, ///< Pattern to use in parsing
+                                            pmConceptSource source, ///< Source for concept
         const psMetadata *cameraFormat, ///< Camera format definition
         const pmFPA *fpa, ///< FPA for concept, or NULL
@@ -91,4 +100,5 @@
 psMetadataItem *p_pmConceptParse_TIME(const psMetadataItem *concept, ///< Concept to parse
                                       const psMetadataItem *pattern, ///< Pattern to use in parsing
+                                            pmConceptSource source, ///< Source for concept
                                       const psMetadata *cameraFormat, ///< Camera format definition
                                       const pmFPA *fpa, ///< FPA for concept, or NULL
@@ -100,5 +110,6 @@
 psMetadataItem *p_pmConceptParse_Positions(const psMetadataItem *concept, ///< Concept to parse
         const psMetadataItem *pattern, ///< Pattern to use in parsing
-        const psMetadata *cameraFormat, ///< Camera format definition
+                                            pmConceptSource source, ///< Source for concept
+       const psMetadata *cameraFormat, ///< Camera format definition
         const pmFPA *fpa, ///< FPA for concept, or NULL
         const pmChip *chip, ///< Chip for concept, or NULL
@@ -108,4 +119,5 @@
 /// Format the CELL.TRIMSEC concept
 psMetadataItem *p_pmConceptFormat_CELL_TRIMSEC(const psMetadataItem *concept, ///< Concept to format
+                                            pmConceptSource source, ///< Source for concept
         const psMetadata *cameraFormat, ///< Camera format definition
         const pmFPA *fpa, ///< FPA for concept, or NULL
@@ -116,4 +128,5 @@
 /// Format the CELL.BIASSEC concept
 psMetadataItem *p_pmConceptFormat_CELL_BIASSEC(const psMetadataItem *concept, ///< Concept to format
+                                            pmConceptSource source, ///< Source for concept
         const psMetadata *cameraFormat, ///< Camera format definition
         const pmFPA *fpa, ///< FPA for concept, or NULL
@@ -124,4 +137,5 @@
 /// Format the CELL.XBIN concept
 psMetadataItem *p_pmConceptFormat_CELL_XBIN(const psMetadataItem *concept, ///< Concept to format
+                                            pmConceptSource source, ///< Source for concept
         const psMetadata *cameraFormat, ///< Camera format definition
         const pmFPA *fpa, ///< FPA for concept, or NULL
@@ -132,4 +146,5 @@
 /// Format the CELL.YBIN concept
 psMetadataItem *p_pmConceptFormat_CELL_YBIN(const psMetadataItem *concept, ///< Concept to format
+                                            pmConceptSource source, ///< Source for concept
         const psMetadata *cameraFormat, ///< Camera format definition
         const pmFPA *fpa, ///< FPA for concept, or NULL
@@ -140,4 +155,5 @@
 /// Format the time system concepts: FPA.TIMESYS and CELL.TIMESYS
 psMetadataItem *p_pmConceptFormat_TIMESYS(const psMetadataItem *concept, ///< Concept to format
+                                            pmConceptSource source, ///< Source for concept
         const psMetadata *cameraFormat, ///< Camera format definition
         const pmFPA *fpa, ///< FPA for concept, or NULL
@@ -148,4 +164,5 @@
 /// Format the time concepts: FPA.TIME and CELL.TIME
 psMetadataItem *p_pmConceptFormat_TIME(const psMetadataItem *concept, ///< Concept to format
+                                            pmConceptSource source, ///< Source for concept
                                        const psMetadata *cameraFormat, ///< Camera format definition
                                        const pmFPA *fpa, ///< FPA for concept, or NULL
@@ -156,4 +173,5 @@
 /// Format a cell position concept, e.g., CELL.X0
 psMetadataItem *p_pmConceptFormat_Positions(const psMetadataItem *concept, ///< Concept to format
+                                            pmConceptSource source, ///< Source for concept
         const psMetadata *cameraFormat, ///< Camera format definition
         const pmFPA *fpa, ///< FPA for concept, or NULL