Index: trunk/psModules/src/camera/pmFPAfileDefine.c
===================================================================
--- trunk/psModules/src/camera/pmFPAfileDefine.c	(revision 17634)
+++ trunk/psModules/src/camera/pmFPAfileDefine.c	(revision 17911)
@@ -237,5 +237,5 @@
         file->fpa = psMemIncrRefCounter(fpa);
     } else {
-        file->fpa = pmFPAConstruct(file->camera);
+        file->fpa = pmFPAConstruct(file->camera, file->cameraName);
     }
 
@@ -482,5 +482,5 @@
 
     // build the template fpa, set up the basic view
-    fpa = pmFPAConstruct(config->camera);
+    fpa = pmFPAConstruct(config->camera, config->cameraName);
     if (!fpa) {
         psError(PS_ERR_IO, false, "Failed to construct FPA from %s", realName);
@@ -783,5 +783,5 @@
 
     // build the template fpa, set up the basic view
-    fpa = pmFPAConstruct (config->camera);
+    fpa = pmFPAConstruct(config->camera, config->cameraName);
     if (!fpa) {
         psError(PS_ERR_IO, false, "Failed to construct FPA from %s", (char *)infiles->data[0]);
@@ -867,5 +867,5 @@
 
     // build the template fpa, set up the basic view
-    pmFPA *fpa = pmFPAConstruct (config->camera);
+    pmFPA *fpa = pmFPAConstruct(config->camera, config->cameraName);
     if (!fpa) {
         psError(PS_ERR_IO, false, "Failed to construct FPA for %s", filename);
@@ -949,5 +949,5 @@
     if (!file) {
         // build the template fpa, set up the basic view
-        fpa = pmFPAConstruct (config->camera);
+        fpa = pmFPAConstruct(config->camera, config->cameraName);
         if (!fpa) {
             psError(PS_ERR_IO, false, "Failed to construct FPA for %s", filename);
@@ -1090,5 +1090,5 @@
     PS_ASSERT_STRING_NON_EMPTY(filename, NULL);
 
-    pmFPA *fpa = pmFPAConstruct(src->camera);
+    pmFPA *fpa = pmFPAConstruct(src->camera, psMetadataLookupStr(NULL, src->concepts, "FPA.CAMERA"));
     // XXX should this use DefineOutputForFormat?
     pmFPAfile *file = pmFPAfileDefineOutput (config, fpa, filename);
@@ -1139,5 +1139,5 @@
         return NULL;
     }
-    file->fpa = pmFPAConstruct(file->camera);
+    file->fpa = pmFPAConstruct(file->camera, file->cameraName);
 
     return file;