Changeset 21e71f1 in sasview for src/sas/sascalc/dataloader

Timestamp:

Nov 21, 2018 6:39:24 AM (5 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

f2e199e

Parents:

44c15fc (diff), fb39f28 (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_project_save' into ESS_GUI

Location:

src/sas/sascalc/dataloader

Files:

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

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

@@ -184 +184 @@
             if CANSAS_NS.get(self.cansas_version).get("ns") == value.rsplit(" ")[0]:
                 return True
-        if ext == "svs":
+        if ext == ".svs":
             return True # Why is this required?
         # If we get to this point then file isn't valid CanSAS

src/sas/sascalc/dataloader/file_reader_base_class.py

@@ -276 +276 @@
                     dataset.xmax = np.max(dataset.qx_data)
                     dataset.ymin = np.min(dataset.qy_data)
-                    dataset.ymax = np.max(dataset.qx_data)
+                    dataset.ymax = np.max(dataset.qy_data)
 
     def format_unit(self, unit=None):