Changeset 2de278d9 in sasview for fittingview/src/sans/perspectives
- Timestamp:
- Oct 12, 2011 4:41:56 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:
- 1363416
- Parents:
- 26fc866
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
fittingview/src/sans/perspectives/fitting/fitting.py
r26fc866 r2de278d9 1111 1111 model_name) 1112 1112 else: 1113 #Separate result in to data corresponding to each page1114 #temp_pars = []1115 #temp_res_param = []1116 # Park sorts the params by itself so that we must check1117 # param name and resort it back as it was. No effects on Scipy.1118 """"1119 if res.parameters != None:1120 #model = cpage.model1121 #for fid in self.page_finder[pid]:1122 # if fid != None:1123 # # Below works only for batch using one model1124 # model = self.page_finder[pid][fid].get_model()1125 # break1126 for p in res.parameters:1127 model_name, param_name = self.split_string(p.name)1128 if model.name == model_name:1129 p_name= model.name+"."+param_name1130 if p.name == p_name:1131 temp_res_param.append(p)1132 temp_pars.append(param_name)1133 res.parameters = temp_res_param1134 pars = temp_pars1135 """1136 1113 cell = BatchCell() 1137 1114 cell.label = res.fitness … … 1166 1143 qmin, qmax = fitproblem.get_range() 1167 1144 flag = issubclass(data.__class__, Data2D) 1168 correct_result = False1169 1145 if not flag: 1170 1146 if len(res.theory) == len(res.index) and \ … … 1178 1154 data=data, update_chisqr=False, 1179 1155 source='fit') 1156 self.on_set_batch_result(page_id=pid, 1157 fid=data.id, 1158 batch_outputs=batch_outputs, 1159 batch_inputs=batch_inputs) 1180 1160 else: 1181 1161 data_name = str(None) … … 1201 1181 update_chisqr=False, 1202 1182 source='fit') 1183 self.on_set_batch_result(page_id=pid, 1184 fid=data.id, 1185 batch_outputs=batch_outputs, 1186 batch_inputs=batch_inputs) 1203 1187 else: 1204 1188 data_name = str(None) … … 1210 1194 msg += "Data %s and Model %s did not fit.\n" % (data_name, 1211 1195 model_name) 1212 1213 if correct_result : 1214 self.on_set_batch_result(page_id=pid, 1215 fid=data.id, 1216 batch_outputs=batch_outputs, 1217 batch_inputs=batch_inputs) 1218 1219 #print msg 1196 1220 1197 wx.PostEvent(self.parent, StatusEvent(status=msg, error="error", 1221 1198 type="stop")) … … 1845 1822 title = new_plot.name 1846 1823 self.page_finder[page_id].set_residuals(residuals=new_plot, fid=data.id) 1824 self.parent.update_theory(data_id=data.id, theory=new_plot) 1847 1825 batch_on = self.fit_panel.get_page_by_id(page_id).batch_on 1848 1826 if not batch_on:
Note: See TracChangeset
for help on using the changeset viewer.