Changeset 13593 for trunk/psphot/src

Timestamp:

Jun 1, 2007, 6:16:29 PM (19 years ago)

Author:

Paul Price

Message:

Updating high-level programs to use symbolic names for mask values in the recipes.

Location:

trunk/psphot/src

Files:

• psphot.h (modified) (1 diff)
• psphotMaskReadout.c (modified) (2 diffs)
• psphotReadout.c (modified) (2 diffs)

trunk/psphot/src/psphot.h

@@ -57 +57 @@
 int             pmSourceSortByY (const void **a, const void **b);
 bool            psphotGrowthCurve (pmReadout *readout, pmPSF *psf, bool ignore);
-bool            psphotMaskReadout (pmReadout *readout, psMetadata *recipe);
+bool            psphotMaskReadout (pmReadout *readout, psMetadata *recipe, pmConfig *config);
 void            psphotSourceFreePixels (psArray *sources);
 

trunk/psphot/src/psphotMaskReadout.c

@@ -1 +1 @@
 # include "psphotInternal.h"
 
-bool psphotMaskReadout (pmReadout *readout, psMetadata *recipe) {
-    
+bool psphotMaskReadout (pmReadout *readout, psMetadata *recipe, pmConfig *config) {
+
     bool status;
 
@@ -19 +19 @@
 
     // psImageKeepRegion assumes the region refers to the parent coordinates
-    psImageKeepRegion (readout->mask, keep, "OR", PM_MASK_BAD);
+    psImageKeepRegion (readout->mask, keep, "OR", pmConfigMask("BAD", config));
 
     return true;

trunk/psphot/src/psphotReadout.c

@@ -24 +24 @@
 
     // generate mask & weight images if they don't already exit
-    if ((!readout->mask && !pmReadoutGenerateMask(readout)) ||
+    if ((!readout->mask && !pmReadoutGenerateMask(readout, pmConfigMask("SAT", config),
+                                                  pmConfigMask("BAD", config))) ||
         (!readout->weight && !pmReadoutGenerateWeight(readout, true))) {
         psError (PSPHOT_ERR_CONFIG, false, "trouble creating mask and/or weight");
@@ -37 +38 @@
 
     // I have a valid mask, now mask in the analysis region of interest
-    psphotMaskReadout (readout, recipe);
+    psphotMaskReadout (readout, recipe, config);
 
     // run a single-model test if desired