Changeset 13416

Timestamp:

May 17, 2007, 2:48:42 PM (19 years ago)

Author:

Paul Price

Message:

Fixing names for input PSF file.

Location:

trunk/psphot/src

Files:

• psphotArguments.c (modified) (1 diff)
• psphotDefineFiles.c (modified) (1 diff)
• psphotLoadPSF.c (modified) (1 diff)

trunk/psphot/src/psphotArguments.c

@@ -97 +97 @@
     // if these command-line options are supplied, load the file name lists into config->arguments
     // override any configuration-specified source for these files
-    // 
+    //
     pmConfigFileSetsMD (config->arguments, &argc, argv, "MASK",   "-mask",   "-masklist");
     pmConfigFileSetsMD (config->arguments, &argc, argv, "WEIGHT", "-weight", "-weightlist");
-    pmConfigFileSetsMD (config->arguments, &argc, argv, "PSF",    "-psf",    "-psflist");
+    pmConfigFileSetsMD (config->arguments, &argc, argv, "PSPHOT.PSF", "-psf", "-psflist");
     pmConfigFileSetsMD (config->arguments, &argc, argv, "SRC",    "-src",    "-srclist");
 

trunk/psphot/src/psphotDefineFiles.c

@@ -98 +98 @@
     if (psMetadataLookupPtr(NULL, config->arguments, "PSPHOT.PSF")) {
         status = false;
-        pmFPAfileDefineFromArgs (&status, config, "PSPHOT.PSF.LOAD", "PSPHOT.PSF");
+        pmFPAfileBindFromArgs(&status, input, config, "PSPHOT.PSF.LOAD", "PSPHOT.PSF");
+//        pmFPAfileDefineFromArgs (&status, config, "PSPHOT.PSF.LOAD", "PSPHOT.PSF");
         if (!status) {
-            psError(PSPHOT_ERR_CONFIG, false, "Failed to find/build PSPHOT.SRC");
+            psError(PSPHOT_ERR_CONFIG, false, "Failed to find/build PSPHOT.PSF.LOAD");
             return status;
         }

trunk/psphot/src/psphotLoadPSF.c

@@ -5 +5 @@
 
     // find the currently selected readout
-    pmReadout  *readout = pmFPAfileThisReadout (config->files, view, "PSPHOT.LOAD.PSF");
+    pmReadout  *readout = pmFPAfileThisReadout (config->files, view, "PSPHOT.PSF.LOAD");
     if (!readout) return NULL;