Changeset 6eb02a5 in sasview

Timestamp:

Jan 15, 2018 6:11:57 PM (7 years ago)

Author:

GitHub <noreply@…>

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:

e110cb0

Parents:

a40e913 (diff), a0f4768 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Paul Butler <butlerpd@…> (01/15/18 18:11:57)

git-committer:

GitHub <noreply@…> (01/15/18 18:11:57)

Message:

Merge pull request #133 from SasView?/ticket-993

ticket 993
closes #993

Files:

• installers/installer_generator.py (modified) (3 diffs)
• .gitignore (modified) (1 diff)
• build_tools/conda/ymls/sasview-env-build_linux.yml (added)
• build_tools/conda/ymls/sasview-env-build_osx.yml (added)
• build_tools/conda/ymls/sasview-env-build_win.yml (added)
• installers/sasview.spec (modified) (1 prop)
• installers/version.txt (modified) (1 prop)
• src/sas/sascalc/dataloader/file_reader_base_class.py (modified) (6 diffs)
• src/sas/sascalc/dataloader/readers/abs_reader.py (modified) (4 diffs)
• src/sas/sascalc/dataloader/readers/associations.py (modified) (1 diff)
• src/sas/sasgui/guiframe/images/Thumbs.db (deleted)
• src/sas/sasgui/perspectives/fitting/fitting.py (modified) (1 prop)
• src/sas/sasgui/perspectives/fitting/gpu_options.py (modified) (2 diffs)
• src/sas/sasview/images/dls_logo.png (modified) (1 prop) (previous)
• src/sas/sasview/images/tudelft_logo.png (modified) (1 prop) (previous)
• src/sas/sasview/test/1d_data/saxess_example.pdh (modified) (1 prop)
• test/sasdataloader/test/nans_in_1d_data.dat (added)
• test/sasdataloader/test/nans_in_2d_data.DAT (added)
• test/sasdataloader/test/sam14_cor.ABS (added)
• test/sasdataloader/test/sam14_cor.cor (added)
• test/sasdataloader/test/utest_abs_reader.py (modified) (1 diff)
• test/sasdataloader/test/utest_ascii.py (modified) (2 diffs)

installers/installer_generator.py

@@ -9 +9 @@
 import sys
 import string
+
+is_64bit = sys.maxsize > 2**32
 
 root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -25 +27 @@
 AppSupportURL = local_config._homepage
 AppUpdatesURL = local_config._homepage
+ArchitecturesInstallIn64BitMode = 'x64'
 ChangesEnvironment = 'true'
 DefaultDirName = os.path.join("{pf}" , AppName+Dev)
@@ -343 +346 @@
     TEMPLATE += "AppSupportURL=%s\n" % str(AppSupportURL)
     TEMPLATE += "AppUpdatesURL=%s \n" % str(AppUpdatesURL)
+    if is_64bit:
+        TEMPLATE += "ArchitecturesInstallIn64BitMode=%s \n" % str(ArchitecturesInstallIn64BitMode)
     TEMPLATE += "ChangesEnvironment=%s \n" % str(ChangesEnvironment)
     TEMPLATE += "DefaultDirName=%s\n" % str(DefaultDirName)

.gitignore

@@ -29 +29 @@
 default_categories.json
 /setup.cfg
+Thumbs.db
 
 # doc build

src/sas/sascalc/dataloader/file_reader_base_class.py

@@ -7 +7 @@
 import os
 import sys
-import re
+import math
 import logging
 from abc import abstractmethod
@@ -25 +25 @@
     def decode(s):
         return s.decode() if isinstance(s, bytes) else s
+
+# Data 1D fields for iterative purposes
+FIELDS_1D = ('x', 'y', 'dx', 'dy', 'dxl', 'dxw')
+# Data 2D fields for iterative purposes
+FIELDS_2D = ('data', 'qx_data', 'qy_data', 'q_data', 'err_data',
+                 'dqx_data', 'dqy_data', 'mask')
+
 
 class FileReader(object):
@@ -102 +109 @@
         self.current_dataset = None
         self.filepath = None
+        self.ind = None
         self.output = []
 
@@ -159 +167 @@
                 # Sort data by increasing x and remove 1st point
                 ind = np.lexsort((data.y, data.x))
