Changeset 2ca5d57b in sasview for src/sas/sascalc/dataloader

Timestamp:

Sep 13, 2018 11:33:22 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:

feec1cb

Parents:

4fdcc65

Message:

Code cleanup and additional unit tests.

File:

• src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) (3 diffs)

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

@@ -131 +131 @@
             value = data.get(key)
             class_name = h5attr(value, u'canSAS_class')
+            if isinstance(class_name, (list, tuple, np.ndarray)):
+                class_name = class_name[0]
             if class_name is None:
                 class_name = h5attr(value, u'NX_class')
@@ -538 +540 @@
             if dataset.data.ndim == 2:
                 (n_rows, n_cols) = dataset.data.shape
-                print(n_rows)
-                print(n_cols)
                 flat_qy = dataset.qy_data[0::n_cols].flatten()
                 if flat_qy[0] == flat_qy[1]:
@@ -548 +548 @@
                     flat_qx = np.transpose(dataset.qx_data)[0::n_rows].flatten()
                 dataset.x_bins = np.unique(flat_qx)
-                print(dataset.x_bins)
-                print(len(dataset.x_bins))
-                print(dataset.y_bins)
-                print(len(dataset.y_bins))
                 dataset.data = dataset.data.flatten()
                 dataset.qx_data = dataset.qx_data.flatten()