Changeset 17236

Timestamp:

Mar 30, 2008, 8:40:06 AM (18 years ago)

Author:

eugene

Message:

trigger extended source fit based on source size

File:

• branches/eam_branch_20080324/psphot/src/psphotBlendFit.c (modified) (2 diffs)

branches/eam_branch_20080324/psphot/src/psphotBlendFit.c

@@ -40 +40 @@
         // skip non-astronomical objects (very likely defects)
         if (source->mode &  PM_SOURCE_MODE_BLEND) continue;
+        if (source->mode &  PM_SOURCE_MODE_CR_LIMIT) continue;
         if (source->type == PM_SOURCE_TYPE_DEFECT) continue;
         if (source->type == PM_SOURCE_TYPE_SATURATED) continue;
@@ -79 +80 @@
         // XXX re-consider conditions under which the source has EXT fit:
         // I should try EXT if the source size measurement says it is large
-        if (psphotFitBlend (readout, source, psf, maskVal)) {
-            psTrace ("psphot", 5, "source at %7.1f, %7.1f is psf", source->moments->x, source->moments->y);
-            Npsf ++;
-            continue;
-        }
-        if (psphotFitBlob (readout, source, sources, psf, maskVal)) {
-            psTrace ("psphot", 5, "source at %7.1f, %7.1f is ext", source->moments->x, source->moments->y);
-            Next ++;
-            continue;
-        }
+        if (source->mode & PM_SOURCE_MODE_EXT_LIMIT) {
+            if (psphotFitBlob (readout, source, sources, psf, maskVal)) {
+                source->type = PM_SOURCE_TYPE_EXTENDED;
+                psTrace ("psphot", 5, "source at %7.1f, %7.1f is ext", source->moments->x, source->moments->y);
+                Next ++;
+                continue;
+            }
+        } else {
+            if (psphotFitBlend (readout, source, psf, maskVal)) {
+                source->type = PM_SOURCE_TYPE_STAR;
+                psTrace ("psphot", 5, "source at %7.1f, %7.1f is psf", source->moments->x, source->moments->y);
+                Npsf ++;
+                continue;
+            }
+        }
 
         psTrace ("psphot", 5, "source at %7.1f, %7.1f failed", source->moments->x, source->moments->y);