Changeset 273a6d7 in sasview for docs/sphinx-docs

Timestamp:

Mar 24, 2016 3:38:02 AM (8 years ago)

Author:

wojciech

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:

c31dcdb1

Parents:

197260f (diff), e81f6dd (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

Location:

docs/sphinx-docs

Files:

• build_sphinx.py (modified) (1 diff)
• source/user/sasgui/perspectives/fitting/optimizer.rst (modified) (1 diff)
• source/user/shape-sphere.rst (modified) (1 diff)

docs/sphinx-docs/build_sphinx.py

@@ -150 +150 @@
     if os.path.exists(SASMODELS_SOURCE_IMG):
         print "Found img  folder SASMODELS_SOURCE_IMG    at ", SASMODELS_SOURCE_IMG
-        if os.path.exists(SASMODELS_DEST_IMG):
-            print "Found img  folder SASMODELS_DEST_IMG      at ", SASMODELS_DEST_IMG
-            print "Copying sasmodels model image files..."
-            for files in os.listdir(SASMODELS_SOURCE_IMG):
-                fromhere=os.path.join(SASMODELS_SOURCE_IMG,files)
-                tohere=os.path.join(SASMODELS_DEST_IMG,files)
-                shutil.copy(fromhere,tohere)
+        if not os.path.exists(SASMODELS_DEST_IMG):
+            print "Missing docs folder SASMODELS_DEST_IMG at ", SASMODELS_DEST_IMG
+            os.makedirs(SASMODELS_DEST_IMG)
+            print "created SASMODELS_DEST_BUILDIMG at ", SASMODELS_DEST_BUILDIMG
+        else: print "Found img  folder SASMODELS_DEST_IMG      at ", SASMODELS_DEST_IMG
+        print "Copying sasmodels model image files..."
+        for files in os.listdir(SASMODELS_SOURCE_IMG):
+            fromhere=os.path.join(SASMODELS_SOURCE_IMG,files)
+            tohere=os.path.join(SASMODELS_DEST_IMG,files)
+            shutil.copy(fromhere,tohere)
+    else: print "cannot find SASMODELS_SOURCE_IMG", SASMODELS_SOURCE_IMG
 
     if os.path.exists(SASMODELS_SOURCE_AUTOIMG):
         print "Found img  folder SASMODELS_SOURCE_AUTOIMG    at ", SASMODELS_SOURCE_AUTOIMG
-        if os.path.exists(SASMODELS_DEST_IMG):
-            print "Copying sasmodels model auto-generated image files..."
-            for files in os.listdir(SASMODELS_SOURCE_AUTOIMG):
-                fromhere=os.path.join(SASMODELS_SOURCE_AUTOIMG,files)
-                tohere=os.path.join(SASMODELS_DEST_IMG,files)
-                shutil.copy(fromhere,tohere)
+        if not os.path.exists(SASMODELS_DEST_IMG):
+            print "Missing docs folder SASMODELS_DEST_IMG at ", ASMODELS_DEST_IMG
+            os.makedirs(SASMODELS_DEST_BUILDIMG)
+            print "created SASMODELS_DEST_BUILDIMG at ", SASMODELS_DEST_BUILDIMG
+        print "Copying sasmodels model auto-generated image files..."
+        for files in os.listdir(SASMODELS_SOURCE_AUTOIMG):
+            fromhere=os.path.join(SASMODELS_SOURCE_AUTOIMG,files)
+            tohere=os.path.join(SASMODELS_DEST_IMG,files)
+            shutil.copy(fromhere,tohere)
+        else: print "no source directorty",SASMODELS_SOURCE_AUTOIMG ,"was found"
     
     # And the rst prolog with the unit substitutions

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

@@ -404 +404 @@
 Like differential evolution, DREAM will evaluate $k$ points in parallel,
 where $k$ is the size of the population.
+
+.. _option-burn:
 
 Options

docs/sphinx-docs/source/user/shape-sphere.rst

@@ -12 +12 @@
     models/adsorbed_layer.rst
     models/binary_hard_sphere.rst
+    models/core_multi_shell.rst
     models/core_shell_sphere.rst
     models/fuzzy_sphere.rst