Changeset 5c1c486 in sasview for src/sas/sasgui/perspectives
- Timestamp:
- Sep 13, 2017 10:27:29 AM (7 years ago)
- 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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
- Children:
- fca1f50
- Parents:
- b76e65a (diff), 7b3f154 (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/sasgui/perspectives/fitting
- Files:
-
- 3 added
- 7 edited
-
fitting.py (modified) (2 diffs)
-
media/combine_batch_grid.png (added)
-
media/combine_batch_page.png (added)
-
media/combine_batch_plot.png (added)
-
media/fitting_help.rst (modified) (2 diffs)
-
model_thread.py (modified) (3 diffs)
-
simfitpage.py (modified) (3 diffs)
-
basepage.py (modified) (4 diffs)
-
fitpage.py (modified) (6 diffs)
-
fitpanel.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
src/sas/sasgui/perspectives/fitting/fitting.py
r0900627 r5c1c486 1748 1748 @param unsmeared_error: data error, rescaled to unsmeared model 1749 1749 """ 1750 1751 1750 number_finite = np.count_nonzero(np.isfinite(y)) 1752 1751 np.nan_to_num(y) … … 1754 1753 data_description=model.name, 1755 1754 data_id=str(page_id) + " " + data.name) 1755 plots_to_update = [] # List of plottables that have changed since last calculation 1756 # Create the new theories 1756 1757 if unsmeared_model is not None: 1757 self.create_theory_1D(x, unsmeared_model, page_id, model, data, state, 1758 unsmeared_model_plot = self.create_theory_1D(x, unsmeared_model, 1759 page_id, model, data, state, 1758 1760 data_description=model.name + " unsmeared", 1759 1761 data_id=str(page_id) + " " + data.name + " unsmeared") 1762 plots_to_update.append(unsmeared_model_plot) 1760 1763 1761 1764 if unsmeared_data is not None and unsmeared_error is not None: 1762 self.create_theory_1D(x, unsmeared_data, page_id, model, data, state, 1765 unsmeared_data_plot = self.create_theory_1D(x, unsmeared_data, 1766 page_id, model, data, state, 1763 1767 data_description="Data unsmeared", 1764 1768 data_id="Data " + data.name + " unsmeared", 1765 1769 dy=unsmeared_error) 1766 # Comment this out until we can get P*S models with correctly populated parameters 1767 #if sq_model is not None and pq_model is not None: 1768 # self.create_theory_1D(x, sq_model, page_id, model, data, state, 1769 # data_description=model.name + " S(q)", 1770 # data_id=str(page_id) + " " + data.name + " S(q)") 1771 # self.create_theory_1D(x, pq_model, page_id, model, data, state, 1772 # data_description=model.name + " P(q)", 1773 # data_id=str(page_id) + " " + data.name + " P(q)") 1770 plots_to_update.append(unsmeared_data_plot) 1771 if sq_model is not None and pq_model is not None: 1772 sq_id = str(page_id) + " " + data.name + " S(q)" 1773 sq_plot = self.create_theory_1D(x, sq_model, page_id, model, data, state, 1774 data_description=model.name + " S(q)", 1775 data_id=sq_id) 1776 plots_to_update.append(sq_plot) 1777 pq_id = str(page_id) + " " + data.name + " P(q)" 1778 pq_plot = self.create_theory_1D(x, pq_model, page_id, model, data, state, 1779 data_description=model.name + " P(q)", 1780 data_id=pq_id) 1781 plots_to_update.append(pq_plot) 1782 # Update the P(Q), S(Q) and unsmeared theory plots if they exist 1783 wx.PostEvent(self.parent, NewPlotEvent(plots=plots_to_update, 1784 action='update')) 1774 1785 1775 1786 current_pg = self.fit_panel.get_page_by_id(page_id) -
src/sas/sasgui/perspectives/fitting/media/fitting_help.rst
r5295cf5 r05b0bf6 484 484 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 485 485 486 .. _Batch_Fit_Mode: 487 486 488 Batch Fit Mode 487 489 -------------- … … 636 638 637 639 Example: radius [2 : 5] , radius [10 : 25] 638 639 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 640 641 .. note:: This help document was last changed by Steve King, 10Oct2016 640 641 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 642 643 Combined Batch Fit Mode 644 ----------------------- 645 646 The purpose of the Combined Batch Fit is to allow running two or more batch 647 fits in sequence without overwriting the output table of results. This may be 648 of interest for example if one is fitting a series of data sets where there is 649 a shape change occurring in the series that requires changing the model part 650 way through the series; for example a sphere to rod transition. Indeed the 651 regular batch mode does not allow for multiple models and requires all the 652 files in the series to be fit with single model and set of parameters. While 653 it is of course possible to just run part of the series as a batch fit using 654 model one followed by running another batch fit on the rest of the series with 655 model two (and/or model three etc), doing so will overwrite the table of 656 outputs from the previous batch fit(s). This may not be desirable if one is 657 interested in comparing the parameters: for example the sphere radius of set 658 one and the cylinder radius of set two. 659 660 Method 661 ^^^^^^ 662 663 In order to use the *Combined Batch Fit*, first load all the data needed as 664 described in :ref:`Loading_data`. Next start up two or more *BatchPage* fits 665 following the instructions in :ref:`Batch_Fit_Mode` but **DO NOT PRESS FIT**. 666 At this point the *Combine Batch Fit* menu item under the *Fitting menu* should 667 be active (if there is one or no *BatchPage* the menu item will be greyed out 668 and inactive). Clicking on *Combine Batch Fit* will bring up a new panel, 669 similar to the *Const & Simult Fit* panel. In this case there will be a 670 checkbox for each *BatchPage* instead of each *FitPage* that should be included 671 in the fit. Once all are selected, click the Fit button on 672 the *BatchPage* to run each batch fit in *sequence* 673 674 .. image:: combine_batch_page.png 675 676 The batch table will then pop up at the end as for the case of the simple Batch 677 Fitting with the following caveats: 678 679 .. note:: 680 The order matters. The parameters in the table will be taken from the model 681 used in the first *BatchPage* of the list. Any parameters from the 682 second and later *BatchPage* s that have the same name as a parameter in the 683 first will show up allowing for plotting of that parameter across the 684 models. The other parameters will not be available in the grid. 685 .. note:: 686 a corralary of the above is that currently models created as a sum|multiply 687 model will not work as desired because the generated model parameters have a 688 p#_ appended to the beginning and thus radius and p1_radius will not be 689 recognized as the same parameter. 690 691 .. image:: combine_batch_grid.png 692 693 In the example shown above the data is a time series with a shifting peak. 694 The first part of the series was fitted using the *broad_peak* model, while 695 the rest of the data were fit using the *gaussian_peak* model. Unfortunately the 696 time is not listed in the file but the file name contains the information. As 697 described in :ref:`Grid_Window`, a column can be added manually, in this case 698 called time, and the peak position plotted against time. 699 700 .. image:: combine_batch_plot.png 701 702 Note the discontinuity in the peak position. This reflects the fact that the 703 Gaussian fit is a rather poor model for the data and is not actually 704 finding the peak. 705 706 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 707 708 .. note:: This help document was last changed by Paul Butler, 10 September 709 2017 -
src/sas/sasgui/perspectives/fitting/model_thread.py
r7432acb r0f9ea1c 71 71 (self.data.qy_data * self.data.qy_data)) 72 72 73 # For theory, qmax is based on 1d qmax 73 # For theory, qmax is based on 1d qmax 74 74 # so that must be mulitified by sqrt(2) to get actual max for 2d 75 75 index_model = (self.qmin <= radius) & (radius <= self.qmax) … … 91 91 self.data.qy_data[index_model] 92 92 ]) 93 output = np.zeros(len(self.data.qx_data)) 93 # Initialize output to NaN so masked elements do not get plotted. 94 output = np.empty_like(self.data.qx_data) 94 95 # output default is None 95 96 # This method is to distinguish between masked 96 97 #point(nan) and data point = 0. 97 output = output / output98 output[:] = np.NaN 98 99 # set value for self.mask==True, else still None to Plottools 99 100 output[index_model] = value … … 198 199 output[index] = self.model.evalDistribution(self.data.x[index]) 199 200 201 x=self.data.x[index] 202 y=output[index] 200 203 sq_values = None 201 204 pq_values = None 202 s_model = None203 p_model = None204 205 if isinstance(self.model, MultiplicationModel): 205 206 s_model = self.model.s_model 206 207 p_model = self.model.p_model 207 elif hasattr(self.model, "get_composition_models"): 208 p_model, s_model = self.model.get_composition_models() 209 210 if p_model is not None and s_model is not None: 211 sq_values = np.zeros((len(self.data.x))) 212 pq_values = np.zeros((len(self.data.x))) 213 sq_values[index] = s_model.evalDistribution(self.data.x[index]) 214 pq_values[index] = p_model.evalDistribution(self.data.x[index]) 208 sq_values = s_model.evalDistribution(x) 209 pq_values = p_model.evalDistribution(x) 210 elif hasattr(self.model, "calc_composition_models"): 211 results = self.model.calc_composition_models(x) 212 if results is not None: 213 pq_values, sq_values = results 214 215 215 216 216 elapsed = time.time() - self.starttime 217 217 218 self.complete(x= self.data.x[index], y=output[index],218 self.complete(x=x, y=y, 219 219 page_id=self.page_id, 220 220 state=self.state, -
src/sas/sasgui/perspectives/fitting/simfitpage.py
r959eb01 ra9f9ca4 1 1 """ 2 Simultaneous fit page2 Simultaneous or Batch fit page 3 3 """ 4 # Note that this is used for both Simultaneous/Constrained fit AND for 5 # combined batch fit. This is done through setting of the batch_on parameter. 6 # There are the a half dozen or so places where an if statement is used as in 7 # if not batch_on: 8 # xxxx 9 # else: 10 # xxxx 11 # This is just wrong but dont have time to fix this go. Proper approach would be 12 # to strip all parts of the code that depend on batch_on and create the top 13 # level class from which a contrained/simultaneous fit page and a combined 14 # batch page inherit. 15 # 16 # 04/09/2017 --PDB 17 4 18 import sys 5 19 from collections import namedtuple … … 400 414 # General Help button 401 415 self.btHelp = wx.Button(self, wx.ID_HELP, 'HELP') 402 self.btHelp.SetToolTipString("Simultaneous/Constrained Fitting help.") 416 if self.batch_on: 417 self.btHelp.SetToolTipString("Combined Batch Fitting help.") 418 else: 419 self.btHelp.SetToolTipString("Simultaneous/Constrained Fitting help.") 403 420 self.btHelp.Bind(wx.EVT_BUTTON, self._on_help) 404 421 … … 527 544 """ 528 545 _TreeLocation = "user/sasgui/perspectives/fitting/fitting_help.html" 529 _PageAnchor = "#simultaneous-fit-mode" 530 _doc_viewer = DocumentationWindow(self, self.ID_DOC, _TreeLocation, 546 if not self.batch_on: 547 _PageAnchor = "#simultaneous-fit-mode" 548 _doc_viewer = DocumentationWindow(self, self.ID_DOC, _TreeLocation, 531 549 _PageAnchor, 532 550 "Simultaneous/Constrained Fitting Help") 551 else: 552 _PageAnchor = "#combined-batch-fit-mode" 553 _doc_viewer = DocumentationWindow(self, self.ID_DOC, _TreeLocation, 554 _PageAnchor, 555 "Combined Batch Fit Help") 533 556 534 557 def set_manager(self, manager): -
src/sas/sasgui/perspectives/fitting/basepage.py
r914c49d5 rb76e65a 2929 2929 return False 2930 2930 2931 2932 def _get_copy_params_details(self): 2933 """ 2934 Combines polydisperse parameters with self.parameters so that they can 2935 be written to the clipboard (for Excel or LaTeX). Also returns a list of 2936 the names of parameters that have been fitted 2937 2938 :returns: all_params - A list of all parameters, in the format of 2939 self.parameters 2940 :returns: fitted_par_names - A list of the names of parameters that have 2941 been fitted 2942 """ 2943 # Names of params that are being fitted 2944 fitted_par_names = [param[1] for param in self.param_toFit] 2945 # Names of params with associated polydispersity 2946 disp_params = [param[1].split('.')[0] for param in self.fittable_param] 2947 2948 # Create array of all parameters 2949 all_params = copy.copy(self.parameters) 2950 for param in self.parameters: 2951 if param[1] in disp_params: 2952 # Polydisperse params aren't in self.parameters, so need adding 2953 # to all_params 2954 name = param[1] + ".width" 2955 index = all_params.index(param) + 1 2956 to_insert = [] 2957 if name in fitted_par_names: 2958 # Param is fitted, so already has a param list in self.param_toFit 2959 to_insert = self.param_toFit[fitted_par_names.index(name)] 2960 else: 2961 # Param isn't fitted, so mockup a param list 2962 to_insert = [None, name, self.model.getParam(name), None, None] 2963 all_params.insert(index, to_insert) 2964 return all_params, fitted_par_names 2965 2931 2966 def get_copy_excel(self): 2932 2967 """ … … 2942 2977 Get the string copies of the param names and values in the tap 2943 2978 """ 2979 if not self.parameters: 2980 # Do nothing if parameters doesn't exist 2981 return False 2982 2944 2983 content = '' 2945 2946 2984 crlf = chr(13) + chr(10) 2947 2985 tab = chr(9) 2948 2986 2949 # Do it if params exist 2950 if self.parameters: 2951 2952 for param in self.parameters: 2953 content += param[1] # parameter name 2987 all_params, fitted_param_names = self._get_copy_params_details() 2988 2989 # Construct row of parameter names 2990 for param in all_params: 2991 name = param[1] # Parameter name 2992 content += name 2993 content += tab 2994 if name in fitted_param_names: 2995 # Only print errors for fitted parameters 2996 content += name + "_err" 2954 2997 content += tab 2955 content += param[1] + "_err" 2956 content += tab 2957 2958 content += crlf 2959 2960 # row of values and errors... 2961 for param in self.parameters: 2962 content += param[2].GetValue() # value 2963 content += tab 2964 content += param[4].GetValue() # error 2965 content += tab 2966 2967 return content 2968 else: 2969 return False 2998 2999 content += crlf 3000 3001 # Construct row of parameter values and errors 3002 for param in all_params: 3003 value = param[2] 3004 if hasattr(value, 'GetValue'): 3005 # param[2] is a text box 3006 value = value.GetValue() 3007 else: 3008 # param[2] is a float (from our self._get_copy_params_details) 3009 value = str(value) 3010 content += value 3011 content += tab 3012 if param[1] in fitted_param_names: 3013 # Only print errors for fitted parameters 3014 content += param[4].GetValue() 3015 content += tab 3016 3017 return content 2970 3018 2971 3019 def get_copy_latex(self): … … 2982 3030 Get the string copies of the param names and values in the tap 2983 3031 """ 3032 if not self.parameters: 3033 # Do nothing if self.parameters doesn't exist 3034 return False 3035 2984 3036 content = '\\begin{table}' 2985 3037 content += '\\begin{tabular}[h]' … … 2988 3040 tab = chr(9) 2989 3041 2990 # Do it if params exist 2991 if self.parameters: 2992 2993 content += '{|' 2994 for param in self.parameters: 2995 content += 'l|l|' 2996 content += '}\hline' 2997 content += crlf 2998 2999 for index, param in enumerate(self.parameters): 3000 content += param[1].replace('_', '\_') # parameter name 3042 all_params, fitted_param_names = self._get_copy_params_details() 3043 3044 content += '{|' 3045 for param in all_params: 3046 content += 'l|l|' 3047 content += '}\hline' 3048 content += crlf 3049 3050 # Construct row of parameter names 3051 for index, param in enumerate(all_params): 3052 name = param[1] # Parameter name 3053 content += name.replace('_', '\_') # Escape underscores 3054 if name in fitted_param_names: 3055 # Only print errors for fitted parameters 3001 3056 content += ' & ' 3002 content += param[1].replace('_', '\_') + "\_err" 3003 if index < len(self.parameters) - 1: 3004 content += ' & ' 3005 content += '\\\\ \\hline' 3006 content += crlf 3007 3008 # row of values and errors... 3009 for index, param in enumerate(self.parameters): 3010 content += param[2].GetValue() # parameter value 3057 content += name.replace('_', '\_') + "\_err" 3058 if index < len(all_params) - 1: 3011 3059 content += ' & ' 3012 content += param[4].GetValue() # parameter error 3013 if index < len(self.parameters) - 1: 3014 content += ' & ' 3015 content += '\\\\ \\hline' 3016 content += crlf 3017 3018 content += '\\end{tabular}' 3019 content += '\\end{table}' 3020 return content 3021 else: 3022 return False 3060 3061 content += '\\\\ \\hline' 3062 content += crlf 3063 3064 # Construct row of values and errors 3065 for index, param in enumerate(all_params): 3066 value = param[2] 3067 if hasattr(value, "GetValue"): 3068 # value is a text box 3069 value = value.GetValue() 3070 else: 3071 # value is a float (from self._get_copy_params_details) 3072 value = str(value) 3073 content += value 3074 if param[1] in fitted_param_names: 3075 # Only print errors for fitted params 3076 content += ' & ' 3077 content += param[4].GetValue() 3078 if index < len(all_params) - 1: 3079 content += ' & ' 3080 3081 content += '\\\\ \\hline' 3082 content += crlf 3083 content += '\\end{tabular}' 3084 content += '\\end{table}' 3085 3086 return content 3023 3087 3024 3088 def set_clipboard(self, content=None): -
src/sas/sasgui/perspectives/fitting/fitpage.py
red2276f r0b6f83c 289 289 self.btFitHelp.SetToolTipString("General fitting help.") 290 290 self.btFitHelp.Bind(wx.EVT_BUTTON, self._onFitHelp) 291 291 292 292 # Resolution Smearing Help button (for now use same technique as 293 293 # used for dI help to get tiniest possible button that works … … 303 303 self.btSmearHelp.SetToolTipString("Resolution smearing help.") 304 304 self.btSmearHelp.Bind(wx.EVT_BUTTON, self._onSmearHelp) 305 305 306 306 # textcntrl for custom resolution 307 307 self.smear_pinhole_percent = ModelTextCtrl(self, wx.ID_ANY, … … 564 564 sizer.Add(self.draw_button, 0, 0) 565 565 sizer.Add((-1, 5)) 566 566 567 567 sizer.Add(self.tcChi, 0, 0) 568 568 sizer.Add(self.Npts_fit, 0, 0) … … 570 570 sizer.Add(self.btFit, 0, 0) 571 571 sizer.Add(self.btFitHelp, 0, 0) 572 572 573 573 boxsizer_range.Add(sizer_chi2) 574 574 boxsizer_range.Add(sizer) … … 2181 2181 self.save_current_state() 2182 2182 2183 if not self.is_mac: 2184 self.Layout() 2185 self.Refresh() 2183 2186 # plot model ( when drawing, do not update chisqr value again) 2184 2187 self._draw_model(update_chisqr=False, source='fit') … … 2775 2778 else: 2776 2779 return cmp(a.lower(), b.lower()) 2777 2780 2778 2781 # keys obtained now from ordered dict, so commenting alphabetical 2779 2782 # ordering keys.sort(custom_compare) -
src/sas/sasgui/perspectives/fitting/fitpanel.py
r67b0a99 r6f9abd3 501 501 if data is None: 502 502 return None 503 focused_page = self.GetPage(self.GetSelection()) 503 504 for page in self.opened_pages.values(): 504 505 # check if the selected data existing in the fitpanel 505 506 pos = self.GetPageIndex(page) 506 507 if not check_data_validity(page.get_data()) and not page.batch_on: 508 if page.model is not None and page != focused_page: 509 # Page has an active theory and is in background - don't 510 # send data here. 511 continue 507 512 # make sure data get placed in 1D empty tab if data is 1D 508 513 # else data get place on 2D tab empty tab
Note: See TracChangeset
for help on using the changeset viewer.
