Changeset e4c45887 in sasview


Ignore:
Timestamp:
May 24, 2018 4: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:
2 added
5 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/Perspectives/Corfunc/media/corfunc_help.rst

    r417c03f rb86754f  
    253253----- 
    254254Upon sending data for correlation function analysis, it will be plotted (minus 
    255 the background value), along with a *red* bar indicating the *upper end of the 
    256 low-Q range* (used for Guinier back-extrapolation), and 2 *purple* bars indicating  
     255the background value), along with a bar indicating the *upper end of the 
     256low-Q range* (used for Guinier back-extrapolation), and 2 bars indicating  
    257257the range to be used for Porod forward-extrapolation. These bars may be moved by  
    258 grabbing and dragging, or by entering appropriate values in the Q range input boxes. 
     258entering appropriate values in the Q range input boxes. 
    259259 
    260260.. figure:: tutorial1.png 
    261261   :align: center 
    262262 
    263 Once the Q ranges have been set, click the "Calculate Bg" button to determine the  
    264 background level. Alternatively, enter your own value into the box. If the box turns  
     263Once the Q ranges have been set, click the "Calculate" button in the *Background* section 
     264of the dialog to determine the background level. 
     265Alternatively, enter your own value into the box. If the box turns  
    265266yellow this indicates that background subtraction has created some negative intensities. 
    266267 
     
    273274   :align: center 
    274275 
    275 Now select which type of transform you would like to perform, using the radio 
    276 buttons: 
    277  
    278 *   **Fourier**: to perform a Fourier Transform to calculate the correlation 
    279     functions 
    280 *   **Hilbert**: to perform a Hilbert Transform to calculate the volume fraction 
    281     profile 
    282  
    283 and click the "Transform" button to perform the selected transform and plot 
     276Now click the "Transform" button to perform the **Fourier** transform and plot 
    284277the results. 
    285278 
     
    287280    :align: center 
    288281 
    289 If a Fourier Transform was performed, the "Compute Parameters" button can now be  
    290 clicked to interpret the correlation function as described earlier. The parameters  
    291 will appear in the "Output Parameters" section of the SasView GUI. 
    292  
    293  .. figure:: tutorial4.png 
    294     :align: center 
    295  
    296  
    297282.. note:: 
    298283    This help document was last changed by Steve King, 26Sep2017 
  • build_tools/conda_py3_qt5_osx.yml

    rbc4caf3 r565ab1f  
    104104  - zlib=1.2.11=intel_3 
    105105  - pyquante2_pure=2.0=py_0 
     106  - sphinx=1.5.4 
    106107  - pip: 
    107108    - bumps==0.7.6 
Note: See TracChangeset for help on using the changeset viewer.