Changeset 90f49a8 in sasview

Timestamp:

Apr 10, 2014 8:32:51 PM (11 years ago)

Author:

pkienzle

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:

042f065

Parents:

95d58d3

Message:

oops…use bumps instead of scipy.leasqr in bumps wrapper

File:

• src/sans/fit/BumpsFitting.py (modified) (2 diffs)

src/sans/fit/BumpsFitting.py

@@ -121 +121 @@
 
         # TODO: this belongs in monitor not residuals calculation
-        if self.fitresult is not None:
+        if False: # self.fitresult is not None:
             #self.fitresult.set_model(model=self.model)
             self.fitresult.residuals = self.res+0
@@ -243 +243 @@
                               msg_q=msg_q)
         try:
-            #run_bumps(problem, result, ftol)
-            run_scipy(problem, result, ftol)
+            run_bumps(problem, result, ftol)
+            #run_scipy(problem, result, ftol)
         except:
             if hasattr(sys, 'last_type') and sys.last_type == KeyboardInterrupt: