Changeset 3a473ef in sasview for test/sascalculator

Timestamp:

Aug 31, 2018 7:13:23 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

c1cfa80

Parents:

aa1db44

Message:

Manual update of test/ directory with changes on master - SASVIEW-996

Location:

test/sascalculator/test

Files:

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

test/sascalculator/test/utest_sas_gen.py

@@ -2 +2 @@
 Unit tests for the sas_gen
 """
+
+import os.path
 import warnings
 warnings.simplefilter("ignore")
 
 import unittest
+import numpy as np
+
 from sas.sascalc.calculator import sas_gen
+
+
+def find(filename):
+    return os.path.join(os.path.dirname(__file__), filename)
 
 
@@ -20 +28 @@
         Test .sld file loaded
         """
-        f = self.sldloader.read("sld_file.sld")
+        f = self.sldloader.read(find("sld_file.sld"))
         self.assertEqual(f.pos_x[0], -40.5)
         self.assertEqual(f.pos_y[0], -13.5)
@@ -29 +37 @@
         Test .pdb file loaded
         """
-        f = self.pdbloader.read("c60.pdb")
+        f = self.pdbloader.read(find("c60.pdb"))
         self.assertEqual(f.pos_x[0], -0.733)
         self.assertEqual(f.pos_y[0], -1.008)
@@ -38 +46 @@
         Test .omf file loaded
         """
-        f = self.omfloader.read("A_Raw_Example-1.omf")
+        f = self.omfloader.read(find("A_Raw_Example-1.omf"))
         output = sas_gen.OMF2SLD()
         output.set_data(f)
@@ -48 +56 @@
         self.assertEqual(output.pos_z[0], 0.0)
 
+    def test_calculator(self):
+        """
+        Test that the calculator calculates.
+        """
+        f = self.omfloader.read(find("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]