Changeset 26542 for branches/eam_branches/20091201/psphot/src/psphotMaskReadout.c

Timestamp:

Jan 7, 2010, 5:07:54 PM (17 years ago)

Author:

eugene

Message:

upgrade psphot functions to work in the stack context (see doc/stack.txt)

File:

• branches/eam_branches/20091201/psphot/src/psphotMaskReadout.c (modified) (4 diffs)

branches/eam_branches/20091201/psphot/src/psphotMaskReadout.c

@@ -2 +2 @@
 
 // generate mask and variance if not defined, additional mask for restricted subregion
-bool psphotSetMaskAndVariance (pmConfig *config, pmReadout *readout, psMetadata *recipe) {
+bool psphotSetMaskAndVarianceReadout (pmConfig *config, pmReadout *readout, psMetadata *recipe) {
 
     bool status;
@@ -76 +76 @@
 }
 
-bool psphotStackSetMaskAndVariance (pmConfig *config, const pmFPAview *view, psMetadata *recipe) {
+bool psphotSetMaskAndVariance (pmConfig *config, const pmFPAview *view, psMetadata *recipe) {
 
-    int num = psMetadataAddS32 (&status, config->arguments, "INPUTS.NUM");
-    psAbort (!status, "programming error: must define INPUTS.NUM");
+    bool status = false;
+
+    int num = psMetadataLookupS32 (&status, config->arguments, "PSPHOT.INPUT.NUM");
+    psAssert (status, "programming error: must define PSPHOT.INPUT.NUM");
 
     // loop over the available readouts
@@ -85 +87 @@
 
         pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PSPHOT.INPUT", i); // File of interest
+        PS_ASSERT_PTR_NON_NULL (file, false);
 
         // find the currently selected readout
@@ -91 +94 @@
 
         // Generate the mask and weight images, including the user-defined analysis region of interest
-        psphotSetMaskAndVariance (config, readout, recipe);
+        if (!psphotSetMaskAndVarianceReadout (config, readout, recipe)) {
+            psError (PSPHOT_ERR_CONFIG, false, "failed to generate mask for PSPHOT.INPUT entry %d", i);
+            return false;
+        }
 
         // display the image, weight, mask (ch 1,2,3)
         psphotVisualShowImage (readout);
     }
-
+    return true;
 }