Changeset 26e1001 in sasview for fittingview/src/sans/perspectives/fitting

Timestamp:

Dec 8, 2011 3:42:38 PM (13 years ago)

Author:

Jae Cho <jhjcho@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

78ecdcc

Parents:

3176ea7

Message:

fixed the problem in batch fitting with one param set fittable

File:

• fittingview/src/sans/perspectives/fitting/fitting.py (modified) (2 diffs)

fittingview/src/sans/perspectives/fitting/fitting.py

@@ -1284 +1284 @@
                             batch_inputs["error on %s" % str(param)].append(ERROR)
                 else:
+                    # ToDo: Why sometimes res.pvec comes with numpy.float64? 
+                    # Need to fix it within ScipyEngine
+                    if res.pvec.__class__== numpy.float64:
+                        res.pvec = [res.pvec]
+                        
                     cell = BatchCell()
                     cell.label = res.fitness
@@ -1465 +1470 @@
                     index += 1
                     cpage._on_fit_complete()
-        except ValueError:
-                msg = "Fitting did not converge!!!"
-                wx.PostEvent(self.parent, StatusEvent(status=msg, info="error",
-                                                      type="stop"))
         except:
             msg = "Fit completed but Following"