Changeset 17813 for trunk/ppSub/src/ppSubArguments.c

Timestamp:

May 27, 2008, 9:32:16 AM (18 years ago)

Author:

Paul Price

Message:

Determine the PSF, rather than assuming it's the same as one of the inputs. Not yet tested, but I'm hopeful.........

File:

• trunk/ppSub/src/ppSubArguments.c (modified) (3 diffs)

trunk/ppSub/src/ppSubArguments.c

@@ -174 +174 @@
     assert(config);
 
-    psMetadataAddBool(config->arguments, PS_LIST_TAIL, "PHOTOMETRY", 0, "Do photometry?",
-                      psArgumentGet(argc, argv, "-psf") ? true : false);
-    pmConfigFileSetsMD(config->arguments, &argc, argv, "PSPHOT.PSF", "-psf", NULL);
     pmConfigFileSetsMD(config->arguments, &argc, argv, "PPSUB.SOURCES", "-sources", NULL);
 
@@ -214 +211 @@
     psMetadataAddBool(arguments, PS_LIST_TAIL, "-renorm", 0, "Renormalise weights?", false);
     psMetadataAddS32(arguments, PS_LIST_TAIL, "-renorm-width", 0, "Renormalisation width", 0);
+    psMetadataAddBool(arguments, PS_LIST_TAIL, "-photometry", 0, "Perform photometry?", false);
 
     if (argc == 1 || !psArgumentParse(arguments, &argc, argv) || argc != 4) {
@@ -298 +296 @@
     }
 
+    if (psMetadataLookupBool(NULL, arguments, "-photometry") ||
+        psMetadataLookupBool(NULL, recipe, "PHOTOMETRY")) {
+        psMetadataAddBool(config->arguments, PS_LIST_TAIL, "PHOTOMETRY", 0, "Perform photometry?", true);
+    }
+
     // Translate the kernel type
     psString type = psMetadataLookupStr(NULL, arguments, "-type"); // Name of kernel type