Changeset e3571cb in sasmodels for sasmodels/data.py

Timestamp:

Oct 21, 2017 8:57:43 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

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

Children:

2bccb5a

Parents:

6773b02

Message:

allow comparison of 1D with integrated 2D

File:

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

sasmodels/data.py

@@ -363 +363 @@
     if hasattr(data, 'isSesans') and data.isSesans:
         _plot_result_sesans(data, None, None, use_data=True, limits=limits)
-    elif hasattr(data, 'qx_data'):
+    elif hasattr(data, 'qx_data') and not getattr(data, 'radial', False):
         _plot_result2D(data, None, None, view, use_data=True, limits=limits)
     else:
@@ -391 +391 @@
     if hasattr(data, 'isSesans') and data.isSesans:
         _plot_result_sesans(data, theory, resid, use_data=True, limits=limits)
-    elif hasattr(data, 'qx_data'):
+    elif hasattr(data, 'qx_data') and not getattr(data, 'radial', False):
         _plot_result2D(data, theory, resid, view, use_data, limits=limits)
     else:
@@ -425 +425 @@
     import matplotlib.pyplot as plt  # type: ignore
     from numpy.ma import masked_array, masked  # type: ignore
+
+    if getattr(data, 'radial', False):
+        radial_data.x = radial_data.q_data
+        radial_data.y = radial_data.data
 
     use_data = use_data and data.y is not None