r3a5f7c8	rb699768
22	22
23	23	#from sas.guitools.plottables import Data1D as plottable_1D
24		from sas.data_util.uncertainty import Uncertainty
	24	from sas.sascalc.data_util.uncertainty import Uncertainty
25	25	import numpy
26	26	import math

src/sas/sascalc/dataloader/loader.py

rf06d7fc	rb699768
26	26	import time
27	27	from zipfile import ZipFile
28		from sas.data_util.registry import ExtensionRegistry
	28	from sas.sascalc.data_util.registry import ExtensionRegistry
29	29	# Default readers are defined in the readers sub-module
30	30	import readers

src/sas/sascalc/dataloader/manipulations.py

r3c3a440	rb699768
97	97
98	98	#TODO: make sense of the following two lines...
99		#from sas.dataloader.data_info import Data2D
	99	#from sas.sascalc.dataloader.data_info import Data2D
100	100	#output = Data2D()
101	101	output = data2d

-                      r79492222
+                      rb699768
 import math
 #import logging
 from sas.dataloader.data_info import Data2D
 from sas.dataloader.data_info import Detector
 from sas.dataloader.manipulations import reader2D_converter
+from sas.sascalc.dataloader.data_info import Data2D
+from sas.sascalc.dataloader.data_info import Detector
+from sas.sascalc.dataloader.manipulations import reader2D_converter
 # Look for unit converter
 has_converter = True
 try:
     from sas.data_util.nxsunit import Converter
+    from sas.sascalc.data_util.nxsunit import Converter
 except:
     has_converter = False

-                      r79492222
+                      rb699768
 import numpy
 import os
 from sas.dataloader.data_info import Data1D
 from sas.dataloader.data_info import Detector
+from sas.sascalc.dataloader.data_info import Data1D
+from sas.sascalc.dataloader.data_info import Detector
 has_converter = True
 try:
     from sas.data_util.nxsunit import Converter
+    from sas.sascalc.data_util.nxsunit import Converter
 except:
     has_converter = False

-                      ref3445e2
+                      rb699768
 import numpy
 import os
 from sas.dataloader.data_info import Data1D
+from sas.sascalc.dataloader.data_info import Data1D
 # Check whether we have a converter available
 has_converter = True
 try:
     from sas.data_util.nxsunit import Converter
+    from sas.sascalc.data_util.nxsunit import Converter
 except:
     has_converter = False

-                      r5ce7f17
+                      rb699768
 import inspect
 # For saving individual sections of data
 from sas.dataloader.data_info import Data1D
 from sas.dataloader.data_info import Collimation
 from sas.dataloader.data_info import TransmissionSpectrum
 from sas.dataloader.data_info import Detector
 from sas.dataloader.data_info import Process
 from sas.dataloader.data_info import Aperture
 import sas.dataloader.readers.xml_reader as xml_reader
 from sas.dataloader.readers.xml_reader import XMLreader
 from sas.dataloader.readers.cansas_constants import CansasConstants
+from sas.sascalc.dataloader.data_info import Data1D
+from sas.sascalc.dataloader.data_info import Collimation
+from sas.sascalc.dataloader.data_info import TransmissionSpectrum
+from sas.sascalc.dataloader.data_info import Detector
+from sas.sascalc.dataloader.data_info import Process
+from sas.sascalc.dataloader.data_info import Aperture
+import sas.sascalc.dataloader.readers.xml_reader as xml_reader
+from sas.sascalc.dataloader.readers.xml_reader import XMLreader
+from sas.sascalc.dataloader.readers.cansas_constants import CansasConstants
 # The following 2 imports *ARE* used. Do not remove either.
 …
 HAS_CONVERTER = True
 try:
     from sas.data_util.nxsunit import Converter
+    from sas.sascalc.data_util.nxsunit import Converter
 except ImportError:
     HAS_CONVERTER = False

-                      rfd5ac0d
+                      rb699768
 import numpy
 import logging
 from sas.dataloader.data_info import Data2D, Detector
 from sas.dataloader.manipulations import reader2D_converter
+from sas.sascalc.dataloader.data_info import Data2D, Detector
+from sas.sascalc.dataloader.manipulations import reader2D_converter
 # Look for unit converter
 has_converter = True
 try:
     from sas.data_util.nxsunit import Converter
+    from sas.sascalc.data_util.nxsunit import Converter
 except:
     has_converter = False

-                      r79492222
+                      rb699768
 import numpy
 import os
 from sas.dataloader.data_info import Data1D
+from sas.sascalc.dataloader.data_info import Data1D
 # Check whether we have a converter available
 has_converter = True
 try:
     from sas.data_util.nxsunit import Converter
+    from sas.sascalc.data_util.nxsunit import Converter
 except:
     has_converter = False

r79492222	rb699768
10	10	"""
11	11	import os
12		from sas.dataloader.data_info import Data2D
	12	from sas.sascalc.dataloader.data_info import Data2D
13	13
14	14

-                      r79492222
+                      rb699768
 import numpy
 import math
 from sas.dataloader.data_info import Data2D, Detector
+from sas.sascalc.dataloader.data_info import Data2D, Detector
 # Look for unit converter
 has_converter = True
 try:
     from sas.data_util.nxsunit import Converter
+    from sas.sascalc.data_util.nxsunit import Converter
 except:
     has_converter = False

-                      redfc8ac
+                      rb699768
 import numpy
 import os
 from sas.dataloader.data_info import SESANSData1D
+from sas.sascalc.dataloader.data_info import SESANSData1D
 # Check whether we have a converter available
 has_converter = True
 try:
     from sas.data_util.nxsunit import Converter
+    from sas.sascalc.data_util.nxsunit import Converter
 except:
     has_converter = False

-                      r79492222
+                      rb699768
 import os
 import numpy
 from sas.dataloader.data_info import Data2D
 from sas.dataloader.manipulations import reader2D_converter
+from sas.sascalc.dataloader.data_info import Data2D
+from sas.sascalc.dataloader.manipulations import reader2D_converter
 class Reader:

Note: See TracChangeset for help on using the changeset viewer.