Changeset 1a8c11c in sasmodels for sasmodels/direct_model.py

Timestamp:

Jul 19, 2018 11:56:00 AM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

58a34f1

Parents:

4341dd4

Message:

fix handling of 1D data mask when no mask specified

File:

• sasmodels/direct_model.py (modified) (2 diffs)

sasmodels/direct_model.py

@@ -250 +250 @@
             qmax = getattr(data, 'qmax', np.inf)
             accuracy = getattr(data, 'accuracy', 'Low')
-            index = ~data.mask & (q >= qmin) & (q <= qmax)
+            index = (data.mask == 0) & (q >= qmin) & (q <= qmax)
             if data.data is not None:
                 index &= ~np.isnan(data.data)
@@ -265 +265 @@
             mask = getattr(data, 'mask', None)
             if mask is not None:
-                index &= ~mask
+                index &= (mask == 0)
             if data.y is not None:
                 index &= ~np.isnan(data.y)