Changeset 87e2f81 in sasview

Timestamp:

Oct 3, 2011 5:33:58 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:

9149431

Parents:

18a6556

Message:

make sure residuals are proprely stored after the fit

File:

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

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

@@ -1044 +1044 @@
                     cell.label = null_value
                     cell.value = null_value
+                    cell.object = [None]
                     batch_outputs["Chi2"].append(cell)
                     for index  in range(len(pars)):
@@ -1098 +1099 @@
         fitproblem = self.page_finder[pid][fid]
         index = self.page_finder[pid].nbr_residuals_computed - 1
-        print "index", index
         residuals =  fitproblem.get_residuals()
         theory_data = fitproblem.get_theory_data()
@@ -1111 +1111 @@
         cell.value = index
         theory_data.id = wx.NewId()
+        theory_data.name = data.name + "[%s]" % str(model.__class__.__name__)
         cell.object = [data, theory_data]
         
@@ -1124 +1125 @@
             batch_inputs[param].append(data.sample.temperature)
         # associate residuals plot
+        
         batch_outputs["Chi2"][index].object = [residuals]
        
@@ -1767 +1769 @@
         flag = False
         batch_inputs, batch_outputs = self.page_finder[page_id].get_result()
-      
+         
         if self.page_finder[page_id].nbr_residuals_computed == -1:
             flag = False
         else:
-            if m == n - 1:
+            if m == n -1:
                 flag = True
             else:
                 flag = False
-                self.page_finder[page_id].nbr_residuals_computed += 1
+            self.page_finder[page_id].nbr_residuals_computed += 1
             
             self.on_set_batch_result(page_id=page_id,