Changeset 65ceb7d in sasmodels for sasmodels/sesans.py

Timestamp:

Sep 18, 2017 2:53:23 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

costrafo411

Children:

3a45c2c

Parents:

2f9f1ec (diff), 058460c (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.

Message:

Merge branch 'master' into costrafo411

File:

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

sasmodels/sesans.py

@@ -41 +41 @@
     _H0 = None # type: np.ndarray
 
-    def __init__(self, z, SElength, zaccept, Rmax):
+    def __init__(self, z, SElength, lam, zaccept, Rmax):
         # type: (np.ndarray, float, float) -> None
         #import logging; logging.info("creating SESANS transform")
         self.q = z
-        self._set_hankel(SElength, zaccept, Rmax)
+        self._set_hankel(SElength, lam, zaccept, Rmax)
 
     def apply(self, Iq):
@@ -53 +53 @@
         return P
 
-    def _set_hankel(self, SElength, zaccept, Rmax):
+    def _set_hankel(self, SElength, lam, zaccept, Rmax):
         # type: (np.ndarray, float, float) -> None
         # Force float32 arrays, otherwise run into memory problems on some machines
@@ -69 +69 @@
         repSE = np.tile(SElength, (q.size, 1))
         H = np.float32(dq/(2*pi)) * j0(repSE*repq) * repq
+
+        replam = np.tile(lam, (q.size, 1))
+        reptheta = np.arcsin(repq*replam/2*np.pi)
+        mask = reptheta > zaccept
+        H[mask] = 0
 
         self.q_calc = q