Changeset f44dbc7 in sasview for park_integration/AbstractFitEngine.py

Timestamp:

Aug 12, 2008 1:33:13 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:

985c88b

Parents:

ee5b04c

Message:

change made on set_model method receive a list instead of dict.
need to rewrite test

File:

• park_integration/AbstractFitEngine.py (modified) (2 diffs)

park_integration/AbstractFitEngine.py

@@ -33 +33 @@
             return xtemp, ytemp,dytemp
     
-    def set_model(self,model,name,Uid,pars={}):
+    def set_model(self,model,name,Uid,pars=[]):
         """ 
       
@@ -49 +49 @@
         print "AbstractFitEngine:  fitting parmater",pars
        
-        if pars !={}:
+        if len(pars) >0:
             self.parameters=[]
-            
             if model==None:
-                raise ValueError, "Cannot set parameters for empty model"
+                raise ValueError, "AbstractFitEngine: Specify parameters to fit"
             else:
                 model.name=name
-                for key, value in pars.iteritems():
-                    param = Parameter(model, key, value)
+                for param_name in pars:
+                    value=model.getParam(param_name)
+                    if value==None:
+                        raise ValueError ,"%s has not value set"%param_name
+                    param = Parameter(model,param_name,value)
                     self.parameters.append(param)