Changeset cf3b781 in sasview for park_integration/ScipyFitting.py

Timestamp:

Jul 7, 2008 6:37:27 PM (16 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:

1b0b3ca

Parents:

672c44da

Message:

need more tests.but usecase 3 implemented

File:

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

park_integration/ScipyFitting.py

@@ -68 +68 @@
         listdata = fitproblem.get_data()
         
-        parameters = self.set_param(model,pars)
+        parameters = self.set_param(model,model.name,pars)
        
         # Do the fit with  data set (contains one or more data) and one model 
         xtemp,ytemp,dytemp=self._concatenateData( listdata)
+        print "dytemp",dytemp
         if qmin==None:
             qmin= min(xtemp)
@@ -123 +124 @@
         return self.fitArrangeList[Uid]
     
-    def set_param(self,model, pars):
+    def set_param(self,model,name, pars):
         """ Recieve a dictionary of parameter and save it """
         parameters=[]
@@ -129 +130 @@
             raise ValueError, "Cannot set parameters for empty model"
         else:
-            #for key ,value in pars:
+            model.name=name
             for key, value in pars.iteritems():
                 param = Parameter(model, key, value)
@@ -164 +165 @@
         #print mylist
         return mylist
-    
+    def remove_data(self,Uid,data=None):
+        """ remove one or all data"""
+        if data==None:# remove all element in data list
+            if self.fitArrangeList.has_key(Uid):
+                self.fitArrangeList[Uid].remove_datalist()
+        else:
+            if self.fitArrangeList.has_key(Uid):
+                self.fitArrangeList[Uid].remove_data(data)
+                
+    def remove_model(self,Uid):
+        """ remove model """
+        if self.fitArrangeList.has_key(Uid):
+            self.fitArrangeList[Uid].remove_model()
                 
 
@@ -214 +227 @@
             if x[j]>qmin and x[j]<qmax:
                 residuals.append( ( y[j] - model.runXY(x[j]) ) / err_y[j] )
-       
+            
         return residuals
         
@@ -240 +253 @@
     return chisqr, out, cov_x    
 
-      
-if __name__ == "__main__": 
-    load= Load()
-    
-    # test fit one data set one model
-    load.set_filename("testdata_line.txt")
-    load.set_values()
-    data1 = Data1D(x=[], y=[], dx=None,dy=None)
-    data1.name = "data1"
-    load.load_data(data1)
-    fitter =ScipyFit()
-    from sans.guitools.LineModel import LineModel
-    model  = LineModel()
-    fitter.set_model(model,1)
-    fitter.set_data(data1,1)
-    
-    chisqr, out, cov=fitter.fit({'A':2,'B':1},None,None)
-    print "my list of param",fitter.createProblem()
-    print"fit only one data",chisqr, out, cov 
-    print "this model list of param",model.getParamList()
-    # test fit with 2 data and one model
-    fitter =ScipyFit()
-   
-    fitter.set_model(model,2 )
-    load.set_filename("testdata1.txt")
-    load.set_values()
-    data2 = Data1D(x=[], y=[], dx=None,dy=None)
-    data2.name = "data2"
-    
-    load.load_data(data2)
-    fitter.set_data(data2,2)
-    
-    load.set_filename("testdata2.txt")
-    load.set_values()
-    data3 = Data1D(x=[], y=[], dx=None,dy=None)
-    data3.name = "data2"
-    load.load_data(data3)
-    fitter.set_data(data3,2)
-    chisqr, out, cov=fitter.fit({'A':2,'B':1},None,None)
-    print"fit two data",chisqr, out, cov 
-