Changeset e090ba90 in sasview for src/sas/sascalc/dataloader/manipulations.py

Timestamp:

Oct 11, 2018 11:59:57 AM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1249

Children:

88d2e70

Parents:

67ed543

Message:

remove errors and warnings from py37 tests of sascalc

File:

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

src/sas/sascalc/dataloader/manipulations.py

@@ -928 +928 @@
 
         # Organize the results
-        for i in range(self.nbins):
-            y[i] = y[i] / y_counts[i]
-            y_err[i] = math.sqrt(y_err[i]) / y_counts[i]
-
+        with np.errstate(divide='ignore', invalid='ignore'):
+            y = y/y_counts
+            y_err = np.sqrt(y_err)/y_counts
             # The type of averaging: phi,q2, or q
             # Calculate x[i]should be at the center of the bin
             if run.lower() == 'phi':
-                x[i] = (self.phi_max - self.phi_min) / self.nbins * \
-                    (1.0 * i + 0.5) + self.phi_min
+                step  = (self.phi_max - self.phi_min) / self.nbins
+                x = (np.arange(self.nbins) + 0.5) * step + self.phi_min
             else:
                 # We take the center of ring area, not radius.
@@ -944 +943 @@
                 # 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)
+                x = x/y_counts
+
         idx = (np.isfinite(y) & np.isfinite(y_err))
         if x_err is not None: