Changeset 2cdc35b in sasmodels for sasmodels/sesans.py

Timestamp:

Apr 11, 2017 9:44:18 AM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

costrafo411

Children:

2f9f1ec

Parents:

7c1cce3

Message:

provide working oriented/unoriented sesans examples

File:

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

sasmodels/sesans.py

@@ -45 +45 @@
         #import logging; logging.info("creating SESANS transform")
         self.q = z
-        # isoriented flag determines whether data is from an oriented sample or
-        # not, should be a selection variable upon entering SESANS data.
         self._set_hankel(SElength, zaccept, Rmax)
 
@@ -105 +103 @@
         #import logging; logging.info("creating SESANS transform")
         self.q = z
-        # isoriented flag determines whether data is from an oriented sample or
-        # not, should be a selection variable upon entering SESANS data.
         self._set_cosmat(SElength, zaccept, Rmax)
 
@@ -113 +109 @@
         Iq = np.reshape(Iq, self._Iq_shape)
         G0 = self._cos0 * np.sum(Iq) * dq
-        G = np.sum(np.dot(Iq, self._cosmat.T), axis=1) * dq
+        G = np.sum(np.dot(Iq, self._cosmat), axis=0) * dq
         P = G - G0
         return P
@@ -125 +121 @@
         q_max = 2 * pi / (SElength[1] - SElength[0])
         q_min = 0.1 * 2 * pi / (np.size(SElength) * SElength[-1])
+        q_min *= 100
 
         q = np.arange(q_min, q_max, q_min, dtype='float32')
@@ -130 +127 @@
 
         cos0 = np.float32(dq / (2 * pi))
-        cosmat = np.float32(dq / (2 * pi)) * np.cos(q[:, None] * SE[None, :])
+        cosmat = np.float32(dq / (2 * pi)) * np.cos(q[:, None] * SElength[None, :])
 
         qx, qy = np.meshgrid(q, q)