Changeset 36375 for trunk/psModules/src/objects/pmSourceFitSet.c

Timestamp:

Dec 10, 2013, 2:55:11 PM (12 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20130904

Location:

trunk

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/objects/pmSourceFitSet.c (modified) (1 diff)

trunk/psModules/src/objects/pmSourceFitSet.c

@@ -352 +352 @@
         // set the model success or failure status
         model->flags |= PM_MODEL_STATUS_FITTED;
-        if (!fitStatus) model->flags |= PM_MODEL_STATUS_NONCONVERGE;
+        if (!fitStatus) {
+          if (isnan(myMin->value)) {
+            model->flags |= PM_MODEL_STATUS_NAN_CHISQ;
+          } else {
+            model->flags |= PM_MODEL_STATUS_NONCONVERGE;
+          }
+        }
 
         // models can go insane: reject these