Changeset 35421 for branches/eam_branches/ipp-20130419/psphot/src/psphotSourceFits.c

Timestamp:

Apr 19, 2013, 4:45:57 PM (13 years ago)

Author:

eugene

Message:

carry over changes from eam_branch/20130307

Location:

branches/eam_branches/ipp-20130419

Files:

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

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

@@ -457 +457 @@
 
     // use the source moments, etc to guess basic model parameters
-    pmModel *model = pmSourceModelGuess (source, modelType);
+    pmModel *model = 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);
@@ -625 +625 @@
         model->params->data.F32[PM_PAR_7] = 0.5/indexGuess[i];
 
-        if (!model->modelGuess(model, source)) {
+        if (!model->modelGuess(model, source, maskVal, markVal)) {
             model->flags |= PM_MODEL_STATUS_BADARGS;
             return false;
@@ -648 +648 @@
     model->flags = PM_MODEL_STATUS_NONE; // do not attempt to handle failures here, let the next iteration deal with it
     model->params->data.F32[PM_PAR_7] = 0.5/indexGuess[iMin];
-    model->modelGuess(model, source);
+    model->modelGuess(model, source, maskVal, markVal);
 
     return true;
@@ -677 +677 @@
         model->params->data.F32[PM_PAR_7] = indexGuess[i];
         
-        if (!model->modelGuess(model, source)) {
+        if (!model->modelGuess(model, source, maskVal, markVal)) {
             model->flags |= PM_MODEL_STATUS_BADARGS;
             return false;