Changeset ed2276f in sasview for test/sasdataloader

Timestamp:

Apr 4, 2017 12:00:18 PM (7 years ago)

Author:

GitHub <noreply@…>

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.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

7b15990

Parents:

9a5097c (diff), 571bf4b (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:

Andrew Jackson <andrew.jackson@…> (04/04/17 12:00:18)

git-committer:

GitHub <noreply@…> (04/04/17 12:00:18)

Message:

Merge branch 'master' into numpy_import

Location:

test/sasdataloader

Files:

• test/utest_abs_reader.py (modified) (3 diffs)
• plugins/test_reader.py (modified) (2 diffs)
• test/utest_averaging.py (modified) (3 diffs)
• test/utest_cansas.py (modified) (1 diff)

test/sasdataloader/test/utest_abs_reader.py

@@ -4 +4 @@
 
 import unittest
+
+import math
 import numpy as np
-from sas.sascalc.dataloader.loader import  Loader
+from sas.sascalc.dataloader.loader import Loader
+from sas.sascalc.dataloader.readers.IgorReader import Reader as IgorReader
 from sas.sascalc.dataloader.data_info import Data1D
  
@@ -85 +88 @@
     
     def setUp(self):
-        self.data = Loader().load("MAR07232_rest.ASC")
-        
+        # the IgorReader should be able to read this filetype
+        # if it can't, stop here.
+        reader = IgorReader()
+        self.data = reader.read("MAR07232_rest.ASC")
+
     def test_igor_checkdata(self):
         """
@@ -107 +113 @@
         
         self.assertEqual(self.data.detector[0].beam_center_unit, 'mm')
-        center_x = (68.76-1)*5.0
-        center_y = (62.47-1)*5.0
+        center_x = (68.76 - 1)*5.0
+        center_y = (62.47 - 1)*5.0
         self.assertEqual(self.data.detector[0].beam_center.x, center_x)
         self.assertEqual(self.data.detector[0].beam_center.y, center_y)
         
         self.assertEqual(self.data.I_unit, '1/cm')
-        self.assertEqual(self.data.data[0], 0.279783)
-        self.assertEqual(self.data.data[1], 0.28951)
-        self.assertEqual(self.data.data[2], 0.167634)
-        
+        # 3 points should be suffcient to check that the data is in column
+        # major order.
+        np.testing.assert_almost_equal(self.data.data[0:3],
+                                       [0.279783, 0.28951, 0.167634])
+        np.testing.assert_almost_equal(self.data.qx_data[0:3],
+                                       [-0.01849072, -0.01821785, -0.01794498])
+        np.testing.assert_almost_equal(self.data.qy_data[0:3],
+                                       [-0.01677435, -0.01677435, -0.01677435])
+
+    def test_generic_loader(self):
+        # the generic loader should direct the file to IgorReader as well
+        data = Loader().load("MAR07232_rest.ASC")
+        self.assertEqual(data.meta_data['loader'], "IGOR 2D")
+
+
 class danse_reader(unittest.TestCase):
     

test/sasdataloader/plugins/test_reader.py

@@ -8 +8 @@
 copyright 2008, University of Tennessee
 """
-import numpy, os
+import os
+import numpy as np
 from sas.sascalc.dataloader.data_info import Data1D
 
@@ -40 +41 @@
                 buff = input_f.read()
                 lines = buff.split('\n')
-                x  = numpy.zeros(0)
-                y  = numpy.zeros(0)
-                dy = numpy.zeros(0)
+                x  = np.zeros(0)
+                y  = np.zeros(0)
+                dy = np.zeros(0)
                 output = Data1D(x, y, dy=dy)
                 self.filename = output.filename = basename
            
                 for line in lines:
-                    x  = numpy.append(x,  float(line)) 
+                    x  = np.append(x,  float(line))
                     
                 output.x = x

test/sasdataloader/test/utest_averaging.py

@@ -1 +1 @@
 
 import unittest
+import math
 
 from sas.sascalc.dataloader.loader import  Loader
 from sas.sascalc.dataloader.manipulations import Ring, CircularAverage, SectorPhi, get_q,reader2D_converter
- 
-import os.path
-import numpy, math
+
+import numpy as np
 import sas.sascalc.dataloader.data_info as data_info
 
@@ -18 +18 @@
             should return the predefined height of the distribution (1.0).
         """
-        x_0  = numpy.ones([100,100])
-        dx_0 = numpy.ones([100,100])
+        x_0  = np.ones([100,100])
+        dx_0 = np.ones([100,100])
         
         self.data = data_info.Data2D(data=x_0, err_data=dx_0)
@@ -42 +42 @@
         
         self.qstep = len(x_0)
-        x=  numpy.linspace(start= -1*self.qmax,
+        x=  np.linspace(start= -1*self.qmax,
                                stop= self.qmax,
                                num= self.qstep,
                                endpoint=True )  
-        y = numpy.linspace(start= -1*self.qmax,
+        y = np.linspace(start= -1*self.qmax,
                                stop= self.qmax,
                                num= self.qstep,

test/sasdataloader/test/utest_cansas.py

@@ -15 +15 @@
 import pylint as pylint
 import unittest
-import numpy
+import numpy as np
 import logging
 import warnings