Changeset 2fd2d99 in sasview for src/sas/sasgui/perspectives

Timestamp:

Sep 26, 2016 3:16:35 AM (8 years ago)

Author:

Gonzalez, Miguel <gonzalez@…>

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.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

51335d7

Parents:

ce94504 (diff), 7f23423 (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:

src/sas/sasgui/perspectives

Files:

• calculator/media/kiessig_calculator_help.copy (deleted)
• calculator/media/resolution_calculator_help.copy (deleted)
• calculator/media/sas_calculator_help.copy (deleted)
• calculator/media/sld_calculator_help.copy (deleted)
• calculator/media/slit_calculator_help.copy (deleted)
• fitting/media/fitting.rst (modified) (1 diff)
• fitting/media/fitting_help.copy (deleted)
• fitting/media/fitting_help.rst (modified) (4 diffs)
• fitting/media/mag_help.copy (deleted)
• fitting/media/pd_help.copy (deleted)
• fitting/media/plugin.rst (added)
• fitting/media/residuals_help.copy (deleted)
• fitting/media/sm_help.copy (deleted)
• invariant/media/invariant_help.copy (deleted)
• pr/media/pr_help.copy (deleted)
• fitting/models.py (modified) (1 diff)

src/sas/sasgui/perspectives/fitting/media/fitting.rst

@@ -18 +18 @@
 
    Information on the SasView Optimisers <optimizer.rst>
-   
+
+   Writing a Plugin <plugin.rst>

src/sas/sasgui/perspectives/fitting/media/fitting_help.rst

@@ -132 +132 @@
 * By :ref:`Writing_a_Plugin`
 
-*NB: Because of the way these options are implemented, it is not possible for them*
-*to use the polydispersity algorithms in SasView. Only models in the model library*
-*can do this. At the time of writing (Release 3.1.0) work is in hand to make it*
-*easier to add new models to the model library.*
-
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
 
@@ -163 +158 @@
 the :ref:`Advanced` option.
 
+*NB: "Fit Parameters" has been split into two sections, those which can be
+polydisperse (shape and orientation parameters) and those which are not
+(scattering length densities, for example).*
+
 Sum|Multi(p1,p2)
 ^^^^^^^^^^^^^^^^
@@ -192 +191 @@
 *Advanced Custom Model Editor*.
 
-*NB: Unless you are confident about what you are doing, it is recommended that you*
-*only modify lines denoted with the ## <----- comments!*
+See :ref:`Writing_a_Plugin` for details on the plugin format.
+
+*NB: Sum/Product models are still using the SasView 3.x model format.  Unless
+you are confident about what you are doing, it is recommended that you
+only modify lines denoted with the ## <----- comments!*
 
 When editing is complete, select *Run -> Compile* from the *Model Editor* menu bar. An
@@ -211 +213 @@
 
 *NB: Custom models shipped with SasView cannot be removed in this way.*
-
-.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
-
-.. _Writing_a_Plugin:
-
-Writing a Plugin
-----------------
-
-Advanced users can write their own model in Python and save it to the the SasView
-*plugin_models* folder
-
-  *C:\\Users\\[username]\\.sasview\\plugin_models* - (on Windows)
-
-in .py format. The next time SasView is started it will compile the plugin and add
-it to the list of *Customized Models*.
-
-It is recommended that existing plugin models be used as templates.
 
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ

src/sas/sasgui/perspectives/fitting/models.py

@@ -151 +151 @@
     try:
         import compileall
-        compileall.compile_dir(dir=dir, ddir=dir, force=1,
+        compileall.compile_dir(dir=dir, ddir=dir, force=0,
                                quiet=report_problem)
     except: