Changes in / [658dd57:c00a797a] in sasview

File:

• test/sasdataloader/test/utest_abs_reader.py (modified) (13 diffs)

test/sasdataloader/test/utest_abs_reader.py

@@ -9 +9 @@
 from sas.sascalc.dataloader.loader import Loader
 from sas.sascalc.dataloader.readers.IgorReader import Reader as IgorReader
-from sas.sascalc.dataloader.readers.abs_reader import Reader as AbsReader
-from sas.sascalc.dataloader.readers.hfir1d_reader import Reader as HFIRReader
-from sas.sascalc.dataloader.readers.danse_reader import Reader as DANSEReader
-from sas.sascalc.dataloader.readers.cansas_reader import Reader as CANSASReader
-
 from sas.sascalc.dataloader.data_info import Data1D
  
 import os.path
 
-
 class abs_reader(unittest.TestCase):
     
     def setUp(self):
-        reader = AbsReader()
-        self.data = reader.read("jan08002.ABS")
-
+        from sas.sascalc.dataloader.readers.abs_reader import Reader
+        self.data = Reader().read("jan08002.ABS")
+        
     def test_abs_checkdata(self):
         """
@@ -68 +62 @@
     def test_checkdata2(self):
         self.assertEqual(self.data.dy[126], 1)
-
-    def test_generic_loader(self):
-        # the generic loader should work as well
-        data = Loader().load("jan08002.ABS")
-        self.assertEqual(data.meta_data['loader'], "IGOR 1D")
-
-
+        
 class hfir_reader(unittest.TestCase):
-
+    
     def setUp(self):
-        reader = HFIRReader()
-        self.data = reader.read("S2-30dq.d1d")
-
+        self.data = Loader().load("S2-30dq.d1d")
+        
     def test_hfir_checkdata(self):
         """
@@ -97 +84 @@
         self.assertEqual(self.data.dy[1], 0.000315)
         self.assertEqual(self.data.dx[1], 0.008249)
-
-    def test_generic_loader(self):
-        # the generic loader should work as well
-        data = Loader().load("S2-30dq.d1d")
-        self.assertEqual(data.meta_data['loader'], "HFIR 1D")
-
+        
 
 class igor_reader(unittest.TestCase):
@@ -156 +138 @@
     
     def setUp(self):
-        reader = DANSEReader()
-        self.data = reader.read("MP_New.sans")
+        self.data = Loader().load("MP_New.sans")
 
     def test_checkdata(self):
@@ -191 +172 @@
         self.assertEqual(self.data.err_data[2], 2.06313)
 
-    def test_generic_loader(self):
-        # the generic loader should work as well
-        data = Loader().load("MP_New.sans")
-        self.assertEqual(data.meta_data['loader'], "DANSE")
-
  
 class cansas_reader(unittest.TestCase):
     
     def setUp(self):
-        reader = CANSASReader()
-        data = reader.read("cansas1d.xml")
+        data = Loader().load("cansas1d.xml")
         self.data = data[0]
-
-    def test_generic_loader(self):
-        # the generic loader should work as well
-        data = Loader().load("cansas1d.xml")
-        self.assertEqual(data[0].meta_data['loader'], "CanSAS XML 1D")
-
+ 
     def test_cansas_checkdata(self):
         self.assertEqual(self.data.filename, "cansas1d.xml")
@@ -221 +191 @@
             tests won't pass
         """
+        
         self.assertEqual(self.data.run[0], "1234")
         self.assertEqual(self.data.meta_data['loader'], "CanSAS XML 1D")
@@ -294 +265 @@
             self.assertEqual(item.distance_unit,'mm')
 
-            if item.size.x == 50 \
-                and item.distance == 11000.0 \
-                and item.name == 'source' \
-                and item.type == 'radius':
+            if item.size.x==50 \
+                and item.distance==11000.0 \
+                and item.name=='source' \
+                and item.type=='radius':
                 _found1 = True
-            elif item.size.x == 1.0 \
-                and item.name == 'sample' \
-                and item.type == 'radius':
+            elif item.size.x==1.0 \
+                and item.name=='sample' \
+                and item.type=='radius':
                 _found2 = True
                 
-        if _found1 == False or _found2 == False:
+        if _found1==False or _found2==False:
             raise RuntimeError, "Could not find all data %s %s" % (_found1, _found2) 
             
@@ -341 +312 @@
             print(item.term)
             for t in item.term:
-                if (t['name'] == "ABS:DSTAND"
-                    and t['unit'] == 'mm'
-                    and float(t['value']) == 1.0):
+                if t['name']=="ABS:DSTAND" \
+                    and t['unit']=='mm' \
+                    and float(t['value'])==1.0:
                     _found_term2 = True
-                elif (t['name'] == "radialstep"
-                      and t['unit'] == 'mm'
-                      and float(t['value']) == 10.0):
+                elif t['name']=="radialstep" \
+                    and t['unit']=='mm' \
+                    and float(t['value'])==10.0:
                     _found_term1 = True
                     
-        if _found_term1 == False or _found_term2 == False:
-            raise RuntimeError, "Could not find all process terms %s %s" % (_found_term1, _found_term2)
+        if _found_term1==False or _found_term2==False:
+            raise RuntimeError, "Could not find all process terms %s %s" % (_found_term1, _found_term2) 
+            
+        
+        
         
     def test_writer(self):
-        r = CANSASReader()
-
+        from sas.sascalc.dataloader.readers.cansas_reader import Reader
+        r = Reader()
+        x = np.ones(5)
+        y = np.ones(5)
+        dy = np.ones(5)
+        
         filename = "write_test.xml"
         r.write(filename, self.data)
@@ -371 +349 @@
         """
         filename = "cansas1d_units.xml"
-        data = CANSASReader().read(filename)
+        data = Loader().load(filename)
         self.data = data[0]
         self.assertEqual(self.data.filename, filename)
@@ -382 +360 @@
         """
         filename = "cansas1d_badunits.xml"
-        data = CANSASReader().read(filename)
+        data = Loader().load(filename)
         self.data = data[0]
         self.assertEqual(self.data.filename, filename)
@@ -393 +371 @@
         print(self.data.errors)
         self.assertEqual(len(self.data.errors), 1)
-
+        
+        
     def test_slits(self):
         """
@@ -399 +378 @@
         """
         filename = "cansas1d_slit.xml"
-        data = CANSASReader().read(filename)
+        data = Loader().load(filename)
         self.data = data[0]
         self.assertEqual(self.data.filename, filename)
@@ -421 +400 @@
         self.assertEqual(self.data.run_name['1234'], 'run name')
         self.assertEqual(self.data.title, "Test title")
-
+        
+            
 
 if __name__ == '__main__':