Changeset 2eaaf1a in sasview for park_integration/test/test_fit_cylinder.py

Timestamp:

Oct 19, 2009 4:57:35 PM (15 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:

eb575b0

Parents:

b72b595

Message:

refactor park_integration test

File:

• park_integration/test/test_fit_cylinder.py (modified) (4 diffs)

park_integration/test/test_fit_cylinder.py

@@ -3 +3 @@
 """
 import unittest
-#from sans.guitools.plottables import Theory1D
-#from sans.guitools.plottables import Data1D
+
 from danse.common.plottools.plottables import Data1D,Theory1D
 from sans.fit.AbstractFitEngine import Model,FitData1D
@@ -11 +10 @@
 from DataLoader.loader import Loader
 
-class testFitModule(unittest.TestCase):
-    """ test fitting """
-    
+class TestSingleFit(unittest.TestCase):
+    """ test single fitting """
+    def setUp(self):
+        """ initialize data"""
+        out = Loader().load("cyl_400_20.txt")
+        #Create data that fitting engine understands
+        data1 = Data1D(x=out.x, y=out.y, dx=out.dx, dy=out.dy)
+        self.data = FitData1D(data1)
+        # Create model that fitting engine understands
+        from sans.models.CylinderModel import CylinderModel
+        model1  = CylinderModel()
+        model1.setParam("scale", 1.0)
+        model1.setParam("radius",18)
+        model1.setParam("length", 397)
+        model1.setParam("contrast",3e-006 )
+        model1.setParam("background", 0.0)
+     
+        self.model = Model(model1)
+       
+        self.pars1 =['length','radius','scale']
+        
+    def _fit(self, name="scipy"):
+        """ return fit result """
+        fitter = Fit(name)
+        fitter.set_data(self.data,1)
+        
+        fitter.set_model(self.model,1,self.pars1)
+        fitter.select_problem_for_fit(Uid=1,value=1)
+        return  fitter.fit()
+       
+
     def test_scipy(self):
         """ Simple cylinder model fit (scipy)  """
         
-        out=Loader().load("cyl_400_20.txt")
-        data1 = Data1D(x=out.x, y=out.y, dx=out.dx, dy=out.y)
-        
-        fitter = Fit('scipy')
-        # Receives the type of model for the fitting
-        from sans.models.CylinderModel import CylinderModel
-        model1  = CylinderModel()
-        model1.setParam('contrast', 1)
-        #data = Data(sans_data=data1)
-        data = FitData1D(data1)
-        model = Model(model1)
-        
-        pars1 =['length','radius','scale']
-        fitter.set_data(data,1)
-        model.set(scale=1e-10)
-        fitter.set_model(model,1,pars1)
-        fitter.select_problem_for_fit(Uid=1,value=1)
-        result1 = fitter.fit()
+        result1 = self._fit("scipy")
         
         self.assert_(result1)
@@ -42 +52 @@
         self.assertTrue( math.fabs(result1.pvec[0]-400.0)/3.0 < result1.stderr[0] )
         self.assertTrue( math.fabs(result1.pvec[1]-20.0)/3.0  < result1.stderr[1] )
-        self.assertTrue( math.fabs(result1.pvec[2]-9.0e-12)/3.0   < result1.stderr[2] )
+        self.assertTrue( math.fabs(result1.pvec[2]-1.0)/3.0   < result1.stderr[2] )
         self.assertTrue( result1.fitness < 1.0 )
+        
         
     def test_park(self):
         """ Simple cylinder model fit (park)  """
-        
-        out=Loader().load("cyl_400_20.txt")
-        data1 = Data1D(x=out.x, y=out.y, dx=out.dx, dy=out.y)
-        
-        fitter = Fit('park')
-        # Receives the type of model for the fitting
-        from sans.models.CylinderModel import CylinderModel
-        model1  = CylinderModel()
-        
-        #data = Data(sans_data=data1)
-        data = FitData1D(data1)
-        model = Model(model1)
-        
-        pars1 =['length','radius','scale']
-        fitter.set_data(data,1)
-        model.set(contrast= 1)
-        model.set(scale=1e-10)
-        fitter.set_model(model,1,pars1)
-        fitter.select_problem_for_fit(Uid=1,value=1)
-        result1 = fitter.fit()
+        result1 = self._fit("park")
         
         self.assert_(result1)
         self.assertTrue(len(result1.pvec)>0 or len(result1.pvec)==0 )
         self.assertTrue(len(result1.stderr)> 0 or len(result1.stderr)==0)
-        
-        print result1.pvec[0]-400.0, result1.pvec[0]
-        print math.fabs(result1.pvec[0]-400.0)/3.0
+       
         self.assertTrue( math.fabs(result1.pvec[0]-400.0)/3.0 < result1.stderr[0] )
         self.assertTrue( math.fabs(result1.pvec[1]-20.0)/3.0  < result1.stderr[1] )
-        self.assertTrue( math.fabs(result1.pvec[2]-9.0e-12)/3.0   < result1.stderr[2] )
+        self.assertTrue( math.fabs(result1.pvec[2]-1.0)/3.0   < result1.stderr[2] )
         self.assertTrue( result1.fitness < 1.0 )
         
-    def test_park2(self):
-        """ Simultaneous cylinder model fit (park)  """
+        
+        
+class TestSimultaneousFit(unittest.TestCase):
+    """ test simultaneous fitting """
+    def setUp(self):
+        """ initialize data"""
         
         out=Loader().load("cyl_400_20.txt")
-        data1 = Data1D(x=out.x, y=out.y, dx=out.dx, dy=out.y)
+        data1 = Data1D(x=out.x, y=out.y, dx=out.dx, dy=out.dy)
+        self.data1 = FitData1D(data1)
         
         out2=Loader().load("cyl_400_40.txt")
-        data2 = Data1D(x=out2.x, y=out2.y, dx=out2.dx, dy=out2.y)
-        
-        fitter = Fit('park')
+        data2 = Data1D(x=out2.x, y=out2.y, dx=out2.dx, dy=out2.dy)
+        self.data2 = FitData1D(data2)
+    
         # Receives the type of model for the fitting
         from sans.models.CylinderModel import CylinderModel
         cyl1  = CylinderModel()
         cyl1.name = "C1"
-        
-        #data1 = Data(sans_data=data1)
-        data1 = FitData1D(data1)
-        model1 = Model(cyl1)
-        model1.set(contrast=1)
-        model1.set(scale= 1e-10)
-        fitter.set_data(data1,1)
-        fitter.set_model(model1, 1, ['length','radius','scale'])
+        self.model1 = Model(cyl1)
+        self.model1.set(scale= 1.0)
+        self.model1.set(radius=18)
+        self.model1.set(length=396)
+        self.model1.set(contrast=3e-006 )
+        self.model1.set(background=0.0)
         
         cyl2  = CylinderModel()
         cyl2.name = "C2"
+        self.model2 = Model(cyl2)
+        self.model2.set(scale= 1.0)
+        self.model2.set(radius=37)
+        self.model2.set(length='C1.length')
+        self.model2.set(contrast=3e-006 )
+        self.model2.set(background=0.0)
+       
+    def _fit(self, name="park"):
+        """ return fit result """
+        fitter = Fit(name)
+        fitter.set_data(self.data1,1)
+        fitter.set_model(self.model1, 1, ['length','radius','scale'])
         
-        #data2 = Data(sans_data=data2)
-        data2 = FitData1D(data2)
-        # This is wrong. We should not store string as 
-        # parameter values
-        # Why not inherit our AbstracFitEngine.Model from Park.Model?
-        
-        #cyl2.setParam('length', 'C1.length')
-        #print "read back:", cyl2.getParam('length')
-        
-        model2 = Model(cyl2)
-        model2.set(length='C1.length')
-        model2.set(contrast=1)
-        model2.set(scale= 1e-10)
-        fitter.set_data(data2,2)
-        fitter.set_model(model2, 2, ['radius','scale'])
+        fitter.set_data(self.data2,2)
+        fitter.set_model(self.model2, 2, ['radius','scale'])
         fitter.select_problem_for_fit(Uid=1,value=1)
         fitter.select_problem_for_fit(Uid=2,value=1)
-        result1 = fitter.fit()
+        return fitter.fit()
+    
+    
+    def test_park2(self):
+        """ Simultaneous cylinder model fit (park)  """
         
+        result1= self._fit('park')
         self.assert_(result1)
-        self.assertTrue(len(result1.pvec)>0 or len(result1.pvec)==0 )
-        self.assertTrue(len(result1.stderr)> 0 or len(result1.stderr)==0)
-        
+        self.assertTrue(len(result1.pvec)>=0  )
+        self.assertTrue(len(result1.stderr)>= 0)
+      
         for par in result1.parameters:
             if par.name=='C1.length':
@@ -140 +137 @@
             elif par.name=='C1.scale':
                 print par.name, par.value
-                self.assertTrue( math.fabs(par.value-9.0e-12)/3.0 < par.stderr )
+                self.assertTrue( math.fabs(par.value-1.0)/3.0 < par.stderr )
             elif par.name=='C2.scale':
                 print par.name, par.value
-                self.assertTrue( math.fabs(par.value-9.0e-12)/3.0 < par.stderr )
+                self.assertTrue( math.fabs(par.value-1.0)/3.0 < par.stderr )
             
-        
+
+if __name__ == '__main__':
+    unittest.main()