Changeset 528bd8c in sasmodels

Timestamp:

Mar 17, 2016 9:36:23 AM (9 years ago)

Author:

awashington

Parents:

4373d62 (diff), 715bb83 (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 715bb8386192a1737472156141049bbf11899237 into 4373d62e7aa3cecc6c87ef83dac6e3f9cb33df6f

File:

• sasmodels/data.py (modified) (1 diff)

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**2, yerr=data.dy/data.y/data.lam**2)
+            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**2, '-', 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)')
+        if is_tof:
+            plt.ylabel('(Log (P/P$_0$))/$\lambda^2$')
+        else:
+            plt.ylabel('Polarisation (P/P0)')
 
     if resid is not None: