Changeset c7c8143 in sasview for src/sas/sascalc/file_converter/nxcansas_writer.py

Timestamp:

Nov 28, 2018 12:01:20 PM (5 years ago)

Author:

Jeff Krzywon <jkrzywon@…>

Branches:

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

Children:

109afbd

Parents:

9220e89c

Message:

Load and save mask from NXcanSAS properly.

File:

• src/sas/sascalc/file_converter/nxcansas_writer.py (modified) (2 diffs)

src/sas/sascalc/file_converter/nxcansas_writer.py

@@ -328 +328 @@
         (n_rows, n_cols) = (len(data.y_bins), len(data.x_bins))
 
-        if n_rows == 0 and n_cols == 0:
+        if ((n_rows == 0 and n_cols == 0)
+                or (n_cols*n_rows != len(data.data.flatten()))):
             # Calculate rows and columns, assuming detector is square
             # Same logic as used in PlotPanel.py _get_bins
@@ -360 +361 @@
             dqy_entry = data_entry.create_dataset('dQy', data=data.dqy_data)
             dqy_entry.attrs['units'] = data.Q_unit
+        if data.mask is not None and not all(data.mask == [None]):
+            data_entry.attrs['mask'] = "mask"
+            mask = np.invert(np.asarray(data.mask, dtype=bool))
+            data_entry.create_dataset('mask', data=mask)