Changeset 18555 for trunk/psphot/src/psphotPSFConvModel.c

Timestamp:

Jul 15, 2008, 10:25:50 AM (18 years ago)

Author:

eugene

Message:

re-org and cleanup of the mask bits to make it consistent with the pmConfigMaskSetBits concepts; ensure mark and mask are correctly used

File:

• trunk/psphot/src/psphotPSFConvModel.c (modified) (2 diffs)

trunk/psphot/src/psphotPSFConvModel.c

@@ -9 +9 @@
 // modelConv to contain the fitted parameters, and the modelFlux to contain the 
 // convolved model image.
-pmModel *psphotPSFConvModel (pmReadout *readout, pmSource *source, pmModelType modelType, psMaskType maskVal, int psfSize) {
+pmModel *psphotPSFConvModel (pmReadout *readout, pmSource *source, pmModelType modelType, psMaskType maskVal, psMaskType markVal, int psfSize) {
     
+    // maskVal is used to test for rejected pixels, and must include markVal
+    maskVal |= markVal;
+
     // make sure we save a cached copy of the psf flux
     pmSourceCachePSF (source, maskVal);
@@ -65 +68 @@
     psVector *dparams = modelConv->dparams;
 
-    psphotCheckRadiusEXT (readout, source, modelConv);
+    psphotCheckRadiusEXT (readout, source, modelConv, markVal);
 
     // create the minimization constraints