Changeset ca3b9c5d in sasview

Timestamp:

Aug 9, 2011 11:18:55 AM (13 years ago)

Author:

Jae Cho <jhjcho@…>

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:

804dd60

Parents:

d075f58

Message:

update dataloader name

Location:

sansdataloader/test

Files:

• testLoad.py (modified) (1 diff)
• testplugings.py (modified) (1 diff)
• utest_abs_reader.py (modified) (3 diffs)
• utest_ascii.py (modified) (1 diff)
• utest_averaging.py (modified) (7 diffs)
• utest_manipulations.py (modified) (1 diff)
• utest_red2d_reader.py (modified) (1 diff)

sansdataloader/test/testLoad.py

@@ -14 +14 @@
 import unittest
 import math
-import DataLoader
-from DataLoader.loader import  Loader
+import sans.dataloader
+from sans.dataloader.loader import  Loader
 
 # Check whether we should test image loading on this system 

sansdataloader/test/testplugings.py

@@ -4 +4 @@
 
 import unittest
-from DataLoader.loader import  Loader, Registry
+from sans.dataloader.loader import  Loader, Registry
 class testLoader(unittest.TestCase):
     

sansdataloader/test/utest_abs_reader.py

@@ -5 +5 @@
 import unittest
 import numpy, math
-from DataLoader.loader import  Loader
-from DataLoader.data_info import Data1D
+from sans.dataloader.loader import  Loader
+from sans.dataloader.data_info import Data1D
  
 import os.path
@@ -13 +13 @@
     
     def setUp(self):
-        from DataLoader.readers.abs_reader import Reader
+        from sans.dataloader.readers.abs_reader import Reader
         self.data = Reader().read("jan08002.ABS")
         
@@ -311 +311 @@
         
     def test_writer(self):
-        from DataLoader.readers.cansas_reader import Reader
+        from sans.dataloader.readers.cansas_reader import Reader
         r = Reader()
         x = numpy.ones(5)

sansdataloader/test/utest_ascii.py

@@ -6 +6 @@
 
 import unittest
-from DataLoader.loader import  Loader
+from sans.dataloader.loader import  Loader
  
 import os.path

sansdataloader/test/utest_averaging.py

@@ -2 +2 @@
 import unittest
 
-from DataLoader.loader import  Loader
-from DataLoader.manipulations import Ring, CircularAverage, SectorPhi, get_q,reader2D_converter
+from sans.dataloader.loader import  Loader
+from sans.dataloader.manipulations import Ring, CircularAverage, SectorPhi, get_q,reader2D_converter
  
 import os.path
 import numpy, math
-import DataLoader.data_info as data_info
+import sans.dataloader.data_info as data_info
 
 class Averaging(unittest.TestCase):
@@ -136 +136 @@
             The test data was not generated by IGOR.
         """
-        from DataLoader.manipulations import Boxsum, Boxavg
+        from sans.dataloader.manipulations import Boxsum, Boxavg
         
         r = Boxsum(x_min=.01, x_max=.015, y_min=0.01, y_max=0.015)
@@ -153 +153 @@
             The test data was not generated by IGOR.
         """
-        from DataLoader.manipulations import SlabX
+        from sans.dataloader.manipulations import SlabX
         
         r = SlabX(x_min=-.01, x_max=.01, y_min=-0.0002, y_max=0.0002, bin_width=0.0004)
@@ -170 +170 @@
             The test data was not generated by IGOR.
         """
-        from DataLoader.manipulations import SlabY
+        from sans.dataloader.manipulations import SlabY
         
         r = SlabY(x_min=.005, x_max=.01, y_min=-0.01, y_max=0.01, bin_width=0.0004)
@@ -189 +189 @@
             The test data was not generated by IGOR.
         """
-        from DataLoader.manipulations import SectorPhi
+        from sans.dataloader.manipulations import SectorPhi
         import math
         
@@ -207 +207 @@
             The test data was not generated by IGOR.
         """
-        from DataLoader.manipulations import SectorPhi
+        from sans.dataloader.manipulations import SectorPhi
         import math
         
@@ -225 +225 @@
             The test data was not generated by IGOR.
         """
-        from DataLoader.manipulations import SectorQ
+        from sans.dataloader.manipulations import SectorQ
         import math
         

sansdataloader/test/utest_manipulations.py

@@ -6 +6 @@
 import unittest
 import numpy, math
-from DataLoader.loader import  Loader
-from DataLoader.data_info import Data1D, Data2D
+from sans.dataloader.loader import  Loader
+from sans.dataloader.data_info import Data1D, Data2D
  
 import os.path

sansdataloader/test/utest_red2d_reader.py

@@ -6 +6 @@
 
 import unittest
-from DataLoader.loader import  Loader
+from sans.dataloader.loader import  Loader
  
 import os.path