Changes in / [5c1c486:7b3f154] in sasview

Files:

• src/sas/sasgui/perspectives/fitting/basepage.py (modified) (4 diffs)
• src/sas/sasgui/perspectives/fitting/fitpage.py (modified) (6 diffs)
• src/sas/sasgui/perspectives/fitting/fitpanel.py (modified) (1 diff)
• src/sas/sasgui/perspectives/fitting/fitting.py (modified) (3 diffs)
• test/corfunc/test/utest_corfunc.py (modified) (1 diff)

src/sas/sasgui/perspectives/fitting/basepage.py

@@ -2929 +2929 @@
             return False
 
-
-    def _get_copy_params_details(self):
-        """
-        Combines polydisperse parameters with self.parameters so that they can
-        be written to the clipboard (for Excel or LaTeX). Also returns a list of
-        the names of parameters that have been fitted
-
-        :returns: all_params - A list of all parameters, in the format of 
-        self.parameters
-        :returns: fitted_par_names - A list of the names of parameters that have
-        been fitted
-        """
-        # Names of params that are being fitted
-        fitted_par_names = [param[1] for param in self.param_toFit]
-        # Names of params with associated polydispersity
-        disp_params = [param[1].split('.')[0] for param in self.fittable_param]
-
-        # Create array of all parameters
-        all_params = copy.copy(self.parameters)
-        for param in self.parameters:
-            if param[1] in disp_params:
-                # Polydisperse params aren't in self.parameters, so need adding
-                # to all_params
-                name = param[1] + ".width"
-                index = all_params.index(param) + 1
-                to_insert = []
-                if name in fitted_par_names:
-                    # Param is fitted, so already has a param list in self.param_toFit
-                    to_insert = self.param_toFit[fitted_par_names.index(name)]
-                else:
-                    # Param isn't fitted, so mockup a param list
-                    to_insert = [None, name, self.model.getParam(name), None, None]
-                all_params.insert(index, to_insert)
-        return all_params, fitted_par_names
-
     def get_copy_excel(self):
         """
@@ -2977 +2942 @@
         Get the string copies of the param names and values in the tap
         """
-        if not self.parameters:
-            # Do nothing if parameters doesn't exist
-            return False
-
         content = ''
+
         crlf = chr(13) + chr(10)
         tab = chr(9)
 
-        all_params, fitted_param_names = self._get_copy_params_details()
-
-        # Construct row of parameter names
-        for param in all_params:
-            name = param[1] # Parameter name
-            content += name
-            content += tab
-            if name in fitted_param_names:
-                # Only print errors for fitted parameters
-                content += name + "_err"
+        # Do it if params exist
+        if self.parameters:
+
+            for param in self.parameters:
+                content += param[1]  # parameter name
                 content += tab
-
-        content += crlf
-
-        # Construct row of parameter values and errors
-        for param in all_params:
-            value = param[2]
-            if hasattr(value, 'GetValue'):
-                # param[2] is a text box
-                value = value.GetValue()
-            else:
-                # param[2] is a float (from our self._get_copy_params_details)
-                value = str(value)
-            content += value
-            content += tab
-            if param[1] in fitted_param_names:
-                # Only print errors for fitted parameters
-                content += param[4].GetValue()
-                content += tab 
-
-        return content
+                content += param[1] + "_err"
+                content += tab
+
+            content += crlf
+
+            # row of values and errors...
+            for param in self.parameters:
+                content += param[2].GetValue()  # value
+                content += tab
+                content += param[4].GetValue()  # error
+                content += tab
+
+            return content
+        else:
+            return False
 
     def get_copy_latex(self):
