Changeset 393f0f3 in sasview

Timestamp:

Jan 26, 2010 11:09:19 AM (14 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:

693500a

Parents:

3c67340

Message:

revert previous commits asked by ga.

Location:

park_integration

Files:

• AbstractFitEngine.py (modified) (7 diffs)
• Fitting.py (modified) (1 diff)
• ScipyFitting.py (modified) (3 diffs)

park_integration/AbstractFitEngine.py

@@ -1 +1 @@
 import logging, sys
-import copy
-from copy import deepcopy
 import park,numpy,math, copy
 from DataLoader.data_info import Data1D
@@ -81 +79 @@
         self.pars=[]
   
-    def clone(self):
-        model = self.model.clone()
-        model.name = self.model.name
-        return Model(model)
+  
     def getParams(self,fitparams):
         """
@@ -120 +115 @@
         """
         try:
-                return self.model.evalDistribution(x)
+            return self.model.evalDistribution(x)
         except:
-                raise
+            raise
 
     
@@ -342 +337 @@
          Sans Assembly class a class wrapper to be call in optimizer.leastsq method
     """
-    def __init__(self,paramlist,model=None , data=None, curr_thread= None):
-        """
-            @param model: the model wrapper for sans -model
-            @param data: the data wrapper for sans data
-        """
-        self.model = model.clone()
-        self.data  = deepcopy(data)
-        self.paramlist = deepcopy(paramlist)
+    def __init__(self,paramlist,Model=None , Data=None, curr_thread= None):
+        """
+            @param Model: the model wrapper fro sans -model
+            @param Data: the data wrapper for sans data
+        """
+        self.model = Model
+        self.data  = Data
+        self.paramlist=paramlist
         self.curr_thread= curr_thread
         self.res=[]
@@ -462 +457 @@
         if model == None:
             raise ValueError, "AbstractFitEngine: Need to set model to fit"
-        #print "set_model",model.name
-        #new_model= deepcopy(model)
-        new_model = model.clone()
-        new_model.name = model.name
-        if not issubclass(new_model.__class__, Model):
-            new_model= Model(new_model)
+        
+        new_model= model
+        if not issubclass(model.__class__, Model):
+            new_model= Model(model)
         
         if len(constraints)>0:
@@ -513 +506 @@
             @param Uid: unique key corresponding to a fitArrange object with data
         """
-        #print "set_data",data.__class__.__name__
         if data.__class__.__name__=='Data2D':
             fitdata=FitData2D(sans_data2d=data, data=data.data, err_data= data.err_data)
         else:
             fitdata=FitData1D(x=data.x, y=data.y , dx= data.dx,dy=data.dy,smearer=smearer)
-        
+       
         fitdata.setFitRange(qmin=qmin,qmax=qmax)
         #A fitArrange is already created but contains model only at Uid
@@ -586 +578 @@
         """
         self.model = model
-        self.model.name = model.name
         
     def add_data(self,data):

park_integration/Fitting.py

@@ -22 +22 @@
         engine.set_param( model,model.name, pars)
         engine.set_model(model,Uid)
-        engine.select_problem_for_fit(Uid,value)
+        
         chisqr1, out1, cov1=engine.fit(pars,qmin,qmax)
     """  

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 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 : 
+
+    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 : 
             raise RuntimeError, "Scipy can't fit more than a single fit problem at a time."
             return
-        elif fit_count == 0 : 
+        elif len(fitproblem)==0 : 
             raise RuntimeError, "No Assembly scheduled for Scipy fitting."
             return
     
-        listdata = []
-        model = fitproblem.get_model().clone()
-        data = fitproblem.get_data()
-        
+        listdata=[]
+        model = fitproblem[0].get_model()
+        listdata = fitproblem[0].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= 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)
+        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)
         
         chisqr = functor.chisq(out)
@@ -108 +98 @@
                 result.pvec = out
                 result.success = success
-                if q is not None:
+                if q !=None:
                     print "went here"
                     q.put(result)
@@ -115 +105 @@
                 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