Changeset 73bbe35 in sasview

Timestamp:

May 21, 2008 5:53:34 PM (17 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:

e94d1d3

Parents:

0954398

Message:

more changed done

File:

• park_integration/test/FittingModule.py (modified) (6 diffs)

park_integration/test/FittingModule.py

@@ -51 +51 @@
         #the list of all data to fit 
         self.data = data
-        #dictionary of models parameters
-        self.parameters={}
+        #list of models parameters
+        self.parameters=[]
         self.contraint =None
         self.residuals=[]
-        
-    def fit_engine(self):
+        self.fitType =None
+        
+    def fit_engine(self,word):
         """
             Check the contraint value and specify what kind of fit to use
         """
+        self.fitType = word
         return True
     
@@ -77 +79 @@
         model =fitproblem.get_model()
         listdata= fitproblem.get_data()
-        
+        self.set_param(model, pars)
+        print "this is self.parameters",self.parameters
         for data in listdata:
             for i in range(len(data.x)):
@@ -92 +95 @@
         if qmax==None:
             qmax= max(xtemp)  
-        chisqr, out, cov = fitHelper(model, pars, xtemp,ytemp, dytemp ,qmin,qmax)
+        chisqr, out, cov = fitHelper(model,self.parameters, xtemp,ytemp, dytemp ,qmin,qmax)
         return chisqr, out, cov
     
@@ -116 +119 @@
         return self.data
     
+    def set_param(self,model, pars):
+        """ Recieve a dictionary of parameter and save it """
+        self.parameters=[]
+        #for key ,value in pars:
+        for key, value in pars.iteritems():
+            print "this is the key",key
+            print "this is the value",value
+            param = Parameter(model, key, value)
+            self.parameters.append(param)
+        
     def add_contraint(self, contraint):
         """ User specify contraint to fit """
@@ -215 +228 @@
     Fit.set_model(model,1 )
     Fit.set_data(data1,1)
-    default_A = model.getParam('A') 
-    default_B = model.getParam('B') 
-    cstA = Parameter(model, 'A', default_A)
-    cstB  = Parameter(model, 'B', default_B)
-    
-    chisqr, out, cov=Fit.fit([cstA,cstB],None,None)
+    #default_A = model.getParam('A') 
+    #default_B = model.getParam('B') 
+    #cstA = Parameter(model, 'A', default_A)
+    #cstB  = Parameter(model, 'B', default_B)
+    
+    #chisqr, out, cov=Fit.fit([cstA,cstB],None,None)
+    chisqr, out, cov=Fit.fit({'A':2,'B':1},None,None)
     print"fit only one data",chisqr, out, cov 
     
@@ -240 +254 @@
     load.load_data(data3)
     Fit.set_data(data3,2)
-    chisqr, out, cov=Fit.fit([cstA,cstB],None,None)
+    chisqr, out, cov=Fit.fit({'A':2,'B':1},None,None)
     print"fit two data",chisqr, out, cov