Changeset 886a89d in sasmodels for doc/genmodel.py

Timestamp:

Mar 18, 2016 6:27:44 AM (9 years ago)

Author:

gonzalezm

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:

3a45c2c

Parents:

044a9c1 (diff), 325e89a (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 branch 'master' of ​https://github.com/SasView/sasmodels

File:

• doc/genmodel.py (modified) (5 diffs)

doc/genmodel.py

@@ -2 +2 @@
 import numpy as np
 import matplotlib.pyplot as plt
+import pylab
 sys.path.insert(0, os.path.abspath('..'))
 from sasmodels import generate, core
@@ -28 +29 @@
     'q_max'     : 1.0,
     'nq'        : 1000,
-    'nq2d'      : 400,
+    'nq2d'      : 100,
     'vmin'      : 1e-3,  # floor for the 2D data results
     'qx_max'    : 0.5,
@@ -59 +60 @@
     if opts['zscale'] == 'log':
         Iq2D = np.log(np.clip(Iq2D, opts['vmin'], np.inf))
-    h = ax.imshow(Iq2D, interpolation='nearest', aspect=1, origin='upper',
-           extent=[-qx_max, qx_max, -qx_max, qx_max], cmap=ice_cm())
-    # , vmin=vmin, vmax=vmax)
+    ax.imshow(Iq2D, interpolation='nearest', aspect=1, origin='lower',
+        extent=[-qx_max, qx_max, -qx_max, qx_max], cmap=pylab.cm.jet)   
     ax.set_xlabel(r'$Q_x \/(\AA^{-1})$')
     ax.set_ylabel(r'$Q_y \/(\AA^{-1})$')
+
+#            im = self.subplot.imshow(output, interpolation='nearest',
+#                                     origin='lower',
+#                                     vmin=zmin_temp, vmax=self.zmax_2D,
+#                                     cmap=self.cmap,
+#                                     extent=(self.xmin_2D, self.xmax_2D,
+#                                             self.ymin_2D, self.ymax_2D))
 
 def ice_cm():
@@ -97 +104 @@
     plot_2d(model, opts, ax2d)
     ax1d = fig.add_axes([ax_left, ax_bottom, ax_width, ax_height])
+    plot_1d(model, opts, ax1d)
     #ax.set_aspect('square')
 else:
@@ -121 +129 @@
 captionstr += '.. figure:: img/' + model_info['id'] + '_autogenfig.png\n'
 captionstr += '\n'
-captionstr += '    1D plot corresponding to the default parameters of the model.\n'
+if model_info['has_2d']:
+    captionstr += '    1D and 2D plots corresponding to the default parameters of the model.\n'
+else:
+    captionstr += '    1D plot corresponding to the default parameters of the model.\n'
 captionstr += '\n'