Changeset 32996 for trunk/psphot/src

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/psphotFitSourcesLinear.c (modified) (1 diff)
• src/psphotForcedReadout.c (modified) (1 diff)
• src/psphotGuessModels.c (modified) (2 diffs)
• src/psphotKronIterate.c (modified) (2 diffs)
• src/psphotRadialProfileWings.c (modified) (4 diffs)
• src/psphotReadout.c (modified) (5 diffs)
• src/psphotReadoutFindPSF.c (modified) (2 diffs)
• src/psphotReadoutForcedKnownSources.c (modified) (1 diff)
• src/psphotReadoutKnownSources.c (modified) (1 diff)
• src/psphotReadoutMinimal.c (modified) (1 diff)
• src/psphotSourceMatch.c (modified) (1 diff)
• src/psphotStackImageLoop.c (modified) (1 prop)
• src/psphotStackMatchPSFsNext.c (modified) (1 diff)
• src/psphotStackReadout.c (modified) (4 diffs)

trunk/psphot/src/psphotFitSourcesLinear.c

@@ -216 +216 @@
     psLogMsg ("psphot.ensemble", PS_LOG_MINUTIA, "built fitSources: %f sec (%ld objects)\n", psTimerMark ("psphot.linear"), sources->n);
 
-    // fprintf (stderr, "****** Nsat : %d ********\n", Nsat);
-
     if (fitSources->n == 0) {
         psFree(fitSources);

trunk/psphot/src/psphotForcedReadout.c

@@ -55 +55 @@
     psphotLoadExtSources (config, view, filerule);
 
-    // construct an initial model for each object, set the radius to fitRadius, set circular fit mask
+    // Construct an initial model for each object, set the radius to fitRadius, set circular
+    // fit mask.  NOTE: only applied to sources without guess models
     psphotGuessModels (config, view, filerule);
 

trunk/psphot/src/psphotGuessModels.c

@@ -46 +46 @@
     psAssert (detections, "missing detections?");
 
-    psArray *sources = detections->newSources;
+    psArray *sources = detections->allSources;
     psAssert (sources, "missing sources?");
 
@@ -160 +160 @@
         pmSource *source = sources->data[i];
 
+        // do not redo sources already guessed
+        if (source->tmpFlags & PM_SOURCE_TMPF_MODEL_GUESS) continue;
+
         // this is used to mark sources for which the model is measured. We check later that
         // all are used.

trunk/psphot/src/psphotKronIterate.c

@@ -111 +111 @@
 
         pmSource *source = sources->data[i];
-        if (!source->peak) continue; // XXX how can we have a peak-less source?
-
-        // allocate space for moments
-        if (!source->moments) continue;
 
         // set a window function for each source based on the moments
+        // (this skips really bad sources (no peak, no moments, DEFECT)
         psphotKronWindowSetSource (source, kronWindow, false, true);
     }
@@ -401 +398 @@
 
     if (!source) return false;
+    if (!source->peak) return false; // XXX how can we have a peak-less source?
     if (!source->moments) return false;
+    if (source->type == PM_SOURCE_TYPE_DEFECT) return false;
+    if (source->type == PM_SOURCE_TYPE_SATURATED) return false;
     psAssert(kronWindow, "need a window");
 

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;

trunk/psphot/src/psphotReadout.c

@@ -127 +127 @@
     // psphotLoadExtSources (config, view, filerule); // pass 1
 
-    // construct an initial model for each object, set the radius to fitRadius, set circular
-    // fit mask (detections->newSources)
-    psphotGuessModels (config, view, filerule); // pass 1
-
     // merge the newly selected sources into the existing list
     // NOTE: merge OLD and NEW
     psphotMergeSources (config, view, filerule);
+
+    // Construct an initial model for each object, set the radius to fitRadius, set circular
+    // fit mask.  NOTE: only applied to sources without guess models
+    psphotGuessModels (config, view, filerule); // pass 1
 
     // linear PSF fit to source peaks, subtract the models from the image (in PSF mask)
@@ -193 +193 @@
         }
 
-        // create full input models, set the radius to fitRadius, set circular fit mask
-        // NOTE: apply only to detections->newSources
-        psphotGuessModels (config, view, filerule); // pass 2 (detections->newSources)
-
         // replace all sources so fit below applies to all at once
         // NOTE: apply only to OLD sources (which have been subtracted)
@@ -205 +201 @@
         // XXX check on free of sources...
         psphotMergeSources (config, view, filerule); // (detections->newSources + detections->allSources -> detections->allSources)
+
+        // Construct an initial model for each object, set the radius to fitRadius, set circular
+        // fit mask.  NOTE: only applied to sources without guess models
+        psphotGuessModels (config, view, filerule); // pass 1
 
         // NOTE: apply to ALL sources
@@ -234 +234 @@
         }
 
-        // create full input models, set the radius to fitRadius, set circular fit mask
-        // NOTE: apply only to detections->newSources
-        psphotGuessModels (config, view, filerule); // pass 2 (detections->newSources)
-
         // replace all sources so fit below applies to all at once
         // NOTE: apply only to OLD sources (which have been subtracted)
@@ -247 +243 @@
         psphotMergeSources (config, view, filerule); // (detections->newSources + detections->allSources -> detections->allSources)
 
+        // Construct an initial model for each object, set the radius to fitRadius, set circular
+        // fit mask.  NOTE: only applied to sources without guess models
+        psphotGuessModels (config, view, filerule); // pass 1
+
         // NOTE: apply to ALL sources
         psphotFitSourcesLinear (config, view, filerule, true); // pass 3 (detections->allSources)

trunk/psphot/src/psphotReadoutFindPSF.c

@@ -54 +54 @@
     }
 
+    // merge the newly selected sources into the existing list
+    // NOTE: merge OLD and NEW
+    psphotMergeSources (config, view, filerule); 
+
 # if 0
     // XXX if we want to determine the aperture residual correction here, we either
@@ -61 +65 @@
     psphotGuessModels (config, view, filerule);
 # endif
-
-    // merge the newly selected sources into the existing list
-    // NOTE: merge OLD and NEW
-    psphotMergeSources (config, view, filerule); 
 
 # if 0

trunk/psphot/src/psphotReadoutForcedKnownSources.c

@@ -36 +36 @@
     }
 
-    // construct an initial model for each object
-    psphotGuessModels (config, view, filerule);
-
     // merge the newly selected sources into the existing list
     // NOTE: merge OLD and NEW
     psphotMergeSources (config, view, filerule); 
+
+    // Construct an initial model for each object, set the radius to fitRadius, set circular
+    // fit mask.  NOTE: only applied to sources without guess models
+    psphotGuessModels (config, view, filerule);
 
     // linear PSF fit to source peaks

trunk/psphot/src/psphotReadoutKnownSources.c

@@ -48 +48 @@
     }
 
-    // construct an initial model for each object
-    psphotGuessModels (config, view, filerule);
-
     // merge the newly selected sources into the existing list
     // NOTE: merge OLD and NEW
     psphotMergeSources (config, view, filerule); 
+
+    // Construct an initial model for each object, set the radius to fitRadius, set circular
+    // fit mask.  NOTE: only applied to sources without guess models
+    psphotGuessModels (config, view, filerule);
 
     // linear PSF fit to source peaks

trunk/psphot/src/psphotReadoutMinimal.c

@@ -59 +59 @@
     }
 
-    // construct an initial model for each object
-    psphotGuessModels (config, view, filerule);
-
     // merge the newly selected sources into the existing list
     psphotMergeSources (config, view, filerule);
+
+    // Construct an initial model for each object, set the radius to fitRadius, set circular
+    // fit mask.  NOTE: only applied to sources without guess models
+    psphotGuessModels (config, view, filerule);
 
     // linear PSF fit to source peaks

trunk/psphot/src/psphotSourceMatch.c

@@ -261 +261 @@
             source->imageID = index;
             source->mode2 |= PM_SOURCE_MODE2_MATCHED; // source is generated based on another image
+            source->type = PM_SOURCE_TYPE_STAR; // until we know more, assume a PSF fit
 
             // add the peak

trunk/psphot/src/psphotStackMatchPSFsNext.c

@@ -51 +51 @@
 
     bool status = false;
+
+    psTimerStart ("psphot.smooth");
 
     // find the currently selected readout

trunk/psphot/src/psphotStackReadout.c

@@ -160 +160 @@
     }
 
-    // construct an initial model for each object, set the radius to fitRadius, set circular fit mask
-    psphotGuessModels (config, view, STACK_SRC);
-
     // merge the newly selected sources into the existing list
     // NOTE: merge OLD and NEW
     psphotMergeSources (config, view, STACK_SRC);
+
+    // Construct an initial model for each object, set the radius to fitRadius, set circular
+    // fit mask.  NOTE: only applied to sources without guess models
+    psphotGuessModels (config, view, STACK_SRC);
 
     // linear PSF fit to source peaks, subtract the models from the image (in PSF mask)
@@ -248 +249 @@
         }
 
-        // create full input models, set the radius to fitRadius, set circular fit mask
-        // NOTE: apply only to detections->newSources
-        psphotGuessModels (config, view, STACK_SRC); // pass 2 (detections->newSources)
-
         // replace all sources so fit below applies to all at once
         // NOTE: apply only to OLD sources (which have been subtracted)
@@ -260 +257 @@
         // XXX check on free of sources...
         psphotMergeSources (config, view, STACK_SRC); // (detections->newSources + detections->allSources -> detections->allSources)
+
+        // Construct an initial model for each object, set the radius to fitRadius, set circular
+        // fit mask.  NOTE: only applied to sources without guess models
+        psphotGuessModels (config, view, STACK_SRC);
     }
 
@@ -269 +270 @@
     objects = psphotMatchSources (config, view, STACK_SRC);
     psMemDump("matchsources");
+
+    // Construct an initial model for each object, set the radius to fitRadius, set circular
+    // fit mask.  NOTE: only applied to sources without guess models
+    psphotGuessModels (config, view, STACK_SRC);
 
     psphotStackObjectsUnifyPosition (objects);