Changeset 47d9be79 in sasview

Timestamp:

Oct 12, 2011 9:41:47 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:

18253cd

Parents:

d8661fb

Message:

make sure all fittable parameters are displayed on the grid

File:

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

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

@@ -1096 +1096 @@
                         msg += "Data %s and Model %s did not fit.\n" % (data_name, 
                                                                         model_name)
-                        print msg
+                        #print msg
                         wx.PostEvent(self.parent, StatusEvent(status=msg,
                                                               error="error",
@@ -1126 +1126 @@
                         cell.value = res.fitness
                         batch_outputs["Chi2"].append(cell)
-                        for param in model.getParamList():
-                            if 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 model.getParamList():
-                                            model.setParam(pars[index], res.pvec[index])
-                                    else:
-                                         batch_outputs[str(param)].append(model.getParam(param))
+                        # add parameters to batch_results
+                        param_list = model.getParamList()
+                        for param in model.getDispParamList():
+                            if not model.is_fittable(param) and \
+                                param in param_list:
+                                param_list.remove(param)
+                        for param in param_list:
+                            # save value of  fixed parameters
+                            if param not in batch_outputs.keys():
+                                batch_outputs[param] = []
+                            if param not in pars:
+                                batch_outputs[str(param)].append(model.getParam(param))
+                        for index  in range(len(pars)):
+                            #save only fitted values
+                            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 model.getParamList():
+                                model.setParam(pars[index], res.pvec[index])
                                     
                     self.page_finder[pid].set_batch_result(batch_inputs=batch_inputs,
@@ -1149 +1156 @@
                     flag = issubclass(data.__class__, Data2D)
                     if not flag:
+                        #print "Batch complete", len(res.theory), len(res.index)
                         self._complete1D(x=data.x, y=res.theory, page_id=pid, 
                                          elapsed=None,