Changeset 36884 for branches/eam_branches/ipp-20140610/psphot/src/psphotSourceFits.c

Timestamp:

Jun 17, 2014, 5:58:38 AM (12 years ago)

Author:

eugene

Message:

merge in changes from trunk (up through pv3 tag)

Location:

branches/eam_branches/ipp-20140610

Files:

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

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

@@ -700 +700 @@
         model->params->data.F32[PM_PAR_7] = 0.5/indexGuess[i];
 
-        if (!model->modelGuess(model, source, maskVal, markVal)) {
+        if (!model->class->modelGuess(model, source, maskVal, markVal)) {
             model->flags |= PM_MODEL_STATUS_BADARGS;
             return false;
@@ -723 +723 @@
     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, maskVal, markVal);
+    model->class->modelGuess(model, source, maskVal, markVal);
 
     return true;
@@ -752 +752 @@
         model->params->data.F32[PM_PAR_7] = indexGuess[i];
         
-        if (!model->modelGuess(model, source, maskVal, markVal)) {
+        if (!model->class->modelGuess(model, source, maskVal, markVal)) {
             model->flags |= PM_MODEL_STATUS_BADARGS;
             return false;