-                data.x = np.asarray([data.x[i] for i in ind]).astype(np.float64)
-                data.y = np.asarray([data.y[i] for i in ind]).astype(np.float64)
+                data.x = self._reorder_1d_array(data.x, ind)
+                data.y = self._reorder_1d_array(data.y, ind)
                 if data.dx is not None:
                     if len(data.dx) == 0:
                         data.dx = None
                         continue
-                    data.dx = np.asarray([data.dx[i] for i in ind]).astype(np.float64)
+                    data.dx = self._reorder_1d_array(data.dx, ind)
                 if data.dxl is not None:
-                    data.dxl = np.asarray([data.dxl[i] for i in ind]).astype(np.float64)
+                    data.dxl = self._reorder_1d_array(data.dxl, ind)
                 if data.dxw is not None:
-                    data.dxw = np.asarray([data.dxw[i] for i in ind]).astype(np.float64)
+                    data.dxw = self._reorder_1d_array(data.dxw, ind)
                 if data.dy is not None:
                     if len(data.dy) == 0:
                         data.dy = None
                         continue
-                    data.dy = np.asarray([data.dy[i] for i in ind]).astype(np.float64)
+                    data.dy = self._reorder_1d_array(data.dy, ind)
                 if data.lam is not None:
-                    data.lam = np.asarray([data.lam[i] for i in ind]).astype(np.float64)
+                    data.lam = self._reorder_1d_array(data.lam, ind)
                 if data.dlam is not None:
-                    data.dlam = np.asarray([data.dlam[i] for i in ind]).astype(np.float64)
+                    data.dlam = self._reorder_1d_array(data.dlam, ind)
+                data = self._remove_nans_in_data(data)
                 if len(data.x) > 0:
                     data.xmin = np.min(data.x)
@@ -184 +193 @@
                     data.ymin = np.min(data.y)
                     data.ymax = np.max(data.y)
+
+    @staticmethod
+    def _reorder_1d_array(array, ind):
+        """
+        Reorders a 1D array based on the indices passed as ind
+        :param array: Array to be reordered
+        :param ind: Indices used to reorder array
+        :return: reordered array
+        """
+        array = np.asarray(array, dtype=np.float64)
+        return array[ind]
+
+    @staticmethod
+    def _remove_nans_in_data(data):
+        """
+        Remove data points where nan is loaded
+        :param data: 1D or 2D data object
+        :return: data with nan points removed
+        """
+        if isinstance(data, Data1D):
+            fields = FIELDS_1D
+        elif isinstance(data, Data2D):
+            fields = FIELDS_2D
+        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:
+                # Update good points only if not already changed
+                good &= np.isfinite(array)
+        if not np.all(good):
+            for name in fields:
+                array = getattr(data, name)
+                if array is not None:
+                    setattr(data, name, array[good])
+        return data
 
     def sort_two_d_data(self):
@@ -214 +261 @@
                     dataset.x_bins = dataset.qx_data[:int(n_cols)]
                 dataset.data = dataset.data.flatten()
+                dataset = self._remove_nans_in_data(dataset)
                 if len(dataset.data) > 0:
                     dataset.xmin = np.min(dataset.qx_data)

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

@@ -29 +29 @@
     type_name = "IGOR 1D"
     # Wildcards
-    type = ["IGOR 1D files (*.abs)|*.abs"]
+    type = ["IGOR 1D files (*.abs)|*.abs", "IGOR 1D USANS files (*.cor)|*.cor"]
     # List of allowed extensions
-    ext = ['.abs']
+    ext = ['.abs', '.cor']
 
     def get_file_contents(self):
@@ -46 +46 @@
         self.current_datainfo = DataInfo()
         self.current_datainfo.filename = filepath
-        self.reset_data_list(len(lines))
         detector = Detector()
         data_line = 0
@@ -188 +187 @@
                     self.current_dataset.y[data_line] = _y
                     self.current_dataset.dy[data_line] = _dy
-                    self.current_dataset.dx[data_line] = _dx
+                    if _dx > 0:
+                        self.current_dataset.dx[data_line] = _dx
+                    else:
+                        if data_line == 0:
+                            self.current_dataset.dx = None
+                            self.current_dataset.dxl = np.zeros(len(lines))
+                            self.current_dataset.dxw = np.zeros(len(lines))
+                        self.current_dataset.dxl[data_line] = abs(_dx)
+                        self.current_dataset.dxw[data_line] = 0
                     data_line += 1
 
@@ -197 +204 @@
                     pass
 
+            # SANS Data:
             # The 6 columns are | Q (1/A) | I(Q) (1/cm) | std. dev.
             # I(Q) (1/cm) | sigmaQ | meanQ | ShadowFactor|
-            if line.count("The 6 columns") > 0:
+            # USANS Data:
+            # EMP LEVEL: <value> ; BKG LEVEL: <value>
+            if line.startswith("The 6 columns") or line.startswith("EMP LEVEL"):
                 is_data_started = True
 

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

@@ -26 +26 @@
     ".dat": "red2d_reader",
     ".abs": "abs_reader",
+    ".cor": "abs_reader",
     ".sans": "danse_reader",
     ".pdh": "anton_paar_saxs_reader"

src/sas/sasgui/perspectives/fitting/gpu_options.py

@@ -8 +8 @@
 '''
 
+import logging
 import os
 import sys
-import warnings
 import wx
 import sasmodels
 from sas.sasgui.guiframe.documentation_window import DocumentationWindow
+
+logger = logging.getLogger(__name__)
 
 
@@ -168 +170 @@
             platforms = cl.get_platforms()
         except ImportError:
-            warnings.warn("pyopencl import failed. Using only CPU computations")
+            logger.warn("Unable to import the pyopencl package.  It may not "
+                        "have been installed.  If you wish to use OpenCL, try "
+                        "running pip install --user pyopencl")
+        except cl.LogicError as err:
+            logger.warn("Unable to fetch the OpenCL platforms.  This likely "
+                        "means that the opencl drivers for your system are "
+                        "not installed.")
+            logger.warn(err)
 
         p_index = 0

test/sasdataloader/test/utest_abs_reader.py

@@ -75 +75 @@
         data = Loader().load(find("jan08002.ABS"))
         self.assertEqual(data[0].meta_data['loader'], "IGOR 1D")
+
+    def test_usans_negative_dxl(self):
+        data_abs = Loader().load(find("sam14_cor.ABS"))
+        data_cor = Loader().load(find("sam14_cor.cor"))
+        for i in range(0, len(data_abs) - 1):
+            self.assertEquals(data_abs.x[i], data_cor.x[i])
+            self.assertEquals(data_abs.y[i], data_cor.y[i])
+            self.assertEquals(data_abs.dxl[i], data_cor.dxl[i])
+            self.assertEquals(data_abs.dxw[i], data_cor.dxw[i])
+            self.assertTrue(data_abs.dxl > 0)
+
 
 class DanseReaderTests(unittest.TestCase):

test/sasdataloader/test/utest_ascii.py

@@ -5 +5 @@
 import os.path
 import warnings
+import math
 warnings.simplefilter("ignore")
 
@@ -110 +111 @@
             self.assertEqual(f, None)
 
+    def test_nan_values(self):
+        """
+        Test loading an ascii data file with nan values saved in x, y, or dy.
+        """
+        f_1d = self.loader.load(find("nans_in_1d_data.dat"))[0]
+        f_2d = self.loader.load(find("nans_in_2d_data.DAT"))[0]
+        for i in range(0, len(f_1d.x) - 1):
+            self.assertFalse(math.isnan(f_1d.x[i]))
+            self.assertFalse(math.isnan(f_1d.y[i]))
+            self.assertFalse(math.isnan(f_1d.dy[i]))
+        f_2d.data = f_2d.data.flatten()
+        f_2d.qx_data = f_2d.qx_data.flatten()
+        f_2d.qy_data = f_2d.qy_data.flatten()
+        for i in range(0, len(f_2d.data) - 1):
+            self.assertFalse(math.isnan(f_2d.data[i]))
+            self.assertFalse(math.isnan(f_2d.qx_data[i]))
+            self.assertFalse(math.isnan(f_2d.qy_data[i]))
+
+
 if __name__ == '__main__':
     unittest.main()