Changeset 24415e9 in sasview

Timestamp:

Apr 9, 2009 6:00: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:

87fbc60

Parents:

56e1202

Message:

set initial value for model multplication parameters

Location:

sansmodels/src/sans/models

Files:

• MultiplicationModel.py (modified) (4 diffs)
• test/utest_modelmultiplication.py (modified) (1 diff)

sansmodels/src/sans/models/MultiplicationModel.py

@@ -74 +74 @@
         for name , value in self.model1.params.iteritems():
             self.params[name]= value
+            if name in self.model2.getParamList():
+                self.model2.setParam(name, value)
             
         for name , value in self.model2.params.iteritems():
@@ -98 +100 @@
             @param value: value of the parameter
         """
-        self._setParamHelper( name, value)
+        
         if name in self.model1.getParamList():
             self.model1.setParam( name, value)
@@ -104 +106 @@
         if name in self.model2.getParamList():
             self.model2.setParam( name, value) 
-        
+       
+        self._setParamHelper( name, value)
         
     def _setParamHelper(self, name, value):
@@ -150 +153 @@
             @return: (DAB value)
         """
+       
         return self.model1.run(x)* self.model2.run(x)
    

sansmodels/src/sans/models/test/utest_modelmultiplication.py

@@ -28 +28 @@
     fixed=['radius.width']
     
-    
+    def test_multiplication_radius(self):
+        """ test multiplication model"""
+        from sans.models.MultiplicationModel import MultiplicationModel
+        from sans.models.SphereModel import SphereModel
+        from sans.models.HayterMSAStructure import HayterMSAStructure
+        my_sphere = SphereModel()
+        my_struct = HayterMSAStructure()
+        model1  =  MultiplicationModel(my_sphere,my_struct)
+        self.assertEquals(model1.getParam("radius"),
+                          my_struct.getParam("radius"),
+                          my_sphere.getParam("radius"))
+        model2 = SphereModel()
+        x= 2
+
+        model1.setParam("radius", 60)
+        self.assertEqual(model1.getParam("radius"), 60)
+        a = model1.run(x)
+        self.assertEqual(a, 2.5723183020756634e-006)
+        model1.setParam("radius", 70)
+        b = model1.run(x)
+        self.assertNotEqual(a, b)
+        model1.setParam("radius", 60)
+        c =  model1.run(x)
+        self.assertEqual(c, 2.5723183020756634e-006)
+        self.assertEqual(a, c)
+        
+        
+        
+        
     def test_multiplication(self):
         """ test multiplication model"""