Changeset 7bd6cfae in sasview

Timestamp:

Oct 3, 2011 5:21:52 AM (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:

63dc6e5

Parents:

5425990

Message:

working on display plot

File:

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

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

@@ -732 +732 @@
                         name = str(element[1])
                         pars.append(name)
-                    for fitproblem in  value.get_fit_problem():
+                    fitproblem_list = value.values()
+                    fitproblem_list.sort()
+                    for fitproblem in  fitproblem_list:
                         if sim_fitter is None:
                             fitter = Fit(self._fit_engine)  
@@ -967 +969 @@
                 if item[0] != None and item[1] != None:
                     listOfConstraint.append((item[0],item[1]))
-        for param in model.getParamList():
-            if param not in pars:
-                if param not in batch_inputs.keys():
-                    batch_inputs[param] = []
-                if param not in model.non_fittable:
-                    batch_inputs[param].append(model.getParam(param))
         new_model = model#deepcopy(model)
         fitter.set_model(new_model, fit_id, pars, constraints=listOfConstraint)
@@ -978 +974 @@
                         qmax=qmax)
         fitter.select_problem_for_fit(id=fit_id, value=1)
-        #fill batch result information
-        if "Data" not in batch_outputs.keys():
-            batch_outputs["Data"] = []
-        batch_outputs["Data"].append(data.name)
-        for key, value in data.meta_data.iteritems():
-            if key not in batch_inputs.keys():
-                batch_inputs[key] = []
-            batch_inputs[key].append(value)
-        param = "temperature"
-        if hasattr(data.sample, param):
-            if param not in  batch_inputs.keys():
-                 batch_inputs[param] = []
-            batch_inputs[param].append(data.sample.temperature)
+       
     
     def _onSelect(self,event):
@@ -1046 +1030 @@
                 if res is None:
                     null_value = numpy.nan
-                    batch_outputs["Chi2"].append(null_value)
+                    from sans.guiframe.data_processor import BatchCell
+                    cell = BatchCell()
+                    cell.label = null_value
+                    cell.value = null_value
+                    batch_outputs["Chi2"].append(cell)
                     for index  in range(len(pars)):
                         batch_outputs[pars[index]].append(null_value)
@@ -1052 +1040 @@
                         batch_inputs["error on %s" % pars[index]].append(item)
                 else:
-                    batch_outputs["Chi2"].append(res.fitness)
+                    from sans.guiframe.data_processor import BatchCell
+                    cell = BatchCell()
+                    cell.label = res.fitness
+                    cell.value = res.fitness
+                    batch_outputs["Chi2"].append(cell)
                     for index  in range(len(pars)):
                         batch_outputs[pars[index]].append(res.pvec[index])
@@ -1060 +1052 @@
             self.page_finder[pid].set_result(result=batch_outputs)   
            
-            """
-            draw_model(self, model, page_id, data=None, smearer=None,
-                   enable1D=True, enable2D=False,
-                   state=None,
-                   toggle_mode_on=False,
-                   qmin=None, qmax=None, 
-                   update_chisqr=True, weight=None):
-            """
             for pid in page_id:
                 cpage = self.fit_panel.get_page_by_id(pid)
@@ -1089 +1073 @@
                                       update_chisqr=False, 
                                       weight=weight)
+        #get theory data and residuals of each data then send all values
+        # to the grid  
+        wx.CallAfter(self.on_set_batch_result, page_id, pars, batch_outputs, 
+                batch_inputs)
                     
-            self.parent.on_set_batch_result(data_outputs=batch_outputs, 
+    def on_set_batch_result(self, page_id, pars, batch_outputs, batch_inputs):
+        """
+        """
+        for pid in page_id:
+            fitproblem_list = self.page_finder[pid].values()
+            fitproblem_list.sort()
+            index = 0
+            for fitproblem in fitproblem_list:
+                residuals =  fitproblem.get_residuals()
+                theory_data = fitproblem.get_theory_data()
+                data = fitproblem.get_fit_data()
+                model = fitproblem.get_model()
+                 #fill batch result information
+                if "Data" not in batch_outputs.keys():
+                    batch_outputs["Data"] = []
+                from sans.guiframe.data_processor import BatchCell
+                cell = BatchCell()
+                cell.label = data.name
+                cell.value = index
+                cell.object = [data, theory_data]
+                
+                for param in model.getParamList():
+                    if param not in pars:
+                        if param not in batch_inputs.keys():
+                            batch_inputs[param] = []
+                        if param not in model.non_fittable:
+                            batch_inputs[param].append(model.getParam(param))
+                batch_outputs["Data"].append(cell)
+                for key, value in data.meta_data.iteritems():
+                    if key not in batch_inputs.keys():
+                        batch_inputs[key] = []
+                    batch_inputs[key].append(value)
+                param = "temperature"
+                if hasattr(data.sample, param):
+                    if param not in  batch_inputs.keys():
+                         batch_inputs[param] = []
+                    batch_inputs[param].append(data.sample.temperature)
+                # associate residuals plot
+                batch_outputs["Chi2"][index].object = residuals
+          
+        self.parent.on_set_batch_result(data_outputs=batch_outputs, 
                                             data_inputs=batch_inputs,
                                             plugin_name=self.sub_menu)
@@ -1151 +1179 @@
                 wx.PostEvent(self.parent, StatusEvent(status=msg))
             except ValueError:
+                raise
                 self._update_fit_button(page_id)
                 msg = "Single Fitting did not converge!!!"
@@ -1156 +1185 @@
                                                       type="stop"))
             except:
+                raise
                 self._update_fit_button(page_id)
                 msg = "Single Fit completed but Following"