Changeset 19962

Timestamp:

Oct 7, 2008, 2:07:16 PM (18 years ago)

Author:

Paul Price

Message:

Adding hook to setup psphot visualisation.

Location:

trunk/ppSub/src

Files:

• ppSubArguments.c (modified) (3 diffs)
• ppSubReadout.c (modified) (1 diff)

trunk/ppSub/src/ppSubArguments.c

@@ -7 +7 @@
 #include <pslib.h>
 #include <psmodules.h>
+#include <psphot.h>
 
 #include "ppSub.h"
@@ -172 +173 @@
 {
     assert(config);
+
+    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;
+    }
+
+    {
+        int arg;                        // Argument Number
+        if ((arg = psArgumentGet(argc, argv, "-psphot-visual"))) {
+            psArgumentRemove(arg, &argc, argv);
+            psMetadataAddBool(recipe, PS_LIST_TAIL, "PSPHOT.VISUAL", 0, "Visual guide to psphot?", true);
+        }
+    }
 
     pmConfigFileSetsMD(config->arguments, &argc, argv, "PPSUB.SOURCES", "-sources", NULL);
@@ -249 +264 @@
     }
 
-    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;
-    }
-
     if (psMetadataLookupBool(NULL, arguments, "-photometry")) {
         psMetadataAddBool(recipe, PS_LIST_TAIL, "PHOTOMETRY", PS_META_REPLACE, "Perform photometry?", true);

trunk/ppSub/src/ppSubReadout.c

@@ -512 +512 @@
         psFree(psf);
 
+        if (psMetadataLookupBool(&mdok, recipe, "PSPHOT.VISUAL")) {
+            psphotSetVisual(true);
+        }
+
         // Need to ensure aperture residual is not calculated
-        psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes, PSPHOT_RECIPE); // Recipe
-        psMetadataItem *item = psMetadataLookup(recipe, "MEASURE.APTREND"); // Item determining aptrend
+        psMetadata *psphotRecipe = psMetadataLookupMetadata(NULL, config->recipes, PSPHOT_RECIPE); // Recipe
+        psMetadataItem *item = psMetadataLookup(psphotRecipe, "MEASURE.APTREND"); // Item determining aptrend
         if (!item) {
             psWarning("Unable to find MEASURE.APTREND in psphot recipe");