@@ -3030 +2982 @@
         Get the string copies of the param names and values in the tap
         """
-        if not self.parameters:
-            # Do nothing if self.parameters doesn't exist
-            return False
-        
         content = '\\begin{table}'
         content += '\\begin{tabular}[h]'
@@ -3040 +2988 @@
         tab = chr(9)
 
-        all_params, fitted_param_names = self._get_copy_params_details()
-
-        content += '{|'
-        for param in all_params:
-            content += 'l|l|'
-        content += '}\hline'
-        content += crlf
-
-        # Construct row of parameter names
-        for index, param in enumerate(all_params):
-            name = param[1] # Parameter name
-            content += name.replace('_', '\_')  # Escape underscores
-            if name in fitted_param_names:
-                # Only print errors for fitted parameters
+        # Do it if params exist
+        if self.parameters:
+
+            content += '{|'
+            for param in self.parameters:
+                content += 'l|l|'
+            content += '}\hline'
+            content += crlf
+
+            for index, param in enumerate(self.parameters):
+                content += param[1].replace('_', '\_')  # parameter name
                 content += ' & '
-                content += name.replace('_', '\_') + "\_err"
-            if index < len(all_params) - 1:
+                content += param[1].replace('_', '\_') + "\_err"
+                if index < len(self.parameters) - 1:
+                    content += ' & '
+            content += '\\\\ \\hline'
+            content += crlf
+
+            # row of values and errors...
+            for index, param in enumerate(self.parameters):
+                content += param[2].GetValue()  # parameter value
                 content += ' & '
-
-        content += '\\\\ \\hline'
-        content += crlf
-
-        # Construct row of values and errors
-        for index, param in enumerate(all_params):
-            value = param[2]
-            if hasattr(value, "GetValue"):
-                # value is a text box
-                value = value.GetValue()
-            else:
-                # value is a float (from self._get_copy_params_details)
-                value = str(value)
-            content += value
-            if param[1] in fitted_param_names:
-                # Only print errors for fitted params
-                content += ' & '
-                content += param[4].GetValue()
-            if index < len(all_params) - 1:
-                content += ' & '
-        
-        content += '\\\\ \\hline'
-        content += crlf
-        content += '\\end{tabular}'
-        content += '\\end{table}'
-
-        return content
+                content += param[4].GetValue()  # parameter error
+                if index < len(self.parameters) - 1:
+                    content += ' & '
+            content += '\\\\ \\hline'
+            content += crlf
+
+            content += '\\end{tabular}'
+            content += '\\end{table}'
+            return content
+        else:
+            return False
 
     def set_clipboard(self, content=None):

src/sas/sasgui/perspectives/fitting/fitpage.py

@@ -289 +289 @@
         self.btFitHelp.SetToolTipString("General fitting help.")
         self.btFitHelp.Bind(wx.EVT_BUTTON, self._onFitHelp)
-
+        
         # Resolution Smearing Help button (for now use same technique as
         # used for dI help to get tiniest possible button that works
@@ -303 +303 @@
         self.btSmearHelp.SetToolTipString("Resolution smearing help.")
         self.btSmearHelp.Bind(wx.EVT_BUTTON, self._onSmearHelp)
-
+        
         # textcntrl for custom resolution
         self.smear_pinhole_percent = ModelTextCtrl(self, wx.ID_ANY,
@@ -564 +564 @@
         sizer.Add(self.draw_button, 0, 0)
         sizer.Add((-1, 5))
-
+        
         sizer.Add(self.tcChi, 0, 0)
         sizer.Add(self.Npts_fit, 0, 0)
@@ -570 +570 @@
         sizer.Add(self.btFit, 0, 0)
         sizer.Add(self.btFitHelp, 0, 0)
-
+        
         boxsizer_range.Add(sizer_chi2)
         boxsizer_range.Add(sizer)
@@ -2181 +2181 @@
         self.save_current_state()
 
-        if not self.is_mac:
-            self.Layout()
-            self.Refresh()
         # plot model ( when drawing, do not update chisqr value again)
         self._draw_model(update_chisqr=False, source='fit')
@@ -2778 +2775 @@
             else:
                 return cmp(a.lower(), b.lower())
-
+        
         # keys obtained now from ordered dict, so commenting alphabetical
         # ordering keys.sort(custom_compare)

src/sas/sasgui/perspectives/fitting/fitpanel.py

@@ -501 +501 @@
             if data is None:
                 return None
-        focused_page = self.GetPage(self.GetSelection())
         for page in self.opened_pages.values():
             # check if the selected data existing in the fitpanel
             pos = self.GetPageIndex(page)
             if not check_data_validity(page.get_data()) and not page.batch_on:
-                if page.model is not None and page != focused_page:
-                    # Page has an active theory and is in background - don't
-                    # send data here.
-                    continue
                 # make sure data get placed in 1D empty tab if data is 1D
                 # else data get place on 2D tab empty tab

src/sas/sasgui/perspectives/fitting/fitting.py

@@ -1326 +1326 @@
 
                 is_data2d = issubclass(data.__class__, Data2D)
-                # Check consistency of arrays
+                #check consistency of arrays
                 if not is_data2d:
                     if len(res.theory) == len(res.index[res.index]) and \
@@ -1337 +1337 @@
                     new_theory[res.index == False] = np.nan
                     correct_result = True
-                # Get all fittable parameters of the current model
+                #get all fittable parameters of the current model
                 param_list = model.getParamList()
                 for param in model.getDispParamList():
-                    if '.' in param and param in param_list:
-                        # Ensure polydispersity results are displayed
-                        p1, p2 = param.split('.')
-                        if not model.is_fittable(p1) and not (p2 == 'width' and param in res.param_list)\
-                            and param in param_list:
-                            param_list.remove(param)
-                    elif not model.is_fittable(param) and \
+                    if not model.is_fittable(param) and \
                         param in param_list:
                         param_list.remove(param)
@@ -1367 +1361 @@
                     batch_outputs["Chi2"].append(ERROR)
                     for param in param_list:
-                        # Save value of  fixed parameters
+                        # save value of  fixed parameters
                         if param not in res.param_list:
                             batch_outputs[str(param)].append(ERROR)
                         else:
-                            # Save only fitted values
+                            #save only fitted values
                             batch_outputs[param].append(ERROR)
                             batch_inputs["error on %s" % str(param)].append(ERROR)

test/corfunc/test/utest_corfunc.py

@@ -17 +17 @@
             upperq=(0.15, 0.24))
         self.extrapolation = None
-        self.transformation = None
 
     def extrapolate(self):