Changeset 7c3aea3 in sasview for sansmodels/src/sans/models

Timestamp:

Apr 22, 2009 9:08:56 PM (16 years ago)

Author:

Jae Cho <jhjcho@…>

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:

0b16ee3

Parents:

6d1235b

Message:

fix a bug in 1d fit

File:

• sansmodels/src/sans/models/MultiplicationModel.py (modified) (1 diff)

sansmodels/src/sans/models/MultiplicationModel.py

@@ -151 +151 @@
         if name in self.model1.getParamList():
             self.model1.setParam( name, value)
-
-        if name==self.para1 or name == self.para2 and  self.modelD !=None:
-                self.modelD.params[name]= value
-                self.model2.setParam('radius', self.modelD.run())
+        if self.modelD !=None:
+            if name==self.para1 or name == self.para2:
+                    self.modelD.params[name]= value
+                    self.model2.setParam('radius', self.modelD.run())
+            elif name in self.model2.getParamList():
+                        self.model2.setParam( name, value)        
         else:
             if name in self.model2.getParamList():