Changeset 28029 for branches/czw_branch/20100427/psphot/src/psphotMaskReadout.c

Timestamp:

May 19, 2010, 2:08:46 PM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/czw_branch/20100427/psphot

Files:

• . (modified) (1 prop)
• src/psphotMaskReadout.c (modified) (3 diffs)

branches/czw_branch/20100427/psphot/src/psphotMaskReadout.c

@@ -1 +1 @@
 # include "psphotInternal.h"
 
-bool psphotSetMaskAndVariance (pmConfig *config, const pmFPAview *view) {
+bool psphotSetMaskAndVariance (pmConfig *config, const pmFPAview *view, const char *filerule) {
 
     bool status = false;
@@ -16 +16 @@
 
         // Generate the mask and weight images, including the user-defined analysis region of interest
-        if (!psphotSetMaskAndVarianceReadout (config, view, "PSPHOT.INPUT", i, recipe)) {
+        if (!psphotSetMaskAndVarianceReadout (config, view, filerule, i, recipe)) {
             psError (PSPHOT_ERR_CONFIG, false, "failed to generate mask for PSPHOT.INPUT entry %d", i);
             return false;
@@ -25 +25 @@
 
 // generate mask and variance if not defined, additional mask for restricted subregion
-bool psphotSetMaskAndVarianceReadout (pmConfig *config, const pmFPAview *view, const char *filename, int index, psMetadata *recipe) {
+bool psphotSetMaskAndVarianceReadout (pmConfig *config, const pmFPAview *view, const char *filerule, int index, psMetadata *recipe) {
 
     bool status;
 
-    pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PSPHOT.INPUT", index); // File of interest
+    pmFPAfile *file = pmFPAfileSelectSingle(config->files, filerule, index); // File of interest
     psAssert (file, "missing file?");