Index: /trunk/psastro/src/psastroDataLoad.c
===================================================================
--- /trunk/psastro/src/psastroDataLoad.c	(revision 7582)
+++ /trunk/psastro/src/psastroDataLoad.c	(revision 7583)
@@ -34,30 +34,30 @@
 
     // files associated with the science image
-    pmFPAfileIOChecks (config->files, view, PM_FPA_BEFORE);
+    pmFPAfileIOChecks (config, view, PM_FPA_BEFORE);
 
     while ((chip = pmFPAviewNextChip (view, input->fpa, 1)) != NULL) {
         psTrace (__func__, 4, "Chip %d: %x %x\n", view->chip, chip->file_exists, chip->process);
         if (!chip->process || !chip->file_exists) { continue; }
-	pmFPAfileIOChecks (config->files, view, PM_FPA_BEFORE);
+	pmFPAfileIOChecks (config, view, PM_FPA_BEFORE);
 
 	while ((cell = pmFPAviewNextCell (view, input->fpa, 1)) != NULL) {
             psTrace (__func__, 4, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process);
             if (!cell->process || !cell->file_exists) { continue; }
-	    pmFPAfileIOChecks (config->files, view, PM_FPA_BEFORE);
+	    pmFPAfileIOChecks (config, view, PM_FPA_BEFORE);
 
 	    // process each of the readouts
 	    while ((readout = pmFPAviewNextReadout (view, input->fpa, 1)) != NULL) {
-		pmFPAfileIOChecks (config->files, view, PM_FPA_BEFORE);
+		pmFPAfileIOChecks (config, view, PM_FPA_BEFORE);
 		if (! readout->data_exists) { continue; }
 
 		psastroConvert (readout, recipe);
 
-		pmFPAfileIOChecks (config->files, view, PM_FPA_AFTER);
+		pmFPAfileIOChecks (config, view, PM_FPA_AFTER);
 	    }
-	    pmFPAfileIOChecks (config->files, view, PM_FPA_AFTER);
+	    pmFPAfileIOChecks (config, view, PM_FPA_AFTER);
 	}
-	pmFPAfileIOChecks (config->files, view, PM_FPA_AFTER);
+	pmFPAfileIOChecks (config, view, PM_FPA_AFTER);
     }
-    pmFPAfileIOChecks (config->files, view, PM_FPA_AFTER);
+    pmFPAfileIOChecks (config, view, PM_FPA_AFTER);
     psFree (view);
     return true;
Index: /trunk/psastro/src/psastroDataSave.c
===================================================================
--- /trunk/psastro/src/psastroDataSave.c	(revision 7582)
+++ /trunk/psastro/src/psastroDataSave.c	(revision 7583)
@@ -30,28 +30,28 @@
 
     // open/load files as needed
-    pmFPAfileIOChecks (config->files, view, PM_FPA_BEFORE);
+    pmFPAfileIOChecks (config, view, PM_FPA_BEFORE);
 
     while ((chip = pmFPAviewNextChip (view, output->fpa, 1)) != NULL) {
         psTrace (__func__, 4, "Chip %d: %x %x\n", view->chip, chip->file_exists, chip->process);
         if (!chip->process || !chip->file_exists) { continue; }
-	pmFPAfileIOChecks (config->files, view, PM_FPA_BEFORE);
+	pmFPAfileIOChecks (config, view, PM_FPA_BEFORE);
 
 	while ((cell = pmFPAviewNextCell (view, output->fpa, 1)) != NULL) {
             psTrace (__func__, 4, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process);
             if (!cell->process || !cell->file_exists) { continue; }
-	    pmFPAfileIOChecks (config->files, view, PM_FPA_BEFORE);
+	    pmFPAfileIOChecks (config, view, PM_FPA_BEFORE);
 
 	    // process each of the readouts
 	    while ((readout = pmFPAviewNextReadout (view, output->fpa, 1)) != NULL) {
-		pmFPAfileIOChecks (config->files, view, PM_FPA_BEFORE);
+		pmFPAfileIOChecks (config, view, PM_FPA_BEFORE);
 		if (! readout->data_exists) { continue; }
 
-		pmFPAfileIOChecks (config->files, view, PM_FPA_AFTER);
+		pmFPAfileIOChecks (config, view, PM_FPA_AFTER);
 	    }
-	    pmFPAfileIOChecks (config->files, view, PM_FPA_AFTER);
+	    pmFPAfileIOChecks (config, view, PM_FPA_AFTER);
 	}
-	pmFPAfileIOChecks (config->files, view, PM_FPA_AFTER);
+	pmFPAfileIOChecks (config, view, PM_FPA_AFTER);
     }
-    pmFPAfileIOChecks (config->files, view, PM_FPA_AFTER);
+    pmFPAfileIOChecks (config, view, PM_FPA_AFTER);
 
     psFree (view);
Index: /trunk/psastro/src/psastroParseCamera.c
===================================================================
--- /trunk/psastro/src/psastroParseCamera.c	(revision 7582)
+++ /trunk/psastro/src/psastroParseCamera.c	(revision 7583)
@@ -7,5 +7,5 @@
 
     // the input image(s) are required arguments; they define the camera
-    pmFPAfile *input = pmFPAfileFromArgs (&status, config, "PSASTRO.INPUT", "INPUT");
+    pmFPAfile *input = pmFPAfileDefineFromArgs (&status, config, "PSASTRO.INPUT", "INPUT");
     if (!status) { psAbort (__func__, "missing INPUT entry"); }
 
@@ -20,5 +20,5 @@
 
     // these calls bind the I/O handle to the specified fpa
-    pmFPAfileDefine (config->files, config->camera, input->fpa, "PSASTRO.OUTPUT");
+    pmFPAfileDefineOutput (config->files, config->camera, input->fpa, "PSASTRO.OUTPUT");
 
     // supply the output name (from cmd-line) to all output (WRITE) files