Changeset b1ec23d in sasview

Timestamp:

Oct 17, 2018 9:07:51 AM (6 years ago)

Author:

krzywon

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, unittest-saveload

Children:

b204004

Parents:

5218180

Message:

Remove unneeded shape check, give better error when saving fails, and data info cleanup.

Location:

src/sas

Files:

• sascalc/dataloader/file_reader_base_class.py (modified) (2 diffs)
• sascalc/dataloader/loader.py (modified) (1 diff)
• sasgui/guiframe/gui_manager.py (modified) (1 diff)

src/sas/sascalc/dataloader/file_reader_base_class.py

@@ -231 +231 @@
                     data.mask = data.mask.astype(dtype=bool)
 
-                if len(data.data.shape) == 2:
-                    n_rows, n_cols = data.data.shape
-                    data.y_bins = data.qy_data[0::int(n_cols)]
-                    data.x_bins = data.qx_data[:int(n_cols)]
-                    data.data = data.data.flatten()
-                    data = self._remove_nans_in_data(data)
+                n_rows, n_cols = data.data.shape
+                data.y_bins = data.qy_data[0::int(n_cols)]
+                data.x_bins = data.qx_data[:int(n_cols)]
+                data.data = data.data.flatten()
+                data = self._remove_nans_in_data(data)
                 if len(data.data) > 0:
                     data.xmin = np.min(data.qx_data)
@@ -288 +287 @@
         :return:
         """
-        data.xaxis("\\rm{Q}", '1/A')
-        data.yaxis("\\rm{Intensity}", "1/cm")
+        data.xaxis(r"\rm{Q}", '1/A')
+        data.yaxis(r"\rm{Intensity}", "1/cm")
         return data
 

src/sas/sascalc/dataloader/loader.py

@@ -367 +367 @@
             try:
                 return fn(path, data)
-            except Exception as exep:
-                pass  # give other loaders a chance to succeed
-        # If we get here it is because all loaders failed
-        raise exep # raises last exception
+            except Exception as exc:
+                msg = "Saving file {} using the {} writer failed.\n".format(
+                    path, type(fn).__name__)
+                msg += str(exc)
+                logger.exception(msg)  # give other loaders a chance to succeed
 
 

src/sas/sasgui/guiframe/gui_manager.py

@@ -2480 +2480 @@
             if has_errors:
                 if data.dx is not None and data.dx != []:
-                    out.write("<X>   <Y>   <dY>   <dX>\n")
+                    out.write("<X>\t<Y>\t<dY>\t<dX>\n")
                 else:
-                    out.write("<X>   <Y>   <dY>\n")
+                    out.write("<X>\t<Y>\t<dY>\n")
             else:
-                out.write("<X>   <Y>\n")
+                out.write("<X>\t<Y>\n")
 
             for i in range(len(data.x)):