Changeset 8d5e11c in sasview

Timestamp:

Sep 11, 2018 11:47:02 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:

4fdcc65

Parents:

9dc1500

Message:

File loader code cleanup.

Location:

src/sas/sascalc/dataloader

Files:

• data_info.py (modified) (5 diffs)
• file_reader_base_class.py (modified) (6 diffs)
• loader.py (modified) (1 diff)

src/sas/sascalc/dataloader/data_info.py

@@ -954 +954 @@
         _str += "Data:\n"
         _str += "   Type:         %s\n" % self.__class__.__name__
-        _str += "   X- & Y-axis:  %s\t[%s]\n" % (self._yaxis, self._yunit)
+        _str += "   X-axis:       %s\t[%s]\n" % (self._xaxis, self._xunit)
+        _str += "   Y-axis:       %s\t[%s]\n" % (self._yaxis, self._yunit)
         _str += "   Z-axis:       %s\t[%s]\n" % (self._zaxis, self._zunit)
         _str += "   Length:       %g \n" % (len(self.data))
@@ -983 +984 @@
                            qx_data=qx_data, qy_data=qy_data,
                            q_data=q_data, mask=mask)
+
+        clone._xaxis = self._xaxis
+        clone._yaxis = self._yaxis
+        clone._zaxis = self._zaxis
+        clone._xunit = self._xunit
+        clone._yunit = self._yunit
+        clone._zunit = self._zunit
 
         clone.title = self.title
@@ -1153 +1161 @@
 def combine_data_info_with_plottable(data, datainfo):
     """
-    A function that combines the DataInfo data in self.current_datainto with a plottable_1D or 2D data object.
+    A function that combines the DataInfo data in self.current_datainto with a
+    plottable_1D or 2D data object.
 
     :param data: A plottable_1D or plottable_2D data object
@@ -1171 +1180 @@
         final_dataset.yaxis(data._yaxis, data._yunit)
     elif isinstance(data, plottable_2D):
-        final_dataset = Data2D(data.data, data.err_data, data.qx_data, data.qy_data, data.q_data,
-                               data.mask, data.dqx_data, data.dqy_data)
+        final_dataset = Data2D(data.data, data.err_data, data.qx_data,
+                               data.qy_data, data.q_data, data.mask,
+                               data.dqx_data, data.dqy_data)
         final_dataset.xaxis(data._xaxis, data._xunit)
         final_dataset.yaxis(data._yaxis, data._yunit)
@@ -1181 +1191 @@
             final_dataset.x_bins = data.qx_data[:int(n_cols)]
     else:
-        return_string = "Should Never Happen: _combine_data_info_with_plottable input is not a plottable1d or " + \
-                        "plottable2d data object"
+        return_string = ("Should Never Happen: _combine_data_info_with_plottabl"
+                         "e input is not a plottable1d or plottable2d data "
+                         "object")
         return return_string
 

src/sas/sascalc/dataloader/file_reader_base_class.py

@@ -37 +37 @@
                        "load the file was made, but, should it be successful, "
                        "SasView cannot guarantee the accuracy of the data.")
+
 
 class FileReader(object):
@@ -141 +142 @@
         Returns the entire file as a string.
         """
-        #return self.f_open.read()
         return decode(self.f_open.read())
 
@@ -308 +308 @@
         Converts al; data to the sasview default of units of A^{-1} for Q and
         cm^{-1} for I.
-        :param default_x_unit: The default x unit used by Sasview
-        :param default_y_unit: The default y unit used by Sasview
+        :param default_q_unit: The default Q unit used by Sasview
+        :param default_i_unit: The default I unit used by Sasview
         """
         new_output = []
@@ -347 +347 @@
             elif isinstance(data, Data2D):
                 try:
-                    data.qx_data = data_conv_x(data.qx_data, units=default_q_unit)
+                    data.qx_data = data_conv_x(data.qx_data,
+                                               units=default_q_unit)
                     if data.dqx_data is not None:
-                        data.dqx_data = data_conv_x(data.dqx_data, units=default_q_unit)
-                    data.qy_data = data_conv_y(data.qy_data, units=default_q_unit)
+                        data.dqx_data = data_conv_x(data.dqx_data,
+                                                    units=default_q_unit)
+                    data.qy_data = data_conv_y(data.qy_data,
+                                               units=default_q_unit)
                     if data.dqy_data is not None:
-                        data.dqy_data = data_conv_y(data.dqy_data, units=default_q_unit)
+                        data.dqy_data = data_conv_y(data.dqy_data,
+                                                    units=default_q_unit)
                 except KeyError:
                     message = "Unable to convert Q units from {0} to 1/A."
@@ -362 +366 @@
                     data.data = data_conv_z(data.data, units=default_i_unit)
                     if data.err_data is not None:
-                        data.err_data = data_conv_z(data.err_data, units=default_i_unit)
+                        data.err_data = data_conv_z(data.err_data,
+                                                    units=default_i_unit)
                 except KeyError:
                     message = "Unable to convert I units from {0} to 1/cm."
@@ -462 +467 @@
                     self.current_dataset.qy_data))
             if has_error_dy:
-                self.current_dataset.err_data = self.current_dataset.err_data[x != 0]
+                self.current_dataset.err_data = self.current_dataset.err_data[
+                    x != 0]
             if has_error_dqx:
-                self.current_dataset.dqx_data = self.current_dataset.dqx_data[x != 0]
+                self.current_dataset.dqx_data = self.current_dataset.dqx_data[
+                    x != 0]
             if has_error_dqy:
-                self.current_dataset.dqy_data = self.current_dataset.dqy_data[x != 0]
+                self.current_dataset.dqy_data = self.current_dataset.dqy_data[
+                    x != 0]
             if has_mask:
                 self.current_dataset.mask = self.current_dataset.mask[x != 0]

src/sas/sascalc/dataloader/loader.py

@@ -367 +367 @@
             try:
                 return fn(path, data)
-            except Exception:
+            except Exception as exep:
                 pass  # give other loaders a chance to succeed
         # If we get here it is because all loaders failed
-        raise  # reraises last exception
+        raise exep # raises last exception