Changes in / [d4cde37:cc2cd5a] in sasview

Location:

src/sas/sascalc/dataloader

Files:

• data_info.py (modified) (1 diff)
• readers/cansas_reader.py (modified) (6 diffs)

src/sas/sascalc/dataloader/data_info.py

@@ -1191 +1191 @@
         final_dataset.yaxis(data._yaxis, data._yunit)
         final_dataset.zaxis(data._zaxis, data._zunit)
-        final_dataset.y_bins = data.y_bins
-        final_dataset.x_bins = data.x_bins
     else:
         return_string = ("Should Never Happen: _combine_data_info_with_plottabl"

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

@@ -17 +17 @@
 # For saving individual sections of data
 from ..data_info import Data1D, Data2D, DataInfo, plottable_1D, plottable_2D, \
-    Collimation, TransmissionSpectrum, Detector, Process, Aperture, \
-    combine_data_info_with_plottable as combine_data
+    Collimation, TransmissionSpectrum, Detector, Process, Aperture
 from ..loader_exceptions import FileContentsException, DefaultReaderException, \
     DataReaderException
 from . import xml_reader
 from .xml_reader import XMLreader
-from .cansas_constants import CansasConstants, CurrentLevel
+from .cansas_constants import CansasConstants
 
 logger = logging.getLogger(__name__)
@@ -59 +58 @@
     type = ["XML files (*.xml)|*.xml", "SasView Save Files (*.svs)|*.svs"]
     # List of allowed extensions
-    ext = ['.xml', '.XML', '.svs', '.SVS']
+    ext = ['.xml', '.svs']
     # Flag to bypass extension check
     allow_all = True
@@ -81 +80 @@
         self.encoding = None
 
-    def read(self, xml_file, schema_path="", invalid=True):
+    def _read(self, xml_file, schema_path="", invalid=True):
         if schema_path != "" or not invalid:
             # read has been called from self.get_file_contents because xml file doens't conform to schema
@@ -90 +89 @@
         return super(XMLreader, self).read(xml_file)
 
-    def get_file_contents(self, xml_file=None, schema_path="", invalid=True):
+    def get_file_contents(self):
+        return self._get_file_contents(xml_file=None, schema_path="", invalid=True)
+
+    def _get_file_contents(self, xml_file=None, schema_path="", invalid=True):
         # Reset everything since we're loading a new file
         self.reset_state()
@@ -124 +126 @@
                 try:
                     # Load data with less strict schema
-                    self.read(xml_file, invalid_schema, False)
+                    self._get_file_contents(xml_file, invalid_schema, False)
 
                     # File can still be read but doesn't match schema, so raise exception
@@ -493 +495 @@
                 self.current_datainfo.errors.add(error)
             self.data_cleanup()
-            self.sort_one_d_data()
-            self.sort_two_d_data()
+            self.sort_data()
             self.reset_data_list()
             return self.output[0], None