Changeset 14834

Timestamp:

Sep 13, 2007, 5:39:58 PM (19 years ago)

Author:

Paul Price

Message:

Cleaning up code to produce photometry. Moving the call to psphot into ppStackReadout.

Location:

trunk/ppStack/src

Files:

• ppStackArguments.c (modified) (2 diffs)
• ppStackCamera.c (modified) (1 diff)
• ppStackLoop.c (modified) (3 diffs)
• ppStackReadout.c (modified) (4 diffs)

trunk/ppStack/src/ppStackArguments.c

@@ -114 +114 @@
     psMetadataAddU8(arguments,  PS_LIST_TAIL, "-mask-blank", 0, "Mask value for blank region", 0);
     psMetadataAddF32(arguments, PS_LIST_TAIL, "-threshold-mask", 0, "Threshold for mask deconvolution", NAN);
-
-    // XXX I want to get this from the recipe as well.  (same for everything else...)
-    psMetadataAddBool(arguments, PS_LIST_TAIL, "-photom", 0, "Mask value for blank region", FALSE);
+    psMetadataAddBool(arguments, PS_LIST_TAIL, "-photometry", 0, "Do photometry on stacked image?", false);
 
     if (argc == 1 || !psArgumentParse(arguments, &argc, argv) || argc != 3) {
@@ -165 +163 @@
     VALUE_ARG_RECIPE_FLOAT("-threshold-mask", "THRESHOLD.MASK", F32);
 
+    if (psMetadataLookupBool(NULL, arguments, "-photometry") ||
+        psMetadataLookupBool(NULL, recipe, "PHOTOMETRY")) {
+        psMetadataAddBool(config->arguments, PS_LIST_TAIL, "PHOTOMETRY", 0,
+                          "Do photometry on stacked image?", true);
+    }
+
     psTrace("ppStack", 1, "Done reading command-line arguments\n");
     psFree(arguments);

trunk/ppStack/src/ppStackCamera.c

@@ -229 +229 @@
     // 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, "PHOTOM"); // perform photometry
+    bool doPhotom = psMetadataLookupBool(&mdok, config->arguments, "PHOTOMETRY"); // perform photometry
     if (doPhotom) {
-        // this file is just used as a carrier; output files (eg, PSPHOT.RESID) are defined by
+        // This file, PSPHOT.INPUT, is just used as a carrier; output files (eg, PSPHOT.RESID) are defined by
         // psphotDefineFiles
-        pmFPAfile *psphotInput = pmFPAfileDefineFromFPA (config, output->fpa, 1, 1, "PSPHOT.INPUT");
-        PS_ASSERT (psphotInput, false);
-
-        // define associated psphot input/output files
-        if (!psphotDefineFiles (config, psphotInput)) {
-            psError(PSPHOT_ERR_CONFIG, false, "Trouble defining the additional input/output files for psphot");
+        pmFPAfile *psphotInput = pmFPAfileDefineFromFPA(config, output->fpa, 1, 1, "PSPHOT.INPUT");
+        if (!psphotInput) {
+            psError(PS_ERR_IO, false, _("Unable to generate output file from PSPHOT.INPUT"));
+            return false;
+        }
+
+        // Define associated psphot input/output files
+        if (!psphotDefineFiles(config, psphotInput)) {
+            psError(PSPHOT_ERR_CONFIG, false,
+                    "Trouble defining the additional input/output files for psphot");
             return false;
         }

trunk/ppStack/src/ppStackLoop.c

@@ -8 +8 @@
 #include <psmodules.h>
 #include <ppStats.h>
-#include <psphot.h>
 
 #include "ppStack.h"
@@ -38 +37 @@
         return false;
     }
-
-    bool doPhotom = psMetadataLookupBool(&mdok, config->arguments, "PHOTOM"); // perform photometry
 
     pmFPAview *view = pmFPAviewAlloc(0); // Pointer into FPA hierarchy
@@ -83 +80 @@
                 }
 
-                if (doPhotom) {
-                  if (!psphotReadout (config, view)) {
-                    psError(psErrorCodeLast(), false, "failure in psphotReadout for stacked image\n");
-                    return false;
-                  }
-                }
-
                 if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {
                     return false;

trunk/ppStack/src/ppStackReadout.c

@@ -6 +6 @@
 #include <pslib.h>
 #include <psmodules.h>
+#include <psphot.h>
 
 #include "ppStack.h"
@@ -18 +19 @@
 {
     // Get the recipe values
+    bool mdok;                          // Status of MD lookup
     int iter = psMetadataLookupS32(NULL, config->arguments, "ITER"); // Rejection iterations
     float combineRej = psMetadataLookupF32(NULL, config->arguments, "COMBINE.REJ"); // Combination threshold
@@ -23 +25 @@
     psMaskType maskBlank = psMetadataLookupU8(NULL, config->arguments, "MASK.BLANK"); // Mask for blank reg.
     float threshold = psMetadataLookupF32(NULL, config->arguments, "THRESHOLD.MASK"); // Threshold for mask deconvolution
+    bool photometry = psMetadataLookupBool(&mdok, config->arguments, "PHOTOMETRY"); // Perform photometry?
 
     // Get the output target
@@ -317 +320 @@
     psFree(cellList);
 
+    if (photometry && !psphotReadout(config, view)) {
+        psError(psErrorCodeLast(), false, "Unable to perform photometry on stacked image.\n");
+        return false;
+    }
+
+
+
+
     psFree(stack);
     psFree(outRO);                      // Drop reference