Changes in / [93b34cc:cb9640f] in sasview

Location:

src/sas

Files:

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

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/calculator/model_editor.py

@@ -965 +965 @@
         out_f.write('    """Absolute scattering"""\n')
         if "scipy." in func_str:
-            out_f.write('    import scipy')
+            out_f.write('    import scipy\n')
         if "numpy." in func_str:
-            out_f.write('    import numpy')
+            out_f.write('    import numpy\n')
         if "np." in func_str:
-            out_f.write('    import numpy as np')
+            out_f.write('    import numpy as np\n')
         for func_line in func_str.split('\n'):
             out_f.write('%s%s\n' % ('    ', func_line))

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)

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: