Changeset f926abb in sasview

Timestamp:

Nov 7, 2017 1:21:18 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

7e82256

Parents:

54b0650

Message:

add smoke test for generic scattering calculator

Files:

• src/sas/sascalc/calculator/sas_gen.py (modified) (2 diffs)
• test/sascalculator/test/utest_sas_gen.py (modified) (2 diffs)

src/sas/sascalc/calculator/sas_gen.py

@@ -1057 +1057 @@
     reader = SLDReader()
     oreader = OMFReader()
-    output = decode(reader.read(tfpath))
-    ooutput = decode(oreader.read(ofpath))
+    output = reader.read(tfpath)
+    ooutput = oreader.read(ofpath)
     foutput = OMF2SLD()
     foutput.set_data(ooutput)
@@ -1087 +1087 @@
     plt.show()
 
-def test():
-    """
-        Test code
-    """
+def test_save():
     ofpath = _get_data_path("coordinate_data", "A_Raw_Example-1.omf")
     if not os.path.isfile(ofpath):
         raise ValueError("file(s) not found: %r"%(ofpath,))
     oreader = OMFReader()
-    ooutput = decode(oreader.read(ofpath))
-    foutput = OMF2SLD()
-    foutput.set_data(ooutput)
+    omfdata = oreader.read(ofpath)
+    omf2sld = OMF2SLD()
+    omf2sld.set_data(omfdata)
     writer = SLDReader()
-    writer.write("out.txt", foutput.output)
+    writer.write("out.txt", omf2sld.output)
+
+def test():
+    """
+        Test code
+    """
+    ofpath = _get_data_path("coordinate_data", "A_Raw_Example-1.omf")
+    if not os.path.isfile(ofpath):
+        raise ValueError("file(s) not found: %r"%(ofpath,))
+    oreader = OMFReader()
+    omfdata = oreader.read(ofpath)
+    omf2sld = OMF2SLD()
+    omf2sld.set_data(omfdata)
     model = GenSAS()
-    model.set_sld_data(foutput.output)
-    x = np.arange(1000)/10000. + 1e-5
-    y = np.arange(1000)/10000. + 1e-5
-    i = np.zeros(1000)
-    model.runXY([x, y, i])
+    model.set_sld_data(omf2sld.output)
+    x = np.linspace(0, 0.1, 11)[1:]
+    model.runXY([x, x])
 
 if __name__ == "__main__":
     #test_load()
+    #test_save()
     test()

test/sascalculator/test/utest_sas_gen.py

@@ -6 +6 @@
 
 import unittest
+import numpy as np
+
 from sas.sascalc.calculator import sas_gen
 
@@ -48 +50 @@
         self.assertEqual(output.pos_z[0], 0.0)
 
+    def test_calculator(self):
+        """
+        Test that the calculator calculates.
+        """
+        f = self.omfloader.read("A_Raw_Example-1.omf")
+        omf2sld = sas_gen.OMF2SLD()
+        omf2sld.set_data(f)
+        model = sas_gen.GenSAS()
+        model.set_sld_data(omf2sld.output)
+        x = np.linspace(0, 0.1, 11)[1:]
+        model.runXY([x, x])
+
 
 if __name__ == '__main__':