Changeset f7d39c9 in sasview for src/sas/qtgui/Perspectives/Fitting

Timestamp:

Aug 22, 2018 7:00:00 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

b7f7d3f

Parents:

0d8b2db

Message:

Several fixes for runtime errors. SASVIEW-988.
Failures in Algorithm Option dialog
Q Ranges not showing properly with charts

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingOptions.py (modified) (1 diff)
• FittingUtilities.py (modified) (2 diffs)

src/sas/qtgui/Perspectives/Fitting/FittingOptions.py

@@ -146 +146 @@
             """
             widget = self.widgetFromOption(option)
-            new_value = widget.currentText() if isinstance(widget, QtWidgets.QComboBox) \
-                else float(widget.text())
-            self.config.values[self.current_fitter_id][option] = new_value
+            if widget is None:
+                return
+            try:
+                new_value = widget.currentText() if isinstance(widget, QtWidgets.QComboBox) \
+                    else float(widget.text())
+                self.config.values[self.current_fitter_id][option] = new_value
+            except ValueError:
+                # Don't update bumps if widget has bad data
+                self.reject
 
         # Update the BUMPS singleton

src/sas/qtgui/Perspectives/Fitting/FittingUtilities.py

@@ -335 +335 @@
     gn = reference_data.y
     en = dy[index][0]
+
+    # x values
+    x_current = current_data.x
+    x_reference = reference_data.x
+
     # build residuals
     residuals = Data1D()
@@ -340 +345 @@
         y = (fn - gn)/en
         residuals.y = -y
+    elif len(fn) > len(gn):
+        residuals.y = (fn - gn[1:len(fn)])/en
     else:
-        # TODO: fix case where applying new data from file on top of existing model data
         try:
-            y = (fn - gn[index][0]) / en
+            y = numpy.zeros(len(current_data.y))
+            begin = 0
+            for i, x_value in enumerate(x_reference):
+                if x_value in x_current:
+                    begin = i
+                    break
+            end = len(x_reference)
+            endl = 0
+            for i, x_value in enumerate(list(x_reference)[::-1]):
+                if x_value in x_current:
+                    endl = i
+                    break
+            # make sure we have correct lengths
+            assert len(x_current) == len(x_reference[begin:end-endl])
+
+            y = (fn - gn[begin:end-endl])/en
             residuals.y = y
         except ValueError: