Changeset 19017

Timestamp:

Aug 11, 2008, 5:11:08 PM (18 years ago)

Author:

Paul Price

Message:

Cleaning up photometry triggering.

Location:

trunk/ppStack/src

Files:

• ppStackArguments.c (modified) (2 diffs)
• ppStackCamera.c (modified) (1 diff)

trunk/ppStack/src/ppStackArguments.c

@@ -195 +195 @@
     valueArgStr(arguments, "-stats", "STATS", arguments);
 
-    psMetadataAddBool(arguments, PS_LIST_TAIL, "PHOTOMETRY", PS_META_REPLACE,
-                      "Do photometry on stacked image?",
-                      psMetadataLookupBool(NULL, arguments, "-photometry"));
-
     return true;
 }
@@ -234 +230 @@
     if (psMetadataLookupBool(NULL, arguments, "-photometry") ||
         psMetadataLookupBool(NULL, recipe, "PHOTOMETRY")) {
-        psMetadataAddBool(arguments, PS_LIST_TAIL, "PHOTOMETRY", PS_META_REPLACE,
+        psMetadataAddBool(recipe, PS_LIST_TAIL, "PHOTOMETRY", PS_META_REPLACE,
                           "Do photometry on stacked image?", true);
     }

trunk/ppStack/src/ppStackCamera.c

@@ -360 +360 @@
     bool mdok = false;
     bool doPhotom = psMetadataLookupBool(&mdok, recipe, "PHOTOMETRY") ||
-        psMetadataLookupBool(&mdok, config->arguments, "PHOTOMETRY"); // perform 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