- Timestamp:
- May 18, 2018 6:02:02 AM (6 years ago)
- 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:
- 0459591
- Parents:
- dbba134 (diff), 3aa3351 (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. - Location:
- src/sas/qtgui
- Files:
-
- 4 added
- 8 edited
-
Calculators/media/resolution_calculator_help.rst (modified) (5 diffs)
-
Calculators/media/resolution_tutor.png (modified) (1 prop) (previous)
-
MainWindow/GuiManager.py (modified) (1 diff)
-
MainWindow/UI/MainWindowUI.ui (modified) (2 diffs)
-
Perspectives/Fitting/media/complex_constraint.png (added)
-
Perspectives/Fitting/media/constraint_1.png (added)
-
Perspectives/Fitting/media/constraint_menu.png (added)
-
Perspectives/Fitting/media/fitting_help.rst (modified) (8 diffs)
-
Perspectives/Fitting/media/restore_batch_window.png (modified) (previous)
-
Perspectives/Fitting/media/simult_batch.png (added)
-
Perspectives/Fitting/media/view_button.png (modified) (previous)
-
Utilities/LocalConfig.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
src/sas/qtgui/Calculators/media/resolution_calculator_help.rst
r417c03f r3aa3351 10 10 ----------- 11 11 12 This tool isapproximately estimates the resolution of $Q$ from SAS instrumental12 This tool approximately estimates the resolution of $Q$ from SAS instrumental 13 13 parameter values assuming that the detector is flat and normal to the 14 14 incident beam. … … 19 19 -------------- 20 20 21 1) Select * SASResolution Estimator* from the *Tool* menu on the SasView toolbar.21 1) Select *Q Resolution Estimator* from the *Tool* menu on the SasView toolbar. 22 22 23 2) Select the source (Neutron or Photon)and source type (Monochromatic or TOF).23 2) Select the source and source type (Monochromatic or TOF). 24 24 25 25 *NOTE! The computational difference between the sources is only the … … 35 35 range. 36 36 37 Optionally, the wavelength (BUT NOT ofthe wavelength spread) can be extended37 Optionally, the wavelength (BUT NOT the wavelength spread) can be extended 38 38 by adding '; nn' where the 'nn' specifies the number of the bins for the 39 39 numerical integration. The default value is nn = 10. The same number of bins … … 49 49 7) 1D and 2D $dQ$ values will be displayed at the bottom of the panel, and a 2D 50 50 resolution weight distribution (a 2D elliptical Gaussian function) will also 51 be displayed in the plot panel even if the $Q$ inputs are outside of the 52 detector limit (the red lines indicate the limits of the detector). 51 be displayed in the plot panel. 53 52 54 53 TOF only: green lines indicate the limits of the maximum $Q$ range accessible 55 54 for the longest wavelength due to the size of the detector. 56 55 57 Note that the effect from the beam block/stop is ignored , soin the small $Q$56 Note that the effect from the beam block/stop is ignored. So, in the small $Q$ 58 57 region near the beam block/stop 59 58 … … 63 62 64 63 8) A summary of the calculation is written to the SasView *Console* at the 65 bottom of the main SasView window .64 bottom of the main SasView window, below the plot. 66 65 67 .. image:: resolution_tutor.png 66 .. figure:: resolution_tutor.png 67 68 .. 69 70 1) Define the source. Select *Photon* for X-ray. This selection only affects 71 the gravitational contribution of the resolution 72 2) Select between *Monochromatic* or *TOF* 73 3) For *TOF*, there is the option 74 of loading a custom spectral distribution using *Add New* in the combo 75 box 76 4) *Wavelength* and *wavelength spread*: one value for *Monochromatic*, 77 minimum and maximum of range for *TOF* 78 5) For *Source* and *Sample Size Aperture*, one value for a circular 79 aperture (diameter) and two values separated by a comma (,) for a 80 rectangular slit (side lengths) 81 6) One value for one ($Qx$, $Qy$) location or more values separated by a 82 comma (,) for more locations. *Note: the $Qx$, $Qy$ input boxes should 83 have the same number of values.* 84 7) Click on *Compute* button to start the calculation 85 8) *Sigma_x* and *Sigma_y* are the components of the 2D $dQ$ at the last 86 ($Qx$, $Qy$) point of inputs 87 9) *Sigma_lamd* is the 2D $dQ_{\lambda}$ at the last point of inputs. 88 *Note: $dQ_{\lambda}$ has only the Qr directional component* 89 10) *(1D Sigma)* is the 1D $dQ$ at the last ($Qx$, $Qy$) point of inputs 90 11) Plot of the result. For *TOF*, a green rectangle marks the limits of 91 maximum $Q$ range accessible for the longest wavelength due to the 92 size of the detector. 68 93 69 94 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ -
src/sas/qtgui/Calculators/media/resolution_tutor.png
- Property mode changed from 100755 to 100644
-
src/sas/qtgui/MainWindow/GuiManager.py
r57be490 ra0ed202 137 137 self.welcomePanel = WelcomePanel() 138 138 self.grid_window = None 139 self._workspace.toolBar.setVisible(LocalConfig.TOOLBAR_SHOW) 140 self._workspace.actionHide_Toolbar.setText("Show Toolbar") 139 141 140 142 # Add calculators - floating for usability -
src/sas/qtgui/MainWindow/UI/MainWindowUI.ui
rd4dac80 rd3ee425 25 25 <y>0</y> 26 26 <width>915</width> 27 <height>2 2</height>27 <height>26</height> 28 28 </rect> 29 29 </property> … … 355 355 <action name="actionSAS_Resolution_Estimator"> 356 356 <property name="text"> 357 <string> SASResolution Estimator</string>357 <string>Q Resolution Estimator</string> 358 358 </property> 359 359 </action> -
src/sas/qtgui/Perspectives/Fitting/media/fitting_help.rst
rb31b7e2 rdbba134 57 57 The graph will update dynamically as the parameter values are changed. 58 58 59 You can decide your own model categorizations using the :ref:`Category_Manager`. 59 .. TODO: uncomment after Category_Manager done 60 .. You can decide your own model categorizations using the :ref:`Category_Manager`. 60 61 61 62 Once you have selected a model you can read its help documentation by right clicking … … 77 78 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 78 79 79 .. _Category_Manager: 80 81 Category Manager 82 ---------------- 83 84 To change the model categorizations, either choose *Category Manager* from the 85 *View* option on the menubar, or click on the *Modify* button on the *Fit Page*. 86 87 .. image:: cat_fig0.png 88 89 The categorization of all models except the user supplied Plugin Models can be 90 reassigned, added to, and removed using *Category Manager*. Models can also be 91 hidden from view in the drop-down menus. 92 93 .. image:: cat_fig1.png 94 95 Changing category 96 ^^^^^^^^^^^^^^^^^ 97 98 To change category, highlight a model in the list by left-clicking on its entry 99 and then click the *Modify* button. Use the *Change Category* panel that appears 100 to make the required changes. 101 102 .. image:: cat_fig2.png 103 104 To create a category for the selected model, click the *Add* button. In order 105 to delete a category, select the category name and click the *Remove Selected* 106 button. Then click *Done*. 107 108 Showing/hiding models 109 ^^^^^^^^^^^^^^^^^^^^^ 110 111 Use the *Enable All / Disable All* buttons and the check boxes beside each model 112 to select the models to show/hide. To apply the selection, click *Ok*. Otherwise 113 click *Cancel*. 114 115 *NB: It may be necessary to change to a different category and then back again* 116 *before any changes take effect.* 117 80 .. TODO: uncomment after Category_Manager done 81 .. 82 .. _Category_Manager: 83 84 Category Manager 85 ---------------- 86 87 To change the model categorizations, either choose *Category Manager* from the 88 *View* option on the menubar, or click on the *Modify* button on the *Fit Page*. 89 90 .. image:: cat_fig0.png 91 92 The categorization of all models except the user supplied Plugin Models can be 93 reassigned, added to, and removed using *Category Manager*. Models can also be 94 hidden from view in the drop-down menus. 95 96 .. image:: cat_fig1.png 97 98 Changing category 99 ^^^^^^^^^^^^^^^^^ 100 101 To change category, highlight a model in the list by left-clicking on its entry 102 and then click the *Modify* button. Use the *Change Category* panel that appears 103 to make the required changes. 104 105 .. image:: cat_fig2.png 106 107 To create a category for the selected model, click the *Add* button. In order 108 to delete a category, select the category name and click the *Remove Selected* 109 button. Then click *Done*. 110 111 Showing/hiding models 112 ^^^^^^^^^^^^^^^^^^^^^ 113 114 Use the *Enable All / Disable All* buttons and the check boxes beside each model 115 to select the models to show/hide. To apply the selection, click *Ok*. Otherwise 116 click *Cancel*. 117 118 *NB: It may be necessary to change to a different category and then back again* 119 *before any changes take effect.* 120 .. 118 121 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 119 122 … … 535 538 them in the first place!). 536 539 537 To tie parameters between the data sets with constraints, check the 'yes' radio button 538 next to *Add Constraint?* in the *Fit Constraints* box. 539 540 *NB: You can only constrain parameters that are set to refine.* 540 .. image:: constraint_1.png 541 542 To tie parameters between the data sets with constraints, select the data sets and right click. 543 From the menu choose *Mutual constraint of parameters in selected models* 544 545 .. image:: constraint_2.png 541 546 542 547 When ready, click the *Fit* button on the *Const & Simul Fit* page, NOT the *Fit* … … 556 561 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 557 562 558 Use the *Easy Setup* drop-down buttons in the *Const & Simul Fit* page to set 559 up constraints between *FitPage*'s. 563 In the *Const. & Simul. Fit* page select two data sets which are to be constrained. 564 Right clicking in the *Source choice for simultaneous fitting* area will bring up 565 the context menu: 566 567 .. image:: constraint_2.png 568 569 Here you can choose datasets for fitting and define constraints between parameters in 570 both datasets. 571 572 Selecting this option will bring up the *Complex Constraint* dialog. 573 574 .. image:: complex_constraint.png 560 575 561 576 Constraints will generally be of the form … … 668 683 .. image:: restore_batch_window.png 669 684 670 Once a batch fit is completed, all model parameters are displayed but *not* 671 their uncertainties. To view the uncertainties, click on a given column then 672 go to *Edit* in the menu bar, select *Insert Column Before* and choose the 673 required data from the list. An empty column can be inserted in the same way. 674 675 To remove a column from the grid, click on the column header and choose 676 *Remove Column* under *Edit* in the menu bar. The same functionality also 677 allows you to re-order columns. 678 679 *NB: You cannot insert/remove/re-order the rows in the Grid Window.* 680 681 All of the above functions are also available by right-clicking on a column 682 label. 683 684 .. image:: edit_menu.png 685 686 *NB: If there is an existing Grid Window and another batch fit is performed,* 685 .. 686 Once a batch fit is completed, all model parameters are displayed but *not* 687 their uncertainties. To view the uncertainties, click on a given column then 688 go to *Edit* in the menu bar, select *Insert Column Before* and choose the 689 required data from the list. An empty column can be inserted in the same way. 690 691 692 To remove a column from the grid, click on the column header and choose 693 *Remove Column* under *Edit* in the menu bar. The same functionality also 694 allows you to re-order columns. 695 696 *NB: You cannot insert/remove/re-order the rows in the Grid Window.* 697 698 All of the above functions are also available by right-clicking on a column 699 label. 700 701 .. image:: edit_menu.png 702 .. 703 704 If there is an existing Grid Window and another batch fit is performed,* 687 705 *an additional 'Table' tab will be added to the Grid Window.* 688 706 … … 704 722 ^^^^^^^^^^^^^^^ 705 723 706 Any column of *numeric* parameter values can be plotted against another using 707 the *Grid Window*. Simply select one column at the time and click the *Add* 708 button next to the required *X/Y-axis Selection Range* text box. When both 709 the X and Y axis boxes have been completed, click the *Plot* button. 710 711 When the *Add* button is clicked, *SasView* also automatically completes the 712 *X/Y-axis Label* text box with the heading from Row 1 of the selected table, 713 but different labels and units can be entered manually. 714 715 .. image:: plot_button.png 716 717 The *X/Y-axis Selection Range* can be edited manually. The text control box 718 recognises the operators +, -, \*, /, or 'pow', and allows the following 719 types of expression : 720 721 1) if an axis label range is a function of 1 or more *columns*, write 722 this type of expression 723 724 constant1 * column_name1 [minimum row index : maximum row index] 725 operator constant2 * column_name2 [minimum row index : maximum row index] 726 727 Example: radius [2 : 5] -3 * scale [2 : 5] 728 729 2) if only some *values* of a given column are needed but the range between 730 the first row and the last row used is not continuous, write this type of 731 expression 732 733 column_name1 [minimum row index1 : maximum row index1] , column_name1 734 [minimum row index2 : maximum row index2] 735 736 Example: radius [2 : 5] , radius [10 : 25] 724 .. 725 Any column of *numeric* parameter values can be plotted against another using 726 the *Grid Window*. Simply select one column at the time and click the *Add* 727 button next to the required *X/Y-axis Selection Range* text box. When both 728 the X and Y axis boxes have been completed, click the *Plot* button. 729 730 When the *Add* button is clicked, *SasView* also automatically completes the 731 *X/Y-axis Label* text box with the heading from Row 1 of the selected table, 732 but different labels and units can be entered manually. 733 734 .. image:: plot_button.png 735 736 The *X/Y-axis Selection Range* can be edited manually. The text control box 737 recognises the operators +, -, \*, /, or 'pow', and allows the following 738 types of expression : 739 740 1) if an axis label range is a function of 1 or more *columns*, write 741 this type of expression 742 743 constant1 * column_name1 [minimum row index : maximum row index] 744 operator constant2 * column_name2 [minimum row index : maximum row index] 745 746 Example: radius [2 : 5] -3 * scale [2 : 5] 747 748 2) if only some *values* of a given column are needed but the range between 749 the first row and the last row used is not continuous, write this type of 750 expression 751 752 column_name1 [minimum row index1 : maximum row index1] , column_name1 753 [minimum row index2 : maximum row index2] 754 755 Example: radius [2 : 5] , radius [10 : 25] 756 .. 757 758 Any row (dataset) can be plotted by selecting it and either right-clicking and choosing 759 *Plot selected fits* menu item or by clicking on the *Plot* button. 737 760 738 761 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ … … 761 784 described in :ref:`Loading_data`. Next start up two or more *BatchPage* fits 762 785 following the instructions in :ref:`Batch_Fit_Mode` but **DO NOT PRESS FIT**. 763 At this point the *Combine Batch Fit* menu item under the *Fitting menu* should 764 be active (if there is one or no *BatchPage* the menu item will be greyed out 765 and inactive). Clicking on *Combine Batch Fit* will bring up a new panel, 766 similar to the *Const & Simult Fit* panel. In this case there will be a 767 checkbox for each *BatchPage* instead of each *FitPage* that should be included 768 in the fit. Once all are selected, click the Fit button on 769 the *BatchPage* to run each batch fit in *sequence* 770 771 .. image:: combine_batch_page.png 786 787 When done, select *Constrained or Simultaneous Fit* under *Fitting* in the menu bar. 788 789 In the *Const & Simul Fit* page that appears, choose *Batch fits* radio button and 790 select which data sets are to be fitted. 791 792 .. image:: simult_batch.png 793 794 Once all are selected, click the Fit button on 795 the *Const. Simult. Fitting* to run each batch fit in *sequence* 796 772 797 773 798 The batch table will then pop up at the end as for the case of the simple Batch … … 786 811 recognized as the same parameter. 787 812 788 .. image:: combine_batch_grid.png 789 790 In the example shown above the data is a time series with a shifting peak. 791 The first part of the series was fitted using the *broad_peak* model, while 792 the rest of the data were fit using the *gaussian_peak* model. Unfortunately the 793 time is not listed in the file but the file name contains the information. As 794 described in :ref:`Grid_Window`, a column can be added manually, in this case 795 called time, and the peak position plotted against time. 796 797 .. image:: combine_batch_plot.png 798 799 Note the discontinuity in the peak position. This reflects the fact that the 800 Gaussian fit is a rather poor model for the data and is not actually 801 finding the peak. 802 803 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 804 805 .. note:: This help document was last changed by Paul Butler, 10 September 806 2017 813 814 .. 815 .. image:: combine_batch_grid.png 816 817 In the example shown above the data is a time series with a shifting peak. 818 The first part of the series was fitted using the *broad_peak* model, while 819 the rest of the data were fit using the *gaussian_peak* model. Unfortunately the 820 time is not listed in the file but the file name contains the information. As 821 described in :ref:`Grid_Window`, a column can be added manually, in this case 822 called time, and the peak position plotted against time. 823 824 .. image:: combine_batch_plot.png 825 826 Note the discontinuity in the peak position. This reflects the fact that the 827 Gaussian fit is a rather poor model for the data and is not actually 828 finding the peak. 829 .. 830 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 831 832 .. note:: This help document was last changed by Piotr Rozyczko, 18 May 2018 -
src/sas/qtgui/Utilities/LocalConfig.py
rd4dac80 ra0ed202 129 129 WELCOME_PANEL_SHOW = False 130 130 #Show or hide toolbar at the start up 131 TOOLBAR_SHOW = True131 TOOLBAR_SHOW = False 132 132 # set a default perspective 133 133 DEFAULT_PERSPECTIVE = 'None'
Note: See TracChangeset
for help on using the changeset viewer.
