Changeset 26fc866 in sasview

Timestamp:

Oct 12, 2011 4:20:33 PM (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:

2de278d9

Parents:

fd51a7c

Message:

fixed park & batch switching param value problem

File:

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

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

@@ -1112 +1112 @@
                     else:
                         #Separate result in to data corresponding to each page
-                        temp_pars = []
-                        temp_res_param = []
+                        #temp_pars = []
+                        #temp_res_param = []
                         # Park sorts the params by itself so that we must check 
                         # param name and resort it back as it was. No effects on Scipy.
+                        """"
                         if res.parameters != None:
-                            model = cpage.model
-                            for fid in self.page_finder[pid]:
-                                if fid != None:
-                                    # Below works only for batch using one model
-                                    model = self.page_finder[pid][fid].get_model()
-                                    break
+                            #model = cpage.model
+                            #for fid in self.page_finder[pid]:
+                            #    if fid != None:
+                            #        # Below works only for batch using one model
+                            #        model = self.page_finder[pid][fid].get_model()
+                            #        break
                             for p in res.parameters:
                                 model_name, param_name = self.split_string(p.name)  
@@ -1132 +1133 @@
                             res.parameters = temp_res_param
                             pars = temp_pars
+                        """
                         cell = BatchCell()
                         cell.label = res.fitness
@@ -1146 +1148 @@
                             if param not in batch_outputs.keys():
                                 batch_outputs[param] = []
-                            if param not in pars:
+                            if param not in res.param_list:
                                 batch_outputs[str(param)].append(model.getParam(param))
-                        for index  in range(len(pars)):
+                        for index  in range(len(res.param_list)):
                             #save only fitted values
-                            batch_outputs[pars[index]].append(res.pvec[index])
+                            batch_outputs[res.param_list[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])
+                            batch_inputs["error on %s" % res.param_list[index]].append(item)
+                            if res.param_list[index] in model.getParamList():
+                                model.setParam(res.param_list[index], res.pvec[index])
                                     
                     self.page_finder[pid].set_batch_result(batch_inputs=batch_inputs,