Changeset 35630 for branches/eam_branches/ipp-20130509/psphot/src/psphotSourceFits.c

Timestamp:

Jun 3, 2013, 6:13:52 PM (13 years ago)

Author:

eugene

Message:

add iterative model window for extended sources (crude and hackish still)

File:

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

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

@@ -268 +268 @@
     { 
         // XXX need to handle failures better here
-        EXT = psphotFitEXT (readout, source, fitOptions, modelTypeEXT, maskVal, markVal);
+        EXT = psphotFitEXT (NULL, readout, source, fitOptions, modelTypeEXT, maskVal, markVal);
         if (!EXT) goto escape;
         if (!isfinite(EXT->params->data.F32[PM_PAR_I0])) goto escape;
@@ -443 +443 @@
 }
 
-pmModel *psphotFitEXT (pmReadout *readout, pmSource *source, pmSourceFitOptions *fitOptions, pmModelType modelType, psImageMaskType maskVal, psImageMaskType markVal) {
+pmModel *psphotFitEXT (pmModel *guessModel, pmReadout *readout, pmSource *source, pmSourceFitOptions *fitOptions, pmModelType modelType, psImageMaskType maskVal, psImageMaskType markVal) {
 
     if ((source->moments->Mxx < 1e-3) || (source->moments->Myy < 1e-3)) {
@@ -457 +457 @@
 
     // use the source moments, etc to guess basic model parameters
-    pmModel *model = pmSourceModelGuess (source, modelType, maskVal, markVal);
+    pmModel *model = guessModel ? guessModel : pmSourceModelGuess (source, modelType, maskVal, markVal);
     if (!model) {
         psTrace ("psphot", 5, "failed to generate a model for source: moments: %f %f\n", source->moments->Mxx, source->moments->Myy);