Changeset 33d3a74 in sasview

Timestamp:

Dec 11, 2018 9:54:53 PM (6 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:

cb9640f

Parents:

175b83f (diff), 1752f38 (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@…> (12/11/18 21:54:53)

git-committer:

GitHub <noreply@…> (12/11/18 21:54:53)

Message:

Merge pull request #200 from SasView?/ticket-1218

Added newlines to import statements in the plugin model template.

Addresses #1218
need to edit 1218 now

Location:

src/sas/sasgui/perspectives

Files:

• calculator/model_editor.py (modified) (1 diff)
• fitting/gpu_options.py (modified) (3 diffs)

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/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: