Changeset 42843 for trunk/psModules/src/objects/pmSource.c

Timestamp:

May 9, 2025, 11:28:49 AM (12 months ago)

Author:

eugene

Message:

optionally allow PSF star positions to be fitted during PSF model construction (default false); option to allow PSF clump analysis to use clipped stats (default) or robust stats; use select circular region of 2nd moment space, not square region; for bright (S/N > 25) externally-supplied sources, use the centroid (Mx,My) value instead of the peak

Location:

trunk/psModules

Files:

• . (modified) (1 prop)
• src/objects/pmSource.c (modified) (5 diffs)

trunk/psModules/src/objects/pmSource.c

@@ -407 +407 @@
 *****************************************************************************/
 
-pmPSFClump pmSourcePSFClump(psImage **savedImage, psRegion *region, psArray *sources, float PSF_SN_LIM, float PSF_CLUMP_GRID_SCALE, psF32 SX_MAX, psF32 SY_MAX, psF32 SX_MIN, psF32 SY_MIN, psF32 AR_MAX)
+pmPSFClump pmSourcePSFClump(psImage **savedImage, psRegion *region, psArray *sources, float PSF_SN_LIM, float PSF_CLUMP_GRID_SCALE, psF32 SX_MAX, psF32 SY_MAX, psF32 SX_MIN, psF32 SY_MIN, psF32 AR_MAX, bool useClippedMean)
 {
     psTrace("psModules.objects", 10, "---- begin ----\n");
@@ -455 +455 @@
                 continue;
             }
+
+            // skip sources associated with possible detector features 
+            if (source->mode2 & PM_SOURCE_MODE2_ON_LINE) continue;
 
             float Mxx = source->moments->Mxx, Myy = source->moments->Myy; // Second moments
@@ -598 +601 @@
         }
 
-        // measures stats of Sx, Sy
-        stats = psStatsAlloc (PS_STAT_CLIPPED_MEAN | PS_STAT_CLIPPED_STDEV);
-
-        if (!psVectorStats (stats, tmpSx, NULL, NULL, 0)) {
-            psError(PS_ERR_UNKNOWN, false, "failed to measure Sx stats");
-            return (emptyClump);
-        }
-        psfClump.X  = stats->clippedMean;
-        psfClump.dX = hypot(stats->clippedStdev, PSF_CLUMP_GRID_SCALE);
-
-        if (!psVectorStats (stats, tmpSy, NULL, NULL, 0)) {
-            psError(PS_ERR_UNKNOWN, false, "failed to measure Sy stats");
-            return (emptyClump);
-        }
-        psfClump.Y  = stats->clippedMean;
-        psfClump.dY = hypot(stats->clippedStdev, PSF_CLUMP_GRID_SCALE);
+        // measures stats of Sx, Sy
+        if (useClippedMean) {
+          stats = psStatsAlloc (PS_STAT_CLIPPED_MEAN | PS_STAT_CLIPPED_STDEV);
+        } else {
+          stats = psStatsAlloc (PS_STAT_ROBUST_MEDIAN | PS_STAT_ROBUST_STDEV);
+        }
+
+        if (!psVectorStats (stats, tmpSx, NULL, NULL, 0)) {
+          psError(PS_ERR_UNKNOWN, false, "failed to measure Sx stats");
+          return (emptyClump);
+        }
+        psfClump.X  = psStatsGetValue (stats, psStatsMeanOption (stats->options)); 
+        psfClump.dX = psStatsGetValue (stats, psStatsStdevOption (stats->options));
+        psfClump.dX = hypot(psfClump.dX, PSF_CLUMP_GRID_SCALE);
+
+        if (!psVectorStats (stats, tmpSy, NULL, NULL, 0)) {
+          psError(PS_ERR_UNKNOWN, false, "failed to measure Sy stats");
+          return (emptyClump);
+        }
+        psfClump.Y  = psStatsGetValue (stats, psStatsMeanOption (stats->options)); 
+        psfClump.dY = psStatsGetValue (stats, psStatsStdevOption (stats->options));
+        psfClump.dY = hypot(psfClump.dX, PSF_CLUMP_GRID_SCALE);              
 
         psTrace ("psModules.objects", 2, "clump  X,  Y: %f, %f\n", psfClump.X, psfClump.Y);
@@ -746 +755 @@
             }
 
+            psF32 radius = hypot ((sigX-clump.X)/clump.dX, (sigY-clump.Y)/clump.dY);
+
+            // XXX this is crude cut to avoid using extended sources in the PSF model
+            // psphot will update this analysis based on the PSF - Kron mags
             // likely unsaturated extended source (too large to be stellar)
-            if (sigX > clump.X + 3*clump.dX || sigY > clump.Y + 3*clump.dY) {
+            // XXX old test: if (sigX > clump.X + 3*clump.dX || sigY > clump.Y + 3*clump.dY) {
+
+            if (radius > 2.0) {
                 source->type = PM_SOURCE_TYPE_EXTENDED;
                 Next ++;
                 continue;
             }
+
+            // skip sources associated with possible detector features 
+            if (source->mode2 & PM_SOURCE_MODE2_ON_LINE) continue;
 
             // the rest are probable stellar objects
@@ -762 +780 @@
 
             // PSF star (within 1.5 sigma of clump center, S/N > limit)
-            psF32 radius = hypot ((sigX-clump.X)/clump.dX, (sigY-clump.Y)/clump.dY);
             if ((source->moments->SN > PSF_SN_LIM) && (radius < PSF_CLUMP_NSIGMA)) {
                 source->type = PM_SOURCE_TYPE_STAR;