Changeset 013adb7 in sasmodels for sasmodels/compare.py

Timestamp:

Dec 23, 2015 5:00:04 PM (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:

8b25ee1

Parents:

e21cc31

Message:

fix vlimits on 2D plots during parameter exploration

File:

• sasmodels/compare.py (modified) (5 diffs)

sasmodels/compare.py

@@ -253 +253 @@
                            cutoff=cutoff)
 
-def compare(opts):
+def compare(opts, limits=None):
     Nbase, Ncomp = opts['N1'], opts['N2']
     pars = opts['pars']
@@ -292 +292 @@
     view = opts['view']
     import matplotlib.pyplot as plt
+    if limits is None:
+        vmin, vmax = np.Inf, -np.Inf
+        if Nbase > 0:
+            vmin = min(vmin, min(base_value))
+            vmax = max(vmax, max(base_value))
+        if Ncomp > 0:
+            vmin = min(vmin, min(comp_value))
+            vmax = max(vmax, max(comp_value))
+        limits = vmin, vmax
+
     if Nbase > 0:
         if Ncomp > 0: plt.subplot(131)
-        plot_theory(data, base_value, view=view, plot_data=False)
+        plot_theory(data, base_value, view=view, plot_data=False, limits=limits)
         plt.title("%s t=%.1f ms"%(base.engine, base_time))
         #cbar_title = "log I"
     if Ncomp > 0:
         if Nbase > 0: plt.subplot(132)
-        plot_theory(data, comp_value, view=view, plot_data=False)
+        plot_theory(data, comp_value, view=view, plot_data=False, limits=limits)
         plt.title("%s t=%.1f ms"%(comp.engine,comp_time))
         #cbar_title = "log I"
@@ -327 +337 @@
     if not opts['explore']:
         plt.show()
+
+    return limits
 
 def _print_stats(label, err):
@@ -626 +638 @@
                 v.range(*parameter_range(k, v.value))
         else:
-            for k, v in self.pars.items():
+            for k, v in pars.items():
                 v.range(*parameter_range(k, v.value))
 
         self.pars = pars
         self.pd_types = pd_types
+        self.limits = None
 
     def numpoints(self):
@@ -654 +667 @@
         pars.update(self.pd_types)
         self.opts['pars'] = pars
-        compare(self.opts)
+        limits = compare(self.opts, limits=self.limits)
+        if self.limits is None:
+            vmin, vmax = limits
+            vmax = 1.3*vmax
+            vmin = vmax*1e-7
+            self.limits = vmin, vmax