Changeset dc5ef15 in sasview for src/sas/qtgui/Perspectives/Fitting/FittingUtilities.py

Timestamp:

May 18, 2017 5:36:57 AM (8 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

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:

6066a3f

Parents:

2a432e7

Message:

Removed qtgui dependency on sasgui and wx SASVIEW-590

File:

• src/sas/qtgui/Perspectives/Fitting/FittingUtilities.py (modified) (2 diffs)

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

@@ -6 +6 @@
 import numpy
 
-from sas.sasgui.guiframe.dataFitting import Data1D
-from sas.sasgui.guiframe.dataFitting import Data2D
+from sas.qtgui.Plotting.PlotterData import Data1D
+from sas.qtgui.Plotting.PlotterData import Data2D
 
 def replaceShellName(param_name, value):
@@ -363 +363 @@
     return [i >> d & 1 for d in xrange(digits)]
 
+def getWeight(data, is2d, flag=None):
+    """
+    Received flag and compute error on data.
+    :param flag: flag to transform error of data.
+    """
+    weight = None
+    if is2d:
+        dy_data = data.err_data
+        data = data.data
+    else:
+        dy_data = data.dy
+        data = data.y
+
+    if flag == 0:
+        weight = numpy.ones_like(data)
+    elif flag == 1:
+        weight = dy_data
+    elif flag == 2:
+        weight = numpy.sqrt(numpy.abs(data))
+    elif flag == 3:
+        weight = numpy.abs(data)
+    return weight