Changeset 11351

Timestamp:

Jan 27, 2007, 4:07:20 PM (19 years ago)

Author:

eugene

Message:

minor

File:

• trunk/ppImage/src/ppImagePhotom.c (modified) (3 diffs)

trunk/ppImage/src/ppImagePhotom.c

@@ -5 +5 @@
 # include "ppImage.h"
 
+// the top portion of this function is equivalent to psphotParseCamera,
+// but different in a few important ways.  
 bool ppImagePhotom (pmConfig *config, pmFPAview *view) {
 
@@ -12 +14 @@
 
     psphotModelGroupInit ();
-
-    // select recipe options supplied on command line
-    psMetadata *recipe  = psMetadataLookupPtr (&status, config->recipes, PSPHOT_RECIPE);
-
-    // set default recipe values here
-    // XXX place this in a psphot library function?
-    psMetadataAddStr (recipe, PS_LIST_TAIL, "FITMODE",         PS_META_NO_REPLACE, "default fitting mode", "NONE");
-    psMetadataAddStr (recipe, PS_LIST_TAIL, "BREAK_POINT",     PS_META_NO_REPLACE, "default break point",  "NONE");
-    psMetadataAddF32 (recipe, PS_LIST_TAIL, "ZERO_PT",         PS_META_NO_REPLACE, "default zero point",    25.00);
-    psMetadataAddS32 (recipe, PS_LIST_TAIL, "BACKGROUND.XBIN", PS_META_NO_REPLACE, "default binning",          64);
-    psMetadataAddS32 (recipe, PS_LIST_TAIL, "BACKGROUND.YBIN", PS_META_NO_REPLACE, "default binning",          64);
 
     // find or define a pmFPAfile PSPHOT.INPUT
@@ -39 +30 @@
         outfile->freeLevel = PM_FPA_LEVEL_FPA;
     }
+
+    // if we have requested PSPHOT.SRC (externally supplied sources), attempt to resolve it 
+    if (psMetadataLookupPtr(NULL, config->arguments, "PSPHOT.SRC")) { 
+        pmFPAfileDefineFromArgs (&status, config, "PSPHOT.SRC", "SRC");
+        if (!status) {
+            psError(PSPHOT_ERR_CONFIG, false, "Failed to find/build PSPHOT.SRC");
+            return status;
+        }
+    }
+
+    // select recipe options supplied on command line
+    psMetadata *recipe  = psMetadataLookupPtr (&status, config->recipes, PSPHOT_RECIPE);
+
+    // set default recipe values here
+    // XXX place this in a psphot library function?
+    psMetadataAddStr (recipe, PS_LIST_TAIL, "FITMODE",         PS_META_NO_REPLACE, "default fitting mode", "NONE");
+    psMetadataAddStr (recipe, PS_LIST_TAIL, "BREAK_POINT",     PS_META_NO_REPLACE, "default break point",  "NONE");
+    psMetadataAddF32 (recipe, PS_LIST_TAIL, "ZERO_PT",         PS_META_NO_REPLACE, "default zero point",    25.00);
+    psMetadataAddS32 (recipe, PS_LIST_TAIL, "BACKGROUND.XBIN", PS_META_NO_REPLACE, "default binning",          64);
+    psMetadataAddS32 (recipe, PS_LIST_TAIL, "BACKGROUND.YBIN", PS_META_NO_REPLACE, "default binning",          64);
 
     // determine PHOTCODE from fpa & view, overwrite in recipe