Changeset 30771

Timestamp:

Mar 1, 2011, 12:44:35 PM (15 years ago)

Author:

eugene

Message:

skip sources without models

Location:

branches/eam_branches/ipp-20110213/psphot/src

Files:

• psphotMergeSources.c (modified) (1 diff)
• psphotReplaceUnfit.c (modified) (2 diffs)

branches/eam_branches/ipp-20110213/psphot/src/psphotMergeSources.c

@@ -613 +613 @@
 
       // allocate image, weight, mask for the new image for each peak
-      pmSourceRedefinePixels (sourceOut, readoutOut, sourceOut->peak->x, sourceOut->peak->y, sourceOut->modelPSF->fitRadius);
+      if (sourceOut->modelPSF) {
+        pmSourceRedefinePixels (sourceOut, readoutOut, sourceOut->peak->x, sourceOut->peak->y, sourceOut->modelPSF->fitRadius);
+      }
 
       // child sources have not been subtracted in this image, but this flag may be raised if

branches/eam_branches/ipp-20110213/psphot/src/psphotReplaceUnfit.c

@@ -155 +155 @@
       // sources have not yet been subtracted in this image (but this flag may be raised)
       source->tmpFlags &= ~PM_SOURCE_TMPF_SUBTRACTED;
+      if (!source->modelPSF) continue;
 
       float Xo = source->modelPSF->params->data.F32[PM_PAR_XPOS];
@@ -231 +232 @@
       bool isPSF = false;
       pmModel *model = pmSourceGetModel(&isPSF, source);
+      if (!model) continue;
+
       float radius = model->fitRadius; // save for future use below