Changeset 32996 for trunk/psphot/src/psphotRadialProfileWings.c

Timestamp:

Dec 22, 2011, 9:00:06 AM (14 years ago)

Author:

eugene

Message:

need to guess models for matched detections in order to get forced photometry -- this meant modifying psphotGuessModels to work on the allSources, not newSources and to test if the guess had previously been performed; updates to radial profile analysis to get smoother Krons -- this now agrees very well with sextractor (though my apertures are slightly smaller and not elliptical)

Location:

trunk/psphot

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/psphotRadialProfileWings.c (modified) (4 diffs)

trunk/psphot/src/psphotRadialProfileWings.c

@@ -80 +80 @@
     }
 
-    MIN_RADIUS = 0.25*psMetadataLookupF32 (&status, readout->analysis, "PSF_MOMENTS_RADIUS");
+    MIN_RADIUS = psMetadataLookupF32 (&status, readout->analysis, "PSF_MOMENTS_RADIUS");
     if (!status) {
-        MIN_RADIUS = 0.25*psMetadataLookupF32 (&status, recipe, "PSF_MOMENTS_RADIUS");
+        MIN_RADIUS = psMetadataLookupF32 (&status, recipe, "PSF_MOMENTS_RADIUS");
     }
 
@@ -209 +209 @@
 # define TEST_Y 3096
 
+float InterpolateValues (float X0, float Y0, float X1, float Y1, float X);
+
 // XXX use integer radius values?  the rings assume integer values, right? or do they?
 bool psphotRadialProfileWingsSource (pmSource *source, pmReadout *readout, psImageMaskType maskVal) {
@@ -226 +228 @@
 
     // radii will be MIN_RADIUS to MAX_RADIUS in NN log steps:
-    float NSTEP = 10.0;
+    float NSTEP = 25.0;
     float MIN_DR = 2;
     float NSIGMA = 1.0;
@@ -288 +290 @@
         // fprintf (stderr, "%f %f : %f : %f %f  :  %f\n", source->peak->xf, source->peak->yf, radius, meanFlux, meanFluxError, slope);
 
-        if (!limit) {
-            limit |= (meanFlux - NSIGMA * meanFluxError < THRESHOLD); // dropped to sky level
-            limit |= isfinite(slope) && (fabs(slope) < 3.0); // SB no longer changing.
-            limitRadius = meanRadius;
+        if (!limit && (meanFlux - NSIGMA * meanFluxError < THRESHOLD)) {
+            // dropped to sky level
+            limit = true;
+            // linearly interpolate to the radius at which we hit the sky
+            if (isfinite(lastFlux)) {
+                limitRadius = InterpolateValues(lastFlux, lastRadius, meanFlux, meanRadius, 0.0);
+            } else {
+                limitRadius = meanRadius;
+            }
+            limitFlux = meanFlux;
+            limitSlope = slope;
+        }
+        if (!limit && isfinite(slope) && (fabs(slope) < 3.0)) { 
+            // SB no longer changing.       
+            limit = true;
+            // linearly interpolate to the radius at which we hit the sky, using the last flux and the limiting slope
+            if (isfinite(lastFlux)) {
+                limitRadius = lastRadius + lastFlux / 3.0;
+            } else {
+                limitRadius = meanRadius;
+            }
             limitFlux = meanFlux;
             limitSlope = slope;