Changeset 4026380 in sasview for DataLoader/test

Timestamp:

Nov 14, 2009 10:33:21 AM (15 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

fd6b789

Parents:

c13b8cc

Message:

dataloader: improved invariant

File:

• DataLoader/test/utest_invariant.py (modified) (1 diff)

DataLoader/test/utest_invariant.py

@@ -15 +15 @@
     
     def setUp(self):
-        #Data iwth no slit smear information
-        data0= Loader().load("PolySpheres.txt")
-        self.I0 = InvariantCalculator( data= data0,contrast=2.6e-6, pConst=20)
+        #Data with no slit smear information
+        data0 = Loader().load("PolySpheres.txt")
+        self.I0 = InvariantCalculator( data=data0)
+        
         # data with smear info
         list = Loader().load("latex_smeared.xml")
         data1= list[0]
-        self.I1= InvariantCalculator( data= data1,contrast=5.3e-6, pConst=20)
+        self.I1= InvariantCalculator( data= data1)
+        
         data2= list[1]
-        self.I2= InvariantCalculator( data= data2,contrast=5.3e-6, pConst=20)
+        self.I2= InvariantCalculator( data= data2)
      
-    def testInvariant(self):
+    def test_invariant(self):
         """ test the invariant value for data with no slit smear"""
         self.assertAlmostEquals(self.I0.q_star, 7.48959e-5)
+        self.assertTrue(self.I1.q_star>0)
+        self.assertTrue(self.I2.q_star>0)
         
-        
-    def test_Computation(self):
+    def test_computation(self):
         """
             Test identity smearing
         """
-        # compute invariant with smear information
-        print "invariant initialized only with data:", self.I1
-        print "invariant q_star",self.I1.q_star
-        print "invariant volume",self.I1.volume
-        print "Invariant surface",self.I1.surface
-        print
-        print "invariant initialized __call__:", self.I1
-        print "invariant q_star",self.I1.q_star
-        print "invariant volume",self.I1.volume
-        print "Invariant surface",self.I1.surface
-        print
-        # compute invariant with smear information
-        print "invariant initialize with data, contrast,pConst:", self.I2
-        print "invariant q_star",self.I2.q_star
-        print "invariant volume",self.I2.volume
-        print "Invariant surface",self.I2.surface
-        print
+        vol = self.I0.get_volume_fraction(contrast=2.6e-6)
+        surface = self.I0.get_surface(contrast=2.6e-6, porod_const=20)
+        
+        # TODO: Need to test output values
+        #self.assertAlmostEquals(vol, 0)
+        #self.assertAlmostEquals(surface, 0)
+        vol = self.I1.get_volume_fraction(contrast=5.3e-6)
+        surface = self.I1.get_surface(contrast=5.3e-6, porod_const=20)
+        
+        # TODO: Need to test output values
+        #self.assertAlmostEquals(vol, 0)
+        #self.assertAlmostEquals(surface, 0)
+        
+        vol = self.I2.get_volume_fraction(contrast=5.3e-6)
+        surface = self.I2.get_surface(contrast=5.3e-6, porod_const=20)
+        
+        # TODO: Need to test output values
+        self.assertAlmostEquals(vol, 0)
+        self.assertAlmostEquals(surface, 0)
+