Changeset 6831a99 in sasview

Timestamp:

Jul 15, 2008 2:02:59 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:

f4e1c9e

Parents:

5ef6709

Message:

modified setmodel

File:

• park_integration/AbstractFitEngine.py (modified) (1 diff)

park_integration/AbstractFitEngine.py

@@ -46 +46 @@
             
         """
-        self.parameters=[]
-        if model==None:
-            raise ValueError, "Cannot set parameters for empty model"
+        if pars !={}:
+            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):
+                self.fitArrangeList[Uid].set_model(model)
+            else:
+            #no fitArrange object has been create with this Uid
+                fitproblem= FitArrange()
+                fitproblem.set_model(model)
+                self.fitArrangeList[Uid]=fitproblem
         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):
-            self.fitArrangeList[Uid].set_model(model)
-        else:
-        #no fitArrange object has been create with this Uid
-            fitproblem= FitArrange()
-            fitproblem.set_model(model)
-            self.fitArrangeList[Uid]=fitproblem
+            raise ValueError, "park_integration:missing parameters"