Changeset 33640 for branches/eam_branches/ipp-20111122/psphot/src/psphotMergeSources.c

Timestamp:

Mar 30, 2012, 2:54:17 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20111122/psphot

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/psphotMergeSources.c (modified) (2 diffs)

branches/eam_branches/ipp-20111122/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