Changeset 13225 for trunk/psphot/src/psphotDefineFiles.c

Timestamp:

May 3, 2007, 4:51:40 PM (19 years ago)

Author:

eugene

Message:

load PSF from external file, load sources file external file, move default values to master recipe

File:

• trunk/psphot/src/psphotDefineFiles.c (modified) (2 diffs)

trunk/psphot/src/psphotDefineFiles.c

@@ -87 +87 @@
     }
 
+    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 +114 @@
     // 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