Changeset 2de278d9 in sasview for fittingview/src

Timestamp:

Oct 12, 2011 4:41:56 PM (13 years ago)

Author:

Gervaise Alina <gervyh@…>

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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

1363416

Parents:

26fc866

Message:

happen residuals to data_explorer

File:

• fittingview/src/sans/perspectives/fitting/fitting.py (modified) (6 diffs)

fittingview/src/sans/perspectives/fitting/fitting.py

@@ -1111 +1111 @@
                                                                         model_name)
                     else:
-                        #Separate result in to data corresponding to each page
-                        #temp_pars = []
-                        #temp_res_param = []
-                        # Park sorts the params by itself so that we must check 
-                        # param name and resort it back as it was. No effects on Scipy.
-                        """"
-                        if res.parameters != None:
-                            #model = cpage.model
-                            #for fid in self.page_finder[pid]:
-                            #    if fid != None:
-                            #        # Below works only for batch using one model
-                            #        model = self.page_finder[pid][fid].get_model()
-                            #        break
-                            for p in res.parameters:
-                                model_name, param_name = self.split_string(p.name)  
-                                if model.name == model_name:
-                                    p_name= model.name+"."+param_name
-                                    if p.name == p_name:      
-                                        temp_res_param.append(p)
-                                        temp_pars.append(param_name)
-                            res.parameters = temp_res_param
-                            pars = temp_pars
-                        """
                         cell = BatchCell()
                         cell.label = res.fitness
@@ -1166 +1143 @@
                     qmin, qmax = fitproblem.get_range()
                     flag = issubclass(data.__class__, Data2D)
-                    correct_result = False
                     if not flag:
                         if len(res.theory) == len(res.index) and \
@@ -1178 +1154 @@
                                          data=data, update_chisqr=False, 
                                          source='fit')
+                            self.on_set_batch_result(page_id=pid, 
+                                             fid=data.id, 
+                                             batch_outputs=batch_outputs, 
+                                             batch_inputs=batch_inputs)
                         else:
                             data_name = str(None)
@@ -1201 +1181 @@
                                          update_chisqr=False, 
                                          source='fit')
+                            self.on_set_batch_result(page_id=pid, 
+                                             fid=data.id, 
+                                             batch_outputs=batch_outputs, 
+                                             batch_inputs=batch_inputs)
                         else:
                             data_name = str(None)
@@ -1210 +1194 @@
                             msg += "Data %s and Model %s did not fit.\n" % (data_name, 
                                                                             model_name)
-                            
-                    if correct_result : 
-                        self.on_set_batch_result(page_id=pid, 
-                                             fid=data.id, 
-                                             batch_outputs=batch_outputs, 
-                                             batch_inputs=batch_inputs)
-          
-        #print msg
+                    
         wx.PostEvent(self.parent, StatusEvent(status=msg, error="error",
                                                               type="stop"))
@@ -1845 +1822 @@
         title = new_plot.name 
         self.page_finder[page_id].set_residuals(residuals=new_plot, fid=data.id)
+        self.parent.update_theory(data_id=data.id, theory=new_plot)
         batch_on = self.fit_panel.get_page_by_id(page_id).batch_on
         if not batch_on: