Changeset a58b5a0 in sasview for src/sas/sascalc/dataloader

Timestamp:

Jan 9, 2018 12:13:25 PM (7 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, ticket885, unittest-saveload

Children:

b6b81a3

Parents:

340291a

Message:

Update documentation to match code.

File:

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

src/sas/sascalc/dataloader/file_reader_base_class.py

@@ -209 +209 @@
         """
         Remove data points where nan is loaded
-        :param data: 1D data set
-        :return: data with mask=0 for any value of nan in data .x, .y, .dx, .dy
+        :param data: 1D or 2D data object
+        :return: data with nan points removed
         """
         if isinstance(data, Data1D):
@@ -218 +218 @@
         else:
             return data
+        # Make array of good points - all others will be removed
         good = np.isfinite(getattr(data, fields[0]))
         for name in fields[1:]:
             array = getattr(data, name)
             if array is not None:
-                # Set mask[i] to 0 when data.<param> is nan
+                # Update good points only if not already changed
                 good &= np.isfinite(array)
         if not np.all(good):