Changeset 55d88b4 in sasmodels for sasmodels/data.py

Timestamp:

Oct 23, 2017 8:03:20 AM (7 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

c11d09f, eb3fab6, 6db17bd

Parents:

09141ff (diff), ba7302a (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.

git-author:

Andrew Jackson <andrew.jackson@…> (10/23/17 08:03:20)

git-committer:

GitHub <noreply@…> (10/23/17 08:03:20)

Message:

Merge pull request #51 from SasView?/flexible-cylinder

Flexible cylinder

File:

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

sasmodels/data.py

@@ -434 +434 @@
 
     scale = data.x**4 if view == 'q4' else 1.0
+    xscale = yscale = 'linear' if view == 'linear' else 'log'
 
     if use_data or use_theory:
@@ -466 +467 @@
             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
@@ -501 +505 @@
         plt.xlabel("$q$/A$^{-1}$")
         plt.ylabel('residuals')
-        plt.xscale('linear')
         plt.title('(model - Iq)/dIq')
+        plt.xscale(xscale)
+        plt.yscale('linear')