Changeset 3740b11 in sasview for sansmodels

Timestamp:

Apr 10, 2009 7:32:51 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:

249bae9

Parents:

24276b6

Message:

Plug-In Cylinder (Ellips)Model times StructureModels?, yet needs to be checked very soon.

File:

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

sansmodels/src/sans/models/MultiplicationModel.py

@@ -3 +3 @@
 import numpy, math
 import copy
+from sans.models.pluginmodel import Model1DPlugin
+from sans.models.DiamCylFunc import  DiamCylFunc
+from sans.models.DiamEllipFunc import  DiamEllipFunc
 class MultiplicationModel(BaseComponent):
     """
@@ -26 +29 @@
             self.name = model1.name
             self.description= model1.description
-  
-        
+                        
+        #For virial coefficients for only two P(Q) models,"CylinderModel","EllipsoidModel". SphereModel works w/o it.
+        modelDiam = None
+        if model1.__class__.__name__ == "CylinderModel":
+            Model1DPlugin("DiamCylFunc")
+            modelDiam = DiamCylFunc()
+            para1 = 'radius'
+            para2 = 'length'
+            
+        elif model1.__class__.__name__  == "EllipsoidModel":
+            Model1DPlugin("DiamEllipFunc")
+            modelDiam = DiamEllipFunc()
+            para1 = 'radius_a'
+            para2 = 'radius_b'
+            
+        self.modelD = modelDiam
+        
+        if model1.__class__.__name__ == "CylinderModel" \
+            or model1.__class__.__name__  == "EllipsoidModel":
+          
+            self.para1 = para1
+            self.para2 = para2
+
         
         self.model1= model1
         self.model2= model2
+        
+        #if modelDiam != None:
+           #self.model2.params["radius"]= DiamEllipFunc()
+        
+           #print "self.modelD",self.modelD.params,self.model1.params,self.model2.params    
+
         ## dispersion
         self._set_dispersion()
@@ -63 +93 @@
             
         for name , value in self.model2.dispersion.iteritems():
-            if not name in self.dispersion.keys():
+            if not name in self.dispersion.keys()and name !='radius':
                 self.dispersion[name]= value
+
+                    
                 
                 
@@ -72 +104 @@
             this model parameters 
         """
+        
         for name , value in self.model1.params.iteritems():
             self.params[name]= value
-            if name in self.model2.getParamList():
+            
+            if self.modelD !=None:
+                if name == self.para1 or name == self.para2:
+                    self.modelD.params[name]= value
+                elif name in self.model2.getParamList() and name !='radius':
+                    self.model2.setParam( name, value)
+
+            elif name in self.model2.getParamList():
                 self.model2.setParam(name, value)
+        if self.modelD !=None:
+            self.model2.setParam('radius', self.modelD.run())
             
         for name , value in self.model2.params.iteritems():
-            if not name in self.params.keys():
+            if not name in self.params.keys()and name != 'radius':
                 self.params[name]= value
             
@@ -90 +132 @@
             
         for name , detail in self.model2.details.iteritems():
-            if not name in self.details.keys():
+            if not name in self.details.keys()and name != 'radius':
                 self.details[name]= detail
                 
@@ -100 +142 @@
             @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():
+
+        
+        if self.modelD !=None:
+            if name == self.para1 or name == self.para2:
+                self.modelD.params[name]= value
+            elif name in self.model2.getParamList() and name != 'radius':
+                self.model2.setParam( name, value)
+        elif name in self.model2.getParamList()and name != 'radius':
             self.model2.setParam( name, value) 
+            
        
         self._setParamHelper( name, value)
@@ -153 +204 @@
             @return: (DAB value)
         """
-       
-        return self.model1.run(x)* self.model2.run(x)
+        #MultiplicationModel(self.model1, self.model2 )      
+           
+        if self.modelD!=None:
+            value = self.modelD.run(x)
+            self.model2.setParam( "radius", value)        
+                        
+            print "self.model2.setParam( radius, value)",value 
+        return self.model1.run(x)*self.model2.run(x)
    
     def runXY(self, x = 0.0):