Changeset 76567bb in sasview

Timestamp:

Apr 13, 2018 4:00:37 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:

b9e89d5

Parents:

effdd98

Message:

Improvements to batch P(r).

Location:

src/sas/qtgui

Files:

• Perspectives/Inversion/InversionPerspective.py (modified) (7 diffs)
• Utilities/GridPanel.py (modified) (3 diffs)

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

@@ -34 +34 @@
 
 
+# TODO: Use communicator to catch data deletions
 # TODO: Update help with batch capabilities
-# TODO: Method to export results in some meaningful way
 class InversionWindow(QtWidgets.QDialog, Ui_PrInversion):
     """
@@ -381 +381 @@
 
     def showBatchOutput(self, output_data):
+        """
+        Display the batch output in tabular form
+        :param output_data: Dictionary mapping filename -> P(r) instance
+        """
         if self.grid_window is None:
             self.grid_window = BatchInversionOutputPanel(
                 parent=self, output_data=output_data)
+        else:
+            self.grid_window.setupTable(output_data)
         self.grid_window.show()
 
@@ -499 +505 @@
             self.dmaxWindow.close()
             self.dmaxWindow = None
-        current_data = self._data
+        self._data_list.pop(self._data)
+        self._data = None
         self.dataList.removeItem(self.dataList.currentIndex())
-        self._data_list.pop(current_data)
         # Last file removed
         if len(self._data_list) == 0:
@@ -527 +533 @@
         for data_ref in self._data_list.keys():
             self.setCurrentData(data_ref)
+            self.performEstimate()
+            self.performEstimateNT()
+            self.acceptAlpha()
+            self.acceptNoTerms()
             self.startThread()
             output[self.logic.data.filename] = self._calculator
@@ -581 +591 @@
         self.estimation_thread_nt.queue()
         self.estimation_thread_nt.ready(2.5)
+        if self.waitForEach:
+            if self.estimation_thread_nt.isrunning():
+                self.estimation_thread_nt.update()
 
     def performEstimate(self):
@@ -599 +612 @@
         self.estimation_thread.queue()
         self.estimation_thread.ready(2.5)
+        if self.waitForEach:
+            if self.estimation_thread.isrunning():
+                self.estimation_thread.update()
 
     ######################################################################
@@ -618 +634 @@
         if message:
             logging.info(message)
-        self.performEstimateNT()
+        if not self.waitForEach:
+            self.performEstimateNT()
 
     def _estimateNTCompleted(self, nterms, alpha, message, elapsed):

src/sas/qtgui/Utilities/GridPanel.py

@@ -295 +295 @@
         """
         # headers
-        param_list = ['Filename', 'Rg', 'Chi^2/dof', 'I(Q=0)', 'Oscillations',
-                      'Background', 'P+ Fraction', 'P+1-theta Fraction',
-                      'Calculation Time']
-        # P(r) keys
-        pr_keys = ['background', ]
+        param_list = ['Filename', 'Rg [Ã
+]', 'χ^2/dof', 'I(Q=0)', 'Oscillations',
+                      'Background [Ã
+^-1]', 'P+ Fraction', 'P+1-σ Fraction',
+                      'Calc. Time [sec]']
 
         keys = data.keys()
@@ -314 +314 @@
             out = pr.out
             cov = pr.cov
+            if out is None:
+                logging.warning("P(r) for {} did not converge.".format(filename))
+                continue
             self.tblParams.setItem(i_row, 0, QtWidgets.QTableWidgetItem(
-                GuiUtils.formatNumber(filename, high=True)))
+                "{}".format(filename)))
             self.tblParams.setItem(i_row, 2, QtWidgets.QTableWidgetItem(
                 "{:.3g}".format(pr.chi2[0])))
@@ -322 +325 @@
             self.tblParams.setItem(i_row, 8, QtWidgets.QTableWidgetItem(
                 "{:.2g}".format(pr.elapsed)))
-            if out is not None:
-                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, 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))))
-            else:
-                self.tblParams.setItem(i_row, 1, QtWidgets.QTableWidgetItem(
-                    "NaN"))
-                self.tblParams.setItem(i_row, 3, QtWidgets.QTableWidgetItem(
-                    "NaN"))
-                self.tblParams.setItem(i_row, 4, QtWidgets.QTableWidgetItem(
-                    "NaN"))
-                self.tblParams.setItem(i_row, 6, QtWidgets.QTableWidgetItem(
-                    "NaN"))
-                self.tblParams.setItem(i_row, 7, QtWidgets.QTableWidgetItem(
-                    "NaN"))
+            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, 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.resizeColumnsToContents()
+
+    @classmethod
+    def onHelp(cls):
+        """
+        Open a local url in the default browser
+        """
+        # TODO: Add anchor to batch fitting help when written
+        location = GuiUtils.HELP_DIRECTORY_LOCATION
+        url = "/user/sasgui/perspectives/pr/pr_help.html"
+        try:
+            webbrowser.open('file://' + os.path.realpath(location + url))
+        except webbrowser.Error as ex:
+            logging.warning("Cannot display help. %s" % ex)