Index: sansmodels/src/sans/models/test/utest_modelmultiplication_cyl.py
===================================================================
--- sansmodels/src/sans/models/test/utest_modelmultiplication_cyl.py	(revision b22748b53be5e9215b8a9151242dc11c82b5bbfa)
+++ 	(revision )
@@ -1,133 +1,0 @@
-"""
-    Unit tests for specific models
-    @author: Gervaise Alina / UTK
-"""
-
-import unittest, numpy,math
-
-from sans.models.MultiplicationModel import MultiplicationModel
-from sans.models.SphereModel import SphereModel
-from sans.models.SquareWellStructure import SquareWellStructure
-      
-class TestDisperser(unittest.TestCase):
-    """ Unit tests for sphere model * SquareWellStructure"""
-    model1= SphereModel()
-    model2= SquareWellStructure()
-    model3= MultiplicationModel(model1, model2)
-    details={}
-    details['scale'] = ['', None, None]
-    #details['radius'] = ['[A]', None, None]#Non ASCII charater
-    #details['contrast'] = ['[1/A^2]', None, None] #Non ASCII charater
-    details['background'] = ['[1/cm]', None, None]
-    details['volfraction'] = ['', None, None]
-    details['welldepth'] = ['[kT]', None, None]
-    details['wellwidth'] = ['', None, None]
-    
-    ## fittable parameters
-    fixed=[]
-    fixed=['radius.width']
-    
-    #Radius of two models should not be equal..
-    def test_multplication_radius(self):
-        "" "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", 20)
-        model1.setParam("length", 400)
-        model2 = HardsphereStructure()
-        model  =  MultiplicationModel(model1,model2 )
-        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"),73.340133152616076)
-        
-    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):
-        """ 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"""
-        ## test details dictionary
-        #self.assertEqual(self.model3.details, self.details)
-        
-        ## test parameters list
-        list3= self.model3.getParamList()
-        for item in self.model1.getParamList():
-            self.assert_(item in list3)
-        for item in self.model2.getParamList():
-            self.assert_(item in list3)
-            
-        ## test set value for parameters and get paramaters
-        self.model3.setParam("scale", 15)
-        self.assertEqual(self.model3.getParam("scale"), 15)
-        self.model3.setParam("radius", 20)
-        self.assertEqual(self.model3.getParam("radius"), 20)
-        self.model3.setParam("radius.width", 15)
-        self.assertEqual(self.model3.getParam("radius.width"), 15)
-        
-        ## Dispersity 
-        list3= self.model3.getDispParamList()
-        self.assertEqual(list3, ['radius.npts', 'radius.nsigmas', 'radius.width'])
-        
-        from sans.models.dispersion_models import ArrayDispersion
-        disp_th = ArrayDispersion()
-        
-        values_th = numpy.zeros(100)
-        weights   = numpy.zeros(100)
-        for i in range(100):
-            values_th[i]=(math.pi/99.0*i)
-            weights[i]=(1.0)
-    
-        disp_th.set_weights(values_th, weights)
-        
-        self.model3.set_dispersion('radius', disp_th)
-        
-        val_1d = self.model3.run(math.sqrt(0.0002))
-        val_2d = self.model3.runXY([0.01,0.01]) 
-        
-        self.assertTrue(math.fabs(val_1d-val_2d)/val_1d < 0.02)
-        model4= self.model3.clone()
-        self.assertEqual(model4.getParam("radius"), 20)
-        
-if __name__ == '__main__':
-    unittest.main()
Index: sansmodels/src/sans/models/test/utest_modelmultiplication_new.py
===================================================================
--- sansmodels/src/sans/models/test/utest_modelmultiplication_new.py	(revision b7a25a7e92114487011ac2621aa87d74e75dd7d9)
+++ 	(revision )
@@ -1,156 +1,0 @@
-"""
-    Unit tests for specific models
-    @author: Gervaise Alina / UTK
-"""
-#This test replaces the older utests for multiplicationModel. Aug. 31, 2009. JC
-import unittest, numpy,math
-
-from sans.models.MultiplicationModel import MultiplicationModel
-from sans.models.SphereModel import SphereModel
-from sans.models.SquareWellStructure import SquareWellStructure
-      
-class TestDisperser(unittest.TestCase):
-    """ Unit tests for sphere model * SquareWellStructure"""
-    model1= SphereModel()
-    model2= SquareWellStructure()
-    model3= MultiplicationModel(model1, model2)
-    details={}
-    details['scale'] = ['', None, None]
-    #details['radius'] = ['[A]', None, None]#Non ASCII charater
-    #details['contrast'] = ['[1/A^2]', None, None] #Non ASCII charater
-    details['background'] = ['[1/cm]', None, None]
-    details['volfraction'] = ['', None, None]
-    details['welldepth'] = ['[kT]', None, None]
-    details['wellwidth'] = ['', None, None]
-    
-    ## fittable parameters
-    fixed=[]
-    fixed=['radius.width']
-    
-    #Radius of model1.calculate_ER should be equal to the out of Diamfunctions
-    def test_multplication_radius(self):
-        "" "test multiplication model"""
-        from sans.models.MultiplicationModel import MultiplicationModel
-        from sans.models.CylinderModel import CylinderModel
-        from sans.models.HardsphereStructure import HardsphereStructure
-        from sans.models.DiamCylFunc import DiamCylFunc
-        model1 = CylinderModel()
-        modelD = DiamCylFunc()
-        model1.setParam("radius", 20)
-        model1.setParam("length", 400)
-        modelD.setParam("radius", 20)
-        modelD.setParam("length", 400)      
-        model2 = HardsphereStructure()
-        model  =  MultiplicationModel(model1,model2 )
-        
-        modelDrun = modelD.run(0.1)/2
-        model2.setParam("volfraction", 0.2)
-        model2.setParam("effect_radius", modelDrun )
-        
-        #Compare new method with old method
-         
-        self.assertEqual(model.run(0.1), model1.run(0.1)*model2.run(0.1))
-        
-        #Compare radius from two different calculations. Note: modelD.run(0.0) is DIAMETER
-        self.assertEqual(model1.calculate_ER(), modelD.run(0.1)/2)
-        
-    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
-        from sans.models.DiamEllipFunc import DiamEllipFunc
-        model1 = EllipsoidModel()
-        modelD = DiamEllipFunc()
-        model1.setParam("radius_a", 20)
-        model1.setParam("radius_b", 400)
-        modelD.setParam("radius_a", 20)
-        modelD.setParam("radius_b", 400)
-        
-        model2 = HardsphereStructure()
-        model2.setParam("volfraction", 0.2)
-        model  =  MultiplicationModel(model1,model2 )       
-        model.setParam("radius_a", 20)
-        model.setParam("radius_b", 400)
-        self.assertEqual(model.getParam("radius_a"), 20)
-        model2_in = modelD.run(0.1)/2
-        model_out = model.run(0.1)
-        
-        model2.setParam("effect_radius", model2_in)
-             
-        #Compare new method with old method
-        self.assertEqual(model_out, model1.run(0.1)*model2.run(0.1))
-        
-        #Compare radius from two different calculations
-        self.assertEqual(model1.calculate_ER(), model2_in)
-    
-    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"""
-        ## test details dictionary
-        #self.assertEqual(self.model3.details, self.details)
-        
-        ## test parameters list
-        list3= self.model3.getParamList()
-
-        for item in self.model1.getParamList():
-            self.assert_(item in list3)
-        for item in self.model2.getParamList():
-            #model3 parameters should not include effect_radius*
-            if not 'effect_radius' in item:  
-                self.assert_(item in list3)
-            
-        ## test set value for parameters and get paramaters
-        self.model3.setParam("scale", 15)
-        self.assertEqual(self.model3.getParam("scale"), 15)
-        self.model3.setParam("radius", 20)
-        self.assertEqual(self.model3.getParam("radius"), 20)
-        self.model3.setParam("radius.width", 15)
-        self.assertEqual(self.model3.getParam("radius.width"), 15)
-        
-        ## Dispersity 
-        list3= self.model3.getDispParamList()
-        self.assertEqual(list3, ['radius.npts', 'radius.nsigmas', 'radius.width'])
-        
-        from sans.models.dispersion_models import ArrayDispersion
-        disp_th = ArrayDispersion()
-        
-        values_th = numpy.zeros(100)
-        weights   = numpy.zeros(100)
-        for i in range(100):
-            values_th[i]=(math.pi/99.0*i)
-            weights[i]=(1.0)
-    
-        disp_th.set_weights(values_th, weights)
-        
-        self.model3.set_dispersion('radius', disp_th)
-        
-        val_1d = self.model3.run(math.sqrt(0.0002))
-        val_2d = self.model3.runXY([0.01,0.01]) 
-        
-        self.assertTrue(math.fabs(val_1d-val_2d)/val_1d < 0.02)
-        model4= self.model3.clone()
-        self.assertEqual(model4.getParam("radius"), 20)
-        
-if __name__ == '__main__':
-    unittest.main()
