Index: trunk/psphot/src/psphotDefineFiles.c
===================================================================
--- trunk/psphot/src/psphotDefineFiles.c	(revision 14212)
+++ trunk/psphot/src/psphotDefineFiles.c	(revision 14892)
@@ -16,5 +16,5 @@
 
     // the output sources are carried on the input->fpa structures
-    pmFPAfile *outsources = pmFPAfileDefineOutput (config, input->fpa, "PSPHOT.OUTPUT");
+    pmFPAfile *outsources = pmFPAfileDefineOutputFromFile (config, input, "PSPHOT.OUTPUT");
     if (!outsources) {
         psError(PSPHOT_ERR_CONFIG, false, "Cannot find a rule for PSPHOT.OUTPUT");
@@ -27,15 +27,15 @@
     if (!psMetadataLookupBool (NULL, recipe, "SAVE.OUTPUT")) {
         pmFPAfileActivate (config->files, false, "PSPHOT.OUTPUT");
-	outsources->save = false;
+        outsources->save = false;
     }
 
     // optionally save the residual image
     if (psMetadataLookupBool(NULL, recipe, "SAVE.RESID")) {
-        pmFPAfile *output = pmFPAfileDefineOutput (config, input->fpa, "PSPHOT.RESID");
-	if (!output) {
+        pmFPAfile *output = pmFPAfileDefineOutputFromFile (config, input, "PSPHOT.RESID");
+        if (!output) {
             psError(PSPHOT_ERR_CONFIG, false, "Cannot find a rule for PSPHOT.RESID");
             return false;
         }
-	output->save = true;
+        output->save = true;
     }
     // optionally save the background model (small FITS image)
@@ -43,10 +43,10 @@
         int DX = psMetadataLookupS32 (&status, recipe, "BACKGROUND.XBIN");
         int DY = psMetadataLookupS32 (&status, recipe, "BACKGROUND.YBIN");
-        pmFPAfile *output = pmFPAfileDefineFromFPA (config, input->fpa, DX, DY, "PSPHOT.BACKMDL");
-	if (!output) {
+        pmFPAfile *output = pmFPAfileDefineFromFile (config, input, DX, DY, "PSPHOT.BACKMDL");
+        if (!output) {
             psError(PSPHOT_ERR_CONFIG, false, "Cannot find a rule for PSPHOT.BACKMDL");
             return false;
         }
-	output->save = true;
+        output->save = true;
     }
     // optionally save the background model's standard deviation (small FITS image)
@@ -54,37 +54,37 @@
         int DX = psMetadataLookupS32 (&status, recipe, "BACKGROUND.XBIN");
         int DY = psMetadataLookupS32 (&status, recipe, "BACKGROUND.YBIN");
-        pmFPAfile *output = pmFPAfileDefineFromFPA (config, input->fpa, DX, DY, "PSPHOT.BACKMDL.STDEV");
-	if (!output) {
+        pmFPAfile *output = pmFPAfileDefineFromFile (config, input, DX, DY, "PSPHOT.BACKMDL.STDEV");
+        if (!output) {
             psError(PSPHOT_ERR_CONFIG, false, "Cannot find a rule for PSPHOT.BACKMDL.STDEV");
             return false;
         }
-	output->save = true;
+        output->save = true;
     }
     // optionally save the full background image
     if (psMetadataLookupBool(NULL, recipe, "SAVE.BACKGND")) {
-        pmFPAfile *output = pmFPAfileDefineFromFPA (config, input->fpa,  1,  1, "PSPHOT.BACKGND");
-	if (!output) {
+        pmFPAfile *output = pmFPAfileDefineFromFile (config, input,  1,  1, "PSPHOT.BACKGND");
+        if (!output) {
             psError(PSPHOT_ERR_CONFIG, false, "Cannot find a rule for PSPHOT.BACKGND");
             return false;
         }
-	output->save = true;
+        output->save = true;
     }
     // optionally save the background-subtracted image
     if (psMetadataLookupBool(NULL, recipe, "SAVE.BACKSUB")) {
-        pmFPAfile *output = pmFPAfileDefineFromFPA (config, input->fpa,  1,  1, "PSPHOT.BACKSUB");
-	if (!output) {
+        pmFPAfile *output = pmFPAfileDefineFromFile (config, input,  1,  1, "PSPHOT.BACKSUB");
+        if (!output) {
             psError(PSPHOT_ERR_CONFIG, false, "Cannot find a rule for PSPHOT.");
             return false;
         }
-	output->save = true;
+        output->save = true;
     }
     // optionally save the PSF Model
     if (psMetadataLookupBool(NULL, recipe, "SAVE.PSF")) {
-        pmFPAfile *output = pmFPAfileDefineOutput (config, input->fpa, "PSPHOT.PSF.SAVE");
-	if (!output) {
+        pmFPAfile *output = pmFPAfileDefineOutputFromFile (config, input, "PSPHOT.PSF.SAVE");
+        if (!output) {
             psError(PSPHOT_ERR_CONFIG, false, "Cannot find a rule for PSPHOT.PSF.SAVE");
             return false;
         }
-	output->save = true;
+        output->save = true;
     }
 
@@ -92,23 +92,23 @@
     // allow specific plots only
     if (psMetadataLookupBool(NULL, recipe, "SAVE.PLOTS")) {
-	pmFPAfile *output = NULL;
-        output = pmFPAfileDefineOutput (config, input->fpa, "SOURCE.PLOT.MOMENTS");
-	if (!output) {
+        pmFPAfile *output = NULL;
+        output = pmFPAfileDefineOutputFromFile (config, input, "SOURCE.PLOT.MOMENTS");
+        if (!output) {
             psError(PSPHOT_ERR_CONFIG, false, "Cannot find a rule for SOURCE.PLOT.MOMENTS");
             return false;
         }
-	output->save = true;
-        output = pmFPAfileDefineOutput (config, input->fpa, "SOURCE.PLOT.PSFMODEL");
-	if (!output) {
+        output->save = true;
+        output = pmFPAfileDefineOutputFromFile (config, input, "SOURCE.PLOT.PSFMODEL");
+        if (!output) {
             psError(PSPHOT_ERR_CONFIG, false, "Cannot find a rule for SOURCE.PLOT.PSFMODEL");
             return false;
         }
-	output->save = true;
-        output = pmFPAfileDefineOutput (config, input->fpa, "SOURCE.PLOT.APRESID");
-	if (!output) {
+        output->save = true;
+        output = pmFPAfileDefineOutputFromFile (config, input, "SOURCE.PLOT.APRESID");
+        if (!output) {
             psError(PSPHOT_ERR_CONFIG, false, "Cannot find a rule for SOURCE.PLOT.APRESID");
             return false;
         }
-	output->save = true;
+        output->save = true;
     }