Changeset 6d20b46 in sasview for park_integration/ScipyFitting.py

Timestamp:

Jan 20, 2010 3:54:52 PM (14 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

662da312

Parents:

e6b9723

Message:

working on thread issues [incomplete]

File:

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

park_integration/ScipyFitting.py

@@ -56 +56 @@
             with Uid as keys
         """
-        self.fitArrangeDict={}
-        self.paramList=[]
+        self.fitArrangeDict = {}
+        self.paramList = []
     #def fit(self, *args, **kw):
     #    return profile(self._fit, *args, **kw)
-
-    def fit(self ,q=None,handler=None,curr_thread= None):
-       
-        fitproblem=[]
-        for id ,fproblem in self.fitArrangeDict.iteritems():
-            if fproblem.get_to_fit()==1:
-                fitproblem.append(fproblem)
-        if len(fitproblem)>1 : 
+    def createFunctor(self):
+        fitproblem=None
+        fit_count = 0 
+        #print " self.fitArrangeDict", self.fitArrangeDict
+        for id, fproblem in self.fitArrangeDict.iteritems():
+            if fproblem.get_to_fit() == 1:
+                fitproblem = fproblem
+                fit_count += 1
+        if fit_count > 1 : 
             raise RuntimeError, "Scipy can't fit more than a single fit problem at a time."
             return
-        elif len(fitproblem)==0 : 
+        elif fit_count == 0 : 
             raise RuntimeError, "No Assembly scheduled for Scipy fitting."
             return
     
-        listdata=[]
-        model = fitproblem[0].get_model()
-        listdata = fitproblem[0].get_data()
+        listdata = []
+        model = fitproblem.get_model().clone()
+        data = fitproblem.get_data()
+        
         # Concatenate dList set (contains one or more data)before fitting
         #data=self._concatenateData( listdata)
-        data=listdata
-        self.curr_thread= curr_thread
+        #data = listdata
+        #self.curr_thread= curr_thread
 
         #try:
-        functor= SansAssembly(self.paramList,model,data, curr_thread= self.curr_thread)
-        out, cov_x, info, mesg, success = optimize.leastsq(functor,model.getParams(self.paramList), full_output=1, warning=True)
+        functor = SansAssembly(self.paramList, model, data)#, curr_thread= curr_thread)
+        return functor , model
+
+    def fit(self, q=None, handler=None, curr_thread=None):
+        
+        functor , model = self.createFunctor()
+        
+        out, cov_x, info, mesg, success = optimize.leastsq(functor,
+                                                model.getParams(self.paramList), 
+                                                full_output=1, warning=True)
         
         chisqr = functor.chisq(out)
@@ -98 +108 @@
                 result.pvec = out
                 result.success = success
-                if q !=None:
+                if q is not None:
                     print "went here"
                     q.put(result)
@@ -105 +115 @@
                 return result
         else:  
-            raise ValueError, "SVD did not converge"+str(success)
+            raise ValueError, "SVD did not converge" + str(success)
         #except FitAbort:
             ## fit engine is stop