Changeset 8d75c5a in sasview

Timestamp:

Mar 21, 2016 10:12:48 AM (9 years ago)

Author:

krzywon

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

66f21cd, 5863b16, 08959b8

Parents:

1af8548 (diff), 6e94173 (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/sasview

Files:

• docs/sphinx-docs/source/user/sasgui/perspectives/fitting/fitting_help.rst (modified) (1 diff)
• src/sas/models/media/olddocs/model_functions.old (moved) (moved from src/sas/models/media/olddocs/model_functions.rst) (1 diff)
• setup.py (modified) (1 diff)

docs/sphinx-docs/source/user/sasgui/perspectives/fitting/fitting_help.rst

@@ -117 +117 @@
 ---------------
 
-For a complete list of all the library models available in SasView, see the section
-:ref:`SasView_model_functions`.
+For a complete list of all the library models available in SasView, see the Model Documentation.
 
 It is also possible to add your own models.

src/sas/models/media/olddocs/model_functions.old

@@ -26 +26 @@
 
 .. Set up some substitutions to make life easier...
-
-.. |alpha| unicode:: U+03B1
-.. |beta| unicode:: U+03B2
-.. |gamma| unicode:: U+03B3
-.. |delta| unicode:: U+03B4
-.. |epsilon| unicode:: U+03B5
-.. |zeta| unicode:: U+03B6
-.. |eta| unicode:: U+03B7
-.. |theta| unicode:: U+03B8
-.. |iota| unicode:: U+03B9
-.. |kappa| unicode:: U+03BA
-.. |lambda| unicode:: U+03BB
-.. |mu| unicode:: U+03BC
-.. |nu| unicode:: U+03BD
-.. |xi| unicode:: U+03BE
-.. |omicron| unicode:: U+03BF
-.. |pi| unicode:: U+03C0
-.. |rho| unicode:: U+03C1
-.. |sigma| unicode:: U+03C3
-.. |tau| unicode:: U+03C4
-.. |upsilon| unicode:: U+03C5
-.. |phi| unicode:: U+03C6
-.. |chi| unicode:: U+03C7
-.. |psi| unicode:: U+03C8
-.. |omega| unicode:: U+03C9
-.. |biggamma| unicode:: U+0393
-.. |bigdelta| unicode:: U+0394
-.. |bigzeta| unicode:: U+039E
-.. |bigpsi| unicode:: U+03A8
-.. |drho| replace:: |bigdelta|\ |rho|
-.. |Ang| unicode:: U+212B
-.. |Ang^-1| replace:: |Ang|\ :sup:`-1`
-.. |Ang^2| replace:: |Ang|\ :sup:`2`
-.. |Ang^-2| replace:: |Ang|\ :sup:`-2`
-.. |Ang^3| replace:: |Ang|\ :sup:`3`
-.. |Ang^-3| replace:: |Ang|\ :sup:`-3`
-.. |Ang^-4| replace:: |Ang|\ :sup:`-4`
-.. |cm^-1| replace:: cm\ :sup:`-1`
-.. |cm^2| replace:: cm\ :sup:`2`
-.. |cm^-2| replace:: cm\ :sup:`-2`
-.. |cm^3| replace:: cm\ :sup:`3`
-.. |cm^-3| replace:: cm\ :sup:`-3`
-.. |sr^-1| replace:: sr\ :sup:`-1`
-.. |P0| replace:: P\ :sub:`0`\
-.. |A2| replace:: A\ :sub:`2`\
-
 
 

setup.py

@@ -254 +254 @@
 packages.append("sas.sasgui.plottools")
 
+# Last of the sas.models
+package_dir["sas.models"] = os.path.join("src", "sas", "models")
+packages.append("sas.models")
 
 IGNORED_FILES = [".svn"]