Changeset 33444

Timestamp:

Mar 8, 2012, 3:59:55 PM (14 years ago)

Author:

bills

Message:

when merging sources and copying a source to a child if there is
no model PSF then there will be no pixels on the destination source.
When this happens clear the PM_SOURCE_TMPF_CANDIDATE_PSFSTAR bit
in source->tmpFlags so that we don't try and use the source for
psf fitting

File:

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

trunk/psphot/src/psphotMergeSources.c

@@ -677 +677 @@
       if (sourceOut->modelPSF) {
         pmSourceRedefinePixels (sourceOut, readoutOut, sourceOut->peak->x, sourceOut->peak->y, sourceOut->modelPSF->fitRadius);
-      }
+      } else {
+        // if we have no pixels we can't use it to determine the psf so make sure this bit is off
+        sourceOut->tmpFlags &= ~PM_SOURCE_TMPF_CANDIDATE_PSFSTAR;
+       }
 
       // child sources have not been subtracted in this image, but this flag may be raised if
@@ -900 +903 @@
             // allocate image, weight, mask for the new image for each peak
             if (sourceOut->modelPSF) {
-              pmSourceRedefinePixels (sourceOut, readout, sourceOut->peak->x, sourceOut->peak->y, sourceOut->modelPSF->fitRadius);
-            }
+                pmSourceRedefinePixels (sourceOut, readout, sourceOut->peak->x, sourceOut->peak->y, 
+                                                                        sourceOut->modelPSF->fitRadius);
+            } else {
+                // if we have no pixels we can't use it to determine the psf so make sure this bit is off
+                sourceOut->tmpFlags &= ~PM_SOURCE_TMPF_CANDIDATE_PSFSTAR;
+            }
 
             // child sources have not been subtracted in this image, but this flag may be raised if