Changeset 3f3df6c in sasmodels

Timestamp:

Mar 28, 2019 10:34:42 AM (6 years ago)

Author:

awashington

Branches:

master

Children:

ccbbc3b

Parents:

0c7b8d8

git-author:

Adam Washington <rprospero@…> (03/28/19 10:16:34)

git-committer:

Adam Washington <rprospero@…> (03/28/19 10:34:42)

Message:

Remove fancy integration

It's too much for a single commit and I can't be sure if it's fixing
things or making them worse.

File:

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

sasmodels/sesans.py

@@ -14 +14 @@
 import numpy as np  # type: ignore
 from numpy import pi  # type: ignore
-from scipy.special import j1
+from scipy.special import j0
 
 
@@ -59 +59 @@
     def _set_hankel(self, SElength, lam, zaccept, Rmax):
         # type: (np.ndarray, float, float) -> None
-        SElength = np.asarray(SElength, dtype='float64')
-
-        # Rmax = #value in text box somewhere in FitPage?
+        SElength = np.asarray(SElength)
         q_max = 2*pi / (SElength[1] - SElength[0])
         q_min = 0.1 * 2*pi / (np.size(SElength) * SElength[-1])
-        # q = np.arange(q_min, q_max, q_min, dtype='float32')
-        # q = np.exp(np.arange(np.log(q_min), np.log(q_max), np.log(2),
-        #                      dtype=np.float32))
-        q = np.exp(np.linspace(np.log(q_min), np.log(q_max), 10*SElength.size,
-                               dtype=np.float64))
-        q = np.hstack([[0], q])
+        q = np.exp(np.arange(np.log(q_min), np.log(q_max), np.log(1.0003)))
 
-        H0 = (q[1:]**2 - q[:-1]**2) / (2 * np.pi) / 2
+        dq = q[1:]-q[:-1]
+        dq = np.hstack([[dq[0]], dq])
 
-        # repq = np.tile(q, (SElength.size, 1)).T
+        H0 = dq/(2*pi) * q
+
         H = np.outer(q, SElength)
-        j1(H, out=H)
-        H *= q.reshape((-1, 1))
-        H = H[1:] - H[:-1]
-        H /= 2 * np.pi * SElength
+        j0(H, out=H)
+        H *= (dq * q).reshape((-1, 1))
+        H /= 2*pi
 
-        lam = np.asarray(lam, dtype=np.float64)
-        reptheta = np.outer(q[1:], lam)
-        reptheta /= np.float64(2*np.pi)
+        reptheta = np.outer(q, lam)
+        reptheta /= 2*np.pi
         np.arcsin(reptheta, out=reptheta)
-        # reptheta = np.arcsin(repq*replam/2*np.pi)
         mask = reptheta > zaccept
-        # H[mask] = 0
+        H[mask] = 0
 
-        # H = np.zeros((q.size, SElength.size), dtype=np.float32)
-        # H0 = q * 0
-        assert(H.shape == (q.size-1, SElength.size))
-
-        self.q_calc = q[1:]
+        self.q_calc = q
         self._H, self._H0 = H, H0