Changeset 35ec279 in sasview for test/sascalculator

Timestamp:

Feb 13, 2015 4:08:43 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:

b9a5f0e

Parents:

8c9ffde

Message:

Completed the SANS to SAS conversion on the tests. src.sas is left.

Location:

test/sascalculator/test

Files:

• utest_resolution_calculator.py (modified) (1 diff)
• utest_sans_gen.py (modified) (5 diffs)
• utest_slit_length_calculator.py (modified) (1 diff)

test/sascalculator/test/utest_resolution_calculator.py

@@ -4 +4 @@
 
 import unittest
-from  sans.calculator.resolution_calculator import ResolutionCalculator \
+from  sas.calculator.resolution_calculator import ResolutionCalculator \
                                             as calculator
 

test/sascalculator/test/utest_sans_gen.py

@@ -1 +1 @@
 """
-Unit tests for the sans_gen
+Unit tests for the sas_gen
 """
 import warnings
@@ -6 +6 @@
 
 import unittest
-from sans.calculator import sans_gen
-from sans.models.SphereModel import SphereModel
+from sas.calculator import sas_gen
+from sas.models.SphereModel import SphereModel
 
 import numpy
@@ -13 +13 @@
 import os.path
 
-class sans_gen_test(unittest.TestCase):
+class sas_gen_test(unittest.TestCase):
     
     def setUp(self):
-        self.sldloader = sans_gen.SLDReader()
-        self.pdbloader = sans_gen.PDBReader()
-        self.omfloader = sans_gen.OMFReader() 
+        self.sldloader = sas_gen.SLDReader()
+        self.pdbloader = sas_gen.PDBReader()
+        self.omfloader = sas_gen.OMFReader() 
         self.comp = SphereModel()
         
@@ -44 +44 @@
         """
         f = self.omfloader.read("A_Raw_Example-1.omf")
-        output = sans_gen.OMF2SLD()
+        output = sas_gen.OMF2SLD()
         output.set_data(f)
         self.assertEqual(f.mx[0], 0)
@@ -57 +57 @@
         sld_data = self.sldloader.read("sphere697_r30.sld")
         # Generic computation  
-        model = sans_gen.GenSAS()
+        model = sas_gen.GenSAS()
         model.setParam('background', 0.0)
         model.setParam('scale', 1.0)

test/sascalculator/test/utest_slit_length_calculator.py

@@ -4 +4 @@
 
 import unittest
-from sans.dataloader.readers.ascii_reader import Reader
-from  sans.calculator.slit_length_calculator import SlitlengthCalculator as calculator
+from sas.dataloader.readers.ascii_reader import Reader
+from  sas.calculator.slit_length_calculator import SlitlengthCalculator as calculator
 
 import os.path