Changeset 5c84add in sasview for docs/sphinx-docs/source

Timestamp:

Oct 1, 2016 8:39:20 AM (8 years ago)

Author:

ajj

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:

624235e

Parents:

601b93d (diff), 9bbc074 (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/source/user

Files:

• gpu_computations.rst (added)
• opencl_installation.rst (added)
• sasgui/guiframe/graph_help.copy (deleted)
• sasgui/perspectives/calculator/kiessig_calculator_help.copy (deleted)
• sasgui/perspectives/calculator/resolution_calculator_help.copy (deleted)
• sasgui/perspectives/calculator/sas_calculator_help.copy (deleted)
• sasgui/perspectives/calculator/sld_calculator_help.copy (deleted)
• sasgui/perspectives/calculator/slit_calculator_help.copy (deleted)
• sasgui/perspectives/fitting/fitting_help.copy (deleted)
• sasgui/perspectives/fitting/mag_help.copy (deleted)
• sasgui/perspectives/fitting/mag_vector.bmp (modified) (previous)
• sasgui/perspectives/fitting/pd_help.copy (deleted)
• sasgui/perspectives/fitting/residuals_help.copy (deleted)
• sasgui/perspectives/fitting/sm_help.copy (deleted)
• sasgui/perspectives/invariant/invariant_help.copy (deleted)
• sasgui/perspectives/invariant/invariant_help.rst (modified) (5 diffs)
• sasgui/perspectives/pr/pr_help.copy (deleted)
• user.rst (modified) (1 diff)

docs/sphinx-docs/source/user/sasgui/perspectives/invariant/invariant_help.rst

@@ -4 +4 @@
 .. by S King, ISIS, during SasView CodeCamp-III in Feb 2015.
 
-Invariant Calculation Perspective
-=================================
+Invariant Calculation
+=====================
 
 Description
@@ -19 +19 @@
 .. image:: image001.gif
 
-where *g = Q* for pinhole geometry (SAS) and *g = Qv* (the slit height) for  
+where *g = q* for pinhole geometry (SAS) and *g = q*\ :sub:`v` (the slit height) for  
 slit geometry (USAS).
 
@@ -45 +45 @@
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
 
-Using the perspective
----------------------
+Using invariant analysis
+------------------------
 
 1) Select *Invariant* from the *Analysis* menu on the SasView toolbar.
@@ -53 +53 @@
 
 3) Select a dataset and use the *Send To* button on the *Data Explorer* to load 
-   the dataset into the *Invariant* perspective.
+   the dataset into the *Invariant* panel.
 
-4) Use the *Customised Input* boxes on the *Invariant* perspective to subtract 
+4) Use the *Customised Input* boxes on the *Invariant* panel to subtract 
    any background, specify the contrast (i.e. difference in SLDs - this must be 
    specified for the eventual value of Q*\  to be on an absolute scale), or to 
@@ -73 +73 @@
 
 8) If the value of Q*\  calculated with the extrapolated regions is invalid, a 
-   red warning will appear at the top of the *Invariant* perspective panel.
+   red warning will appear at the top of the *Invariant* panel.
 
    The details of the calculation are available by clicking the *Details* 

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

@@ -14 +14 @@
          
    Working with SasView <working>
+
+   Computations with GPU <gpu_computations>