Changeset b151003 in sasmodels for sasmodels/data.py

Timestamp:

Apr 14, 2016 8:57:32 AM (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:

391ea92, dd7fc12

Parents:

0ce5710 (diff), 7abcc59 (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 remote-tracking branch 'origin/master' into polydisp

Conflicts:

sasmodels/model_test.py

File:

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

sasmodels/data.py

@@ -410 +410 @@
     use_calc = use_theory and Iq_calc is not None
     num_plots = (use_data or use_theory) + use_calc + use_resid
-
+    non_positive_x = (data.x<=0.0).any()
 
     scale = data.x**4 if view == 'q4' else 1.0
@@ -432 +432 @@
 
         if use_theory:
+            # Note: masks merge, so any masked theory points will stay masked,
+            # and the data mask will be added to it.
             mtheory = masked_array(theory, data.mask.copy())
             mtheory[~np.isfinite(mtheory)] = masked
@@ -443 +445 @@
             plt.ylim(*limits)
 
-        plt.xscale('linear' if not some_present else view)
+        plt.xscale('linear' if not some_present or non_positive_x  else view)
         plt.yscale('linear'
                    if view == 'q4' or not some_present or not all_positive
@@ -471 +473 @@
         plt.xlabel("$q$/A$^{-1}$")
         plt.ylabel('residuals')
-        plt.xscale('linear' if not some_present else view)
+        plt.xscale('linear' if not some_present or non_positive_x else view)