Changeset ec9a635 in sasview for fittingview/src/sans

Timestamp:

Oct 13, 2011 7:48:11 AM (13 years ago)

Author:

Jae Cho <jhjcho@…>

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:

5d0a786

Parents:

1aa6145

Message:

removed float error for chi2 cell

File:

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

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

@@ -1217 +1217 @@
             batch_outputs["Data"] = []
         from sans.guiframe.data_processor import BatchCell
-        
-        try:
+        cell = BatchCell()
+        cell.label = data.name
+        cell.value = index
+        
+        if theory_data != None:
             #Suucessful fit
-            cell = BatchCell()
-            cell.label = data.name
-            cell.value = index
             theory_data.id = wx.NewId()
             theory_data.name = model.name + "[%s]" % str(model.__class__.__name__)
-            cell.object = [data, theory_data]
-            batch_outputs["Data"].append(cell)
-            for key, value in data.meta_data.iteritems():
-                if key not in batch_inputs.keys():
-                    batch_inputs[key] = []
-                if key.lower().strip() != "loader":
-                    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]
-        except: 
-            # theory is None
-            pass
+            try:
+                # associate residuals plot
+                batch_outputs["Chi2"][index].object = [residuals]
+            except:
+                pass
+
+        cell.object = [data, theory_data]
+        batch_outputs["Data"].append(cell)
+        for key, value in data.meta_data.iteritems():
+            if key not in batch_inputs.keys():
+                batch_inputs[key] = []
+            if key.lower().strip() != "loader":
+                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 _fit_completed(self, result, page_id, batch_outputs,
@@ -1812 +1814 @@
             residuals.yaxis('\\rm{Residuals} ', 'normalized')
         new_plot = residuals
-        new_plot.name = "Residuals for " + str(data.name)
+        new_plot.name = "Residuals for " + str(theory_data.name.split()[0])
         ## allow to highlight data when plotted
         new_plot.interactive = True