Changeset 81d3a0c in sasmodels

Timestamp:

Mar 19, 2016 1:00:06 PM (9 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

3a45c2c, 053c4f1, 43b7eea, 89f4163, e65a3e7, 0a7eec11

Parents:

d7cd7d1 (diff), a84a0ca (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 github.com:sasview/sasmodels

Files:

• doc/rst_prolog (modified) (3 diffs)
• example/fit_sesans.py (modified) (1 diff)

doc/rst_prolog

@@ -1 +1 @@
 .. Set up some substitutions to make life easier...
 .. Remove |biggamma|, etc. when they are no longer needed.
+
 
 .. |alpha| unicode:: U+03B1
@@ -32 +33 @@
 .. |bigzeta| unicode:: U+039E
 .. |bigpsi| unicode:: U+03A8
+.. |bigphi| unicode:: U+03A6
+.. |bigsigma| unicode:: U+03A3
 .. |Gamma| unicode:: U+0393
 .. |Delta| unicode:: U+0394
 .. |Zeta| unicode:: U+039E
 .. |Psi| unicode:: U+03A8
+
 
 .. |drho| replace:: |Delta|\ |rho|
@@ -57 +61 @@
 
 
+.. |equiv| unicode:: U+2261
+.. |noteql| unicode:: U+2260
+.. |TM| unicode:: U+2122
+
+
 .. |cdot| unicode:: U+00B7
 .. |deg| unicode:: U+00B0

example/fit_sesans.py

@@ -14 +14 @@
 sys.path.insert(0, SASMODELS)
 
-from bumps.gui.gui_app import main as gui
-gui()
+if sys.argv[-1].startswith('-'):
+    from bumps.cli import main as run_bumps
+else:
+    from bumps.gui.gui_app import main as run_bumps
+run_bumps()