Changeset 18653

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.

Location:

trunk

Files:

• ppStack/src/ppStackArguments.c (modified) (1 diff)
• ppStack/src/ppStackCamera.c (modified) (1 diff)
• ppSub/src/ppSubArguments.c (modified) (1 diff)
• ppSub/src/ppSubCamera.c (modified) (1 diff)

trunk/ppStack/src/ppStackArguments.c

@@ -194 +194 @@
     valueArgStr(arguments, "-stats", "STATS", config->arguments);
 
+    if (psMetadataLookupBool(NULL, arguments, "-photometry")) {
+        psMetadataAddBool(config->arguments, PS_LIST_TAIL, "PHOTOMETRY", 0,
+                          "Do photometry on stacked image?", true);
+    }
+
     return true;
 }

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

trunk/ppSub/src/ppSubArguments.c

@@ -240 +240 @@
     }
 
+    if (psMetadataLookupBool(NULL, config->arguments, "-photometry")) {
+        psMetadataAddBool(config->arguments, PS_LIST_TAIL, "PHOTOMETRY", 0, "Perform photometry?", true);
+    }
+
     return true;
 }

trunk/ppSub/src/ppSubCamera.c

@@ -136 +136 @@
     }
 
+    psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes, PPSUB_RECIPE); // Recipe for ppSim
+    if (!recipe) {
+        psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find recipe %s", PPSUB_RECIPE);
+        return false;
+    }
+
     // psPhot input
-    if (psMetadataLookupBool(NULL, config->arguments, "PHOTOMETRY")) {
+    if (psMetadataLookupBool(NULL, config->arguments, "PHOTOMETRY") ||
+        psMetadataLookupBool(NULL, recipe, "PHOTOMETRY") ) {
+        psMetadataAddBool(config->arguments, PS_LIST_TAIL, "PHOTOMETRY", 0, "Perform photometry?", true);
         psphotModelClassInit ();        // load implementation-specific models
         pmFPAfile *psphot = pmFPAfileDefineFromFPA(config, output->fpa, 1, 1, "PSPHOT.INPUT");