Changeset 309ccaf in sasview for sansmodels/src/sans

Timestamp:

Apr 13, 2009 11:50:02 AM (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:

37f487e

Parents:

42d27f2

Message:

utest for multiplication model (includeing DiaEll? and DiaCyl?).

File:

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

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

@@ -27 +27 @@
     fixed=[]
     fixed=['radius.width']
-    """
+    
     #Radius of two models should not be equal..
     def test_multplication_radius(self):
-        "" test multiplication model""
+        "" "test multiplication model"""
         from sans.models.MultiplicationModel import MultiplicationModel
         from sans.models.CylinderModel import CylinderModel
         from sans.models.HardsphereStructure import HardsphereStructure
         model1 = CylinderModel()
-        model1.setParam("radius", 3)
+        model1.setParam("radius", 20)
+        model1.setParam("length", 400)
         model2 = HardsphereStructure()
         model  =  MultiplicationModel(model1,model2 )
-        model.setParam("radius", 1)
-        self.assertEqual(model.getParam("radius"), 1)
+        model.setParam("radius", 20)
+        self.assertEqual(model.getParam("radius"), 20)
         #self.assertEqual(model.model1.getParam("radius"),3)
         from sans.models.DiamCylFunc import DiamCylFunc
         model4= DiamCylFunc()
         radius= model4.run(0.0)
-        self.assertEqual(model.model2.getParam("radius"),radius)
-    """    
+        self.assertEqual(model.model2.getParam("radius"),74.400330888433245)
+        
+    def test_multplication_radius1(self):
+        "" "test multiplication model"""
+        from sans.models.MultiplicationModel import MultiplicationModel
+        from sans.models.EllipsoidModel import EllipsoidModel
+        from sans.models.HardsphereStructure import HardsphereStructure
+        model1 = EllipsoidModel()
+        model1.setParam("radius_a", 20)
+        model1.setParam("radius_b", 400)
+        model2 = HardsphereStructure()
+        model  =  MultiplicationModel(model1,model2 )
+        model.setParam("radius_a", 20)
+        self.assertEqual(model.getParam("radius_a"), 20)
+        #self.assertEqual(model.model1.getParam("radius"),3)
+        from sans.models.DiamEllipFunc import DiamEllipFunc
+        model4= DiamEllipFunc()
+        radius= model4.run(0.0)
+        self.assertEqual(model.model2.getParam("radius"),270.74504487588121)
     
     def test_multiplication(self):