Changeset 38543

Timestamp:

Jun 25, 2015, 12:34:10 PM (11 years ago)

Author:

bills

Message:

Sometimes modelEXT is set even though there is not a valid psf model. Handle this case

File:

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

trunk/psphot/src/psphotMergeSources.c

@@ -1002 +1002 @@
                 sourceOut->tmpFlags &= ~PM_SOURCE_TMPF_SUBTRACTED;
             } else {
-                if (sourceSrc->modelFlux) {
-                    bool isPSF = false;
-                    pmModel *model = pmSourceGetModel (&isPSF, sourceOut);
+                bool isPSF = false;
+                pmModel *model = pmSourceGetModel (&isPSF, sourceOut);
+                if (model && sourceSrc->modelFlux) {
                     if (model->isPCM) {
                         pmPCMdata *pcm = pmPCMinit (sourceOut, fitOptions, model, maskVal, psfSize);