Changeset 9dda8cc in sasview for src/sas/sascalc/dataloader

Timestamp:

Apr 6, 2017 11:42:01 AM (8 years ago)

Author:

Ricardo Ferraz Leal <ricleal@…>

Branches:

master, 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, costrafo411, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

ccc7192

Parents:

a470e88

Message:

New style exceptions

File:

• src/sas/sascalc/dataloader/manipulations.py (modified) (15 diffs)

src/sas/sascalc/dataloader/manipulations.py

@@ -83 +83 @@
     """
     if data2d.data is None or data2d.x_bins is None or data2d.y_bins is None:
-        raise ValueError, "Can't convert this data: data=None..."
+        raise ValueError("Can't convert this data: data=None...")
     new_x = np.tile(data2d.x_bins, (len(data2d.y_bins), 1))
     new_y = np.tile(data2d.y_bins, (len(data2d.x_bins), 1))
@@ -149 +149 @@
             msg = "_Slab._avg: invalid number of "
             msg += " detectors: %g" % len(data2D.detector)
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
 
         # Get data
@@ -171 +171 @@
             nbins = int(math.ceil((self.y_max - y_min) / self.bin_width))
         else:
-            raise RuntimeError, "_Slab._avg: unrecognized axis %s" % str(maj)
+            raise RuntimeError("_Slab._avg: unrecognized axis %s" % str(maj))
 
         x = np.zeros(nbins)
@@ -232 +232 @@
         if not idx.any():
             msg = "Average Error: No points inside ROI to average..."
-            raise ValueError, msg
+            raise ValueError(msg)
         return Data1D(x=x[idx], y=y[idx], dy=err_y[idx])
 
@@ -308 +308 @@
             msg = "Circular averaging: invalid number "
             msg += "of detectors: %g" % len(data2D.detector)
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
         # Get data
         data = data2D.data[np.isfinite(data2D.data)]
@@ -473 +473 @@
         if len(data2D.q_data) == None:
             msg = "Circular averaging: invalid q_data: %g" % data2D.q_data
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
 
         # Build array of Q intervals
@@ -497 +497 @@
             # No need to calculate the frac when all data are within range
             if self.r_min >= self.r_max:
-                raise ValueError, "Limit Error: min > max"
+                raise ValueError("Limit Error: min > max")
 
             if self.r_min <= q_value and q_value <= self.r_max:
@@ -548 +548 @@
         if not idx.any():
             msg = "Average Error: No points inside ROI to average..."
-            raise ValueError, msg
+            raise ValueError(msg)
 
         return Data1D(x=x[idx], y=y[idx], dy=err_y[idx], dx=d_x)
@@ -589 +589 @@
         """
         if data2D.__class__.__name__ not in ["Data2D", "plottable_2D"]:
-            raise RuntimeError, "Ring averaging only take plottable_2D objects"
+            raise RuntimeError("Ring averaging only take plottable_2D objects")
 
         Pi = math.pi
@@ -649 +649 @@
         if not idx.any():
             msg = "Average Error: No points inside ROI to average..."
-            raise ValueError, msg
+            raise ValueError(msg)
         # elif len(phi_bins[idx])!= self.nbins_phi:
         #    print "resulted",self.nbins_phi- len(phi_bins[idx])
@@ -775 +775 @@
         """
         if data2D.__class__.__name__ not in ["Data2D", "plottable_2D"]:
-            raise RuntimeError, "Ring averaging only take plottable_2D objects"
+            raise RuntimeError("Ring averaging only take plottable_2D objects")
         Pi = math.pi
 
@@ -942 +942 @@
         if not idx.any():
             msg = "Average Error: No points inside sector of ROI to average..."
-            raise ValueError, msg
+            raise ValueError(msg)
         # elif len(y[idx])!= self.nbins:
         #    print "resulted",self.nbins- len(y[idx]),
@@ -1021 +1021 @@
         """
         if data2D.__class__.__name__ not in ["Data2D", "plottable_2D"]:
-            raise RuntimeError, "Ring cut only take plottable_2D objects"
+            raise RuntimeError("Ring cut only take plottable_2D objects")
 
         # Get data
@@ -1070 +1070 @@
         """
         if data2D.__class__.__name__ not in ["Data2D", "plottable_2D"]:
-            raise RuntimeError, "Boxcut take only plottable_2D objects"
+            raise RuntimeError("Boxcut take only plottable_2D objects")
         # Get qx_ and qy_data
         qx_data = data2D.qx_data
@@ -1122 +1122 @@
         """
         if data2D.__class__.__name__ not in ["Data2D", "plottable_2D"]:
-            raise RuntimeError, "Sectorcut take only plottable_2D objects"
+            raise RuntimeError("Sectorcut take only plottable_2D objects")
         Pi = math.pi
         # Get data