Changeset ad8034f in sasview

Timestamp:

Aug 9, 2011 9:29:44 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:

1f2f198

Parents:

9e2af9a

Message:

updated dataloader calls

Location:

sansdataloader/src/sans/dataloader/readers

Files:

• IgorReader.py (modified) (1 diff)
• abs_reader.py (modified) (1 diff)
• ascii_reader.py (modified) (1 diff)
• cansas_reader.py (modified) (1 diff)
• danse_reader.py (modified) (1 diff)
• defaults.xml (modified) (1 diff)
• hfir1d_reader.py (modified) (1 diff)
• red2d_reader.py (modified) (1 diff)
• tiff_reader.py (modified) (1 diff)

sansdataloader/src/sans/dataloader/readers/IgorReader.py

@@ -20 +20 @@
 import math
 #import logging
-from DataLoader.data_info import Data2D
-from DataLoader.data_info import Detector
-from DataLoader.manipulations import reader2D_converter
+from sans.dataloader.data_info import Data2D
+from sans.dataloader.data_info import Detector
+from sans.dataloader.manipulations import reader2D_converter
 
 # Look for unit converter

sansdataloader/src/sans/dataloader/readers/abs_reader.py

@@ -11 +11 @@
 import numpy
 import os
-from DataLoader.data_info import Data1D
-from DataLoader.data_info import Detector
+from sans.dataloader.data_info import Data1D
+from sans.dataloader.data_info import Detector
 
 has_converter = True

sansdataloader/src/sans/dataloader/readers/ascii_reader.py

@@ -15 +15 @@
 import numpy
 import os
-from DataLoader.data_info import Data1D
+from sans.dataloader.data_info import Data1D
 
 # Check whether we have a converter available

sansdataloader/src/sans/dataloader/readers/cansas_reader.py

@@ -31 +31 @@
 import os
 import sys
-from DataLoader.data_info import Data1D
-from DataLoader.data_info import Collimation
-from DataLoader.data_info import Detector
-from DataLoader.data_info import Process
-from DataLoader.data_info import Aperture
+from sans.dataloader.data_info import Data1D
+from sans.dataloader.data_info import Collimation
+from sans.dataloader.data_info import Detector
+from sans.dataloader.data_info import Process
+from sans.dataloader.data_info import Aperture
 from lxml import etree
 import xml.dom.minidom

sansdataloader/src/sans/dataloader/readers/danse_reader.py

@@ -21 +21 @@
 import numpy
 import logging
-from DataLoader.data_info import Data2D, Detector
-from DataLoader.manipulations import reader2D_converter
+from sans.dataloader.data_info import Data2D, Detector
+from sans.dataloader.manipulations import reader2D_converter
 
 # Look for unit converter

sansdataloader/src/sans/dataloader/readers/defaults.xml

@@ -6 +6 @@
         
         <FileType extension='.xml' reader='cansas_reader'/>
+        <FileType extension='.txt' reader='ascii_reader'/>
         <FileType extension='.asc' reader='IgorReader'/>
         <FileType extension='.dat' reader='red2d_reader'/>
         <FileType extension='.tif' reader='tiff_reader'/>
-        <FileType extension='.tiff' reader='tiff_reader'/>
+        <FileType extension='.abs' reader='abs_reader'/>
+        <FileType extension='.d1d' reader='hfir1d_reader'/>
         <FileType extension='.sans' reader='danse_reader'/>
     

sansdataloader/src/sans/dataloader/readers/hfir1d_reader.py

@@ -10 +10 @@
 import numpy
 import os
-from DataLoader.data_info import Data1D
+from sans.dataloader.data_info import Data1D
 
 # Check whether we have a converter available

sansdataloader/src/sans/dataloader/readers/red2d_reader.py

@@ -18 +18 @@
 import math
 #import logging
-from DataLoader.data_info import Data2D, Detector
+from sans.dataloader.data_info import Data2D, Detector
 
 # Look for unit converter

sansdataloader/src/sans/dataloader/readers/tiff_reader.py

@@ -17 +17 @@
 import math, logging, os
 import numpy
-from DataLoader.data_info import Data2D
+from sans.dataloader.data_info import Data2D
     
 class Reader: