Changeset b699768 in sasview for src/sas/sascalc/dataloader/readers/cansas_reader.py

Timestamp:

Feb 19, 2016 10:07:22 AM (8 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.

File:

• src/sas/sascalc/dataloader/readers/cansas_reader.py (moved) (moved from src/sas/dataloader/readers/cansas_reader.py) (2 diffs)

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