Changeset fd877f5 in sasmodels

Timestamp:

Dec 21, 2016 9:31:59 AM (8 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

64614ad

Parents:

f1ec7002 (diff), 91a7c2b (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:

Jeff Krzywon <krzywon@…> (12/21/16 09:31:59)

git-committer:

GitHub <noreply@…> (12/21/16 09:31:59)

Message:

Merge pull request #22 from SasView?/ticket-811

Ticket 811

Location:

sasmodels

Files:

• resolution2d.py (modified) (3 diffs)
• kernel_header.c (modified) (1 diff)

sasmodels/resolution2d.py

@@ -64 +64 @@
         # just need q_calc and weights
         self.data = data
-        self.index = index
-
-        self.qx_data = data.qx_data[index]
-        self.qy_data = data.qy_data[index]
-        self.q_data = data.q_data[index]
+        self.index = index if index is not None else slice(None)
+
+        self.qx_data = data.qx_data[self.index]
+        self.qy_data = data.qy_data[self.index]
+        self.q_data = data.q_data[self.index]
 
         dqx = getattr(data, 'dqx_data', None)
@@ -74 +74 @@
         if dqx is not None and dqy is not None:
             # Here dqx and dqy mean dq_parr and dq_perp
-            self.dqx_data = dqx[index]
-            self.dqy_data = dqy[index]
+            self.dqx_data = dqx[self.index]
+            self.dqy_data = dqy[self.index]
             ## Remove singular points if exists
             self.dqx_data[self.dqx_data < SIGMA_ZERO] = SIGMA_ZERO
@@ -126 +126 @@
         # The angle (phi) of the original q point
         q_phi = np.arctan(q_phi).repeat(nbins)\
-            .reshape(nq, nbins).transpose().flatten()
+            .reshape([nq, nbins]).transpose().flatten()
         ## Find Gaussian weight for each dq bins: The weight depends only
         #  on r-direction (The integration may not need)

sasmodels/kernel_header.c

@@ -148 +148 @@
 inline double sinc(double x) { return x==0 ? 1.0 : sin(x)/x; }
 
-#if 0
+#if 1
 #define ORIENT_SYMMETRIC(qx, qy, theta, phi, q, sn, cn) do { \
     SINCOS(phi*M_PI_180, sn, cn); \