Changeset 4dd63eb in sasview for park_integration/ParkFitting.py

Timestamp:

Jul 10, 2008 6:05:09 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:

49b3ddd

Parents:

83ca047

Message:

change on set_model

File:

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

park_integration/ParkFitting.py

@@ -185 +185 @@
         self.fitArrangeList={}
        
-    def createProblem(self,pars={}):
+    def createProblem(self):
         """
         Extract sansmodel and sansdata from self.FitArrangelist ={Uid:FitArrange}
@@ -211 +211 @@
         
     
-    def fit(self,pars=None, qmin=None, qmax=None):
+    def fit(self, qmin=None, qmax=None):
         """
             Performs fit with park.fit module.It can  perform fit with one model
@@ -229 +229 @@
 
        
-        self.createProblem(pars)
+        self.createProblem()
         pars=self.problem.fit_parameters()
         self.problem.eval()
@@ -240 +240 @@
                          fitter=fitter,
                          handler= fitresult.ConsoleUpdate(improvement_delta=0.1))
-        
+        print "result",result
         return result.fitness,result.pvec,result.cov
     
-    def set_model(self,model,Uid):
-        """ 
+    def set_model(self,model,name,Uid,pars={}):
+        """ 
+      
+            Receive a dictionary of parameter and save it Parameter list
+            For scipy.fit use.
             Set model in a FitArrange object and add that object in a dictionary
             with key Uid.
-            @param model: the model added
+            @param model: model on with parameter values are set
+            @param name: model name
             @param Uid: unique key corresponding to a fitArrange object with model
-        """
+            @param pars: dictionary of paramaters name and value
+            pars={parameter's name: parameter's value}
+            
+        """
+        self.parameters=[]
+        if model==None:
+            raise ValueError, "Cannot set parameters for empty model"
+        else:
+            model.name=name
+            for key, value in pars.iteritems():
+                param = Parameter(model, key, value)
+                self.parameters.append(param)
+        
         #A fitArrange is already created but contains dList only at Uid
         if self.fitArrangeList.has_key(Uid):
@@ -258 +274 @@
             fitproblem.set_model(model)
             self.fitArrangeList[Uid]=fitproblem
+        
         
     def set_data(self,data,Uid):
@@ -286 +303 @@
             return None
     
-    def set_param(self,model,name, pars):
-        """ 
-            Recieve a dictionary of parameter and save it 
-            @param model: model on with parameter values are set
-            @param name: model name
-            @param pars: dictionary of paramaters name and value
-            pars={parameter's name: parameter's value}
-            @return list of Parameter instance
-        """
-        parameters=[]
-        if model==None:
-            raise ValueError, "Cannot set parameters for empty model"
-        else:
-            model.name=name
-            for key, value in pars.iteritems():
-                param = Parameter(model, key, value)
-                parameters.append(param)
-        return parameters
-    
-    def remove_data(self,Uid,data=None):
-        """ remove one or all data.if data ==None will remove the whole
-            list of data at Uid; else will remove only data in that list.
-            @param Uid: unique id containing FitArrange object with data
-            @param data:data to be removed
-        """
-        if data==None:
-        # remove all element in data list
-            if self.fitArrangeList.has_key(Uid):
-                self.fitArrangeList[Uid].remove_datalist()
-        else:
-        #remove only data in dList
-            if self.fitArrangeList.has_key(Uid):
-                self.fitArrangeList[Uid].remove_data(data)
-                
-    def remove_model(self,Uid):
-        """ 
-            remove model in FitArrange object with Uid.
-            @param Uid: Unique id corresponding to the FitArrange object 
-            where model must be removed.
-        """
-        if self.fitArrangeList.has_key(Uid):
-            self.fitArrangeList[Uid].remove_model()
     def remove_Fit_Problem(self,Uid):
         """remove   fitarrange in Uid"""
         if self.fitArrangeList.has_key(Uid):
             del self.fitArrangeList[Uid]
+            
     def _concatenateData(self, listdata=[]):
         """