Index: /branches/eam_branch_20070817/psModules/src/camera/pmFPAfileIO.c
===================================================================
--- /branches/eam_branch_20070817/psModules/src/camera/pmFPAfileIO.c	(revision 14609)
+++ /branches/eam_branch_20070817/psModules/src/camera/pmFPAfileIO.c	(revision 14610)
@@ -26,10 +26,10 @@
 #include "pmMoments.h"
 #include "pmResiduals.h"
+#include "pmGrowthCurve.h"
+#include "pmPSF.h"
 #include "pmModel.h"
 #include "pmSource.h"
 #include "pmSourceIO.h"
-#include "pmGrowthCurve.h"
 #include "pmResiduals.h"
-#include "pmPSF.h"
 #include "pmPSF_IO.h"
 #include "pmFPA_JPEG.h"
@@ -188,5 +188,5 @@
         break;
       case PM_FPA_FILE_PSF:
-        status = pmFPAviewReadPSFmodel (view, file, config);
+        status = pmPSFmodelReadForView (view, file, config);
         break;
       case PM_FPA_FILE_JPEG:
@@ -335,5 +335,5 @@
     // (existing) fpa
     if (file->type == PM_FPA_FILE_PSF) {
-      if (!pmFPAviewCheckDataStatusForPSFmodel (view, file)) {
+      if (!pmPSFmodelCheckDataStatusForView (view, file)) {
         psTrace("psModules.camera", 6, "skip write for %s, no data for this entry", file->name);
         return true;
@@ -402,5 +402,5 @@
 
       case PM_FPA_FILE_PSF:
-        status = pmFPAviewWritePSFmodel (view, file, config);
+        status = pmPSFmodelWriteForView (view, file, config);
         break;
 
@@ -757,4 +757,6 @@
             return false;
         }
+	file->formatName = psStringCopy(config->formatName);
+
     } else {
         bool valid;
@@ -798,5 +800,5 @@
 	break;
       case PM_FPA_FILE_PSF:
-	status = pmPSF_WritePHU (view, file, config);
+	status = pmPSFmodelWritePHU (view, file, config);
 	break;
       case PM_FPA_FILE_SX: