Changeset 35377

Timestamp:

Apr 9, 2013, 11:04:18 AM (13 years ago)

Author:

eugene

Message:

if variance image is missing (and not generated), limp along as best we can

File:

• branches/eam_branches/ipp-20130307/psphot/src/psphotMakeResiduals.c (modified) (1 diff)

branches/eam_branches/ipp-20130307/psphot/src/psphotMakeResiduals.c

@@ -105 +105 @@
         if (model == NULL) continue;  // model must be defined
 
-        psImage *image  = psImageCopy (NULL, source->pixels,   PS_TYPE_F32);
-        psImage *variance = psImageCopy (NULL, source->variance,   PS_TYPE_F32);
-        psImage *mask   = psImageCopy (NULL, source->maskView, PS_TYPE_IMAGE_MASK);
+        psImage *image    = psImageCopy (NULL, source->pixels,     PS_TYPE_F32);
+        psImage *mask     = psImageCopy (NULL, source->maskView ? source->maskView : source->maskObj,  PS_TYPE_IMAGE_MASK);
+        psImage *variance = psImageCopy (NULL, source->variance ? source->variance : source->pixels,   PS_TYPE_F32);
         pmModelSub (image, mask, model, PM_MODEL_OP_FUNC, maskVal);