Changeset b699768 in sasview for src/sas/sascalc/dataloader/readers

Timestamp:

Feb 19, 2016 10:07:22 AM (9 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

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:

d7bb526

Parents:

792e6be

Message:

Initial commit of the refactored SasCalc? module.

Location:

src/sas/sascalc/dataloader/readers

Files:

• IgorReader.py (moved) (moved from src/sas/dataloader/readers/IgorReader.py) (1 diff)
• __init__.py (moved) (moved from src/sas/dataloader/readers/__init__.py)
• abs_reader.py (moved) (moved from src/sas/dataloader/readers/abs_reader.py) (1 diff)
• ascii_reader.py (moved) (moved from src/sas/dataloader/readers/ascii_reader.py) (1 diff)
• associations.py (moved) (moved from src/sas/dataloader/readers/associations.py)
• cansas_constants.py (moved) (moved from src/sas/dataloader/readers/cansas_constants.py)
• cansas_reader.py (moved) (moved from src/sas/dataloader/readers/cansas_reader.py) (2 diffs)
• danse_reader.py (moved) (moved from src/sas/dataloader/readers/danse_reader.py) (1 diff)
• defaults.json (moved) (moved from src/sas/dataloader/readers/defaults.json)
• hfir1d_reader.py (moved) (moved from src/sas/dataloader/readers/hfir1d_reader.py) (1 diff)
• nexus_reader.py (moved) (moved from src/sas/dataloader/readers/nexus_reader.py) (1 diff)
• red2d_reader.py (moved) (moved from src/sas/dataloader/readers/red2d_reader.py) (1 diff)
• schema/cansas1d_v1_0.xsd (moved) (moved from src/sas/dataloader/readers/schema/cansas1d_v1_0.xsd)
• schema/cansas1d_v1_1.xsd (moved) (moved from src/sas/dataloader/readers/schema/cansas1d_v1_1.xsd)
• sesans_reader.py (moved) (moved from src/sas/dataloader/readers/sesans_reader.py) (1 diff)
• tiff_reader.py (moved) (moved from src/sas/dataloader/readers/tiff_reader.py) (1 diff)
• xml_reader.py (moved) (moved from src/sas/dataloader/readers/xml_reader.py)

src/sas/sascalc/dataloader/readers/IgorReader.py

@@ -16 +16 @@
 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

src/sas/sascalc/dataloader/readers/abs_reader.py

@@ -11 +11 @@
 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

src/sas/sascalc/dataloader/readers/ascii_reader.py

@@ -16 +16 @@
 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

src/sas/sascalc/dataloader/readers/cansas_reader.py

@@ -20 +20 @@
 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.
@@ -40 +40 @@
 HAS_CONVERTER = True
 try:
-    from sas.data_util.nxsunit import Converter
+    from sas.sascalc.data_util.nxsunit import Converter
 except ImportError:
     HAS_CONVERTER = False

src/sas/sascalc/dataloader/readers/danse_reader.py

@@ -17 +17 @@
 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

src/sas/sascalc/dataloader/readers/hfir1d_reader.py

@@ -11 +11 @@
 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

src/sas/sascalc/dataloader/readers/nexus_reader.py

@@ -10 +10 @@
 """
 import os
-from sas.dataloader.data_info import Data2D
+from sas.sascalc.dataloader.data_info import Data2D
 
 

src/sas/sascalc/dataloader/readers/red2d_reader.py

@@ -12 +12 @@
 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

src/sas/sascalc/dataloader/readers/sesans_reader.py

@@ -8 +8 @@
 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

src/sas/sascalc/dataloader/readers/tiff_reader.py

@@ -14 +14 @@
 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: