Changeset 35539 for branches/eam_branches/ipp-20130419/pswarp/src/pswarpOptions.c

Timestamp:

May 9, 2013, 10:00:41 AM (13 years ago)

Author:

eugene

Message:

add source for output, output.bkgmodel, and psphotInput in psphotParseCamera; do not activate PSPHOT.INPUT; if a background model is not supplied do not attempt to generate one; generate the metadata for the output bkgmodel

File:

• branches/eam_branches/ipp-20130419/pswarp/src/pswarpOptions.c (modified) (1 diff)

branches/eam_branches/ipp-20130419/pswarp/src/pswarpOptions.c

@@ -70 +70 @@
     }
 
-    bool doBKG = psMetadataLookupBool(&status,recipe, "BACKGROUND.MODEL"); ///< Generate the warped background model?
+    // BACKGROUND.MODEL gets set in config->arguments (to false) if no input model is found
+    bool doBKG = psMetadataLookupBool(&status,config->arguments, "BACKGROUND.MODEL"); ///< Generate the warped background model?
     if (!status) {
-      doBKG = false;
+      // if it is not in config->arguments, look in recipe
+      doBKG = psMetadataLookupBool(&status,recipe, "BACKGROUND.MODEL"); ///< Generate the warped background model?
+      if (!status) {
+        doBKG = false;
       psWarning("BACKGROUND.MODEL is not set in the %s recipe -- defaulting to FALSE.", PSWARP_RECIPE);
+      }
     }
+
     int bkgXgrid = psMetadataLookupS32(&status,recipe, "BKG.XGRID"); ///< Xsize of background model
     if (!status) {