Changeset fbb9397 in sasmodels

Timestamp:

Oct 18, 2017 6:11:37 AM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

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

Children:

3c24ccd

Parents:

32f87a5

Message:

fix handling of value limits on plots

Location:

sasmodels

Files:

• compare.py (modified) (5 diffs)
• data.py (modified) (1 diff)

sasmodels/compare.py

@@ -827 +827 @@
     parameters.
     """
-    limits = np.Inf, -np.Inf
     for k in range(opts['sets']):
         opts['pars'] = parse_pars(opts)
@@ -838 +837 @@
         import matplotlib.pyplot as plt
         plt.show()
+    return limits
 
 def run_models(opts, verbose=False):
@@ -912 +912 @@
 
 
-def plot_models(opts, result, limits=(np.Inf, -np.Inf), setnum=0):
+def plot_models(opts, result, limits=None, setnum=0):
     # type: (Dict[str, Any], Dict[str, Any], Optional[Tuple[float, float]]) -> Tuple[float, float]
+    import matplotlib.pyplot as plt
+
     base_value, comp_value = result['base_value'], result['comp_value']
     base_time, comp_time = result['base_time'], result['comp_time']
@@ -925 +927 @@
     # Plot if requested
     view = opts['view']
-    import matplotlib.pyplot as plt
-    vmin, vmax = limits
-    if have_base:
-        vmin = min(vmin, base_value.min())
-        vmax = max(vmax, base_value.max())
-    if have_comp:
-        vmin = min(vmin, comp_value.min())
-        vmax = max(vmax, comp_value.max())
-    limits = vmin, vmax
+    if limits is None:
+        vmin, vmax = np.inf, -np.inf
+        if have_base:
+            vmin = min(vmin, base_value.min())
+            vmax = max(vmax, base_value.max())
+        if have_comp:
+            vmin = min(vmin, comp_value.min())
+            vmax = max(vmax, comp_value.max())
+        limits = vmin, vmax
 
     if have_base:
@@ -1423 +1425 @@
         self.starting_values = dict((k, v.value) for k, v in pars.items())
         self.pd_types = pd_types
-        self.limits = np.Inf, -np.Inf
+        self.limits = None
 
     def revert_values(self):

sasmodels/data.py

@@ -646 +646 @@
     ymin, ymax = min(data.qy_data), max(data.qy_data)
     if view == 'log':
-        vmin, vmax = np.log10(vmin), np.log10(vmax)
+        vmin_scaled, vmax_scaled= np.log10(vmin), np.log10(vmax)
+    else:
+        vmin_scaled, vmax_scaled = vmin, vmax
     plt.imshow(plottable.reshape(len(data.x_bins), len(data.y_bins)),
                interpolation='nearest', aspect=1, origin='lower',
-               extent=[xmin, xmax, ymin, ymax], vmin=vmin, vmax=vmax)
+               extent=[xmin, xmax, ymin, ymax],
+               vmin=vmin_scaled, vmax=vmax_scaled)
     plt.xlabel("$q_x$/A$^{-1}$")
     plt.ylabel("$q_y$/A$^{-1}$")