Changeset 6756712 in sasview

Timestamp:

Apr 22, 2009 4:12:49 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:

280a14b

Parents:

c3e4a7fa

Message:

fixed a bug and changed setparam

File:

• sansmodels/src/sans/models/MultiplicationModel.py (modified) (2 diffs)

sansmodels/src/sans/models/MultiplicationModel.py

@@ -152 +152 @@
             self.model1.setParam( name, value)
 
-        
-        if self.modelD !=None:
-            if name == self.para1 or name == self.para2:
+        if name==self.para1 or name == self.para2 and  self.modelD !=None:
                 self.modelD.params[name]= value
-            elif name in self.model2.getParamList() and name != 'radius':
+                self.model2.setParam('radius', self.modelD.run())
+        else:
+            if name in self.model2.getParamList():
                 self.model2.setParam( name, value)
-        elif name in self.model2.getParamList()and name != 'radius':
-            self.model2.setParam( name, value) 
-            
-       
+            
+        
+            
         self._setParamHelper( name, value)
         
@@ -210 +209 @@
         #MultiplicationModel(self.model1, self.model2 )      
            
-        if self.modelD!=None:
-            value = self.modelD.run(x)
-            self.model2.setParam( "radius", value)        
+        #if self.modelD!=None:
+        #    value = self.modelD.run(x)
+        #    self.model2.setParam( "radius", value)        
                         
             #print "self.model2.setParam( radius, value)",value