Changeset 5a5e371 in sasview

Timestamp:

Apr 18, 2018 1:13:18 PM (7 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:

• qtgui/Perspectives/Inversion/InversionPerspective.py (modified) (3 diffs)
• qtgui/Utilities/GridPanel.py (modified) (4 diffs)
• sasgui/perspectives/pr/media/pr_help.rst (modified) (2 diffs)

src/sas/qtgui/Perspectives/Inversion/InversionPerspective.py

@@ -33 +33 @@
 
 
-# TODO: Update help with batch capabilities
 class InversionWindow(QtWidgets.QDialog, Ui_PrInversion):
     """
@@ -550 +549 @@
         self.isBatch = True
         self.performEstimate()
-        self.showBatchOutput()
 
     def startNextBatchItem(self):
@@ -564 +562 @@
             # If no data sets left, end batch calculation
             self.calculateAllButton.setText("Calculate All")
+            self.showBatchOutput()
             self.enableButtons()
 

src/sas/qtgui/Utilities/GridPanel.py

@@ -289 +289 @@
 
         super(BatchInversionOutputPanel, self).__init__(parent, output_data)
+        _translate = QtCore.QCoreApplication.translate
+        self.setWindowTitle(_translate("GridPanelUI", "Batch P(r) Results"))
 
     def setupTable(self, data):
@@ -296 +298 @@
         # headers
         param_list = ['Filename', 'Rg [Ã
-]', 'χ^2/dof', 'I(Q=0)', 'Oscillations',
+]', 'Chi^2/dof', 'I(Q=0)', 'Oscillations',
                       'Background [Ã
-^-1]', 'P+ Fraction', 'P+1-σ Fraction',
+^-1]', 'P+ Fraction', 'P+1-theta Fraction',
                       'Calc. Time [sec]']
 
@@ -319 +321 @@
             self.tblParams.setItem(i_row, 0, QtWidgets.QTableWidgetItem(
                 "{}".format(filename)))
+            self.tblParams.setItem(i_row, 1, QtWidgets.QTableWidgetItem(
+                "{:.3g}".format(pr.rg(out))))
             self.tblParams.setItem(i_row, 2, QtWidgets.QTableWidgetItem(
                 "{:.3g}".format(pr.chi2[0])))
-            self.tblParams.setItem(i_row, 5, QtWidgets.QTableWidgetItem(
-                "{:.3g}".format(pr.background)))
-            self.tblParams.setItem(i_row, 8, QtWidgets.QTableWidgetItem(
-                "{:.2g}".format(pr.elapsed)))
-            self.tblParams.setItem(i_row, 1, QtWidgets.QTableWidgetItem(
-                "{:.3g}".format(pr.rg(out))))
             self.tblParams.setItem(i_row, 3, QtWidgets.QTableWidgetItem(
                 "{:.3g}".format(pr.iq0(out))))
             self.tblParams.setItem(i_row, 4, QtWidgets.QTableWidgetItem(
                 "{:.3g}".format(pr.oscillations(out))))
+            self.tblParams.setItem(i_row, 5, QtWidgets.QTableWidgetItem(
+                "{:.3g}".format(pr.background)))
             self.tblParams.setItem(i_row, 6, QtWidgets.QTableWidgetItem(
                 "{:.3g}".format(pr.get_positive(out))))
             self.tblParams.setItem(i_row, 7, QtWidgets.QTableWidgetItem(
                 "{:.3g}".format(pr.get_pos_err(out, cov))))
+            self.tblParams.setItem(i_row, 8, QtWidgets.QTableWidgetItem(
+                "{:.2g}".format(pr.elapsed)))
 
         self.tblParams.resizeColumnsToContents()
@@ -344 +346 @@
         """
         location = GuiUtils.HELP_DIRECTORY_LOCATION
-        url = "/user/sasgui/perspectives/pr/pr_help.html#batch-fit-mode"
+        url = "/user/sasgui/perspectives/pr/pr_help.html#batch-pr-mode"
         try:
             webbrowser.open('file://' + os.path.realpath(location + url))

src/sas/sasgui/perspectives/pr/media/pr_help.rst

@@ -68 +68 @@
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
 
+.. _Batch_Pr_Mode:
+
+Batch P(r) inversion
+--------------------
+
+The p(r) calculator accepts any number of data sets, and supports batch fitting
+for all data sets in the p(r) data set combo box. Switching between data sets in
+the combo box allows for individual fits and review of fit parameters. The
+displayed plots will also update to include the latest fit results for the
+selected data set.
+
+The 'Calculate All' button will run the p(r) calculation for each file,
+sequentially. The calculator will estimate the number of terms, background, and
+regularization constant for each file prior to running the p(r) calculation.
+The final results for all data sets are then presented in a savable data table.
+
+.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
+
 Reference
 ---------
@@ -76 +94 @@
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
 
-.. note::  This help document was last modified by Paul Butler, 05 September, 2016
+.. note::  This help document was last modified by Jeff Krzywon, 18 April 2018