Changeset da3638f in sasmodels

Timestamp:

Mar 6, 2019 3:39:41 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

0d26e91

Parents:

36a2418

Message:

fix numpy deprecation warnings from automatic float to integer

File:

• sasmodels/resolution.py (modified) (2 diffs)

sasmodels/resolution.py

@@ -446 +446 @@
     if q_min + 2*MINIMUM_RESOLUTION < q[0]:
         n_low = np.ceil((q[0]-q_min) / (q[1]-q[0])) if q[1] > q[0] else 15
-        q_low = np.linspace(q_min, q[0], n_low+1)[:-1]
+        q_low = np.linspace(q_min, q[0], int(n_low)+1)[:-1]
     else:
         q_low = []
     if q_max - 2*MINIMUM_RESOLUTION > q[-1]:
         n_high = np.ceil((q_max-q[-1]) / (q[-1]-q[-2])) if q[-1] > q[-2] else 15
-        q_high = np.linspace(q[-1], q_max, n_high+1)[1:]
+        q_high = np.linspace(q[-1], q_max, int(n_high)+1)[1:]
     else:
         q_high = []
@@ -498 +498 @@
         if q_min < 0:
             q_min = q[0]*MINIMUM_ABSOLUTE_Q
-        n_low = log_delta_q * (log(q[0])-log(q_min))
-        q_low = np.logspace(log10(q_min), log10(q[0]), np.ceil(n_low)+1)[:-1]
+        n_low = np.ceil(log_delta_q * (log(q[0])-log(q_min)))
+        q_low = np.logspace(log10(q_min), log10(q[0]), int(n_low)+1)[:-1]
     else:
         q_low = []
     if q_max > q[-1]:
-        n_high = log_delta_q * (log(q_max)-log(q[-1]))
-        q_high = np.logspace(log10(q[-1]), log10(q_max), np.ceil(n_high)+1)[1:]
+        n_high = np.ceil(log_delta_q * (log(q_max)-log(q[-1])))
+        q_high = np.logspace(log10(q[-1]), log10(q_max), int(n_high)+1)[1:]
     else:
         q_high = []