Changeset 29904 for branches/eam_branches/ipp-20101103/psphot/src/psphotMaskReadout.c

Timestamp:

Dec 3, 2010, 2:28:34 AM (16 years ago)

Author:

eugene

Message:

modify psphotReadout and equivalent to accept a filerule argument (allow filerules other than PSPHOT.INPUT)

File:

• branches/eam_branches/ipp-20101103/psphot/src/psphotMaskReadout.c (modified) (2 diffs)

branches/eam_branches/ipp-20101103/psphot/src/psphotMaskReadout.c

@@ -9 +9 @@
     psAssert (recipe, "missing recipe?");
 
-    int num = psMetadataLookupS32 (&status, config->arguments, "PSPHOT.INPUT.NUM");
-    psAssert (status, "programming error: must define PSPHOT.INPUT.NUM");
+    int num = psphotFileruleCount(config, filerule);
 
     // loop over the available readouts
@@ -17 +16 @@
         // Generate the mask and weight images, including the user-defined analysis region of interest
         if (!psphotSetMaskAndVarianceReadout (config, view, filerule, i, recipe)) {
-            psError (PSPHOT_ERR_CONFIG, false, "failed to generate mask for PSPHOT.INPUT entry %d", i);
+            psError (PSPHOT_ERR_CONFIG, false, "failed to generate mask for %s entry %d", filerule, i);
             return false;
         }