Changeset 18653 for trunk/ppStack/src/ppStackCamera.c

Timestamp:

Jul 21, 2008, 4:01:59 PM (18 years ago)

Author:

Paul Price

Message:

Need to check to see if photometry is turned on both before AND after defining the camera --- because it can be turned on on the command line or in a top-level recipe, or in a camera-dependent recipe.

File:

• trunk/ppStack/src/ppStackCamera.c (modified) (1 diff)

trunk/ppStack/src/ppStackCamera.c

@@ -350 +350 @@
     }
 
+    psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes, PPSTACK_RECIPE); // Recipe for ppSim
+    if (!recipe) {
+        psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find recipe %s", PPSTACK_RECIPE);
+        return false;
+    }
 
     // For photometry, we operate on the chip-mosaicked image
     // we create a copy of the mosaicked image for psphot so we can write out a clean image
     bool mdok = false;
-    bool doPhotom = psMetadataLookupBool(&mdok, config->arguments, "PHOTOMETRY"); // perform photometry
+    bool doPhotom = psMetadataLookupBool(&mdok, recipe, "PHOTOMETRY") ||
+        psMetadataLookupBool(&mdok, config->arguments, "PHOTOMETRY"); // perform photometry
     if (doPhotom) {
         // This file, PSPHOT.INPUT, is just used as a carrier; output files (eg, PSPHOT.RESID) are defined by