Merge pull request #2655 from SasView/release_6.0.0_numpy_fix

Cherry-picked new_numpy_behaviour

src/sas/qtgui/Calculators/SlitSizeCalculator.py

@@ -116,7 +116,7 @@ def calculateSlitSize(self, data=None):
         try:
             xdata = data.x
             ydata = data.y
-            if xdata == [] or xdata is None or ydata == [] or ydata is None:
+            if xdata.size == 0 or xdata is None or ydata.size == 0 or ydata is None:
                 msg = "The current data is empty please check x and y"
                 logging.error(msg)
                 return

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

@@ -435,7 +435,8 @@ def calculateChi2(reference_data, current_data, weight):
 
         if index is None:
             index = numpy.ones(len(current_data.y), dtype=bool)
-        if current_data.dy is None or current_data.dy == []:
+        # if current_data.dy is None or not len(current_data.dy):
+        if current_data.dy is None or current_data.dy.size == 0:
             dy = numpy.ones(len(current_data.y))
         else:
             dy = weight

src/sas/sascalc/fit/AbstractFitEngine.py

@@ -161,7 +161,7 @@ class DataLoader.data_info.Data1D
         # Check error bar; if no error bar found, set it constant(=1)
         # TODO: Should provide an option for users to set it like percent,
         # constant, or dy data
-        if dy is None or dy == [] or dy.all() == 0:
+        if dy is None or dy.size == 0 or np.all(dy == 0):
             self.dy = np.ones(len(y))
         else:
             self.dy = np.asarray(dy).copy()
@@ -299,7 +299,7 @@ def set_data(self, sas_data2d, qmin=None, qmax=None):
         if qmax is None:
             self.qmax = math.sqrt(x_max * x_max + y_max * y_max)
         ## new error image for fitting purpose
-        if self.err_data is None or self.err_data == []:
+        if self.err_data is None or self.err_data.size == 0:
             self.res_err_data = np.ones(len(self.data))
         else:
             self.res_err_data = copy.deepcopy(self.err_data)