Index: trunk/psModules/src/camera/pmFPAConstruct.c
===================================================================
--- trunk/psModules/src/camera/pmFPAConstruct.c	(revision 22696)
+++ trunk/psModules/src/camera/pmFPAConstruct.c	(revision 22699)
@@ -14,5 +14,5 @@
 #include "pmFPAview.h"
 #include "pmFPAFlags.h"
-#include "pmConcepts.h"
+#include "pmConceptsRead.h"
 #include "pmFPAConstruct.h"
 #include "pmFPAUtils.h"
Index: trunk/psModules/src/camera/pmFPACopy.c
===================================================================
--- trunk/psModules/src/camera/pmFPACopy.c	(revision 22696)
+++ trunk/psModules/src/camera/pmFPACopy.c	(revision 22699)
@@ -13,5 +13,5 @@
 #include "pmFPAUtils.h"
 #include "pmHDUUtils.h"
-#include "pmConcepts.h"
+#include "pmConceptsCopy.h"
 #include "pmFPACopy.h"
 
Index: trunk/psModules/src/camera/pmFPAHeader.c
===================================================================
--- trunk/psModules/src/camera/pmFPAHeader.c	(revision 22696)
+++ trunk/psModules/src/camera/pmFPAHeader.c	(revision 22699)
@@ -10,5 +10,5 @@
 #include "pmFPA.h"
 #include "pmFPALevel.h"
-#include "pmConcepts.h"
+#include "pmConceptsRead.h"
 #include "pmFPAHeader.h"
 
Index: trunk/psModules/src/camera/pmFPARead.c
===================================================================
--- trunk/psModules/src/camera/pmFPARead.c	(revision 22696)
+++ trunk/psModules/src/camera/pmFPARead.c	(revision 22699)
@@ -17,5 +17,5 @@
 #include "pmFPAFlags.h"
 #include "pmHDUUtils.h"
-#include "pmConcepts.h"
+#include "pmConceptsRead.h"
 #include "pmFPAHeader.h"
 
Index: trunk/psModules/src/camera/pmFPAWrite.c
===================================================================
--- trunk/psModules/src/camera/pmFPAWrite.c	(revision 22696)
+++ trunk/psModules/src/camera/pmFPAWrite.c	(revision 22699)
@@ -18,5 +18,5 @@
 #include "pmHDUUtils.h"
 #include "pmHDUGenerate.h"
-#include "pmConcepts.h"
+#include "pmConceptsWrite.h"
 
 #include "pmFPAWrite.h"
Index: trunk/psModules/src/camera/pmFPAfile.c
===================================================================
--- trunk/psModules/src/camera/pmFPAfile.c	(revision 22696)
+++ trunk/psModules/src/camera/pmFPAfile.c	(revision 22699)
@@ -18,5 +18,5 @@
 #include "pmFPAfile.h"
 #include "pmFPACopy.h"
-#include "pmConcepts.h"
+#include "pmConceptsCopy.h"
 
 static void pmFPAfileFree(pmFPAfile *file)
@@ -409,5 +409,5 @@
     // XXX this should be smarter (ie, only copy concepts from the current chips)
     // but such a call is needed, so re-copy stuff rather than no copy
-    pmFPACopyConcepts (out, in);
+    pmConceptsCopyFPA(out, in, true, true);
 
     // pmFPAWrite takes care of all PHUs as needed
Index: trunk/psModules/src/camera/pmFPAfileDefine.c
===================================================================
--- trunk/psModules/src/camera/pmFPAfileDefine.c	(revision 22696)
+++ trunk/psModules/src/camera/pmFPAfileDefine.c	(revision 22699)
@@ -21,5 +21,5 @@
 #include "pmFPAConstruct.h"
 
-#include "pmConcepts.h"
+#include "pmConceptsCopy.h"
 
 # define FPA_TEST_ASSERT(A){ \
@@ -1024,8 +1024,8 @@
         }
 
-	// XXX A TEST: this is a provisional fpa until we read the first header for this pmFPAfile
-	// we are going to replace it when we determine the true file.  blow this away here...
-	psFree (file->fpa);
-	file->fpa = NULL;
+        // XXX A TEST: this is a provisional fpa until we read the first header for this pmFPAfile
+        // we are going to replace it when we determine the true file.  blow this away here...
+        psFree (file->fpa);
+        file->fpa = NULL;
     }
 
@@ -1184,5 +1184,5 @@
 
     // inherit the concepts from the src fpa:
-    pmFPACopyConcepts(file->fpa, file->src);
+    pmConceptsCopyFPA(file->fpa, file->src, true, true);
 
     return file;
Index: trunk/psModules/src/camera/pmFPAfileFitsIO.c
===================================================================
--- trunk/psModules/src/camera/pmFPAfileFitsIO.c	(revision 22696)
+++ trunk/psModules/src/camera/pmFPAfileFitsIO.c	(revision 22699)
@@ -22,5 +22,5 @@
 #include "pmFPAConstruct.h"
 #include "pmDark.h"
-#include "pmConcepts.h"
+#include "pmConceptsWrite.h"
 
 // Get a suitable FPA for the file; generate it if necessary