Changeset d1a4793 in sasview

Timestamp:

Oct 27, 2017 1:20:08 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:

e7651ff

Parents:

dab3351

Message:

P(r) calculator returning reasonable answers. Plotting and unit tests left.

File:

• src/sas/qtgui/Perspectives/PrInversion/PrInversionPerspective.py (modified) (10 diffs)

src/sas/qtgui/Perspectives/PrInversion/PrInversionPerspective.py

@@ -1 +1 @@
 import sys
 import logging
+import pylab
 import numpy as np
 
@@ -14 +15 @@
 
 # pr inversion calculation elements
+from sas.sascalc.dataloader.data_info import Data1D
 from sas.sascalc.pr.invertor import Invertor
 
+def is_float(value):
+    try:
+        return float(value)
+    except ValueError:
+        return 0.0
 
 class PrInversionWindow(QtGui.QTabWidget, Ui_PrInversion):
@@ -41 +48 @@
         # is there data
         self._has_data = False
+        self._data = Data1D()
+
+        # p(r) calculator
+        self._calculator = Invertor()
+        self._last_calculator = None
+        self.calc_thread = None
+        self.estimation_thread = None
 
         # Current data object in view
@@ -49 +63 @@
             data = [data]
         for datum in data:
-            self._data_list.append({datum : None})
-
-        # p(r) calculator
-        self._calculator = Invertor()
-        self._last_calculator = None
-        self.calc_thread = None
-        self.estimation_thread = None
+            self._data_list.append({datum: self._calculator.clone()})
 
         self.model = QtGui.QStandardItemModel(self)
@@ -234 +242 @@
     # GUI Interaction Events
 
+    def update_calculator(self):
+        """Update all p(r) params. Take all GUI values as an override"""
+        self._calculator.set_x(self._data.x)
+        self._calculator.set_y(self._data.y)
+        self._calculator.set_err(self._data.dy)
+        self._calculator.set_qmin(is_float(UI.TabbedPrInversionUI._fromUtf8(
+            self.minQInput.text())))
+        self._calculator.set_qmax(is_float(UI.TabbedPrInversionUI._fromUtf8(
+            self.maxQInput.text())))
+        self._calculator.set_alpha(is_float(UI.TabbedPrInversionUI._fromUtf8(
+            self.regularizationConstantInput.text())))
+        self._calculator.set_dmax(is_float(UI.TabbedPrInversionUI._fromUtf8(
+            self.maxDistanceInput.text())))
+        self._calculator.set_est_bck(int(is_float(
+            UI.TabbedPrInversionUI._fromUtf8(self.backgroundInput.text()))))
+        self._calculator.set_slit_height(is_float(
+            UI.TabbedPrInversionUI._fromUtf8(self.slitHeightInput.text())))
+        self._calculator.set_slit_width(is_float(
+            UI.TabbedPrInversionUI._fromUtf8(self.slitWidthInput.text())))
+
     def _calculation(self):
         """
         Calculate the P(r) for every data set in the data list
         """
-        # TODO: Set all invertor values before calculation
-        self._calculator.__setattr__("qmin", UI.TabbedPrInversionUI._fromUtf8(
-            self.minQInput.text()))
+        # Pull in any GUI changes before running the calculations
+        self.update_calculator()
+        # Run
         self.startThread()
 
@@ -314 +342 @@
             self._data_list.append({data_object: None})
             self._has_data = True
+            self._data = data_object
             self.enableButtons()
             self.populateDataComboBox(data_object.filename)
-            self.model.setItem(WIDGETS.W_QMIN,
-                               QtGui.QStandardItem(str(data_object.x.min())))
-            self.model.setItem(WIDGETS.W_QMAX,
-                               QtGui.QStandardItem(str(data_object.x.max())))
+            self.model.setItem(WIDGETS.W_QMIN, QtGui.QStandardItem(
+                "{:.4g}".format(data_object.x.min())))
+            self.model.setItem(WIDGETS.W_QMAX, QtGui.QStandardItem(
+                "{:.4g}".format(data_object.x.max())))
 
             # Estimate initial values from data
+            self.update_calculator()
             self.performEstimate()
 
             # TODO: Plot data on load
 
-            # TODO: Only load in the 1st data until batch mode is working
-            # TODO: Thus, the break
+            # TODO: Only load the 1st data until batch mode is working
+            # TODO: thus, the break
             break
 
@@ -411 +441 @@
         self.regConstantSuggestionButton.setText(QtCore.QString(str(alpha)))
         self.regConstantSuggestionButton.setEnabled(True)
-        if message is not None:
+        if message:
             logging.info(message)
         self.performEstimateNT()
@@ -426 +456 @@
         """
         # Save useful info
-        self.noOfTermsSuggestionButton.setText(QtCore.QString(str(nterms)))
+        self.noOfTermsSuggestionButton.setText(QtCore.QString(
+            "{:n}".format(nterms)))
         self.noOfTermsSuggestionButton.setEnabled(True)
-        self.regConstantSuggestionButton.setText(QtCore.QString(str(alpha)))
+        self.regConstantSuggestionButton.setText(QtCore.QString(
+            "{:.3g}".format(alpha)))
         self.regConstantSuggestionButton.setEnabled(True)
         self.model.setItem(WIDGETS.W_COMP_TIME,
                            QtGui.QStandardItem(str(elapsed)))
-        if message is not None:
+        if message:
             logging.info(message)
             pass
@@ -459 +491 @@
         # Show result on control panel
 
+        # TODO: Connect self._calculator to GUI
         self.model.setItem(WIDGETS.W_RG, QtGui.QStandardItem(str(pr.rg(out))))
         self.model.setItem(WIDGETS.W_I_ZERO,
                            QtGui.QStandardItem(str(pr.iq0(out))))
         self.model.setItem(WIDGETS.W_BACKGROUND_INPUT,
-                           QtGui.QStandardItem("{:.2g}".format(pr.background)))
+                           QtGui.QStandardItem("{:.3f}".format(pr.background)))
         self.model.setItem(WIDGETS.W_BACKGROUND_OUTPUT,
                            QtGui.QStandardItem(str(pr.background)))
         self.model.setItem(WIDGETS.W_CHI_SQUARED,
-                           QtGui.QStandardItem(str(pr.chi2)))
+                           QtGui.QStandardItem(str(pr.chi2[0])))
         self.model.setItem(WIDGETS.W_COMP_TIME,
                            QtGui.QStandardItem(str(elapsed)))
@@ -476 +509 @@
         self.model.setItem(WIDGETS.W_SIGMA_POS_FRACTION,
                            QtGui.QStandardItem(str(pr.get_pos_err(out, cov))))
+
+        # Display results tab
+        self.PrTabWidget.setCurrentIndex(1)
 
         # TODO: Show plots