Changeset ffbe487 in sasview

Timestamp:

Oct 24, 2013 1:56:04 PM (11 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

76263a5

Parents:

8f52edd

Message:

Update loader imports for latest move

Files:

• src/sans/dataloader/data_info.py (modified) (1 diff)
• src/sans/dataloader/loader.py (modified) (1 diff)
• src/sans/dataloader/readers/IgorReader.py (modified) (1 diff)
• src/sans/dataloader/readers/abs_reader.py (modified) (1 diff)
• src/sans/dataloader/readers/ascii_reader.py (modified) (1 diff)
• src/sans/dataloader/readers/cansas_reader.py (modified) (1 diff)
• src/sans/dataloader/readers/cansas_reader_new.py (modified) (1 diff)
• src/sans/dataloader/readers/danse_reader.py (modified) (1 diff)
• src/sans/dataloader/readers/hfir1d_reader.py (modified) (1 diff)
• src/sans/dataloader/readers/red2d_reader.py (modified) (1 diff)
• test/sansdataloader/test/utest_cansas.py (modified) (1 diff)

src/sans/dataloader/data_info.py

@@ -22 +22 @@
 
 #from sans.guitools.plottables import Data1D as plottable_1D
-from data_util.uncertainty import Uncertainty
+from sans.data_util.uncertainty import Uncertainty
 import numpy
 import math

src/sans/dataloader/loader.py

@@ -26 +26 @@
 import time
 from zipfile import ZipFile
-from data_util.registry import ExtensionRegistry
+from sans.data_util.registry import ExtensionRegistry
 # Default readers are defined in the readers sub-module
 import readers

src/sans/dataloader/readers/IgorReader.py

@@ -23 +23 @@
 has_converter = True
 try:
-    from data_util.nxsunit import Converter
+    from sans.data_util.nxsunit import Converter
 except:
     has_converter = False

src/sans/dataloader/readers/abs_reader.py

@@ -16 +16 @@
 has_converter = True
 try:
-    from data_util.nxsunit import Converter
+    from sans.data_util.nxsunit import Converter
 except:
     has_converter = False

src/sans/dataloader/readers/ascii_reader.py

@@ -21 +21 @@
 has_converter = True
 try:
-    from data_util.nxsunit import Converter
+    from sans.data_util.nxsunit import Converter
 except:
     has_converter = False

src/sans/dataloader/readers/cansas_reader.py

@@ -41 +41 @@
 HAS_CONVERTER = True
 try:
-    from data_util.nxsunit import Converter
+    from sans.data_util.nxsunit import Converter
 except:
     HAS_CONVERTER = False

src/sans/dataloader/readers/cansas_reader_new.py

@@ -41 +41 @@
 HAS_CONVERTER = True
 try:
-    from data_util.nxsunit import Converter
+    from sans.data_util.nxsunit import Converter
 except:
     HAS_CONVERTER = False

src/sans/dataloader/readers/danse_reader.py

@@ -23 +23 @@
 has_converter = True
 try:
-    from data_util.nxsunit import Converter
+    from sans.data_util.nxsunit import Converter
 except:
     has_converter = False

src/sans/dataloader/readers/hfir1d_reader.py

@@ -16 +16 @@
 has_converter = True
 try:
-    from data_util.nxsunit import Converter
+    from sans.data_util.nxsunit import Converter
 except:
     has_converter = False

src/sans/dataloader/readers/red2d_reader.py

@@ -17 +17 @@
 has_converter = True
 try:
-    from data_util.nxsunit import Converter
+    from sans.data_util.nxsunit import Converter
 except:
     has_converter = False

test/sansdataloader/test/utest_cansas.py

@@ -17 +17 @@
 HAS_CONVERTER = True
 try:
-    from data_util.nxsunit import Converter
+    from sans.data_util.nxsunit import Converter
 except:
     HAS_CONVERTER = False