Changeset 8474

Timestamp:

Aug 22, 2006, 1:20:23 PM (20 years ago)

Author:

rhl

Message:

Two changes relating to Bug 807:
1/ Ignore objects with PM_SOURCE_MODE_BLEND set when determining rough PSF
2/ OR in new pmSource.mode values so as not to override previous bits

File:

• trunk/psModules/src/objects/pmSource.c (modified) (9 diffs)

trunk/psModules/src/objects/pmSource.c

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-22 20:46:55 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-22 23:20:23 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -225 +225 @@
                 continue;
             }
+            if (tmpSrc->mode & PM_SOURCE_MODE_BLEND) {
+                continue;
+            }
 
             // for the moment, force splane dimensions to be 10x10 image pix
@@ -258 +261 @@
 
         if (peaks == NULL)
+        {
             return (psfClump);
+        }
     }
     // XXX EAM : possible errors:
@@ -395 +400 @@
         if ((Nsatpix > 1) && big) {
             tmpSrc->type = PM_SOURCE_TYPE_STAR;
-            tmpSrc->mode = PM_SOURCE_MODE_SATSTAR;
+            tmpSrc->mode |= PM_SOURCE_MODE_SATSTAR;
             Nsatstar ++;
             continue;
@@ -403 +408 @@
         if (Nsatpix > 1) {
             tmpSrc->type = PM_SOURCE_TYPE_SATURATED;
-            tmpSrc->mode = PM_SOURCE_MODE_DEFAULT;
+            tmpSrc->mode |= PM_SOURCE_MODE_DEFAULT;
             Nsat ++;
             continue;
@@ -413 +418 @@
         if ((sigX < 0.05) || (sigY < 0.05)) {
             tmpSrc->type = PM_SOURCE_TYPE_DEFECT;
-            tmpSrc->mode = PM_SOURCE_MODE_DEFAULT;
+            tmpSrc->mode |= PM_SOURCE_MODE_DEFAULT;
             Ncr ++;
             continue;
@@ -421 +426 @@
         if ((sigX > (clump.X + 3*clump.dX)) || (sigY > (clump.Y + 3*clump.dY))) {
             tmpSrc->type = PM_SOURCE_TYPE_EXTENDED;
-            tmpSrc->mode = PM_SOURCE_MODE_DEFAULT;
+            tmpSrc->mode |= PM_SOURCE_MODE_DEFAULT;
             Next ++;
             continue;
@@ -435 +440 @@
         if ((tmpSrc->moments->SN > PSF_SN_LIM) && (radius < 1.5)) {
             tmpSrc->type = PM_SOURCE_TYPE_STAR;
-            tmpSrc->mode = PM_SOURCE_MODE_PSFSTAR;
+            tmpSrc->mode |= PM_SOURCE_MODE_PSFSTAR;
             Npsf ++;
             continue;
@@ -442 +447 @@
         // random type of star
         tmpSrc->type = PM_SOURCE_TYPE_STAR;
-        tmpSrc->mode = PM_SOURCE_MODE_DEFAULT;
+        tmpSrc->mode |= PM_SOURCE_MODE_DEFAULT;
     }