Changeset 80963c6c in sasview for src/sas/sascalc/dataloader/readers

Timestamp:

Feb 7, 2019 4:02:47 AM (5 years ago)

Author:

wojciech

Branches:

ESS_GUI, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_sync_sascalc

Children:

a1b49a7

Parents:

a74dd016 (diff), a0f3c29 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ESS_GUI' of ​https://github.com/SasView/sasview into ESS_GUI

File:

• src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) (1 diff)

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