Index: trunk/psModules/src/camera/pmFPAfileIO.c
===================================================================
--- trunk/psModules/src/camera/pmFPAfileIO.c	(revision 12716)
+++ trunk/psModules/src/camera/pmFPAfileIO.c	(revision 12804)
@@ -197,5 +197,5 @@
         return false;
     }
-    psTrace ("psModules.camera", 5, "read %s (%s)\n", file->filename, file->name);
+    psTrace ("psModules.camera", 5, "read %s (%s) (%d:%d:%d)\n", file->filename, file->name, view->chip, view->cell, view->readout);
     return true;
 }
@@ -255,5 +255,5 @@
 
             pmFPAAddSourceFromView(file->fpa, fpaname, view, format);
-            psTrace ("psModules.camera", 5, "created fpa data elements for %s (fpa: %p)\n", file->name, file->fpa);
+            psTrace ("psModules.camera", 5, "created fpa data elements for %s (%s) (%d:%d:%d)\n", file->name, file->name, view->chip, view->cell, view->readout);
             break;
     }
@@ -391,5 +391,5 @@
         return false;
     }
-    psTrace ("psModules.camera", 5, "wrote %s (fpa: %p)\n", file->filename, file->fpa);
+    psTrace ("psModules.camera", 5, "wrote %s (%s) (%d:%d:%d)\n", file->filename, file->name, view->chip, view->cell, view->readout);
     return true;
 }
@@ -431,5 +431,5 @@
       case PM_FPA_FILE_FRINGE:
       case PM_FPA_FILE_CMF:
-        psTrace ("psModules.camera", 5, "closing %s (type: %d)\n", file->filename, file->type);
+        psTrace ("psModules.camera", 5, "closing %s (%s) (%d:%d:%d)\n", file->filename, file->name, view->chip, view->cell, view->readout);
         status = psFitsClose (file->fits);
         file->fits = NULL;
@@ -454,5 +454,5 @@
     }
     if (!status) {
-        psError(PS_ERR_UNKNOWN, false, "failed to close %s (%s)\n", file->filename, file->name);
+        psError(PS_ERR_UNKNOWN, false, "failed to close %s (%s) (%d:%d:%d)\n", file->filename, file->name, view->chip, view->cell, view->readout);
         return false;
     }
@@ -498,10 +498,10 @@
       case PM_FPA_FILE_CMF:
         psTrace ("psModules.camera", 5, "NOT freeing %s (%s) : save for further analysis\n", file->filename, file->name);
-        break;
+	return true;
       case PM_FPA_FILE_PSF:
       case PM_FPA_FILE_JPEG:
       case PM_FPA_FILE_KAPA:
         psTrace ("psModules.camera", 5, "nothing to free for %s (%s)\n", file->filename, file->name);
-        break;
+	return true;
       default:
         psError(PS_ERR_IO, true, "warning: type mismatch; saw type %d", file->type);
@@ -512,5 +512,5 @@
         return false;
     }
-    psTrace ("psModules.camera", 5, "freed %s (%s)\n", file->filename, file->name);
+    psTrace ("psModules.camera", 5, "freed %s (%s) (%d:%d:%d)\n", file->filename, file->name, view->chip, view->cell, view->readout);
     return true;
 }
@@ -635,5 +635,5 @@
       case PM_FPA_FILE_FRINGE:
       case PM_FPA_FILE_CMF:
-        psTrace ("psModules.camera", 5, "opening %s (type: %d)\n", file->filename, file->type);
+        psTrace ("psModules.camera", 5, "opening %s (%s) (%d:%d:%d)\n", file->filename, file->name, view->chip, view->cell, view->readout);
         file->fits = psFitsOpen (file->filename, mode);
         if (file->fits == NULL) {
@@ -659,5 +659,5 @@
         // the images supplied by the detrend database, which are only identified here (above).
         if (!pmFPAfileReadPHU (file, view, config)) {
-            psError (PS_ERR_IO, true, "error reading PHU for %s (%s)\n", file->filename, file->name);
+            psError (PS_ERR_IO, true, "error reading PHU for %s (%s) (%d:%d:%d)\n", file->filename, file->name, view->chip, view->cell, view->readout);
             return false;
         }