Changeset ced5bd2 in sasmodels for sasmodels/data.py

Timestamp:

Oct 4, 2017 4:26:41 PM (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:

2573fa1

Parents:

18a2bfc

Message:

allow -q=min:max on the sascomp command line

File:

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

sasmodels/data.py

@@ -438 +438 @@
 
     scale = data.x**4 if view == 'q4' else 1.0
+    xscale = yscale = 'linear' if view == 'linear' else 'log'
 
     if use_data or use_theory:
@@ -470 +471 @@
             plt.ylim(*limits)
 
-        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 if view is not None
-                   else 'log')
+
+        xscale = ('linear' if not some_present or non_positive_x
+                  else view if view is not None
+                  else 'log')
+        yscale = ('linear'
+                  if view == 'q4' or not some_present or not all_positive
+                  else view if view is not None
+                  else 'log')
+        plt.xscale(xscale)
         plt.xlabel("$q$/A$^{-1}$")
+        plt.yscale(yscale)
         plt.ylabel('$I(q)$')
         title = ("data and model" if use_theory and use_data
@@ -505 +509 @@
         plt.xlabel("$q$/A$^{-1}$")
         plt.ylabel('residuals')
-        plt.xscale('linear')
         plt.title('(model - Iq)/dIq')
+        plt.xscale(xscale)
+        plt.yscale('linear')