Changeset 84db7a5 in sasmodels for sasmodels/data.py

Timestamp:

Mar 17, 2016 10:47:47 AM (8 years ago)

Author:

krzywon

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:

6824af5

Parents:

4373d62

Message:

Updated sesans scripting to be more command line focused AND modified hardsphere to effect_radius.

File:

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

sasmodels/data.py

@@ -440 +440 @@
 
     if use_data or use_theory:
+        is_tof = np.any(data.lam!=data.lam[0])
         if num_plots > 1:
             plt.subplot(1, num_plots, 1)
         if use_data:
-            plt.errorbar(data.x, data.y, yerr=data.dy)
+            if is_tof:
+                plt.errorbar(data.x, np.log(data.y)/(data.lam*data.lam), yerr=data.dy/data.y/(data.lam*data.lam))
+            else:
+                plt.errorbar(data.x, data.y, yerr=data.dy)
         if theory is not None:
-            plt.plot(data.x, theory, '-', hold=True)
+            if is_tof:
+                plt.plot(data.x, np.log(theory)/(data.lam*data.lam), '-', hold=True)
+            else:
+                plt.plot(data.x, theory, '-', hold=True)
         if limits is not None:
             plt.ylim(*limits)
-        plt.xlabel('spin echo length (nm)')
-        plt.ylabel('polarization (P/P0)')
+
+        plt.xlabel('spin echo length ({})'.format(data._xunit))
+        if is_tof:
+            plt.ylabel('(Log (P/P$_0$))/$\lambda^2$')
+        else:
+            plt.ylabel('polarization (P/P0)')
+
 
     if resid is not None:
@@ -455 +467 @@
             plt.subplot(1, num_plots, (use_data or use_theory) + 1)
         plt.plot(data.x, resid, 'x')
-        plt.xlabel('spin echo length (nm)')
+        plt.xlabel('spin echo length ({})'.format(data._xunit))
         plt.ylabel('residuals (P/P0)')