Changeset 9fb4572 in sasview

Timestamp:

Oct 18, 2018 11:43:55 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:

9f45f83, 0863065

Parents:

845144e

Message:

Reinstate shape check.

Files:

• src/sas/sascalc/dataloader/file_reader_base_class.py (modified) (1 diff)
• test/sasdataloader/test/utest_ascii.py (modified) (2 diffs)

src/sas/sascalc/dataloader/file_reader_base_class.py

@@ -231 +231 @@
                     data.mask = data.mask.astype(dtype=bool)
 
-                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()
+                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)
                 if len(data.data) > 0:

test/sasdataloader/test/utest_ascii.py

@@ -10 +10 @@
 import unittest
 from sas.sascalc.dataloader.loader import Loader
+from sas.sascalc.dataloader.data_info import Data2D
 
 
@@ -121 +122 @@
             self.assertFalse(math.isnan(f_1d.y[i]))
             self.assertFalse(math.isnan(f_1d.dy[i]))
+        self.assertTrue(isinstance(f_2d, Data2D))
         f_2d.data = f_2d.data.flatten()
         f_2d.qx_data = f_2d.qx_data.flatten()