Changeset d4dac80 in sasview for src/sas/qtgui/Perspectives/Fitting/ModelThread.py
- Timestamp:
- Apr 25, 2018 4:59:33 AM (6 years ago)
- Branches:
- 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
- Children:
- 017b285
- Parents:
- 93c79b5
- git-author:
- Piotr Rozyczko <rozyczko@…> (03/22/18 14:46:19)
- git-committer:
- Piotr Rozyczko <rozyczko@…> (04/25/18 04:59:33)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/qtgui/Perspectives/Fitting/ModelThread.py
rcee5c78 rd4dac80 8 8 from sas.sascalc.data_util.calcthread import CalcThread 9 9 from sas.sascalc.fit.MultiplicationModel import MultiplicationModel 10 import sas.qtgui.Utilities.LocalConfig as LocalConfig 10 11 11 12 class Calc2D(CalcThread): … … 99 100 output[index_model] = value 100 101 elapsed = time.time() - self.starttime 101 #self.complete(image=output, 102 # data=self.data, 103 # page_id=self.page_id, 104 # model=self.model, 105 # state=self.state, 106 # toggle_mode_on=self.toggle_mode_on, 107 # elapsed=elapsed, 108 # index=index_model, 109 # fid=self.fid, 110 # qmin=self.qmin, 111 # qmax=self.qmax, 112 # weight=self.weight, 113 # #qstep=self.qstep, 114 # update_chisqr=self.update_chisqr, 115 # source=self.source) 116 return (output, 117 self.data, 118 self.page_id, 119 self.model, 120 self.state, 121 self.toggle_mode_on, 122 elapsed, 123 index_model, 124 self.fid, 125 self.qmin, 126 self.qmax, 127 self.weight, 128 self.update_chisqr, 129 self.source) 102 103 if LocalConfig.USING_TWISTED: 104 return (output, 105 self.data, 106 self.page_id, 107 self.model, 108 self.state, 109 self.toggle_mode_on, 110 elapsed, 111 index_model, 112 self.fid, 113 self.qmin, 114 self.qmax, 115 self.weight, 116 self.update_chisqr, 117 self.source) 118 else: 119 self.complete(image=output, 120 data=self.data, 121 page_id=self.page_id, 122 model=self.model, 123 state=self.state, 124 toggle_mode_on=self.toggle_mode_on, 125 elapsed=elapsed, 126 index=index_model, 127 fid=self.fid, 128 qmin=self.qmin, 129 qmax=self.qmax, 130 weight=self.weight, 131 #qstep=self.qstep, 132 update_chisqr=self.update_chisqr, 133 source=self.source) 130 134 131 135 … … 229 233 elapsed = time.time() - self.starttime 230 234 231 return (self.data.x[index], output[index], 232 self.page_id, 233 self.state, 234 self.weight, 235 self.fid, 236 self.toggle_mode_on, 237 elapsed, index, self.model, 238 self.data, 239 self.update_chisqr, 240 self.source) 241 242 # TODO: as of 4.1, the output contains more items: 243 # unsmeared_* and pq_model/sq_model 244 # Need to add these too 245 246 #self.complete(x=self.data.x[index], y=output[index], 247 # page_id=self.page_id, 248 # state=self.state, 249 # weight=self.weight, 250 # fid=self.fid, 251 # toggle_mode_on=self.toggle_mode_on, 252 # elapsed=elapsed, index=index, model=self.model, 253 # data=self.data, 254 # update_chisqr=self.update_chisqr, 255 # source=self.source, 256 # unsmeared_model=unsmeared_output, 257 # unsmeared_data=unsmeared_data, 258 # unsmeared_error=unsmeared_error, 259 # pq_model=pq_values, 260 # sq_model=sq_values) 235 if LocalConfig.USING_TWISTED: 236 return (self.data.x[index], output[index], 237 self.page_id, 238 self.state, 239 self.weight, 240 self.fid, 241 self.toggle_mode_on, 242 elapsed, index, self.model, 243 self.data, 244 self.update_chisqr, 245 self.source) 246 else: 247 self.complete(x=self.data.x[index], y=output[index], 248 page_id=self.page_id, 249 state=self.state, 250 weight=self.weight, 251 fid=self.fid, 252 toggle_mode_on=self.toggle_mode_on, 253 elapsed=elapsed, index=index, model=self.model, 254 data=self.data, 255 update_chisqr=self.update_chisqr, 256 source=self.source, 257 unsmeared_model=unsmeared_output, 258 unsmeared_data=unsmeared_data, 259 unsmeared_error=unsmeared_error, 260 pq_model=pq_values, 261 sq_model=sq_values) 261 262 262 263 def results(self):
Note: See TracChangeset
for help on using the changeset viewer.