Changeset 2e08a9f in sasview for fittingview/src/sans/perspectives

Timestamp:

Sep 8, 2011 5:06:02 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:

f7f6886

Parents:

10675c3

Message:

working on batch result

File:

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

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

@@ -701 +701 @@
                         if sim_fitter is None:
                             fitter = Fit(self._fit_engine)  
-                            print "onfit id ", id(fitproblem)
                             self._fit_helper(fitproblem, pars, fitter, fit_id)
                             fitter_list.append(fitter) 
@@ -858 +857 @@
         """
         receive and event telling to update a panel with a name starting with 
-        event.panel_name. this method update slicer panel for a given interactor.
-        
-        :param event: contains type of slicer , paramaters for updating the panel
-            and panel_name to find the slicer 's panel concerned.
+        event.panel_name. this method update slicer panel 
+        for a given interactor.
+        
+        :param event: contains type of slicer , paramaters for updating 
+            the panel and panel_name to find the slicer 's panel concerned.
         """
         for item in self.parent.panels:
@@ -960 +960 @@
             batch_result = {"Chi2":[]}
             for index  in range(len(pars)):
-                    batch_result[pars[index]] = []
-                    batch_result["error on %s" % pars[index]] = []
+                batch_result[pars[index]] = []
+                batch_result["error on %s" % pars[index]] = []
             for res in result:
                 if res is None:
-                    continue
-                batch_result["Chi2"].append(res.fitness)
-                for index  in range(len(pars)):
-                    batch_result[pars[index]].append(res.pvec[index])
-                    item = res.stderr[index]
-                    batch_result["error on %s" % pars[index]].append(item)
+                    null_value = numpy.nan
+                    batch_result["Chi2"].append(null_value)
+                    for index  in range(len(pars)):
+                        batch_result[pars[index]].append(null_value)
+                        item = null_value
+                        batch_result["error on %s" % pars[index]].append(item)
+                else:
+                    batch_result["Chi2"].append(res.fitness)
+                    for index  in range(len(pars)):
+                        batch_result[pars[index]].append(res.pvec[index])
+                        item = res.stderr[index]
+                        batch_result["error on %s" % pars[index]].append(item)
             pid = page_id[0]
             self.page_finder[pid].set_result(result=batch_result)      
@@ -1259 +1265 @@
             new_plot.xaxis(_xaxis, _xunit)
             new_plot.yaxis(_yaxis, _yunit)
-            self.page_finder[page_id].set_theory_data(data=new_plot, fid=data.id)
+            self.page_finder[page_id].set_theory_data(data=new_plot, 
+                                                      fid=data.id)
             self.parent.update_theory(data_id=data.id, theory=new_plot,
                                        state=state)   
@@ -1277 +1284 @@
                 if update_chisqr:
                     wx.PostEvent(current_pg,
-                                 Chi2UpdateEvent(output=self._cal_chisqr(data=data,
+                                 Chi2UpdateEvent(output=self._cal_chisqr(
+                                                                data=data,
                                                             page_id=page_id,
                                                             index=index)))