Changeset 46cd1c3 in sasview for src/sas/sascalc/dataloader

Timestamp:

May 18, 2017 2:48:06 PM (8 years ago)

Author:

Ricardo M. 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:

7b15990

Parents:

e123eb9

Message:

Added Design by contract

File:

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

src/sas/sascalc/dataloader/manipulations.py

@@ -787 +787 @@
         return Data1D(x=phi_values[idx], y=phi_bins[idx], dy=phi_err[idx])
 
-################################################################################
 
 class _Sector(object):
@@ -802 +801 @@
     """
 
-    def __init__(self, r_min, r_max, phi_min=0, phi_max=2 * math.pi, nbins=20, base = None):
+    def __init__(self, r_min, r_max, phi_min=0, phi_max=2 * math.pi, nbins=20,
+                 base=None):
+        '''
+        :param base: must be a valid base for an algorithm, i.e.,
+        a positive number
+        '''
         self.r_min = r_min
         self.r_max = r_max
@@ -838 +842 @@
         y_err = np.zeros(self.nbins)
         x_err = np.zeros(self.nbins)
-        y_counts = np.zeros(self.nbins) # Cycle counts (for the mean)
+        y_counts = np.zeros(self.nbins)  # Cycle counts (for the mean)
 
         # Get the min and max into the region: 0 <= phi < 2Pi
@@ -936 +940 @@
                 # We take the center of ring area, not radius.
                 # This is more accurate than taking the radial center of ring.
-                #delta_r = (self.r_max - self.r_min) / self.nbins
-                #r_inner = self.r_min + delta_r * i
-                #r_outer = r_inner + delta_r
-                #x[i] = math.sqrt((r_inner * r_inner + r_outer * r_outer) / 2)
+                # delta_r = (self.r_max - self.r_min) / self.nbins
+                # r_inner = self.r_min + delta_r * i
+                # r_outer = r_inner + delta_r
+                # x[i] = math.sqrt((r_inner * r_inner + r_outer * r_outer) / 2)
                 x[i] = x[i] / y_counts[i]
         y_err[y_err == 0] = np.average(y_err)
@@ -952 +956 @@
         # elif len(y[idx])!= self.nbins:
         #    print "resulted",self.nbins- len(y[idx]),
-        #"empty bin(s) due to tight binning..."
+        # "empty bin(s) due to tight binning..."
         return Data1D(x=x[idx], y=y[idx], dy=y_err[idx], dx=d_x)