Changeset a2ccd569 in sasview for test/sasdataloader

Timestamp:

Mar 19, 2016 11:32:11 AM (9 years ago)

Author:

smk78

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:

38e88e0

Parents:

a407a40 (diff), ef908db (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://github.com/SasView/sasview.git

Location:

test/sasdataloader/test

Files:

• 1000A_sphere_sm.xml (deleted)
• CMSphere5.txt (deleted)
• CMSphere5smearsphere.txt (deleted)
• PolySpheres.txt (deleted)
• _THETA_weights.txt (deleted)
• latex_smeared.xml (deleted)
• slit_1000A_sphere_sm_h.txt (deleted)
• slit_1000A_sphere_sm_w_0_0001.txt (deleted)
• slit_1000A_sphere_sm_w_0_0002.txt (deleted)
• utest_smearing.py (modified) (2 diffs)

test/sasdataloader/test/utest_smearing.py

@@ -10 +10 @@
 #from DataLoader.qsmearing import SlitSmearer, QSmearer, smear_selection
 from sas.sascalc.data_util.qsmearing import SlitSmearer, QSmearer, smear_selection
-from sas.models.SphereModel import SphereModel
 import os.path
 from time import time
@@ -92 +91 @@
         for i in range(len(input)):
             self.assertAlmostEqual(answer[i], output[i], 2)
-      
-class smear_test_1Dpinhole(unittest.TestCase):
-    
-    def setUp(self):
-        # NIST sample data
-        self.data = Loader().load("CMSphere5.txt")
-        # NIST smeared sphere w/ param values below
-        self.answer = Loader().load("CMSphere5smearsphere.txt")
-        # call spheremodel
-        self.model = SphereModel()
-        # setparams consistent with Igor default
-        self.model.setParam('scale', 1.0)
-        self.model.setParam('background', 0.01)
-        self.model.setParam('radius', 60.0)
-        self.model.setParam('sldSolv', 6.3e-06)
-        self.model.setParam('sldSph', 1.0e-06)
-        
-    def test_q(self):
-        """
-        Compare Pinhole resolution smearing with NIST
-        """
-        # x values
-        input = numpy.zeros(len(self.data.x))
-        # set time
-        st1 = time()
-        # cal I w/o smear
-        input = self.model.evalDistribution(self.data.x)
-        # Cal_smear (first call)
-        for i in range(1000):
-            s = QSmearer(self.data, self.model)
-        # stop and record time taken
-        first_call_time = time()-st1
-        # set new time
-        st = time()
-        # cal I w/o smear (this is not neccessary to call but just to be fare
-        input = self.model.evalDistribution(self.data.x)
-        # smear cal (after first call done above)
-        for i in range(1000):
-            output = s(input)
-
-        # record time taken
-        last_call_time = time()-st
-        # compare the ratio of ((NIST_answer-SsanView_answer)/NIST_answer)
-        # If the ratio less than 1%, pass the test 
-        for i in range(len(self.data.x)):
-            ratio  = math.fabs((self.answer.y[i]-output[i])/self.answer.y[i])
-            if ratio > 0.006:
-                ratio = 0.006
-            self.assertEqual(math.fabs((self.answer.y[i]-output[i])/ \
-                                       self.answer.y[i]), ratio) 
-        # print
-        print "\n NIST_time = 10sec:"
-        print "Cal_time(1000 times of first_calls; ) = ",  first_call_time  
-        print "Cal_time(1000 times of calls) = ",  last_call_time 
         
 if __name__ == '__main__':