Index: trunk/psModules/src/concepts/pmConcepts.h
===================================================================
--- trunk/psModules/src/concepts/pmConcepts.h	(revision 11253)
+++ trunk/psModules/src/concepts/pmConcepts.h	(revision 11749)
@@ -4,6 +4,6 @@
  * @author Paul Price, IfA
  *
- * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-01-24 02:54:14 $
+ * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-02-12 22:22:15 $
  * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
  */
@@ -19,7 +19,23 @@
 #include "pmFPALevel.h"
 
+/// Source for concepts when reading and writing.
+///
+/// Since some sources become available at different times from others, we need to provide some specificity to
+/// reading and writing concepts (or we're forced to wait until everything's available, which we don't want to
+/// do).  Concepts may be read from or written to multiple sources at once by OR-ing them.
+typedef enum {
+    PM_CONCEPT_SOURCE_NONE     = 0x00,  ///< No concepts
+    PM_CONCEPT_SOURCE_CELLS    = 0x01,  ///< Concept comes from the camera information
+    PM_CONCEPT_SOURCE_DEFAULTS = 0x02,  ///< Concept comes from defaults
+    PM_CONCEPT_SOURCE_PHU      = 0x04,  ///< Concept comes from PHU
+    PM_CONCEPT_SOURCE_HEADER   = 0x08,  ///< Concept comes from FITS header
+    PM_CONCEPT_SOURCE_DATABASE = 0x10,  ///< Concept comes from database
+    PM_CONCEPT_SOURCE_ALL      = 0xff   ///< All concepts
+} pmConceptSource;
+
 /// Function to call to parse a concept once it has been read
 typedef psMetadataItem* (*pmConceptParseFunc)(const psMetadataItem *concept, ///< Concept to parse
         const psMetadataItem *pattern, ///< Pattern for parsing
+                                              pmConceptSource source, ///< Source of concept
         const psMetadata *cameraFormat, ///< Camera format definition
         const pmFPA *fpa, ///< FPA for concept, or NULL
@@ -30,4 +46,5 @@
 /// Function to call to format a concept for writing
 typedef psMetadataItem* (*pmConceptFormatFunc)(const psMetadataItem *concept, ///< Concept to format
+                                               pmConceptSource source, ///< Source of concept
         const psMetadata *cameraFormat, ///< Camera format definition
         const pmFPA *fpa, ///< FPA for concept, or NULL
@@ -65,19 +82,4 @@
                        pmFPALevel level ///< Level at which to store concept in the FPA hierarchy
                       );
-
-/// Source for concepts when reading and writing.
-///
-/// Since some sources become available at different times from others, we need to provide some specificity to
-/// reading and writing concepts (or we're forced to wait until everything's available, which we don't want to
-/// do).  Concepts may be read from or written to multiple sources at once by OR-ing them.
-typedef enum {
-    PM_CONCEPT_SOURCE_NONE     = 0x00,  ///< No concepts
-    PM_CONCEPT_SOURCE_CELLS    = 0x01,  ///< Concept comes from the camera information
-    PM_CONCEPT_SOURCE_DEFAULTS = 0x02,  ///< Concept comes from defaults
-    PM_CONCEPT_SOURCE_PHU      = 0x04,  ///< Concept comes from PHU
-    PM_CONCEPT_SOURCE_HEADER   = 0x08,  ///< Concept comes from FITS header
-    PM_CONCEPT_SOURCE_DATABASE = 0x10,  ///< Concept comes from database
-    PM_CONCEPT_SOURCE_ALL      = 0xff   ///< All concepts
-} pmConceptSource;
 
 /// Get a list of defined concepts for a particular level.