Changeset 09e9e13 in sasmodels

Timestamp:

Apr 11, 2017 10:43:35 AM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

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

Children:

1a4d4c0

Parents:

1cd24b4

Message:

improve plots for sasmodels driven by bumps

File:

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

sasmodels/data.py

@@ -450 +450 @@
             if view is 'log':
                 mtheory[mtheory <= 0] = masked
-            plt.plot(data.x, scale*mtheory, '-', hold=True)
+            plt.plot(data.x, scale*mtheory, '-')
             all_positive = all_positive and (mtheory > 0).all()
             some_present = some_present or (mtheory.count() > 0)
@@ -457 +457 @@
             plt.ylim(*limits)
 
-        plt.xscale('linear' if not some_present or non_positive_x  else view)
+        plt.xscale('linear' if not some_present or non_positive_x
+                   else view if view is not None
+                   else 'log')
         plt.yscale('linear'
                    if view == 'q4' or not some_present or not all_positive
-                   else view)
+                   else view if view is not None
+                   else 'log')
         plt.xlabel("$q$/A$^{-1}$")
         plt.ylabel('$I(q)$')
+        title = ("data and model" if use_theory and use_data
+                 else "data" if use_data
+                 else "model")
+        plt.title(title)
 
     if use_calc:
@@ -482 +489 @@
         if num_plots > 1:
             plt.subplot(1, num_plots, use_calc + 2)
-        plt.plot(data.x, mresid, '-')
+        plt.plot(data.x, mresid, '.')
         plt.xlabel("$q$/A$^{-1}$")
         plt.ylabel('residuals')
-        plt.xscale('linear' if not some_present or non_positive_x else view)
+        plt.xscale('linear')
+        plt.title('(model - Iq)/dIq')
 
 
@@ -512 +520 @@
         if theory is not None:
             if is_tof:
-                plt.plot(data.x, np.log(theory)/(data.lam*data.lam), '-', hold=True)
+                plt.plot(data.x, np.log(theory)/(data.lam*data.lam), '-')
             else:
-                plt.plot(data.x, theory, '-', hold=True)
+                plt.plot(data.x, theory, '-')
         if limits is not None:
             plt.ylim(*limits)