Changeset 0ae0f9a in sasmodels for sasmodels/resolution.py

Timestamp:

Oct 8, 2016 1:30:56 PM (8 years ago)

Author:

jhbakker

Branches:

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

Children:

eb8a82e

Parents:

0444c02 (diff), 630cdd4 (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 'ajj_sesans' into Jurrian1D

File:

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

sasmodels/resolution.py

@@ -55 +55 @@
         return theory
 
+
+class SESANS1D(Resolution):
+
+    def __init__(self, data, q_calc):
+        self.data = data
+        self.q_calc = q_calc
+
+    def apply(self, theory):
+        return sesans.transform(self.data, self.q_calc, theory, None, None)
 
 class Pinhole1D(Resolution):
@@ -306 +315 @@
             weights[i, :] = (in_x + abs_x) * np.diff(q_edges) / (2*h)
         else:
-            for k in range(-n_height, h_height+1):
+            for k in range(-n_height, n_height+1):
                 weights[i, :] += _q_perp_weights(q_edges, qi+k*h/n_height, w)
             weights[i, :] /= 2*n_height + 1