Index: trunk/psphot/src/psphotDefineFiles.c
===================================================================
--- trunk/psphot/src/psphotDefineFiles.c	(revision 13216)
+++ trunk/psphot/src/psphotDefineFiles.c	(revision 13225)
@@ -87,4 +87,20 @@
     }
 
+    if (psMetadataLookupPtr(NULL, config->arguments, "SRC")) { 
+	pmFPAfileDefineFromArgs (&status, config, "PSPHOT.INPUT.CMF", "SRC");
+	if (!status) {
+	    psError(PSPHOT_ERR_CONFIG, false, "Failed to find/build PSPHOT.INPUT.CMF");
+	    return status;
+	}
+    }
+
+    if (psMetadataLookupPtr(NULL, config->arguments, "PSF")) { 
+	pmFPAfileDefineFromArgs (&status, config, "PSPHOT.PSF.LOAD", "PSF");
+	if (!status) {
+	    psError(PSPHOT_ERR_CONFIG, false, "Failed to find/build PSPHOT.SRC");
+	    return status;
+	}
+    }
+
     // XXX add in example PSF image thumbnails
     // pmFPAfileConstruct (config->files, format, config->camera, "PSPHOT.PSF_SAMPLE");
@@ -98,11 +114,4 @@
     // before it is added back into the code.
 # if (0)    
-    if (psMetadataLookupPtr(NULL, config->arguments, "SRC")) { 
-	pmFPAfileDefineFromArgs (&status, config, "PSPHOT.SRC", "SRC");
-	if (!status) {
-	    psError(PSPHOT_ERR_CONFIG, false, "Failed to find/build PSPHOT.SRC");
-	    return status;
-	}
-    }
     // optionally load the PSF Model and/or fixed stars
     // XXX add this back in later