Changeset 5a5e371 in sasview
- Timestamp:
- Apr 18, 2018 3:13:18 PM (7 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:
- 917eba5
- Parents:
- ae34d30
- Location:
- src/sas
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/qtgui/Perspectives/Inversion/InversionPerspective.py
rae34d30 r5a5e371 33 33 34 34 35 # TODO: Update help with batch capabilities36 35 class InversionWindow(QtWidgets.QDialog, Ui_PrInversion): 37 36 """ … … 550 549 self.isBatch = True 551 550 self.performEstimate() 552 self.showBatchOutput()553 551 554 552 def startNextBatchItem(self): … … 564 562 # If no data sets left, end batch calculation 565 563 self.calculateAllButton.setText("Calculate All") 564 self.showBatchOutput() 566 565 self.enableButtons() 567 566 -
src/sas/qtgui/Utilities/GridPanel.py
rae34d30 r5a5e371 289 289 290 290 super(BatchInversionOutputPanel, self).__init__(parent, output_data) 291 _translate = QtCore.QCoreApplication.translate 292 self.setWindowTitle(_translate("GridPanelUI", "Batch P(r) Results")) 291 293 292 294 def setupTable(self, data): … … 296 298 # headers 297 299 param_list = ['Filename', 'Rg [Ã 298 ]', ' Ï^2/dof', 'I(Q=0)', 'Oscillations',300 ]', 'Chi^2/dof', 'I(Q=0)', 'Oscillations', 299 301 'Background [Ã 300 ^-1]', 'P+ Fraction', 'P+1- ÏFraction',302 ^-1]', 'P+ Fraction', 'P+1-theta Fraction', 301 303 'Calc. Time [sec]'] 302 304 … … 319 321 self.tblParams.setItem(i_row, 0, QtWidgets.QTableWidgetItem( 320 322 "{}".format(filename))) 323 self.tblParams.setItem(i_row, 1, QtWidgets.QTableWidgetItem( 324 "{:.3g}".format(pr.rg(out)))) 321 325 self.tblParams.setItem(i_row, 2, QtWidgets.QTableWidgetItem( 322 326 "{:.3g}".format(pr.chi2[0]))) 323 self.tblParams.setItem(i_row, 5, QtWidgets.QTableWidgetItem(324 "{:.3g}".format(pr.background)))325 self.tblParams.setItem(i_row, 8, QtWidgets.QTableWidgetItem(326 "{:.2g}".format(pr.elapsed)))327 self.tblParams.setItem(i_row, 1, QtWidgets.QTableWidgetItem(328 "{:.3g}".format(pr.rg(out))))329 327 self.tblParams.setItem(i_row, 3, QtWidgets.QTableWidgetItem( 330 328 "{:.3g}".format(pr.iq0(out)))) 331 329 self.tblParams.setItem(i_row, 4, QtWidgets.QTableWidgetItem( 332 330 "{:.3g}".format(pr.oscillations(out)))) 331 self.tblParams.setItem(i_row, 5, QtWidgets.QTableWidgetItem( 332 "{:.3g}".format(pr.background))) 333 333 self.tblParams.setItem(i_row, 6, QtWidgets.QTableWidgetItem( 334 334 "{:.3g}".format(pr.get_positive(out)))) 335 335 self.tblParams.setItem(i_row, 7, QtWidgets.QTableWidgetItem( 336 336 "{:.3g}".format(pr.get_pos_err(out, cov)))) 337 self.tblParams.setItem(i_row, 8, QtWidgets.QTableWidgetItem( 338 "{:.2g}".format(pr.elapsed))) 337 339 338 340 self.tblParams.resizeColumnsToContents() … … 344 346 """ 345 347 location = GuiUtils.HELP_DIRECTORY_LOCATION 346 url = "/user/sasgui/perspectives/pr/pr_help.html#batch- fit-mode"348 url = "/user/sasgui/perspectives/pr/pr_help.html#batch-pr-mode" 347 349 try: 348 350 webbrowser.open('file://' + os.path.realpath(location + url)) -
src/sas/sasgui/perspectives/pr/media/pr_help.rst
r1abd19c r5a5e371 68 68 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 69 69 70 .. _Batch_Pr_Mode: 71 72 Batch P(r) inversion 73 -------------------- 74 75 The p(r) calculator accepts any number of data sets, and supports batch fitting 76 for all data sets in the p(r) data set combo box. Switching between data sets in 77 the combo box allows for individual fits and review of fit parameters. The 78 displayed plots will also update to include the latest fit results for the 79 selected data set. 80 81 The 'Calculate All' button will run the p(r) calculation for each file, 82 sequentially. The calculator will estimate the number of terms, background, and 83 regularization constant for each file prior to running the p(r) calculation. 84 The final results for all data sets are then presented in a savable data table. 85 86 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 87 70 88 Reference 71 89 --------- … … 76 94 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 77 95 78 .. note:: This help document was last modified by Paul Butler, 05 September, 201696 .. note:: This help document was last modified by Jeff Krzywon, 18 April 2018
Note: See TracChangeset
for help on using the changeset viewer.