Changeset 175b83f in sasview

Timestamp:

Nov 29, 2018 6:55:13 AM (5 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

Children:

75313af, 46119c2, 33d3a74, 1342f6a

Parents:

4e373ab (diff), 895703d (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:

Wojciech Potrzebowski <Wojciech.Potrzebowski@…> (11/29/18 06:55:13)

git-committer:

GitHub <noreply@…> (11/29/18 06:55:13)

Message:

Merge pull request #195 from SasView?/ticket-1015-quick-fix

Ticket 1015. Clean out existing kernels when changing compute engine

Location:

src/sas

Files:

• sasgui/perspectives/fitting/gpu_options.py (modified) (3 diffs)
• sascalc/dataloader/file_reader_base_class.py (modified) (1 diff)
• sasgui/perspectives/fitting/fitting.py (modified) (1 diff)

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

@@ -23 +23 @@
 import sasmodels
 import sasmodels.model_test
-import sasmodels.kernelcl
+import sasmodels.sasview_model
 
 from sas.sasgui.guiframe.documentation_window import DocumentationWindow
@@ -239 +239 @@
             if "SAS_OPENCL" in os.environ:
                 del os.environ["SAS_OPENCL"]
-        sasmodels.kernelcl.reset_environment()
+        sasmodels.sasview_model.reset_environment()
         event.Skip()
 
@@ -265 +265 @@
             if "SAS_OPENCL" in os.environ:
                 del os.environ["SAS_OPENCL"]
-        sasmodels.kernelcl.reset_environment()
+        sasmodels.sasview_model.reset_environment()
 
         try:

src/sas/sascalc/dataloader/file_reader_base_class.py

@@ -276 +276 @@
                     dataset.xmax = np.max(dataset.qx_data)
                     dataset.ymin = np.min(dataset.qy_data)
-                    dataset.ymax = np.max(dataset.qx_data)
+                    dataset.ymax = np.max(dataset.qy_data)
 
     def format_unit(self, unit=None):

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

@@ -776 +776 @@
         :param weight: current dy data
         """
-        # If we are not dealing with a specific fit problem, then
-        # there is no point setting the weights.
-        if fid is None:
-            return
+        # Note: this is used to set the data weights for the fit based on
+        # the weight selection in the GUI.
         if uid in self.page_finder.keys():
             self.page_finder[uid].set_weight(flag=flag, is2d=is2d)