Changeset 5bb05a4 in sasview for test/sascalculator/test

Timestamp:

Dec 6, 2017 11:04:17 AM (6 years ago)

Author:

GitHub <noreply@…>

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:

a64f8f4, b6b81a3, 0a88623, 66285f5

Parents:

f53d684 (diff), bc4f5bb (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.

git-author:

Paul Kienzle <pkienzle@…> (12/06/17 11:04:17)

git-committer:

GitHub <noreply@…> (12/06/17 11:04:17)

Message:

Merge pull request 127 from SasView?/ticket-1032-sldi. Closes #1032.

Location:

test/sascalculator/test

Files:

• utest_sas_gen.py (modified) (2 diffs)
• utest_slit_length_calculator.py (modified) (2 diffs)

test/sascalculator/test/utest_sas_gen.py

@@ -8 +8 @@
 
 import unittest
+import numpy as np
+
 from sas.sascalc.calculator import sas_gen
 
@@ -54 +56 @@
         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__':

test/sascalculator/test/utest_slit_length_calculator.py

@@ -3 +3 @@
 """
 
+import os.path
 import unittest
 from sas.sascalc.dataloader.readers.ascii_reader import Reader
 from sas.sascalc.calculator.slit_length_calculator import SlitlengthCalculator \
     as calculator
+
+
+def find(filename):
+    return os.path.join(os.path.dirname(__file__), filename)
 
 
@@ -19 +24 @@
             Test slit_length_calculator"
         """
-        list = self.reader.read("beam profile.DAT")
+        list = self.reader.read(find("beam profile.DAT"))
         self.assertTrue(len(list) == 1)
         f = list[0]