Changeset 5a5e371 in sasview


Ignore:
Timestamp:
Apr 18, 2018 3:13:18 PM (4 years ago)
Author:
krzywon
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
Message:

Document batch p(r) and link to the anchor from the results window. Remove unicode characters from batch results table for saving purposes.

Location:
src/sas
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/Perspectives/Inversion/InversionPerspective.py

    rae34d30 r5a5e371  
    3333 
    3434 
    35 # TODO: Update help with batch capabilities 
    3635class InversionWindow(QtWidgets.QDialog, Ui_PrInversion): 
    3736    """ 
     
    550549        self.isBatch = True 
    551550        self.performEstimate() 
    552         self.showBatchOutput() 
    553551 
    554552    def startNextBatchItem(self): 
     
    564562            # If no data sets left, end batch calculation 
    565563            self.calculateAllButton.setText("Calculate All") 
     564            self.showBatchOutput() 
    566565            self.enableButtons() 
    567566 
  • src/sas/qtgui/Utilities/GridPanel.py

    rae34d30 r5a5e371  
    289289 
    290290        super(BatchInversionOutputPanel, self).__init__(parent, output_data) 
     291        _translate = QtCore.QCoreApplication.translate 
     292        self.setWindowTitle(_translate("GridPanelUI", "Batch P(r) Results")) 
    291293 
    292294    def setupTable(self, data): 
     
    296298        # headers 
    297299        param_list = ['Filename', 'Rg [à
    298 ]', 'χ^2/dof', 'I(Q=0)', 'Oscillations', 
     300]', 'Chi^2/dof', 'I(Q=0)', 'Oscillations', 
    299301                      'Background [à
    300 ^-1]', 'P+ Fraction', 'P+1-σ Fraction', 
     302^-1]', 'P+ Fraction', 'P+1-theta Fraction', 
    301303                      'Calc. Time [sec]'] 
    302304 
     
    319321            self.tblParams.setItem(i_row, 0, QtWidgets.QTableWidgetItem( 
    320322                "{}".format(filename))) 
     323            self.tblParams.setItem(i_row, 1, QtWidgets.QTableWidgetItem( 
     324                "{:.3g}".format(pr.rg(out)))) 
    321325            self.tblParams.setItem(i_row, 2, QtWidgets.QTableWidgetItem( 
    322326                "{:.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)))) 
    329327            self.tblParams.setItem(i_row, 3, QtWidgets.QTableWidgetItem( 
    330328                "{:.3g}".format(pr.iq0(out)))) 
    331329            self.tblParams.setItem(i_row, 4, QtWidgets.QTableWidgetItem( 
    332330                "{:.3g}".format(pr.oscillations(out)))) 
     331            self.tblParams.setItem(i_row, 5, QtWidgets.QTableWidgetItem( 
     332                "{:.3g}".format(pr.background))) 
    333333            self.tblParams.setItem(i_row, 6, QtWidgets.QTableWidgetItem( 
    334334                "{:.3g}".format(pr.get_positive(out)))) 
    335335            self.tblParams.setItem(i_row, 7, QtWidgets.QTableWidgetItem( 
    336336                "{:.3g}".format(pr.get_pos_err(out, cov)))) 
     337            self.tblParams.setItem(i_row, 8, QtWidgets.QTableWidgetItem( 
     338                "{:.2g}".format(pr.elapsed))) 
    337339 
    338340        self.tblParams.resizeColumnsToContents() 
     
    344346        """ 
    345347        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" 
    347349        try: 
    348350            webbrowser.open('file://' + os.path.realpath(location + url)) 
  • src/sas/sasgui/perspectives/pr/media/pr_help.rst

    r1abd19c r5a5e371  
    6868.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 
    6969 
     70.. _Batch_Pr_Mode: 
     71 
     72Batch P(r) inversion 
     73-------------------- 
     74 
     75The p(r) calculator accepts any number of data sets, and supports batch fitting 
     76for all data sets in the p(r) data set combo box. Switching between data sets in 
     77the combo box allows for individual fits and review of fit parameters. The 
     78displayed plots will also update to include the latest fit results for the 
     79selected data set. 
     80 
     81The 'Calculate All' button will run the p(r) calculation for each file, 
     82sequentially. The calculator will estimate the number of terms, background, and 
     83regularization constant for each file prior to running the p(r) calculation. 
     84The final results for all data sets are then presented in a savable data table. 
     85 
     86.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 
     87 
    7088Reference 
    7189--------- 
     
    7694.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 
    7795 
    78 .. note::  This help document was last modified by Paul Butler, 05 September, 2016 
     96.. note::  This help document was last modified by Jeff Krzywon, 18 April 2018 
Note: See TracChangeset for help on using the changeset viewer.