Changeset 2352350 in sasmodels

Timestamp:

Mar 17, 2016 10:07:29 AM (9 years ago)

Author:

krzywon

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:

3bcd03d

Parents:

bdb653c (diff), f10bc52 (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 remote-tracking branch 'origin/master'

Files:

• sasmodels/models/adsorbed_layer.py (modified) (1 diff)
• sasmodels/models/mono_gauss_coil.py (modified) (1 diff)
• example/fit_sesans.py (modified) (1 diff)
• example/sesansfit.sh (modified) (1 diff)

sasmodels/models/adsorbed_layer.py

@@ -89 +89 @@
                background = 'background')
 
+# these unit test values taken from SasView 3.1.2
 tests =  [
     [{'scale': 1.0, 'second_moment': 23.0, 'adsorbed_amount': 1.9, 

sasmodels/models/mono_gauss_coil.py

@@ -86 +86 @@
                background = 'background')
 
+# these unit test values taken from SasView 3.1.2
 tests =  [
-    [{'scale': 70.0, 'radius_gyration': 75.0, 'background': 0.0},
+    [{'scale': 1.0, 'i_zero': 70.0, 'radius_gyration': 75.0, 'background': 0.0},
      [0.0106939, 0.469418], [57.1241, 0.112859]],
     ]

example/fit_sesans.py

@@ -1 +1 @@
 import shlex, subprocess, sys
+import platform
 args = shlex.split("sesansfit.sh blah --edit")
 args[1] = sys.argv[1]
-subprocess.Popen(args, shell="True")
+if platform.system() != "Windows":
+    args = ["sh"] + args
+    shellFlag = False
+else:
+    shellFlag = True
+subprocess.Popen(args, shell=shellFlag)

example/sesansfit.sh

@@ -8 +8 @@
 set -x
 
-pythonw -m bumps.cli $*
+python -m bumps.cli $*