Changeset 8cfdd5e in sasview

Timestamp:

Mar 17, 2009 1:47:45 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:

bb18ef1

Parents:

4d74a8f

Message:

fix setParam for modelMulplication, add 1 unittest

Location:

sansmodels/src/sans/models

Files:

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

sansmodels/src/sans/models/MultiplicationModel.py

@@ -13 +13 @@
 
        
-        ## Name of the model
-        self.name=""
-        ## model description
+        ## Setting  model name model description
         self.description=""
         if  model1.name != "NoStructure"and  model2.name != "NoStructure":
@@ -34 +32 @@
         self.model2= model2
         ## dispersion
-        self.dispersion = {}
         self._set_dispersion()
         ## Define parameters
-        self.params = {}
         self._set_params()
         ## Parameter details [units, min, max]
-        self.details = {}
         self._set_details()
         #list of parameter that can be fitted
-        self.fixed= []  
         self._set_fixed_params()  
         
@@ -83 +77 @@
                 self.details[name]= detail
                 
+    def setParam(self, name, value):
+        """ 
+            Set the value of a model parameter
+        
+            @param name: name of the parameter
+            @param value: value of the parameter
+        """
+        self._setParamHelper( name, value)
+        if name in self.model1.getParamList():
+            self.model1.setParam( name, value)
+            
+        if name in self.model2.getParamList():
+            self.model2.setParam( name, value) 
+        
+        
+    def _setParamHelper(self, name, value):
+        """
+            Helper function to setparam
+        """
+        # Look for dispersion parameters
+        toks = name.split('.')
+        if len(toks)==2:
+            for item in self.dispersion.keys():
+                if item.lower()==toks[0].lower():
+                    for par in self.dispersion[item]:
+                        if par.lower() == toks[1].lower():
+                            self.dispersion[item][par] = value
+                            return
+        else:
+            # Look for standard parameter
+            for item in self.params.keys():
+                if item.lower()==name.lower():
+                    self.params[item] = value
+                    return
+            
+        raise ValueError, "Model does not contain parameter %s" % name
+    
+        
+   
+             
+   
     def _set_fixed_params(self):
         """

sansmodels/src/sans/models/NoStructure.py

@@ -21 +21 @@
         F(x)= 1
         """
-        ## Parameter details [units, min, max]
-        self.details = {}
-        #list of parameter that cannot be fitted
-        self.fixed= []
+       
     def clone(self):
         """ Return a identical copy of self """

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

@@ -27 +27 @@
     fixed=[]
     fixed=['radius.width']
+    
+    
+    def test_multiplication(self):
+        """ test multiplication model"""
+        from sans.models.MultiplicationModel import MultiplicationModel
+        from sans.models.SphereModel import SphereModel
+        from sans.models.NoStructure import NoStructure
+        model1  =  MultiplicationModel(SphereModel(),NoStructure())
+        model2 = SphereModel()
+        x= 2
+        a = model1.run(x)
+        
+        b=  model2.run(x)
+        self.assertEqual(a, b)
+        model2.setParam("scale", 10)
+        c=  model2.run(x)
+        self.assertEqual(c, 10*b)
+        model1.setParam("scale", 10)
+        d=  model1.run(x)
+        self.assertEqual(d, 10*a)
+        self.assertEqual(model1.getParam("scale"), 10)
+        
+        
     def testMultiplicationModel(self):
         """ Test Multiplication  sphere with SquareWellStructure"""