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

Timestamp:

May 11, 2017 4:53:22 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:

d60da0c

Parents:

672b8ab

Message:

Code review fixes SASVIEW-588
Pylint related fixes in Perspectives/Fitting?

File:

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

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

@@ +1 @@
+from copy import deepcopy
+
 from PyQt4 import QtGui
 from PyQt4 import QtCore
 
 import numpy
-from copy import deepcopy
 
 from sas.sasgui.guiframe.dataFitting import Data1D
@@ -57 +58 @@
         item1.setCheckable(True)
         item1.setEditable(False)
-        item_err = QtGui.QStandardItem()
+        # item_err = QtGui.QStandardItem()
         # check for polydisp params
         if param.polydisperse:
@@ -199 +200 @@
     #flag = self.get_weight_flag()
     #weight = get_weight(data=self.data, is2d=self._is_2D(), flag=flag)
-
-    if reference_data == None:
-       return chisqr
+    chisqr = None
+    if reference_data is None:
+        return chisqr
 
     # temporary default values for index and weight
@@ -209 +210 @@
     # Get data: data I, theory I, and data dI in order
     if isinstance(reference_data, Data2D):
-        if index == None:
+        if index is None:
             index = numpy.ones(len(current_data.data), dtype=bool)
-        if weight != None:
+        if weight is not None:
             current_data.err_data = weight
         # get rid of zero error points
@@ -221 +222 @@
     else:
         # 1 d theory from model_thread is only in the range of index
-        if index == None:
+        if index is None:
             index = numpy.ones(len(current_data.y), dtype=bool)
-        if weight != None:
+        if weight is not None:
             current_data.dy = weight
-        if current_data.dy == None or current_data.dy == []:
+        if current_data.dy is None or current_data.dy == []:
             dy = numpy.ones(len(current_data.y))
         else:
@@ -288 +289 @@
     residuals.dxw = None
     residuals.ytransform = 'y'
-    # For latter scale changes 
+    # For latter scale changes
     residuals.xaxis('\\rm{Q} ', 'A^{-1}')
     residuals.yaxis('\\rm{Residuals} ', 'normalized')
@@ -299 +300 @@
     """
     # temporary default values for index and weight
-    index = None
+    # index = None
     weight = None
 
@@ -351 +352 @@
     group_id = reference_data.group_id
     residuals.group_id = "res" + str(group_id)
-    
+
     # Symbol
     residuals.symbol = 0