Changeset 28677 for branches/eam_branches/ipp-20100621/psphot/src/psphotSourceFits.c

Timestamp:

Jul 15, 2010, 6:31:24 AM (16 years ago)

Author:

eugene

Message:

correctly unmark unused PSF candidates using source id; grid search for sersic terms

File:

• branches/eam_branches/ipp-20100621/psphot/src/psphotSourceFits.c (modified) (3 diffs)

branches/eam_branches/ipp-20100621/psphot/src/psphotSourceFits.c

@@ -345 +345 @@
 
     // copy most data from the primary source (modelEXT, blends stay NULL)
-    pmSource *newSrc = pmSourceCopy (source);
+    pmSource *newSrc = pmSourceCopyData (source);
     newSrc->modelPSF = psMemIncrRefCounter (DBL->data[1]);
     newSrc->modelPSF->fitRadius = radius;
@@ -447 +447 @@
     maskVal |= markVal;
 
-    psTraceSetLevel("psLib.math.psMinimizeLMChi2", 5);
+    // psTraceSetLevel("psLib.math.psMinimizeLMChi2", 5);
 
     // use the source moments, etc to guess basic model parameters
@@ -460 +460 @@
     }
 
-    // for sersic models, get the initial guess more carefully
+    // for sersic models, use a grid search to choose an index, then float the params there
     if (modelType == pmModelClassGetType("PS_MODEL_SERSIC")) {
         psphotFitSersicIndex (source, EXT, fitOptions, maskVal);
     }
 
-    // fit EXT (not PSF) model (set/unset the pixel mask)
-    options.mode = PM_SOURCE_FIT_EXT;
+    if (modelType == pmModelClassGetType("PS_MODEL_SERSIC")) {
+        options.mode = PM_SOURCE_FIT_NO_INDEX;
+    } else {
+        options.mode = PM_SOURCE_FIT_EXT;
+    }
     pmSourceFitModel (source, EXT, &options, maskVal);
 
-    psTraceSetLevel("psLib.math.psMinimizeLMChi2", 0);
+    // psTraceSetLevel("psLib.math.psMinimizeLMChi2", 0);
     return (EXT);
 }
 
-float indexGuess[] = {0.5, 0.25, 0.125};
+// note that these should be 1/2n of the standard sersic index
+float indexGuess[] = {0.5, 0.33, 0.25, 0.167, 0.125, 0.083};
 
 // A sersic model is very sensitive to the index.  attempt to find the index first by grid search in just the index