Index: /trunk/psModules/src/camera/pmFPAfileDefine.c
===================================================================
--- /trunk/psModules/src/camera/pmFPAfileDefine.c	(revision 15130)
+++ /trunk/psModules/src/camera/pmFPAfileDefine.c	(revision 15131)
@@ -141,20 +141,4 @@
     file->mode = PM_FPA_MODE_WRITE;
     file->save = false;
-
-// XXX we are deprecating the use of FILE.SAVE in the camera config
-# if (0)
-    char *save = psMetadataLookupStr (&status, data, "FILE.SAVE");
-    if (save != NULL) {
-        if (!strcasecmp (save, "TRUE"))     {
-            file->save = true;
-        } else if (!strcasecmp (save, "FALSE"))     {
-            file->save = false;
-        } else {
-            psError(PS_ERR_IO, true, "Illegal value \"%s\" for FILE.SAVE for %s", save, name);
-            psFree(file);
-            return NULL;
-        }
-    }
-# endif
 
     // Use the camera we were told to, the camera of the provided FPA, or default to the default camera
@@ -187,4 +171,16 @@
     file->camera = psMemIncrRefCounter(camera);
     file->cameraName = psMemIncrRefCounter(cameraName);
+
+    // XXX this seems a bit of a hack: use the cameraName to determine the mosaic level...
+    # if (0)
+    if (cameraName) {
+	if (!strcmp(cameraName + strlen(cameraName) - 5, "-CHIP")) {
+	    file->mosaicLevel = PM_FPA_LEVEL_CHIP;
+	}
+	if (!strcmp(cameraName + strlen(cameraName) - 5, "-FPA")) {
+	    file->mosaicLevel = PM_FPA_LEVEL_FPA;
+	}
+    }
+    # endif
 
     // Use the format we were told to, the format specified in the file rule, or default to the default format
@@ -941,4 +937,5 @@
 
     pmFPA *fpa = pmFPAConstruct(src->camera);
+    // XXX should this use DefineOutputForFormat?
     pmFPAfile *file = pmFPAfileDefineOutput (config, fpa, filename);
     if (!file) {