Changeset 31154 for trunk/psphot/src/psphotRadialAperturesByObject.c

Timestamp:

Apr 4, 2011, 1:12:39 PM (15 years ago)

Author:

eugene

Message:

use the smoothed image for footprint culling; use a more stringent culling for saturated stars; more tweaks to get sat stars to be fitted; various updates to psphotStack; unify psphotImageLoop varients; be a bit careful about number of stars in a PSF clump

Location:

trunk/psphot

Files:

• . (modified) (2 props)
• src/psphotRadialAperturesByObject.c (modified) (4 diffs)

trunk/psphot

@@ -19 +19 @@
 psphot-config
 Doxyfile
+a.out.dSYM

@@ -19 +19 @@
 psphot-config
 Doxyfile
+a.out.dSYM

trunk/psphot/src/psphotRadialAperturesByObject.c

@@ -43 +43 @@
     assert (maskVal);
 
-    // XXX temporary user-supplied systematic sky noise measurement (derive from background model)
-    float skynoise = psMetadataLookupF32 (&status, recipe, "SKY.NOISE");
-
     // S/N limit to perform full non-linear fits
     float SN_LIM = psMetadataLookupF32 (&status, recipe, "RADIAL_APERTURES_SN_LIM");
@@ -63 +60 @@
     
     // source analysis is done in S/N order (brightest first)
-    objects = psArraySort (objects, pmPhotObjSortBySN);
+    objects = psArraySort (objects, pmPhotObjSortByFlux);
 
     // generate look-up arrays for readouts
@@ -109 +106 @@
             // limit selection to some SN limit
             assert (source->peak); // how can a source not have a peak?
-            if (source->peak->SN < SN_LIM) continue;
+            if (sqrt(source->peak->detValue) < SN_LIM) continue;
 
             int index = source->imageID;
@@ -147 +144 @@
 
             // force source image to be a bit larger...
-            // float radius = source->peak->xf - source->pixels->col0;
-            // radius = PS_MAX (radius, source->peak->yf - source->pixels->row0);
-            // radius = PS_MAX (radius, source->pixels->numRows - source->peak->yf + source->pixels->row0);
-            // radius = PS_MAX (radius, source->pixels->numCols - source->peak->xf + source->pixels->col0);
             pmSourceRedefinePixels (source, readout, source->peak->xf, source->peak->yf, outerRadius + 2);
 
-            if (!psphotRadialApertureSource (source, recipe, skynoise, maskVal, radMax, nMatchedPSF)) {
+            if (!psphotRadialApertureSource (source, recipe, maskVal, radMax, nMatchedPSF)) {
                 psTrace ("psphot", 5, "failed to extract radial profile for source at %7.1f, %7.1f", source->moments->Mx, source->moments->My);
             } else {
                 source->mode |= PM_SOURCE_MODE_RADIAL_FLUX;
+                if (source->parent) {
+                    source->parent->mode |= PM_SOURCE_MODE_RADIAL_FLUX;
+                }
             }
 

@@ -19 +19 @@
 psphot-config
 Doxyfile
+a.out.dSYM