Changeset 0d26e91 in sasmodels for sasmodels/resolution.py

Timestamp:

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

Author:

GitHub <noreply@…>

Branches:

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

Children:

15f5138

Parents:

da3638f (diff), e589e9a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Paul Kienzle <pkienzle@…> (03/06/19 15:44:39)

git-committer:

GitHub <noreply@…> (03/06/19 15:44:39)

Message:

Merge branch 'beta_approx' into ticket-1015-gpu-mem-error

File:

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

sasmodels/resolution.py

@@ -445 +445 @@
     q = np.sort(q)
     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], int(n_low)+1)[:-1]
+        n_low = int(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]
     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, int(n_high)+1)[1:]
+        n_high = int(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:]
     else:
         q_high = []
@@ -498 +498 @@
         if q_min < 0:
             q_min = q[0]*MINIMUM_ABSOLUTE_Q
-        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]
+        n_low = int(np.ceil(log_delta_q * (log(q[0])-log(q_min))))
+        q_low = np.logspace(log10(q_min), log10(q[0]), n_low+1)[:-1]
     else:
         q_low = []
     if q_max > q[-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:]
+        n_high = int(np.ceil(log_delta_q * (log(q_max)-log(q[-1]))))
+        q_high = np.logspace(log10(q[-1]), log10(q_max), n_high+1)[1:]
     else:
         q_high = []