Changeset a0f3c29 in sasview for src/sas/sascalc

Timestamp:

Feb 7, 2019 5:34:01 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_sync_sascalc

Children:

44a698c

Parents:

d09f462f

Message:

Patched the issue with reading SVS files after updating the Cansas
reader. SASVIEW-984

Location:

src/sas/sascalc/dataloader

Files:

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

src/sas/sascalc/dataloader/data_info.py

@@ -1188 +1188 @@
         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
+        if hasattr(data, 'y_bins'):
+            final_dataset.y_bins = data.y_bins
+        if hasattr(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

@@ -493 +493 @@
                 self.current_datainfo.errors.add(error)
             self.data_cleanup()
-            self.sort_one_d_data()
-            self.sort_two_d_data()
+            # Where are these defined??
+            #self.sort_one_d_data()
+            #self.sort_two_d_data()
             self.reset_data_list()
             return self.output[0], None