Changeset e68bfef in sasview for fittingview/src/sans/perspectives

Timestamp:

Oct 6, 2011 1:09:45 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:

e03a14e

Parents:

5722d66

Message:

make sure all model parameters are displayed in the grid whether or not they were fitted

File:

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

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

@@ -34 +34 @@
 from sans.guiframe.gui_style import GUIFRAME_ID
 from sans.guiframe.plugin_base import PluginBase 
+from sans.guiframe.data_processor import BatchCell
 from sans.fit.Fitting import Fit
 from .console import ConsoleUpdate
@@ -1064 +1065 @@
                 if res is None:
                     null_value = numpy.nan
-                    from sans.guiframe.data_processor import BatchCell
                     cell = BatchCell()
                     cell.label = null_value
@@ -1070 +1070 @@
                     cell.object = [None]
                     batch_outputs["Chi2"].append(cell)
-                    for index  in range(len(pars)):
-                        batch_outputs[pars[index]].append(null_value)
-                        item = null_value
-                        batch_inputs["error on %s" % pars[index]].append(item)
-                        if pars[index] in model.getParamList():
-                            temp_model.setParam(pars[index], res.pvec[index])
+                    for param in temp_model.getParamList():
+                        if temp_model.is_fittable(param):
+                            for index  in range(len(pars)):
+                                #replug only fitted values
+                                if param != pars[index]:
+                                    batch_outputs[pars[index]].append(null_value)
+                                    item = null_value
+                                    batch_inputs["error on %s" % pars[index]].append(item)
+                                    if pars[index] in model.getParamList():
+                                        temp_model.setParam(pars[index], res.pvec[index])
+                                else:
+                                     batch_outputs[str(param)].append(temp_model.getParam(param))
                 else:
                     from sans.guiframe.data_processor import BatchCell
@@ -1082 +1088 @@
                     cell.value = res.fitness
                     batch_outputs["Chi2"].append(cell)
-                    for index  in range(len(pars)):
-                        batch_outputs[pars[index]].append(res.pvec[index])
-                        item = res.stderr[index]
-                        batch_inputs["error on %s" % pars[index]].append(item)
-                        if pars[index] in temp_model.getParamList():
-                            temp_model.setParam(pars[index], res.pvec[index])
-                        
+                    for param in temp_model.getParamList():
+                        if temp_model.is_fittable(param):
+                            for index  in range(len(pars)):
+                                #replug only fitted values
+                                if param != pars[index]:
+                                    batch_outputs[pars[index]].append(res.pvec[index])
+                                    item = res.stderr[index]
+                                    batch_inputs["error on %s" % pars[index]].append(item)
+                                    if pars[index] in temp_model.getParamList():
+                                        temp_model.setParam(pars[index], res.pvec[index])
+                                else:
+                                     batch_outputs[str(param)].append(temp_model.getParam(param))
+                                
                 self.page_finder[pid].set_batch_result(batch_inputs=batch_inputs,
                                                  batch_outputs=batch_outputs)   
@@ -1143 +1155 @@
             if key not in batch_inputs.keys():
                 batch_inputs[key] = []
-            batch_inputs[key].append(value)
+            if key.lower().strip() != "loader":
+                batch_inputs[key].append(value)
         param = "temperature"
         if hasattr(data.sample, param):