Changeset 8f882fe in sasview for src/sas/sascalc/dataloader/file_reader_base_class.py

Timestamp:

Jul 6, 2018 12:23:21 PM (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:

eb6abab

Parents:

058f6c3

Message:

Changes to NXcanSAS reader to comply with specification. refs #976

File:

• src/sas/sascalc/dataloader/file_reader_base_class.py (modified) (4 diffs)

src/sas/sascalc/dataloader/file_reader_base_class.py

@@ -175 +175 @@
                 # Normalize the units for
                 data.x_unit = self.format_unit(data.x_unit)
+                data._xunit = data.x_unit
                 data.y_unit = self.format_unit(data.y_unit)
+                data._yunit = data.y_unit
                 # Sort data by increasing x and remove 1st point
                 ind = np.lexsort((data.y, data.x))
@@ -206 +208 @@
             elif isinstance(data, Data2D):
                 # Normalize the units for
-                data.x_unit = self.format_unit(data.Q_unit)
-                data.y_unit = self.format_unit(data.I_unit)
+                data.Q_unit = self.format_unit(data.Q_unit)
+                data.I_unit = self.format_unit(data.I_unit)
+                data._xunit = data.Q_unit
+                data._yunit = data.Q_unit
+                data._zunit = data.I_unit
                 data.data = data.data.astype(np.float64)
                 data.qx_data = data.qx_data.astype(np.float64)
@@ -318 +323 @@
                 try:
                     data.x = data_conv_x(data.x, units=default_q_unit)
+                    data._xunit = default_q_unit
+                    data.x_unit = default_q_unit
                     if data.dx is not None:
                         data.dx = data_conv_x(data.dx, units=default_q_unit)
@@ -330 +337 @@
                 try:
                     data.y = data_conv_y(data.y, units=default_i_unit)
+                    data._yunit = default_i_unit
+                    data.y_unit = default_i_unit
                     if data.dy is not None:
                         data.dy = data_conv_y(data.dy, units=default_i_unit)