Changeset 2446b66 in sasview

Timestamp:

Jun 15, 2011 5:45:19 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:

bdc25e2

Parents:

dc613d6

Message:

moved scipy import to compute function

File:

• park_integration/ScipyFitting.py (modified) (2 diffs)

park_integration/ScipyFitting.py

@@ -9 +9 @@
 import numpy 
 import sys
-from scipy import optimize
+
 
 from sans.fit.AbstractFitEngine import FitEngine
@@ -142 +142 @@
         if handler is not None:
             handler.set_result(result=result)
-        #try:
-        functor = SansAssembly(self.param_list, model, data, handler=handler,
-                         fitresult=result, curr_thread= self.curr_thread)
         try:
+            # This import must be here; otherwise it will be confused when more
+            # than one thread exist.
+            from scipy import optimize
+            
+            functor = SansAssembly(self.param_list, model, data, handler=handler,\
+                         fitresult=result, curr_thread= curr_thread)
             out, cov_x, _, mesg, success = optimize.leastsq(functor,
                                             model.get_params(self.param_list),