Changeset 56b2687 in sasmodels for sasmodels/direct_model.py

Timestamp:

Jul 14, 2016 1:35:58 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

98ba1fc

Parents:

61f8638 (diff), fa800e72 (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 polydisp

Conflicts:

README.rst
sasmodels/core.py
sasmodels/data.py
sasmodels/generate.py
sasmodels/kernelcl.py
sasmodels/kerneldll.py
sasmodels/sasview_model.py

File:

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

sasmodels/direct_model.py

@@ -133 +133 @@
 
         if self.data_type == 'sesans':
-            
             q = sesans.make_q(data.sample.zacceptance, data.Rmax)
             index = slice(None, None)
@@ -180 +179 @@
                   and getattr(data, 'dxw', None) is not None):
                 res = resolution.Slit1D(data.x[index],
-                                        qx_width=data.dxw[index],
-                                        qy_width=data.dxl[index])
+                                        qx_width=data.dxl[index],
+                                        qy_width=data.dxw[index])
             else:
                 res = resolution.Perfect1D(data.x[index])