Changeset 13035 for trunk/psphot/src/psphotChoosePSF.c

Timestamp:

Apr 25, 2007, 3:35:50 PM (19 years ago)

Author:

eugene

Message:

incorporating changes from eam_02_branch (pmSourceAdd/Sub, modified API for pmModelAdd, cached models)

File:

• trunk/psphot/src/psphotChoosePSF.c (modified) (1 diff)

trunk/psphot/src/psphotChoosePSF.c

@@ -239 +239 @@
 
             // set the mask and subtract the PSF model
-            psImageKeepCircle (source->mask, x, y, RADIUS, "OR", PM_MASK_MARK);
-            pmModelSub (source->pixels, source->mask, source->modelPSF, false, false);
-            psImageKeepCircle (source->mask, x, y, RADIUS, "AND", PS_NOT_U8(PM_MASK_MARK));
+            // XXX should we be using maskObj? should we be unsetting the mask?
+            // use pmModelSub because modelFlux has not been generated
+            assert (source->maskObj);
+            psImageKeepCircle (source->maskObj, x, y, RADIUS, "OR", PM_MASK_MARK);
+            pmModelSub (source->pixels, source->maskObj, source->modelPSF, PM_MODEL_OP_FULL);
+            psImageKeepCircle (source->maskObj, x, y, RADIUS, "AND", PS_NOT_U8(PM_MASK_MARK));
         }