Changeset e4c45887 in sasview

Timestamp:

May 24, 2018 6:50:34 AM (7 years ago)

Author:

wpotrzebowski <wojciechpotrzebowski@…>

Branches:

ESS_GUI, 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

Children:

4c56923

Parents:

565ab1f (diff), 3244b548 (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 'ESS_GUI' of ​https://github.com/SasView/sasview into ESS_GUI

Files:

• installers/sasview.py (added)
• src/sas/qtgui/Perspectives/Corfunc/media/corfunc_help.rst (modified) (3 diffs)
• src/sas/qtgui/Perspectives/Corfunc/media/tutorial1.png (modified) (previous)
• src/sas/qtgui/Perspectives/Corfunc/media/tutorial2.png (modified) (previous)
• src/sas/qtgui/Perspectives/Corfunc/media/tutorial3.png (modified) (previous)
• src/sas/qtgui/Perspectives/Fitting/media/optimizer.rst (added)
• build_tools/conda_py3_qt5_osx.yml (modified) (1 diff)

src/sas/qtgui/Perspectives/Corfunc/media/corfunc_help.rst

@@ -253 +253 @@
 -----
 Upon sending data for correlation function analysis, it will be plotted (minus
-the background value), along with a *red* bar indicating the *upper end of the
-low-Q range* (used for Guinier back-extrapolation), and 2 *purple* bars indicating 
+the background value), along with a bar indicating the *upper end of the
+low-Q range* (used for Guinier back-extrapolation), and 2 bars indicating 
 the range to be used for Porod forward-extrapolation. These bars may be moved by 
-grabbing and dragging, or by entering appropriate values in the Q range input boxes.
+entering appropriate values in the Q range input boxes.
 
 .. figure:: tutorial1.png
    :align: center
 
-Once the Q ranges have been set, click the "Calculate Bg" button to determine the 
-background level. Alternatively, enter your own value into the box. If the box turns 
+Once the Q ranges have been set, click the "Calculate" button in the *Background* section
+of the dialog to determine the background level.
+Alternatively, enter your own value into the box. If the box turns 
 yellow this indicates that background subtraction has created some negative intensities.
 
@@ -273 +274 @@
    :align: center
 
-Now select which type of transform you would like to perform, using the radio
-buttons:
-
-*   **Fourier**: to perform a Fourier Transform to calculate the correlation
-    functions
-*   **Hilbert**: to perform a Hilbert Transform to calculate the volume fraction
-    profile
-
-and click the "Transform" button to perform the selected transform and plot
+Now click the "Transform" button to perform the **Fourier** transform and plot
 the results.
 
@@ -287 +280 @@
     :align: center
 
-If a Fourier Transform was performed, the "Compute Parameters" button can now be 
-clicked to interpret the correlation function as described earlier. The parameters 
-will appear in the "Output Parameters" section of the SasView GUI.
-
- .. figure:: tutorial4.png
-    :align: center
-
-
 .. note::
     This help document was last changed by Steve King, 26Sep2017

build_tools/conda_py3_qt5_osx.yml

@@ -104 +104 @@
   - zlib=1.2.11=intel_3
   - pyquante2_pure=2.0=py_0
+  - sphinx=1.5.4
   - pip:
     - bumps==0.7.6