Changeset 42f1ad9 in sasmodels

Timestamp:

Mar 18, 2016 12:35:49 PM (9 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:

824465b, 3a45c2c

Parents:

bfea0c2 (diff), 31c64d9 (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:

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

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()

example/sesansfit.py

@@ -19 +19 @@
     @return: FitProblem for Bumps usage
     """
+    initial_vals['background'] = 0.0
     try:
         loader = Loader()
@@ -50 +51 @@
     else:
         radius = 1000
-    data.Rmax = 3*radius # [A]
+    data.Rmax = 30*radius # [A]
 
     if isinstance(model, basestring):