Changeset ef908db in sasview for test/sascalculator

Timestamp:

Mar 19, 2016 10:42:09 AM (9 years ago)

Author:

krzywon

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:

66f21cd

Parents:

05fb3d6b

Message:

Remove all tests referring to saview Models and delete unused test files.

File:

• test/sascalculator/test/utest_sas_gen.py (modified) (3 diffs)

test/sascalculator/test/utest_sas_gen.py

@@ -7 +7 @@
 import unittest
 from sas.sascalc.calculator import sas_gen
-from sas.models.SphereModel import SphereModel
 
 import numpy
@@ -18 +17 @@
         self.sldloader = sas_gen.SLDReader()
         self.pdbloader = sas_gen.PDBReader()
-        self.omfloader = sas_gen.OMFReader() 
-        self.comp = SphereModel()
+        self.omfloader = sas_gen.OMFReader()
         
     def test_sldreader(self):
@@ -53 +51 @@
         self.assertEqual(output.pos_z[0], 0.0)
 
-"""      
-    def test_slda_and_run(self): # Works when sld reader uses loadtxt
-        sld_data = self.sldloader.read("sphere697_r30.sld")
-        # Generic computation  
-        model = sas_gen.GenSAS()
-        model.setParam('background', 0.0)
-        model.setParam('scale', 1.0)
-        model.setParam('Up_frac_in', 0.5)
-        model.setParam('Up_frac_out', 0.5)
-        model.setParam('Up_theta', 0.0)
-        x = numpy.array([0.01])
-        y = numpy.array([0.01])
-        model.set_sld_data(sld_data)
-        out_gen = model.runXY([x, y])
-        # Analytic computation
-        analy_model = self.comp
-        analy_model.setParam('background', 0.0)
-        analy_model.setParam('scale', 1.0)
-        analy_model.setParam('radius', 30.0)
-        analy_model.setParam('sldSolv', 0.0)
-        analy_model.setParam('sldSph', 6.97e-06) 
-        out_analy = analy_model.runXY([0.01, 0.01])
-        # Comparison
-        self.assertAlmostEqual(out_gen[0], out_analy, 1)
-"""   
 if __name__ == '__main__':
     unittest.main()