Changeset bfea0c2 in sasmodels for example

Timestamp:

Mar 18, 2016 12:34:24 PM (8 years ago)

Author:

jhbakker

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

42f1ad9

Parents:

4c1bfb3 (diff), c1c37d5 (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.

Message:

Merge branch 'master' of ​https://github.com/SasView/sasmodels

Location:

example

Files:

• sesansfit.py (modified) (2 diffs)
• fit_sesans.py (modified) (1 diff)
• sesansfit.sh (deleted)

example/sesansfit.py

@@ -2 +2 @@
 from sasmodels import core, bumps_model, sesans
 from sas.sascalc.dataloader.loader import Loader
-
-HAS_CONVERTER = True
-try:
-    from sas.sascalc.data_util.nxsunit import Converter
-except ImportError:
-    HAS_CONVERTER = False
-
 
 def get_bumps_model(model_name):
@@ -31 +24 @@
         data = loader.load(file)
         if data is None: raise IOError("Could not load file %r"%(file))
-        if HAS_CONVERTER == True:
-            default_unit = "A"
-            data_conv_q = Converter(data._xunit)
-            for x in data.x:
-                print x
-            data.x = data_conv_q(data.x, units=default_unit)
-            for x in data.x:
-                print x
-            data._xunit = default_unit
 
     except:

example/fit_sesans.py

@@ -1 @@
-import shlex, subprocess, sys
-import platform
-args = shlex.split("sesansfit.sh blah --edit")
-args[1] = sys.argv[1]
-if platform.system() != "Windows":
-    args = ["sh"] + args
-    shellFlag = False
-else:
-    shellFlag = True
-subprocess.Popen(args, shell=shellFlag)
+#!/usr/bin/env python
+import os
+import sys
+
+# Need to fix the paths to sasmodels and sasview if no eggs present
+ONEUP=os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+PROJECTS=os.path.dirname(ONEUP)
+SASMODELS=os.path.join(PROJECTS, 'sasmodels')
+SASVIEW=os.path.join(PROJECTS, 'sasview', 'src')
+BUMPS=os.path.join(PROJECTS, 'bumps')
+
+sys.path.insert(0, BUMPS)
+sys.path.insert(0, SASVIEW)
+sys.path.insert(0, SASMODELS)
+
+from bumps.gui.gui_app import main as gui
+gui()