Changeset 26fc866 in sasview for fittingview/src/sans
- Timestamp:
- Oct 12, 2011 4:20:33 PM (13 years ago)
- 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
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
fittingview/src/sans/perspectives/fitting/fitting.py
rda6fd1a r26fc866 1112 1112 else: 1113 1113 #Separate result in to data corresponding to each page 1114 temp_pars = []1115 temp_res_param = []1114 #temp_pars = [] 1115 #temp_res_param = [] 1116 1116 # Park sorts the params by itself so that we must check 1117 1117 # param name and resort it back as it was. No effects on Scipy. 1118 """" 1118 1119 if res.parameters != None: 1119 model = cpage.model1120 for fid in self.page_finder[pid]:1121 if fid != None:1122 # Below works only for batch using one model1123 model = self.page_finder[pid][fid].get_model()1124 break1120 #model = cpage.model 1121 #for fid in self.page_finder[pid]: 1122 # if fid != None: 1123 # # Below works only for batch using one model 1124 # model = self.page_finder[pid][fid].get_model() 1125 # break 1125 1126 for p in res.parameters: 1126 1127 model_name, param_name = self.split_string(p.name) … … 1132 1133 res.parameters = temp_res_param 1133 1134 pars = temp_pars 1135 """ 1134 1136 cell = BatchCell() 1135 1137 cell.label = res.fitness … … 1146 1148 if param not in batch_outputs.keys(): 1147 1149 batch_outputs[param] = [] 1148 if param not in pars:1150 if param not in res.param_list: 1149 1151 batch_outputs[str(param)].append(model.getParam(param)) 1150 for index in range(len( pars)):1152 for index in range(len(res.param_list)): 1151 1153 #save only fitted values 1152 batch_outputs[ pars[index]].append(res.pvec[index])1154 batch_outputs[res.param_list[index]].append(res.pvec[index]) 1153 1155 item = res.stderr[index] 1154 batch_inputs["error on %s" % pars[index]].append(item)1155 if pars[index] in model.getParamList():1156 model.setParam( pars[index], res.pvec[index])1156 batch_inputs["error on %s" % res.param_list[index]].append(item) 1157 if res.param_list[index] in model.getParamList(): 1158 model.setParam(res.param_list[index], res.pvec[index]) 1157 1159 1158 1160 self.page_finder[pid].set_batch_result(batch_inputs=batch_inputs,
Note: See TracChangeset
for help on using the changeset viewer.